repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
experimental
[mTask.git]
/
Devices
/
mTaskDevice.dcl
diff --git
a/Devices/mTaskDevice.dcl
b/Devices/mTaskDevice.dcl
index
f21e654
..
bae7af6
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 iTasks
import Devices.mTaskSerial
import Devices.mTaskTCP
+import Tasks.mTaskTask
import mTaskInterpret
import Generics.gCons
import iTasksTTY
import mTaskInterpret
import Generics.gCons
import iTasksTTY
@@
-24,7
+25,7
@@
channels :: MTaskDevice -> Shared Channels
deviceTask :: Maybe TaskId
,deviceChannels :: String
,deviceName :: String
deviceTask :: Maybe TaskId
,deviceChannels :: String
,deviceName :: String
- ,deviceTasks :: [
(String, Int)
]
+ ,deviceTasks :: [
MTaskTask
]
,deviceData :: MTaskResource
}
,deviceData :: MTaskResource
}
@@
-32,8
+33,8
@@
class MTaskDuplex a where
synFun :: a (Shared Channels) -> Task ()
manageDevices :: (MTaskDevice (Shared Channels) -> Task ()) [MTaskDevice] -> Task ()
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 ()
deviceTaskAcked :: MTaskDevice Int -> Task ()
deviceTaskDeleteAcked :: MTaskDevice Int -> Task ()