X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=Devices%2FmTaskDevice.dcl;h=cae651920dab32ed8092869cf2263148a40279c4;hb=c518754bec4758cce7d899463f9c68612c3bf4e4;hp=f254a22f2f16b20552580d40019b004b93397f2c;hpb=a2b8b2a0de173f92092bf6cbbed23551e674ca3c;p=mTask.git

diff --git a/Devices/mTaskDevice.dcl b/Devices/mTaskDevice.dcl
index f254a22..cae6519 100644
--- a/Devices/mTaskDevice.dcl
+++ b/Devices/mTaskDevice.dcl
@@ -10,25 +10,24 @@ 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
-		,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
 	}
 
 instance == MTaskDevice
@@ -39,8 +38,12 @@ class MTaskDuplex a where
 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)
+getDevice :: String -> Task MTaskDevice
+
+withDevices :: MTaskDevice (MTaskDevice -> MTaskDevice) -> Task ()
 
 deviceTaskDelete :: MTaskDevice MTaskTask -> Task ()
 deviceTaskAcked :: MTaskDevice Int -> Task ()
 deviceTaskDeleteAcked :: MTaskDevice Int -> Task ()
+deviceAddSpec :: MTaskDevice MTaskDeviceSpec -> Task ()