'\0' = MTEmpty
'\n' = MTEmpty
'm' = MTMessage x
+ 't' = MTTaskAdded (from16bit (x % (1,3)))
'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
instance toString MTaskMSGRecv where
toString (MTPub i v) = "Publish id: " +++ toString i
+++ " value " +++ safePrint v
+ toString (MTTaskAdded i) = "Task added with id: " +++ toString i
toString MTEmpty = "Empty message"
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
toByteVal :: BC -> [Char]
toByteVal b
-# bt = toChar $ consIndex{|*|} b + 1
+# bt = toChar $ consIndex{|*|} 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]
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]
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
b <++> retrn [BCJmpF else] <++> t
<++> retrn [BCJmp endif,BCLab else] <++> e <++> retrn [BCLab endif]
-instance noOp ByteCode where noOp = mempty
+instance noOp ByteCode where noOp = retrn [BCNop]
withLabel :: (Int -> (ByteCode b q)) -> ByteCode b q
withLabel f = BC \s->let [fresh:fs] = s.freshl