import iTasks
import mTask
+import Devices.mTaskDevice
from Text import class Text(startsWith,concat,split,join), instance Text String
import TTY, iTasksTTY
-derive class iTask MTaskMSGRecv, MTaskMSGSend, SerTCP, UserLED
+derive class iTask UserLED
-:: Channels :== ([MTaskMSGRecv], [MTaskMSGSend], Bool)
-
-:: SerTCP = SerialDevice | TCPDevice
-:: MTaskDevice = {
- deviceTask :: Maybe TaskId,
- deviceConnected :: Maybe String,
- deviceName :: String,
- deviceTasks :: [(String, Int)]
- }
:: MTaskShare = {
initValue :: Int,
withTask :: String,
memoryShare s d = sdsFocus s $ memoryStore "" $ Just d
deviceStore :: Shared [MTaskDevice]
-deviceStore = memoryShare "mTaskDevices" []
+deviceStore = sharedStore "mTaskDevices" []
sdsStore :: Shared [MTaskShare]
sdsStore = memoryShare "mTaskShares" []
bcStateStore = memoryShare "mTaskBCState" zero
mTaskTaskStore :: Shared [String]
-mTaskTaskStore = memoryShare "mTaskTasks" ["ledder", "ledon", "ledoff"]
+mTaskTaskStore = memoryShare "mTaskTasks" ["count", "ledon", "ledoff"]
mTaskMap :: Map String (Main (ByteCode () Stmt))
-mTaskMap = 'DM'.fromList [("ledder", bc), ("ledon", bc2 LED1), ("ledoff", bc3 LED3)]
+mTaskMap = 'DM'.fromList [("count", bc), ("ledon", bc2 LED1), ("ledoff", bc3 LED3)]
bc :: Main (ByteCode () Stmt)
bc = sds \x=1 In sds \pinnetje=1 In {main =
bc3 :: UserLED -> Main (ByteCode () Stmt)
bc3 d = {main = ledOff d}
-:: MTaskDeviceStatus = {connected :: Bool, name :: String, tasks :: [(String, Int)]}
-derive class iTask MTaskDeviceStatus, MTaskDevice, MTaskShare, BCState
+:: MTaskDeviceStatus = {connected :: Bool, name :: String, tasks :: [String]}
+derive class iTask MTaskDeviceStatus, MTaskShare, BCState
mTaskManager :: Task ()
mTaskManager = anyTask
[ viewmTasks @! ()
- , viewShares
+ , whileUnchanged sdsStore viewShares
, whileUnchanged deviceStore viewDevices
] <<@ ApplyLayout layout
where
]
viewmTasks = listmTasks
- >&^ \sh->whileUnchanged sh $ \mi->case mi of
+ >&^ \sh->whileUnchanged sh $ \mi->forever (case mi of
Nothing = viewInformation "No task selected" [] ()
Just mTaskTask = get deviceStore
>>= \devices->case devices of
[] = viewInformation "No devices yet" [] ()
- ds = sendmTask mTaskTask ds @! ()
+ ds = sendmTask mTaskTask ds @! ())
where
listmTasks :: Task String
listmTasks = enterChoiceWithShared "Available mTasks" [ChooseFromList id] mTaskTaskStore
@! ()
where
createBytecode st = toMessages timeout $ toRealByteCode (unMain $ fromJust ('DM'.get mTask mTaskMap)) st
- sharename i = fromJust (device.deviceConnected) +++ "-" +++ toString i
+ sharename i = device.deviceChannels +++ "-" +++ toString i
toSDSRecords st = [{MTaskShare |
initValue=toInt d1*265 + toInt d2,
withTask=mTask,
getSDSRecord :: Int -> Task MTaskShare
getSDSRecord i = get sdsStore @ \l->hd [s\\s<-l | s.identifier == i]
- channels :: MTaskDevice -> Shared Channels
- channels d = memoryShare (fromJust d.deviceConnected) ([], [], False)
-
- viewShares :: Task ()
- viewShares = whileUnchanged sdsStore $ anyTask o map viewer
+ viewShares :: [MTaskShare] -> Task ()
+ viewShares st = anyTask $ map viewer st
where
viewer :: MTaskShare -> Task ()
viewer m = viewSharedInformation "" [] (getSDSStore m)
viewDevice :: MTaskDevice -> Task ()
viewDevice d = (viewInformation "Device settings" [] d
- ||- (case d.deviceConnected of
- Just s = viewSharedInformation "Channels" [ViewAs dropEmpty] (channels d) @! ()
- Nothing = viewInformation "No channels yet" [] "" @! ()
- )) <<@ ArrangeHorizontal
+ ||- viewSharedInformation "Channels" [ViewAs dropEmpty] (channels d) @! ()
+ ) <<@ ArrangeHorizontal
where
dropEmpty (r,s,ss) = (filter ((=!=)MTEmpty) r,s,ss)
- addDevice :: (Shared [MTaskDevice]) -> Task SerTCP
- addDevice devices = enterInformation "Device type" []
- >&^ \sh->whileUnchanged sh $ \mty->case mty of
- Nothing = viewInformation "No type selected yet" [] "" @! ()
- Just ty = case ty of
- TCPDevice = (enterInformation "Name" [] -&&- enterInformation "Hostname" [] -&&- enterInformation "Port" [])
- >>= \(name, (host, port))->cont name (syncNetworkChannel host port)
- SerialDevice = accWorld getTTYDevices
- >>= \dl->(enterInformation "Name" [] -&&- enterChoice "Device" [] dl -&&- updateInformation "Settings" [] zero)
- >>= \(name, (dev, set))->cont name (syncSerialChannel dev set encode decode)
- where
- cont :: String ((Shared Channels) -> Task ()) -> Task ()
- cont name synfun = get randomInt
- @ (\randint->{deviceConnected=Just (name +++ toString randint), deviceName=name, deviceTasks=[], deviceTask=Nothing})
- >>= \dev->appendTopLevelTask 'DM'.newMap True (let ch = channels dev in process ch -||- synfun ch)
- >>= \tid->upd (\l->[{dev & deviceTask=Just tid}:l]) devices
- @! ()
+
+// addDevice :: (Shared [MTaskDevice]) -> Task SerTCP
+// addDevice devices = enterInformation "Device type" []
+// >&^ \sh->whileUnchanged sh $ \mty->case mty of
+// Nothing = viewInformation "No type selected yet" [] "" @! ()
+// Just ty = case ty of
+// TCPDevice = (enterInformation "Name" [] -&&- enterInformation "Hostname" [] -&&- enterInformation "Port" [])
+// >>= \(name, (host, port))->cont name (syncNetworkChannel host port)
+// SerialDevice = (enterInformation "Name" [] -&&- enterTTYSettings)
+// >>= \(name, set)->cont name (syncSerialChannel set encode decode)
+// where
+// cont :: String ((Shared Channels) -> Task ()) -> Task ()
+// cont name synfun = get randomInt
+// @ (\randint->{deviceChannels=name +++ toString randint, deviceName=name, deviceTasks=[], deviceTask=Nothing})
+// >>= \dev->appendTopLevelTask 'DM'.newMap True (let ch = channels dev in process ch -||- synfun ch)
+// >>= \tid->upd (\l->[{dev & deviceTask=Just tid}:l]) devices
+// @! ()
process :: (Shared Channels) -> Task ()
process ch = forever (watch ch >>* [OnValue (
MTSDSDelAck i = traceValue (toString m) @! ()
MTPub i val = getSDSRecord i >>= set (toInt val.[0]*256 + toInt val.[1]) o getSDSStore @! ()
MTMessage val = traceValue (toString m) @! ()
- MTEmpty = traceValue (toString m) @! ()
+ MTEmpty = treturn ()
) >>| process ms
-
deviceviewer :: [MTaskDevice] -> [MTaskDeviceStatus]
deviceviewer ds = [{MTaskDeviceStatus | name = d.deviceName,
- connected = if (isNothing d.deviceConnected) False True,
- tasks = d.deviceTasks}\\d<-ds]
+ connected = if (isNothing d.deviceTask) False True,
+ tasks = [s +++ toString i\\(s, i)<-d.deviceTasks]}\\d<-ds]
mapPar :: (a -> Task a) [a] -> Task ()
mapPar f l = foldr1 (\x y->f x ||- y) l <<@ ArrangeWithTabs @! ()
= (Ok "", Just (msgs,[],sendStopped), map encode send, False)
whileConnected :: (Maybe String) String ([MTaskMSGRecv], [MTaskMSGSend],Bool) -> (MaybeErrorString String, Maybe ([MTaskMSGRecv],[MTaskMSGSend],Bool), [String], Bool)
- whileConnected Nothing acc (msgs,send,sendStopped)
- = (Ok acc, Nothing, [], False)
-
- whileConnected (Just newData) acc (msgs,send,sendStopped)
- = (Ok acc, Just (msgs ++ [decode newData],[],False), map encode send, False)
+
+ //whileConnected Nothing acc (msgs,send,sendStopped)
+ //= (Ok acc, Just (msgs,[],sendStopped), map encode send, False)
+ whileConnected mnewData acc (msgs,send,sendStopped)
+ = (Ok acc, Just (msgs ++ map decode (maybeToList mnewData),[],sendStopped), map encode send, False)
//| sendStopped = (Ok acc, Just (msgs ++ [decode newData],[],False), map encode send, False)
// = (Ok acc, Just (msgs ++ [decode newData],[],False), [], False)
repositories / mTask.git / blobdiff