X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.icl;h=8b489d8422fc015788f2dd4d62b74ab8767a245e;hb=de76c5f5ac6a0c4291b51d5b2c16e3611b5c99e3;hp=0026290f50e5f36c932737b062fdbb6b40467e15;hpb=8155b7e2298e78fd53fc17df35d940472dcf8661;p=mTask.git

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index 0026290..8b489d8 100644
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -43,8 +43,8 @@ import Tasks.Examples
 encode :: MTaskMSGSend -> String
 encode (MTTask to data) = "t" +++ toByteCode to +++ to16bit (size data) +++ data +++ "\n"
 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"
+encode (MTSds i v) = "s" +++ to16bit i +++ toByteCode v +++ "\n"
+encode (MTUpd i v) = "u" +++ to16bit i +++ toByteCode v +++ "\n"
 encode (MTSpec) = "c\n"
 
 import StdDebug
@@ -158,8 +158,7 @@ instance fromByteCode MTaskDeviceSpec where
 		|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)
+		,bytesMemory=from16bit $ s % (1,3)
 		}
 
 derive gPrint Long, UserLED, Button, AnalogPin, DigitalPin, PinMode, Pin, BC, MTaskDeviceSpec
@@ -329,18 +328,20 @@ toReadableByteCode x s
 			where
 				(ex, newls) = splitAt (bclength b - 1) ls
 
+derive gPrint BCShare
+
 toMessages :: MTaskInterval (Main (ByteCode a b)) BCState -> ([MTaskMSGSend], BCState)
 toMessages interval x s
 # (bc, newstate) = toRealByteCode (unMain x) s
-# newsdss = 'DL'.difference s.sdss newstate.sdss
-= ([MTSds sdsi $ toByteCode e\\{sdsi,sdsval=(BCValue e)}<-newsdss] ++
+# newsdss = 'DL'.difference newstate.sdss s.sdss 
+| not (trace_tn $ printToString s.sdss) = undef
+| not (trace_tn $ printToString newstate.sdss) = undef
+| not (trace_tn $ printToString newsdss) = undef
+= ([MTSds sdsi e\\{sdsi,sdsval=e}<-newsdss] ++
 	[MTTask interval bc], newstate)
 
 instance == BCShare where (==) a b = a.sdsi == b.sdsi
 
-toSDSUpdate :: Int Int -> [MTaskMSGSend]
-toSDSUpdate i v = [MTUpd i (to16bit v)]
-
 //Start = toMessages (OnInterval 500) $ toRealByteCode (unMain bc) zero
 Start = fst $ toReadableByteCode (unMain $ countAndLed) zero
 //Start = fst $ toReadableByteCode (unMain $ blink LED1) zero