X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.dcl;h=17034beb04f6e8e0d1f78cf4776b65cddb0d694c;hb=547eb2278f48ab8b94e70ef4a1fc2bf5093bdfb2;hp=70dc6ad513617dde9f60956f05d56b77ab659f64;hpb=ddfd196fa4999b117701121a2f4cb1fe378f902d;p=mTask.git

diff --git a/mTaskInterpret.dcl b/mTaskInterpret.dcl
index 70dc6ad..17034be 100644
--- a/mTaskInterpret.dcl
+++ b/mTaskInterpret.dcl
@@ -6,15 +6,26 @@ from Data.Monoid import class Semigroup, class Monoid
 import mTask
 
 :: MTaskMSGRecv
-	= MTPub Int String
+	= MTTaskAck Int
+	| MTTaskDelAck Int
+	| MTSDSAck Int
+	| MTSDSDelAck Int
+	| MTPub Int String
 	| MTMessage String
 	| MTEmpty
 
 :: MTaskMSGSend
-	= MTSds Int String
-	| 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
@@ -49,6 +60,9 @@ decode :: String -> MTaskMSGRecv
 	| BCJmp Int
 	| BCJmpT Int
 	| BCJmpF Int
+	//UserLED
+	| BCLedOn [Char]
+	| BCLedOff [Char]
 	//Serial
 	| BCSerialAvail
 	| BCSerialPrint
@@ -66,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
 
@@ -80,12 +100,15 @@ instance toByteCode Char
 instance toByteCode String
 instance toByteCode Long
 instance toByteCode Button
+instance toByteCode UserLED
+//instance toByteCode MTaskInterval
 
 instance toChar Pin
 instance arith ByteCode
 instance boolExpr ByteCode
 instance analogIO ByteCode
 instance digitalIO ByteCode
+instance userLed ByteCode
 //instance If ByteCode Stmt Stmt Stmt
 //instance If ByteCode e Stmt Stmt
 //instance If ByteCode Stmt e Stmt
@@ -98,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)