X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=6c80f05e67ab5068b6056e99c7983f3ed551684e;hb=00fec1dc0792381759d7cfbfb55f17996a11f1a4;hp=24444d9c3825c697e761914e62ea43cd7729614f;hpb=66d5b66f8b05c529557aefde0dbb6b0d076a622e;p=mTask.git diff --git a/miTask.icl b/miTask.icl index 24444d9..6c80f05 100644 --- a/miTask.icl +++ b/miTask.icl @@ -5,6 +5,7 @@ from StdFunc import flip import iTasks import mTask +import Devices.mTaskDevice from Text import class Text(startsWith,concat,split,join), instance Text String @@ -19,17 +20,8 @@ import iTasks._Framework.Store 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, @@ -45,7 +37,7 @@ memoryShare :: String a -> Shared a | iTask a memoryShare s d = sdsFocus s $ memoryStore "" $ Just d deviceStore :: Shared [MTaskDevice] -deviceStore = memoryShare "mTaskDevices" [] +deviceStore = sharedStore "mTaskDevices" [] sdsStore :: Shared [MTaskShare] sdsStore = memoryShare "mTaskShares" [] @@ -54,10 +46,10 @@ bcStateStore :: Shared BCState 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 = @@ -83,13 +75,13 @@ bc2 d = {main = ledOn d} 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 @@ -99,12 +91,12 @@ mTaskManager = anyTask ] 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 @@ -124,7 +116,7 @@ mTaskManager = anyTask @! () 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, @@ -139,11 +131,8 @@ mTaskManager = anyTask 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) @@ -166,30 +155,28 @@ mTaskManager = anyTask 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 ( @@ -205,14 +192,13 @@ mTaskManager = anyTask 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 @! () @@ -232,11 +218,11 @@ syncNetworkChannel server port channel = catchAll = (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)