X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.icl;h=c81476a1d118b405f07fe3976492d12a9ebdd9c5;hb=a2df77cbda43d5a24eeb8ac7db7452baae9f18aa;hp=ef75b9a1bf7c3c58e599d1c01e441099d5371dcf;hpb=bfbcdc683846195fbe720f4b3c38f3b0604c8f22;p=mTask.git diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl index ef75b9a..c81476a 100644 --- a/mTaskInterpret.icl +++ b/mTaskInterpret.icl @@ -53,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 @@ -81,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 @@ -158,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 @@ -282,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=[]}