repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update
[mTask.git]
/
mTaskInterpret.icl
diff --git
a/mTaskInterpret.icl
b/mTaskInterpret.icl
index
c986ec5
..
aeceb92
100644
(file)
--- a/
mTaskInterpret.icl
+++ b/
mTaskInterpret.icl
@@
-41,12
+41,7
@@
import Text.Encodings.Base64
import Tasks.Examples
encode :: MTaskMSGSend -> String
import Tasks.Examples
encode :: MTaskMSGSend -> String
-encode (MTTask to data) = "t" +++ tob +++ to16bit (size data) +++ data +++ "\n"
- where
- tob = case to of
- OneShot = to16bit 0
- OnInterval i = to16bit i
- OnInterrupt _ = abort "Interrupts not implemented yet"
+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 (MTTaskDel i) = "d" +++ to16bit i +++ "\n"
encode (MTSds i v) = "s" +++ to16bit i +++ v +++ "\n"
encode (MTUpd i v) = "u" +++ to16bit i +++ v +++ "\n"
@@
-159,9
+154,9
@@
instance fromByteCode MTaskInterval
instance fromByteCode MTaskDeviceSpec where
fromByteCode s = let c = toInt s.[0] in
{MTaskDeviceSpec
instance fromByteCode MTaskDeviceSpec where
fromByteCode s = let c = toInt s.[0] in
{MTaskDeviceSpec
- |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)
}
,maxTask=from16bit $ s % (1,3)
,maxSDS=from16bit $ s % (3,5)
}