X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.dcl;h=f0795e17956a182176e1509f296946fa401276fa;hb=be3f747f775c05facb8a34cf0baba523401b88fb;hp=d104b021cc7e13b6c0c9354868cb9ad9389106d2;hpb=18c1286739897b65578e87b17167c6cef1922a3b;p=mTask.git diff --git a/mTaskInterpret.dcl b/mTaskInterpret.dcl index d104b02..f0795e1 100644 --- a/mTaskInterpret.dcl +++ b/mTaskInterpret.dcl @@ -15,8 +15,9 @@ from Generics.gCons import class gCons, generic conses, generic consName, generi | MTTaskDelAck Int | MTSDSAck Int | MTSDSDelAck Int - | MTPub Int String + | MTPub Int BCValue | MTMessage String + | MTDevSpec MTaskDeviceSpec | MTEmpty :: MTaskMSGSend @@ -30,6 +31,14 @@ from Generics.gCons import class gCons, generic conses, generic consName, generi | OnInterval Int | OnInterrupt Int +:: MTaskDeviceSpec = + {haveLed :: Bool + ,haveAio :: Bool + ,haveDio :: Bool + ,maxTask :: Int //Should be number of bytes reserved in total for shares, tasks and functions + ,maxSDS :: Int + } + :: BCValue = E.e: BCValue e & mTaskType e instance toString MTaskInterval @@ -84,14 +93,14 @@ decode :: String -> MTaskMSGRecv | BCDigitalWrite Pin | BCTest AnalogPin -derive gPrint BCValue +derive gPrint BCValue, MTaskDeviceSpec derive consIndex BCValue derive consName BCValue derive conses BCValue derive consNum BCValue derive class gCons Long, UserLED, Button, AnalogPin, DigitalPin, PinMode, Pin -derive class iTask UserLED, Long, Pin, Button, AnalogPin, DigitalPin, PinMode +derive class iTask UserLED, Long, Pin, Button, AnalogPin, DigitalPin, PinMode, MTaskDeviceSpec derive gEditor BCValue derive gText BCValue derive JSONEncode BCValue @@ -104,8 +113,7 @@ derive gEq BCValue :: BCShare = { sdsi :: Int, sdspub :: Bool, - sdsval :: Dynamic, - sdsbc :: String + sdsval :: BCValue } :: BCState = { @@ -120,11 +128,10 @@ class fromByteCode a :: String -> a class mTaskType a | toByteCode, fromByteCode, iTask, TC a instance toByteCode Int, Bool, Char, Long, String, Button, UserLED, BCValue -instance fromByteCode Int, Bool, Char, Long, String, Button, UserLED +instance fromByteCode Int, Bool, Char, Long, String, Button, UserLED, BCValue instance toByteCode MTaskInterval -instance fromByteCode MTaskInterval +instance fromByteCode MTaskInterval, MTaskDeviceSpec -instance toChar Pin instance arith ByteCode instance boolExpr ByteCode instance analogIO ByteCode