X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=mTaskInterpret.dcl;h=17034beb04f6e8e0d1f78cf4776b65cddb0d694c;hb=1d6cedaf81bbbe0ae869f20c9003bf018fb027ff;hp=319ffb3e7e4d6f09bb238c27a0b92e4057d7fc4e;hpb=55afb005ced3bba3813163596cdc7288a318a3c2;p=mTask.git

diff --git a/mTaskInterpret.dcl b/mTaskInterpret.dcl
index 319ffb3..17034be 100644
--- a/mTaskInterpret.dcl
+++ b/mTaskInterpret.dcl
@@ -15,10 +15,17 @@ import mTask
 	| MTEmpty
 
 :: MTaskMSGSend
-	= MTTask Int String
+	= MTTask MTaskInterval String
+	| MTTaskDel Int
 	| MTSds Int String
 	| MTUpd Int String
 
+:: MTaskInterval
+	= OneShot
+	| OnInterval Int
+	| OnInterrupt Int
+
+instance toString MTaskInterval
 instance toString MTaskMSGRecv
 instance toString MTaskMSGSend
 encode :: MTaskMSGSend -> String
@@ -73,10 +80,16 @@ decode :: String -> MTaskMSGRecv
 instance Semigroup (ByteCode a p)
 instance Monoid (ByteCode a p)
 
+:: BCShare = {
+		sdsi :: Int,
+		sdspub :: Bool,
+		sdsval :: [Char]
+	}
+
 :: BCState = {
 		freshl :: [Int],
 		freshs :: [Int],
-		sdss :: [(Int, [Char])]
+		sdss :: [BCShare]
 	}
 instance zero BCState
 
@@ -88,6 +101,7 @@ instance toByteCode String
 instance toByteCode Long
 instance toByteCode Button
 instance toByteCode UserLED
+//instance toByteCode MTaskInterval
 
 instance toChar Pin
 instance arith ByteCode
@@ -107,11 +121,9 @@ instance assign ByteCode
 instance seq ByteCode
 instance serial ByteCode
 
-//pub :: (ByteCode a b) -> ByteCode a b
-
-toMessages :: Int (String, BCState) -> ([MTaskMSGSend], BCState)
+toMessages :: MTaskInterval (String, BCState) -> ([MTaskMSGSend], BCState)
 toSDSUpdate :: Int Int -> [MTaskMSGSend]
 
 toByteVal :: BC -> [Char]
 toReadableByteCode :: (ByteCode a b) -> (String, BCState)
-toRealByteCode :: (ByteCode a b) -> (String, BCState)
+toRealByteCode :: (ByteCode a b) BCState -> (String, BCState)