repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small update
[mTask.git]
/
mTaskInterpret.icl
diff --git
a/mTaskInterpret.icl
b/mTaskInterpret.icl
index
34dc617
..
c81476a
100644
(file)
--- a/
mTaskInterpret.icl
+++ b/
mTaskInterpret.icl
@@
-43,8
+43,8
@@
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 :: 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
encode (MTSpec) = "c\n"
import StdDebug
@@
-53,7
+53,7
@@
decode x
| not (trace_tn ("decoding: " +++ toString (toJSON x))) = undef
| size x == 0 = MTEmpty
= case x.[0] of
| 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
'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
+++ " 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
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
|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
}
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]
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=[]}
instance zero BCState where
zero = {freshl=[1..], freshs=[1..], sdss=[]}
@@
-338,14
+341,11
@@
toMessages interval x s
| not (trace_tn $ printToString s.sdss) = undef
| not (trace_tn $ printToString newstate.sdss) = undef
| not (trace_tn $ printToString newsdss) = undef
| not (trace_tn $ printToString s.sdss) = undef
| not (trace_tn $ printToString newstate.sdss) = undef
| not (trace_tn $ printToString newsdss) = undef
-= ([MTSds sdsi
$ toByteCode e\\{sdsi,sdsval=(BCValue e)
}<-newsdss] ++
+= ([MTSds sdsi
e\\{sdsi,sdsval=e
}<-newsdss] ++
[MTTask interval bc], newstate)
instance == BCShare where (==) a b = a.sdsi == b.sdsi
[MTTask interval bc], newstate)
instance == BCShare where (==) a b = a.sdsi == b.sdsi
-toSDSUpdate :: Int Int -> [MTaskMSGSend]
-toSDSUpdate i v = [MTUpd i (to16bit v)]
-
//Start = toMessages (OnInterval 500) $ toRealByteCode (unMain bc) zero
Start = fst $ toReadableByteCode (unMain $ countAndLed) zero
//Start = fst $ toReadableByteCode (unMain $ blink LED1) zero
//Start = toMessages (OnInterval 500) $ toRealByteCode (unMain bc) zero
Start = fst $ toReadableByteCode (unMain $ countAndLed) zero
//Start = fst $ toReadableByteCode (unMain $ blink LED1) zero