X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.dcl;h=29e1fb95b6e98a089fedd10317b105aa9894383b;hb=a408afc0974b9a122d34f42afe177b08668c075c;hp=84c1e3f02253849013f025b78c8d315779b70727;hpb=ee38806680e1706a4aea577d1ed699860f1fb0e8;p=mTask.git

diff --git a/mTaskInterpret.dcl b/mTaskInterpret.dcl
index 84c1e3f..29e1fb9 100644
--- a/mTaskInterpret.dcl
+++ b/mTaskInterpret.dcl
@@ -11,7 +11,7 @@ from GenPrint import generic gPrint
 from Generics.gCons import class gCons, generic conses, generic consName, generic consIndex, generic consNum
 
 :: MTaskMSGRecv
-	= MTTaskAck Int
+	= MTTaskAck Int Int
 	| MTTaskDelAck Int
 	| MTSDSAck Int
 	| MTSDSDelAck Int
@@ -23,8 +23,8 @@ from Generics.gCons import class gCons, generic conses, generic consName, generi
 :: MTaskMSGSend
 	= MTTask MTaskInterval String
 	| MTTaskDel Int
-	| MTSds Int String
-	| MTUpd Int String
+	| MTSds Int BCValue
+	| MTUpd Int BCValue
 	| MTSpec
 
 :: MTaskInterval
@@ -36,8 +36,7 @@ from Generics.gCons import class gCons, generic conses, generic consName, generi
 		{haveLed :: Bool
 		,haveAio :: Bool
 		,haveDio :: Bool
-		,maxTask :: Int //Should be number of bytes reserved in total for shares, tasks and functions
-		,maxSDS  :: Int
+		,bytesMemory :: Int
 	}
 
 :: BCValue = E.e: BCValue e & mTaskType e
@@ -68,6 +67,7 @@ decode :: String -> MTaskMSGRecv
 	//Binary Bool ops
 	| BCAnd
 	| BCOr
+	//Binary ops
 	| BCEq
 	| BCNeq
 	| BCLes
@@ -92,7 +92,8 @@ decode :: String -> MTaskMSGRecv
 	| BCAnalogWrite Pin
 	| BCDigitalRead Pin
 	| BCDigitalWrite Pin
-	| BCTest AnalogPin
+	//Return
+	| BCReturn
 
 derive gPrint BCValue, MTaskDeviceSpec
 derive consIndex BCValue
@@ -144,14 +145,14 @@ instance If ByteCode Stmt e Stmt
 instance If ByteCode x y Stmt
 instance IF ByteCode
 instance noOp ByteCode
+instance retrn ByteCode
 
 instance sds ByteCode
 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)