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

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index 538a5a9..e603f82 100644
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -60,7 +60,7 @@ decode 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))
+	'p' = MTPub (from16bit (x % (1,3))) (x % (3,size x))
 	'\0' = MTEmpty
 	'\n' = MTEmpty
 	_ = MTMessage x//abort ("Didn't understand message: " +++ join " " [toString (toInt c)\\c<-: x] +++ "\n")
@@ -120,22 +120,22 @@ 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
@@ -329,7 +329,8 @@ toSDSUpdate :: Int Int -> [MTaskMSGSend]
 toSDSUpdate i v = [MTUpd i (to16bit v)]
 
 //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