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

diff --git a/mTaskInterpret.dcl b/mTaskInterpret.dcl
index 0deb665..17034be 100644
--- a/mTaskInterpret.dcl
+++ b/mTaskInterpret.dcl
@@ -5,6 +5,32 @@ from Control.Monad.State import :: State, :: StateT
 from Data.Monoid import class Semigroup, class Monoid
 import mTask
 
+:: MTaskMSGRecv
+	= MTTaskAck Int
+	| MTTaskDelAck Int
+	| MTSDSAck Int
+	| MTSDSDelAck Int
+	| MTPub Int String
+	| MTMessage String
+	| MTEmpty
+
+:: MTaskMSGSend
+	= 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
+decode :: String -> MTaskMSGRecv
+
 :: BC
 	= BCNop
 	| BCLab Int
@@ -34,6 +60,9 @@ import mTask
 	| BCJmp Int
 	| BCJmpT Int
 	| BCJmpF Int
+	//UserLED
+	| BCLedOn [Char]
+	| BCLedOff [Char]
 	//Serial
 	| BCSerialAvail
 	| BCSerialPrint
@@ -51,10 +80,16 @@ import mTask
 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
 
@@ -65,16 +100,19 @@ 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 If ByteCode Stmt Stmt Stmt
-instance If ByteCode Stmt e Stmt
-instance If ByteCode Stmt Stmt e
-instance If ByteCode x y Expr
+instance userLed ByteCode
+//instance If ByteCode Stmt Stmt Stmt
+//instance If ByteCode e Stmt Stmt
+//instance If ByteCode Stmt e Stmt
+instance If ByteCode x y Stmt
 instance IF ByteCode
 instance noOp ByteCode
 
@@ -83,9 +121,9 @@ instance assign ByteCode
 instance seq ByteCode
 instance serial ByteCode
 
-getSDSBytes :: BCState -> String
-getTaskBytes :: Int String -> String
+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)