X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Devices%2FmTaskDevice.dcl;h=c489d01a117f8313acb129479abc5ef2b753ef22;hb=7ab8606c3d22a2bc2743eae7a398407c84d502f2;hp=457a1a687a185889c339083cc5793c68b3989a85;hpb=b3d2bd33a99a2dbdc4907b6876a965c16c37314c;p=mTask.git

diff --git a/Devices/mTaskDevice.dcl b/Devices/mTaskDevice.dcl
index 457a1a6..c489d01 100644
--- a/Devices/mTaskDevice.dcl
+++ b/Devices/mTaskDevice.dcl
@@ -4,16 +4,16 @@ from Data.Maybe import :: Maybe
 import iTasks
 import Devices.mTaskSerial
 import Devices.mTaskTCP
+import Utils.SDS
+import Tasks.mTaskTask
 import mTaskInterpret
 import Generics.gCons
 import iTasksTTY
 
-derive class iTask MTaskDevice, MTaskResource, MTaskMSGRecv, MTaskMSGSend
+derive class iTask MTaskDevice, MTaskResource, MTaskMSGRecv, MTaskMSGSend, BCShare
 derive conses MTaskResource, TCPSettings
 derive consName MTaskResource, TCPSettings
 
-channels :: MTaskDevice -> Shared Channels
-
 :: Channels :== ([MTaskMSGRecv], [MTaskMSGSend], Bool)
 
 :: MTaskResource 
@@ -22,19 +22,24 @@ channels :: MTaskDevice -> Shared Channels
 
 :: MTaskDevice = {
 		 deviceTask :: Maybe TaskId
+		,deviceError :: Maybe String
 		,deviceChannels :: String
 		,deviceName :: String
-		,deviceTasks :: [(String, Int)]
+		,deviceTasks :: [MTaskTask]
 		,deviceData :: MTaskResource
 	}
 
+instance == MTaskDevice
+
 class MTaskDuplex a where
 	synFun :: a (Shared Channels) -> Task ()
 
-//makeDevice :: MTaskResource String -> Task MTaskDevice
-
-addDevice :: (Shared [MTaskDevice]) -> Task String
-//addDevice :: (Shared [MTaskDevice]) -> Task MTaskResource
-//addDevice :: (Shared [MTaskDevice]) -> Task ()
+startupDevices :: Task [MTaskDevice]
+connectDevice :: (MTaskDevice (Shared Channels) -> Task ()) MTaskDevice -> Task ()
+manageDevices :: (MTaskDevice (Shared Channels) -> Task ()) [MTaskDevice] -> Task ()
+sendToDevice :: String (Main (ByteCode () Stmt)) (MTaskDevice, MTaskInterval) -> Task ()
+sendMessages :: [MTaskMSGSend] -> (MTaskDevice -> Task Channels)
 
-viewDevices :: [MTaskDevice] -> Task ()
+deviceTaskDelete :: MTaskDevice MTaskTask -> Task ()
+deviceTaskAcked :: MTaskDevice Int -> Task ()
+deviceTaskDeleteAcked :: MTaskDevice Int -> Task ()