X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Devices%2FmTaskDevice.dcl;h=17acd10809c1f611d48ae49bfa71ea18849d479c;hb=32ff545d18253da21f25c69c6d99b96f90668773;hp=1662cbbb70f4347e18aae1e3f7daddb5e5ea8984;hpb=1d6cedaf81bbbe0ae869f20c9003bf018fb027ff;p=mTask.git

diff --git a/Devices/mTaskDevice.dcl b/Devices/mTaskDevice.dcl
index 1662cbb..17acd10 100644
--- a/Devices/mTaskDevice.dcl
+++ b/Devices/mTaskDevice.dcl
@@ -4,12 +4,13 @@ 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, BCShare
+derive class iTask MTaskDevice, MTaskDeviceSpec, MTaskResource, MTaskMSGRecv, MTaskMSGSend, BCShare
 derive conses MTaskResource, TCPSettings
 derive consName MTaskResource, TCPSettings
 
@@ -19,12 +20,14 @@ derive consName MTaskResource, TCPSettings
 	= TCPDevice TCPSettings
 	| SerialDevice TTYSettings
 
-:: MTaskDevice = {
-		 deviceTask :: Maybe TaskId
-		,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
@@ -32,6 +35,8 @@ instance == MTaskDevice
 class MTaskDuplex a where
 	synFun :: a (Shared Channels) -> 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)
@@ -39,3 +44,4 @@ sendMessages :: [MTaskMSGSend] -> (MTaskDevice -> Task Channels)
 deviceTaskDelete :: MTaskDevice MTaskTask -> Task ()
 deviceTaskAcked :: MTaskDevice Int -> Task ()
 deviceTaskDeleteAcked :: MTaskDevice Int -> Task ()
+deviceAddSpec :: MTaskDevice MTaskDeviceSpec -> Task ()