layout is working, now up to the communication

[mTask.git] / mTaskInterpret.dcl

diff --git a/mTaskInterpret.dcl b/mTaskInterpret.dcl
index bca5df7..319ffb3 100644 (file)
--- a/mTaskInterpret.dcl
+++ b/mTaskInterpret.dcl
@@ -5,16 +5,24 @@ from Control.Monad.State import :: State, :: StateT
 from Data.Monoid import class Semigroup, class Monoid
 import mTask
 
-:: MTaskMessage 
-       = MTSds Int String
-       | MTTask Int String
+:: MTaskMSGRecv
+       = MTTaskAck Int
+       | MTTaskDelAck Int
+       | MTSDSAck Int
+       | MTSDSDelAck Int
        | MTPub Int String
+       | MTMessage String
+       | MTEmpty
+
+:: MTaskMSGSend
+       = MTTask Int String
+       | MTSds Int String
        | MTUpd Int String
 
-instance toString MTaskMessage
-safePrint :: String -> String
-encode :: MTaskMessage -> String
-decode :: String -> MTaskMessage
+instance toString MTaskMSGRecv
+instance toString MTaskMSGSend
+encode :: MTaskMSGSend -> String
+decode :: String -> MTaskMSGRecv
 
 :: BC
        = BCNop
@@ -45,6 +53,9 @@ decode :: String -> MTaskMessage
        | BCJmp Int
        | BCJmpT Int
        | BCJmpF Int
+       //UserLED
+       | BCLedOn [Char]
+       | BCLedOff [Char]
        //Serial
        | BCSerialAvail
        | BCSerialPrint
@@ -76,16 +87,18 @@ instance toByteCode Char
 instance toByteCode String
 instance toByteCode Long
 instance toByteCode Button
+instance toByteCode UserLED
 
 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
 
@@ -94,7 +107,10 @@ instance assign ByteCode
 instance seq ByteCode
 instance serial ByteCode
 
-toMessages :: Int (String, BCState) -> [MTaskMessage]
+//pub :: (ByteCode a b) -> ByteCode a b
+
+toMessages :: Int (String, BCState) -> ([MTaskMSGSend], BCState)
+toSDSUpdate :: Int Int -> [MTaskMSGSend]
 
 toByteVal :: BC -> [Char]
 toReadableByteCode :: (ByteCode a b) -> (String, BCState)