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

diff --git a/Devices/mTaskDevice.dcl b/Devices/mTaskDevice.dcl
index 457a1a6..2af19ea 100644
--- a/Devices/mTaskDevice.dcl
+++ b/Devices/mTaskDevice.dcl
@@ -4,37 +4,48 @@ 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 
 	= TCPDevice TCPSettings
 	| SerialDevice TTYSettings
 
-:: MTaskDevice = {
-		 deviceTask :: Maybe TaskId
-		,deviceChannels :: String
-		,deviceName :: String
-		,deviceTasks :: [(String, Int)]
-		,deviceData :: MTaskResource
+:: MTaskDevice =
+		{ deviceTask :: Maybe TaskId
+		, deviceError :: Maybe String
+		, deviceChannels :: String
+		, deviceName :: String
+		, deviceTasks :: [MTaskTask]
+		, deviceData :: MTaskResource
+		, deviceSpec :: Maybe MTaskDeviceSpec
+		, deviceShares :: [MTaskShare]
 	}
 
+instance == MTaskDevice
+
 class MTaskDuplex a where
 	synFun :: a (Shared Channels) -> Task ()
 
-//makeDevice :: MTaskResource String -> Task MTaskDevice
+withDevice :: (MTaskDevice -> Task a) String -> Task a | iTask a
+
+startupDevices :: Task [MTaskDevice]
+connectDevice :: (MTaskDevice (Shared Channels) -> Task ()) MTaskDevice -> Task ()
+manageDevices :: (MTaskDevice (Shared Channels) -> Task ()) [MTaskDevice] -> Task ()
+sendMessages :: [MTaskMSGSend] -> (MTaskDevice -> Task Channels)
 
-addDevice :: (Shared [MTaskDevice]) -> Task String
-//addDevice :: (Shared [MTaskDevice]) -> Task MTaskResource
-//addDevice :: (Shared [MTaskDevice]) -> Task ()
+withDevices :: MTaskDevice (MTaskDevice -> MTaskDevice) -> Task ()
 
-viewDevices :: [MTaskDevice] -> Task ()
+deviceTaskDelete :: MTaskDevice MTaskTask -> Task ()
+deviceTaskAcked :: MTaskDevice Int Int -> Task ()
+deviceTaskDeleteAcked :: MTaskDevice Int -> Task ()
+deviceAddSpec :: MTaskDevice MTaskDeviceSpec -> Task ()