X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.icl;h=8b489d8422fc015788f2dd4d62b74ab8767a245e;hb=de76c5f5ac6a0c4291b51d5b2c16e3611b5c99e3;hp=538a5a9269b2115a0e09a204d6160856783ac239;hpb=f0f7587b66378846c8d09ef044eae394bc250e53;p=mTask.git

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index 538a5a9..8b489d8 100644
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -41,26 +41,25 @@ import Text.Encodings.Base64
 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 (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
 decode x
+| not (trace_tn ("decoding: " +++ toString (toJSON x))) = undef
 | size x == 0 = MTEmpty
 = case x.[0] of
-	't' = MTTaskAck (from16bit (x % (1,3)))
-	'd' = MTTaskDelAck (from16bit (x % (1,3)))
+	't' = MTTaskAck $ fromByteCode x
+	'd' = MTTaskDelAck $ fromByteCode x
 	'm' = MTMessage x
-	's' = MTSDSAck (from16bit (x % (1,3)))
-	'a' = MTSDSDelAck (from16bit (x % (1,3)))
-	'p' = MTPub (from16bit (x % (1,3))) (x % (3,5))
+	's' = MTSDSAck $ fromByteCode x
+	'a' = MTSDSDelAck $ fromByteCode x
+	'p' = MTPub (fromByteCode x) $ fromByteCode $ x % (3,size x)
+	'c'	= MTDevSpec $ fromByteCode (x % (1, size x))
 	'\0' = MTEmpty
 	'\n' = MTEmpty
 	_ = MTMessage x//abort ("Didn't understand message: " +++ join " " [toString (toInt c)\\c<-: x] +++ "\n")
@@ -88,6 +87,7 @@ instance toString MTaskMSGRecv where
 	toString (MTSDSDelAck i) = "SDS deleted with id: " +++ toString i
 	toString (MTPub i v) = "Publish id: " +++ toString i
 		+++ " value " +++ safePrint v
+	toString (MTDevSpec mt) = "Specification: " +++ printToString mt
 	toString (MTMessage m) = m
 	toString MTEmpty = "Empty message"
 
@@ -120,26 +120,26 @@ parseBCValue c s = case c of
 castfbc :: a -> (String -> a) | mTaskType a
 castfbc _ = fromByteCode
 
-instance toByteCode Bool where toByteCode b = {#'b','\0',if b '\x01' '\0'}
+instance toByteCode Bool where toByteCode b = {#'b',if b '\x01' '\0'}
 instance toByteCode Int where toByteCode n = {'i',toChar $ n/256,toChar $ n rem 256}
 instance toByteCode Long where toByteCode (L n) = {'l',toChar $ n/256,toChar $ n rem 256}
-instance toByteCode Char where toByteCode c = {'c','\0',c}
+instance toByteCode Char where toByteCode c = {'c',c}
 instance toByteCode String where toByteCode s = abort $ "Undef on toBytecode String" +++ s
-instance toByteCode Button where toByteCode s = {'B','\0',toChar $ consIndex{|*|} s}
-instance toByteCode UserLED where toByteCode s = {'L','\0',toChar $ consIndex{|*|} s}
+instance toByteCode Button where toByteCode s = {'B',toChar $ consIndex{|*|} s}
+instance toByteCode UserLED where toByteCode s = {'L',toChar $ consIndex{|*|} s}
 instance toByteCode BCValue where toByteCode (BCValue v) = toByteCode v
 
-instance fromByteCode Bool where fromByteCode s = fromByteCode s == 1
+instance fromByteCode Bool where fromByteCode s = s.[1] == '\x01'
 instance fromByteCode Int where fromByteCode s = (toInt s.[1])*256 + toInt s.[2]
 instance fromByteCode Long where fromByteCode s = L $ fromByteCode s
-instance fromByteCode Char where fromByteCode s = fromInt $ fromByteCode s
+instance fromByteCode Char where fromByteCode s = s.[1]
 instance fromByteCode String where fromByteCode s = abort $ "Undef on fromBytecode String" +++ s
-instance fromByteCode Button where fromByteCode s = conses{|*|} !! fromByteCode s
-instance fromByteCode UserLED where fromByteCode s = conses{|*|} !! fromByteCode s
+instance fromByteCode Button where fromByteCode s = conses{|*|} !! toInt s.[1]
+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
@@ -152,8 +152,16 @@ instance fromByteCode MTaskInterval
 			0 = OneShot
 			i = OnInterval i
 		= OnInterrupt $ fromByteCode s bitand 127
-
-derive gPrint Long, UserLED, Button, AnalogPin, DigitalPin, PinMode, Pin, BC
+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
+		,bytesMemory=from16bit $ s % (1,3)
+		}
+
+derive gPrint Long, UserLED, Button, AnalogPin, DigitalPin, PinMode, Pin, BC, MTaskDeviceSpec
 derive class gCons BC
 
 consIndex{|BCValue|} _ = 0
@@ -182,7 +190,7 @@ gDefault{|BCValue|} = BCValue 0
 gEq{|BCValue|} (BCValue e) (BCValue f) = toByteCode e == toByteCode f
 
 derive class gCons Long, UserLED, Button, AnalogPin, DigitalPin, PinMode, Pin
-derive class iTask UserLED, Long, Pin, Button, AnalogPin, DigitalPin, PinMode
+derive class iTask UserLED, Long, Pin, Button, AnalogPin, DigitalPin, PinMode, MTaskDeviceSpec
 
 op2 :: (ByteCode a p1) (ByteCode a p2) BC -> ByteCode b Expr
 op2 (BC x) (BC y) bc = BC $ x >>| y >>| tell [bc]
@@ -320,16 +328,23 @@ 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 $ blink LED1) zero
+Start = fst $ toReadableByteCode (unMain $ countAndLed) zero
+//Start = fst $ toReadableByteCode (unMain $ blink LED1) zero
 //Start = let (bcs, st) = toReadableByteCode (unMain bc) zero
 //		in (bcs, st.sdss)
 	where