X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.icl;h=21b53c901927d632134b09e60a53d76293c2589b;hb=3cac8340c7c822ecda3783286196c6bc4cdec66a;hp=968591323845e5c37c5c2d999c7d25dcb7066cb3;hpb=ddfd196fa4999b117701121a2f4cb1fe378f902d;p=mTask.git

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index 9685913..21b53c9 100644
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -27,14 +27,15 @@ 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
 	'\0' = MTEmpty
+	'\n' = MTEmpty
+	'm' = MTMessage x
 	'u' = MTPub (from16bit (x % (1,3))) (x % (3,5))
-	_ = abort ("Didn't understand message: " +++ join " " [toString (toInt c)\\c<-: x] +++ "\n")
+	_ = MTMessage x//abort ("Didn't understand message: " +++ join " " [toString (toInt c)\\c<-: x] +++ "\n")
 
 safePrint :== toString o toJSON
 
@@ -104,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]
@@ -113,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