equality for devices, externalize tasks

[mTask.git] / Devices / mTaskDevice.dcl

diff --git a/Devices/mTaskDevice.dcl b/Devices/mTaskDevice.dcl
index f21e654..0e9f567 100644 (file)
--- a/Devices/mTaskDevice.dcl
+++ b/Devices/mTaskDevice.dcl
@@ -4,6 +4,7 @@ from Data.Maybe import :: Maybe
 import iTasks
 import Devices.mTaskSerial
 import Devices.mTaskTCP
+import Tasks.mTaskTask
 import mTaskInterpret
 import Generics.gCons
 import iTasksTTY
@@ -24,16 +25,18 @@ channels :: MTaskDevice -> Shared Channels
                 deviceTask :: Maybe TaskId
                ,deviceChannels :: String
                ,deviceName :: String
-               ,deviceTasks :: [(String, Int)]
+               ,deviceTasks :: [MTaskTask]
                ,deviceData :: MTaskResource
        }
 
+instance == MTaskDevice
+
 class MTaskDuplex a where
        synFun :: a (Shared Channels) -> Task ()
 
 manageDevices :: (MTaskDevice (Shared Channels) -> Task ()) [MTaskDevice] -> Task ()
-sendToDevice :: (Map String (Main (ByteCode () Stmt))) String (MTaskDevice, Int) -> Task ()
+sendToDevice :: String (Main (ByteCode () Stmt)) (MTaskDevice, Int) -> Task ()
 
-deviceTaskDelete :: MTaskDevice Int -> Task ()
+deviceTaskDelete :: MTaskDevice MTaskTask -> Task ()
 deviceTaskAcked :: MTaskDevice Int -> Task ()
 deviceTaskDeleteAcked :: MTaskDevice Int -> Task ()