small update

[mTask.git] / mTaskInterpret.icl

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index aeceb92..c81476a 100644 (file)
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -43,8 +43,9 @@ import Tasks.Examples
 encode :: MTaskMSGSend -> String
 encode (MTTask to data) = "t" +++ toByteCode to +++ to16bit (size data) +++ data +++ "\n"
 encode (MTTaskDel i) = "d" +++ to16bit i +++ "\n"
-encode (MTSds i v) = "s" +++ to16bit i +++ v +++ "\n"
-encode (MTUpd i v) = "u" +++ to16bit i +++ v +++ "\n"
+encode (MTSds i v) = "s" +++ to16bit i +++ toByteCode v +++ "\n"
+encode (MTUpd i v) = "u" +++ to16bit i +++ toByteCode v +++ "\n"
+encode (MTSpec) = "c\n"
 
 import StdDebug
 decode :: String -> MTaskMSGRecv
@@ -52,7 +53,7 @@ decode x
 | not (trace_tn ("decoding: " +++ toString (toJSON x))) = undef
 | size x == 0 = MTEmpty
 = case x.[0] of
-       't' = MTTaskAck $ fromByteCode x
+       't' = MTTaskAck (fromByteCode x) (fromByteCode (x % (2, size x)))
        'd' = MTTaskDelAck $ fromByteCode x
        'm' = MTMessage x
        's' = MTSDSAck $ fromByteCode x
@@ -80,7 +81,8 @@ instance toString MTaskMSGSend where
                +++ " value " +++ safePrint v
 
 instance toString MTaskMSGRecv where
-       toString (MTTaskAck i) = "Task added with id: " +++ toString i
+       toString (MTTaskAck i mem) = "Task added with id: " +++ toString i
+               +++ " free memory: " +++ toString mem
        toString (MTTaskDelAck i) = "Task deleted with id: " +++ toString i
        toString (MTSDSAck i) = "SDS added with id: " +++ toString i
        toString (MTSDSDelAck i) = "SDS deleted with id: " +++ toString i
@@ -138,7 +140,7 @@ instance fromByteCode UserLED where fromByteCode s = conses{|*|} !! toInt s.[1]
 instance fromByteCode BCValue where fromByteCode s = parseBCValue s.[0] s
 
 instance toByteCode MTaskInterval where
-       toByteCode OneShot = toByteCode 0
+       toByteCode OneShot = toByteCode (OnInterval 0)
        //Intervals have the first bit 0 and the rest is a 15 bit unsigned int
        toByteCode (OnInterval i) = {toChar $ i/256 bitand 127, toChar $ i rem 256}
        //Intervals have the first bit 1 and the rest is a 15 bit unsigned int
@@ -157,8 +159,7 @@ instance fromByteCode MTaskDeviceSpec where
                |haveLed=(c bitand 1) > 0
                ,haveAio=(c bitand 2) > 0
                ,haveDio=(c bitand 4) > 0
-               ,maxTask=from16bit $ s % (1,3)
-               ,maxSDS=from16bit $ s % (3,5)
+               ,bytesMemory=from16bit $ s % (1,3)
                }
 
 derive gPrint Long, UserLED, Button, AnalogPin, DigitalPin, PinMode, Pin, BC, MTaskDeviceSpec
@@ -281,6 +282,9 @@ instance userLed ByteCode where
        ledOn  (BC l) = BC $ l >>| tell [BCLedOn]
        ledOff (BC l) = BC $ l >>| tell [BCLedOff]
 
+instance retrn ByteCode where
+  retrn (BC l) = BC $ tell [BCReturn]
+
 instance zero BCState where
        zero = {freshl=[1..], freshs=[1..], sdss=[]}
 
@@ -328,13 +332,19 @@ toReadableByteCode x s
                        where
                                (ex, newls) = splitAt (bclength b - 1) ls
 
-toMessages :: MTaskInterval (String, BCState) -> ([MTaskMSGSend], BCState)
-toMessages interval (bytes, st=:{sdss}) = (
-       [MTSds sdsi $ toByteCode e\\{sdsi,sdsval=(BCValue e)}<-sdss] ++
-       [MTTask interval bytes], st)
+derive gPrint BCShare
+
+toMessages :: MTaskInterval (Main (ByteCode a b)) BCState -> ([MTaskMSGSend], BCState)
+toMessages interval x s
+# (bc, newstate) = toRealByteCode (unMain x) s
+# newsdss = 'DL'.difference newstate.sdss s.sdss 
+| not (trace_tn $ printToString s.sdss) = undef
+| not (trace_tn $ printToString newstate.sdss) = undef
+| not (trace_tn $ printToString newsdss) = undef
+= ([MTSds sdsi e\\{sdsi,sdsval=e}<-newsdss] ++
+       [MTTask interval bc], newstate)
 
-toSDSUpdate :: Int Int -> [MTaskMSGSend]
-toSDSUpdate i v = [MTUpd i (to16bit v)]
+instance == BCShare where (==) a b = a.sdsi == b.sdsi
 
 //Start = toMessages (OnInterval 500) $ toRealByteCode (unMain bc) zero
 Start = fst $ toReadableByteCode (unMain $ countAndLed) zero