X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Devices%2FmTaskDevice.dcl;h=dc097f551de246de70a7092667bc3ca05734bd0c;hb=8782aef8ee6b8e0d3be35bee36b519212bdd8de9;hp=c489d01a117f8313acb129479abc5ef2b753ef22;hpb=9f93ff243f8ba2e1924e70df10978060a3b6f461;p=mTask.git

diff --git a/Devices/mTaskDevice.dcl b/Devices/mTaskDevice.dcl
index c489d01..dc097f5 100644
--- a/Devices/mTaskDevice.dcl
+++ b/Devices/mTaskDevice.dcl
@@ -20,13 +20,15 @@ derive consName MTaskResource, TCPSettings
 	= TCPDevice TCPSettings
 	| SerialDevice TTYSettings
 
-:: MTaskDevice = {
-		 deviceTask :: Maybe TaskId
-		,deviceError :: Maybe String
-		,deviceChannels :: String
-		,deviceName :: String
-		,deviceTasks :: [MTaskTask]
-		,deviceData :: MTaskResource
+:: MTaskDevice =
+		{ deviceTask :: Maybe TaskId
+		, deviceError :: Maybe String
+		, deviceChannels :: String
+		, deviceName :: String
+		, deviceTasks :: [MTaskTask]
+		, deviceData :: MTaskResource
+		, deviceSpec :: Maybe MTaskDeviceSpec
+		, deviceShares :: [MTaskShare]
 	}
 
 instance == MTaskDevice
@@ -34,12 +36,18 @@ instance == MTaskDevice
 class MTaskDuplex a where
 	synFun :: a (Shared Channels) -> Task ()
 
+withDevices :: MTaskDevice (MTaskDevice -> MTaskDevice) -> Task [MTaskDevice]
+//withDevices :: MTaskDevice (MTaskDevice -> MTaskDevice) -> Task ()
+
 startupDevices :: Task [MTaskDevice]
-connectDevice :: (MTaskDevice (Shared Channels) -> Task ()) MTaskDevice -> Task ()
+connectDevice :: (MTaskDevice (Shared Channels) -> Task ()) MTaskDevice -> Task Channels
 manageDevices :: (MTaskDevice (Shared Channels) -> Task ()) [MTaskDevice] -> Task ()
-sendToDevice :: String (Main (ByteCode () Stmt)) (MTaskDevice, MTaskInterval) -> Task ()
-sendMessages :: [MTaskMSGSend] -> (MTaskDevice -> Task Channels)
+
+sendMessages :: [MTaskMSGSend] MTaskDevice -> Task Channels
+sendMessagesIW :: [MTaskMSGSend] MTaskDevice *IWorld -> *(MaybeError TaskException (), *IWorld)
+
 
 deviceTaskDelete :: MTaskDevice MTaskTask -> Task ()
-deviceTaskAcked :: MTaskDevice Int -> Task ()
-deviceTaskDeleteAcked :: MTaskDevice Int -> Task ()
+deviceTaskAcked :: MTaskDevice Int Int -> Task [MTaskDevice]
+deviceTaskDeleteAcked :: MTaskDevice Int -> Task [MTaskDevice]
+deviceAddSpec :: MTaskDevice MTaskDeviceSpec -> Task [MTaskDevice]