X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.icl;h=c986ec5607b45425c45997d1d1a69545247b9b97;hb=be3f747f775c05facb8a34cf0baba523401b88fb;hp=e603f8271bc293730dc9e76db58a7ee2b77b3da7;hpb=7ab8606c3d22a2bc2743eae7a398407c84d502f2;p=mTask.git

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index e603f82..c986ec5 100644
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -51,16 +51,19 @@ 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"
 
+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,size x))
+	'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 +91,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"
 
@@ -152,8 +156,17 @@ 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
+		,maxTask=from16bit $ s % (1,3)
+		,maxSDS=from16bit $ s % (3,5)
+		}
+
+derive gPrint Long, UserLED, Button, AnalogPin, DigitalPin, PinMode, Pin, BC, MTaskDeviceSpec
 derive class gCons BC
 
 consIndex{|BCValue|} _ = 0
@@ -182,7 +195,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]