not working again.

[mTask.git] / mTaskInterpret.icl

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index d88c318..0ab4508 100644 (file)
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -55,9 +55,9 @@ instance toString MTaskMSGRecv where
 bclength :: BC -> Int
 bclength (BCPush _) = 3
 bclength (BCLab _) = 2
-bclength (BCSdsStore _) = 2
-bclength (BCSdsFetch _) = 2
-bclength (BCSdsPublish _) = 2
+bclength (BCSdsStore _) = 3
+bclength (BCSdsFetch _) = 3
+bclength (BCSdsPublish _) = 3
 bclength (BCAnalogRead _) = 2
 bclength (BCAnalogWrite _) = 2
 bclength (BCDigitalRead _) = 2
@@ -73,9 +73,9 @@ toByteVal b
 = [bt:case b of
                (BCPush i) = i
                (BCLab i) = [toChar i]
-               (BCSdsStore i) = [toChar i]
-               (BCSdsFetch i) = [toChar i]
-               (BCSdsPublish i) = [toChar i]
+               (BCSdsStore i) = [c\\c<-:to16bit i]
+               (BCSdsFetch i) = [c\\c<-:to16bit i]
+               (BCSdsPublish i) = [c\\c<-:to16bit i]
                (BCAnalogRead i) = [toChar i]
                (BCAnalogWrite i) = [toChar i]
                (BCDigitalRead i) = [toChar i]
@@ -105,8 +105,8 @@ 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 1]
-       toByteCode False = [toChar 0]
+       toByteCode True = [toChar 0, toChar 1]
+       toByteCode False = [toChar 0, toChar 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]
@@ -114,8 +114,8 @@ instance toByteCode String where toByteCode s = undef
 instance toByteCode Button where toByteCode s = [toChar $ consIndex{|*|} s]
 
 instance toChar Pin where
-       toChar (Digital p) = toChar $ consIndex{|*|} p + 1
-       toChar (Analog p) = toChar $ consIndex{|*|} p + 1
+       toChar (Digital p) = toChar $ consIndex{|*|} p
+       toChar (Analog p) = toChar $ consIndex{|*|} p
 
 derive gPrint BC, AnalogPin, Pin, DigitalPin
 derive consIndex BC, Pin, Button