X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.dcl;h=7ddff193c068c1f3082fdc3f267201c5c7cb4d32;hb=09b207a39b7791098daafd7d87c3ad9d3db3e19f;hp=d104b021cc7e13b6c0c9354868cb9ad9389106d2;hpb=18c1286739897b65578e87b17167c6cef1922a3b;p=mTask.git

diff --git a/mTaskInterpret.dcl b/mTaskInterpret.dcl
index d104b02..7ddff19 100644
--- a/mTaskInterpret.dcl
+++ b/mTaskInterpret.dcl
@@ -15,21 +15,31 @@ 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
 	= MTTask MTaskInterval String
 	| MTTaskDel Int
-	| MTSds Int String
-	| MTUpd Int String
+	| MTSds Int BCValue
+	| MTUpd Int BCValue
+	| MTSpec
 
 :: MTaskInterval
 	= OneShot
 	| 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 +94,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 +114,7 @@ derive gEq BCValue
 :: BCShare = {
 		sdsi :: Int,
 		sdspub :: Bool,
-		sdsval :: Dynamic,
-		sdsbc :: String
+		sdsval :: BCValue
 	}
 
 :: BCState = {
@@ -120,11 +129,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
@@ -142,8 +150,7 @@ instance assign ByteCode
 instance seq ByteCode
 instance serial ByteCode
 
-toMessages :: MTaskInterval (String, BCState) -> ([MTaskMSGSend], BCState)
-toSDSUpdate :: Int Int -> [MTaskMSGSend]
+toMessages :: MTaskInterval (Main (ByteCode a b)) BCState -> ([MTaskMSGSend], BCState)
 
 toByteVal :: BC -> String
 toReadableByteCode :: (ByteCode a b) BCState -> (String, BCState)