repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updates
[mTask.git]
/
mTaskInterpret.icl
diff --git
a/mTaskInterpret.icl
b/mTaskInterpret.icl
index
1833e62
..
3f57e7d
100644
(file)
--- a/
mTaskInterpret.icl
+++ b/
mTaskInterpret.icl
@@
-1,11
+1,14
@@
implementation module mTaskInterpret
//import iTasks
implementation module mTaskInterpret
//import iTasks
-import gdynamic, gCons, GenEq, StdMisc, StdArray, GenBimap
+import Generics.gCons
+
+import GenEq, StdMisc, StdArray, GenBimap
import GenPrint
import StdEnum
import mTask
import GenPrint
import StdEnum
import mTask
+import StdInt
import StdFile
import StdString
import StdFile
import StdString
@@
-23,35
+26,54
@@
import qualified Data.Map as DM
import Text.Encodings.Base64
encode :: MTaskMSGSend -> String
import Text.Encodings.Base64
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 (MTTaskDel i) = "d" +++ to16bit i +++ "\n"
encode (MTSds i v) = "s" +++ to16bit i +++ v +++ "\n"
encode (MTSds i v) = "s" +++ to16bit i +++ v +++ "\n"
-encode (MTTask to data) = "t" +++ to16bit to +++ to16bit (size data) +++ data +++ "\n"
encode (MTUpd i v) = "u" +++ to16bit i +++ v +++ "\n"
decode :: String -> MTaskMSGRecv
decode x
| size x == 0 = MTEmpty
= case x.[0] of
encode (MTUpd i v) = "u" +++ to16bit i +++ v +++ "\n"
decode :: String -> MTaskMSGRecv
decode x
| size x == 0 = MTEmpty
= case x.[0] of
+ 't' = MTTaskAck (from16bit (x % (1,3)))
+ 'd' = MTTaskDelAck (from16bit (x % (1,3)))
+ 'm' = MTMessage x
+ 's' = MTSDSAck (from16bit (x % (1,3)))
+ 'a' = MTSDSDelAck (from16bit (x % (1,3)))
+ 'p' = MTPub (from16bit (x % (1,3))) (x % (3,5))
'\0' = MTEmpty
'\n' = MTEmpty
'\0' = MTEmpty
'\n' = MTEmpty
- 'm' = MTMessage x
- 't' = MTTaskAdded (from16bit (x % (1,3)))
- 'u' = MTPub (from16bit (x % (1,3))) (x % (3,5))
_ = MTMessage x//abort ("Didn't understand message: " +++ join " " [toString (toInt c)\\c<-: x] +++ "\n")
safePrint :== toString o toJSON
_ = MTMessage x//abort ("Didn't understand message: " +++ join " " [toString (toInt c)\\c<-: x] +++ "\n")
safePrint :== toString o toJSON
+instance toString MTaskInterval where
+ toString OneShot = "One shot"
+ toString (OnInterrupt i) = "Interrupt: " +++ toString i
+ toString (OnInterval i) = "Every " +++ toString i +++ "ms"
+
instance toString MTaskMSGSend where
toString (MTSds i v) = "Sds id: " +++ toString i
+++ " value " +++ safePrint v
toString (MTTask to data) = "Task timeout: " +++ toString to
+++ " data " +++ safePrint data
instance toString MTaskMSGSend where
toString (MTSds i v) = "Sds id: " +++ toString i
+++ " value " +++ safePrint v
toString (MTTask to data) = "Task timeout: " +++ toString to
+++ " data " +++ safePrint data
+ toString (MTTaskDel i) = "Task delete request: " +++ toString i
toString (MTUpd i v) = "Update id: " +++ toString i
+++ " value " +++ safePrint v
instance toString MTaskMSGRecv where
toString (MTUpd i v) = "Update id: " +++ toString i
+++ " value " +++ safePrint v
instance toString MTaskMSGRecv where
+ toString (MTTaskAck i) = "Task added 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
toString (MTPub i v) = "Publish id: " +++ toString i
+++ " value " +++ safePrint v
toString (MTPub i v) = "Publish id: " +++ toString i
+++ " value " +++ safePrint v
- toString (MT
TaskAdded i) = "Task added with id: " +++ toString i
+ toString (MT
Message m) = m
toString MTEmpty = "Empty message"
bclength :: BC -> Int
toString MTEmpty = "Empty message"
bclength :: BC -> Int
@@
-110,15
+132,19
@@
retrn = BC o tuple
fmp :: ([BC] -> [BC]) (ByteCode a p) -> ByteCode a q
fmp f b = BC \s->let (bc, s`) = runBC b s in (f bc, s`)
fmp :: ([BC] -> [BC]) (ByteCode a p) -> ByteCode a q
fmp f b = BC \s->let (bc, s`) = runBC b s in (f bc, s`)
-instance toByteCode Bool where
- toByteCode True = [toChar 0, toChar 1]
- toByteCode False = [toChar 0, toChar 0]
+instance toByteCode Bool where toByteCode b = toByteCode $ if b 1 0
instance toByteCode Int where toByteCode n = map toChar [n/256,n rem 256]
instance toByteCode Long where toByteCode (L n) = toByteCode n
instance toByteCode Char where toByteCode c = [c]
instance toByteCode String where toByteCode s = undef
instance toByteCode Button where toByteCode s = [toChar $ consIndex{|*|} s]
instance toByteCode UserLED where toByteCode s = [toChar $ consIndex{|*|} s]
instance toByteCode Int where toByteCode n = map toChar [n/256,n rem 256]
instance toByteCode Long where toByteCode (L n) = toByteCode n
instance toByteCode Char where toByteCode c = [c]
instance toByteCode String where toByteCode s = undef
instance toByteCode Button where toByteCode s = [toChar $ consIndex{|*|} s]
instance toByteCode UserLED where toByteCode s = [toChar $ consIndex{|*|} s]
+instance toByteCode MTaskInterval where
+ toByteCode OneShot = toByteCode 0
+ //Intervals have the first bit 0 and the rest is a 15 bit unsigned int
+ toByteCode (OnInterval i) = map toChar [i/256 bitand 127, i rem 256]
+ //Intervals have the first bit 1 and the rest is a 15 bit unsigned int
+ toByteCode (OnInterrupt i) = map toChar [i/256 bitor 128, i rem 256]
instance toChar Pin where
toChar (Digital p) = toChar $ consIndex{|*|} p
instance toChar Pin where
toChar (Digital p) = toChar $ consIndex{|*|} p
@@
-186,7
+212,6
@@
instance sds ByteCode where
}
con f = undef
pub x = fmp makePub x
}
con f = undef
pub x = fmp makePub x
-// pub _ = undef
instance assign ByteCode where
(=.) v e = e <++> fmp makeStore v
instance assign ByteCode where
(=.) v e = e <++> fmp makeStore v
@@
-219,10
+244,9
@@
instance userLed ByteCode where
instance zero BCState where
zero = {freshl=[1..], freshs=[1..], sdss=[]}
instance zero BCState where
zero = {freshl=[1..], freshs=[1..], sdss=[]}
-
-toRealByteCode :: (ByteCode a b) -> (String, BCState)
-toRealByteCode x
-# (bc, st) = runBC x zero
+toRealByteCode :: (ByteCode a b) BCState -> (String, BCState)
+toRealByteCode x s
+# (bc, st) = runBC x s
# (bc, gtmap) = computeGotos bc 1
= (concat $ map (toString o toByteVal) (map (implGotos gtmap) bc), st)
# (bc, gtmap) = computeGotos bc 1
= (concat $ map (toString o toByteVal) (map (implGotos gtmap) bc), st)
@@
-250,13
+274,13
@@
toReadableByteCode x
# (bc, gtmap) = computeGotos bc 0
= (join "\n" $ map readable (map (implGotos gtmap) bc), st)
# (bc, gtmap) = computeGotos bc 0
= (join "\n" $ map readable (map (implGotos gtmap) bc), st)
-toMessages ::
Int
(String, BCState) -> ([MTaskMSGSend], BCState)
+toMessages ::
MTaskInterval
(String, BCState) -> ([MTaskMSGSend], BCState)
toMessages interval (bytes, st=:{sdss}) = ([MTSds i (toString b)\\(i,b)<-sdss] ++ [MTTask interval bytes], st)
toSDSUpdate :: Int Int -> [MTaskMSGSend]
toSDSUpdate i v = [MTUpd i (to16bit v)]
toMessages interval (bytes, st=:{sdss}) = ([MTSds i (toString b)\\(i,b)<-sdss] ++ [MTTask interval bytes], st)
toSDSUpdate :: Int Int -> [MTaskMSGSend]
toSDSUpdate i v = [MTUpd i (to16bit v)]
-Start = toMessages
500 $ toRealByteCode (unMain bc)
+Start = toMessages
(OnInterval 500) $ toRealByteCode (unMain bc) zero
where
bc = sds \x=5 In
sds \y=4 In
where
bc = sds \x=5 In
sds \y=4 In