X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=miTask.icl;h=4bef60020d83c59a9c2e3819b3f7dd809148cf88;hb=526e9fec79086ef2a701420736cf89a6191cc13c;hp=62b6ce1738c7e51720e05c0b9fed6c0de29d605f;hpb=955c4eb992b45e48a1a3dad6418236431ddcd095;p=mTask.git diff --git a/miTask.icl b/miTask.icl index 62b6ce1..4bef600 100644 --- a/miTask.icl +++ b/miTask.icl @@ -1,80 +1,106 @@ module miTask import StdDebug, StdMisc - -from Text import class Text(concat,join,split), instance Text String +from StdFunc import flip import iTasks import mTask +import Devices.mTaskDevice +import Shares.mTaskShare +import Utils.SDS + +from Text import class Text(startsWith,concat,split,join), instance Text String + +import qualified Data.Map as DM + +from Data.Func import $ +import Data.Tuple +import Data.List +import System.Directory + +import iTasks._Framework.Store -derive class iTask MTaskMessage +import TTY, iTasksTTY + +derive class iTask UserLED Start :: *World -> *World -Start world = startEngine ( - enterInformation "Port Number?" [] - >>= \port->withShared ([], False, [], False) (mTaskTask port) - ) world -Start world = startEngine mTaskTask world - -mTaskTask :: Int (Shared ([MTaskMessage],Bool,[MTaskMessage],Bool)) -> Task () -mTaskTask port ch = - syncNetworkChannel "localhost" port "\n" decode encode ch ||- - ( - sendMsg msgs ch >>= \_-> - viewSharedInformation "channels" [ViewWith lens] ch @! () - ) >>* [OnAction ActionFinish (always shutDown)] +Start world = startEngine (mTaskManager + >>* [OnAction (Action "Shutdown") (always $ shutDown)]) world + +mTaskMap :: Map String (Main (ByteCode () Stmt)) +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 = + IF (digitalRead D3) ( + x =. x +. lit 1 :. + pub x + ) ( + noOp + ) :. + IF (pinnetje ==. lit 1) ( + ledOn LED1 + ) ( + IF (pinnetje ==. lit 2) ( + ledOn LED2 + ) ( + ledOn LED3 + ) + )} + +bc2 :: UserLED -> Main (ByteCode () Stmt) +bc2 d = {main = ledOn d} + +bc3 :: UserLED -> Main (ByteCode () Stmt) +bc3 d = {main = ledOff d} + +mTaskManager :: Task () +mTaskManager = anyTask + [ viewmTasks @! () + , whileUnchanged sdsStore viewShares + , whileUnchanged deviceStore $ manageDevices process + ] <<@ ApplyLayout layout where - lens :: ([MTaskMessage],Bool,[MTaskMessage],Bool) -> ([String], [String]) - lens (r,_,s,_) = (f r, f s) + layout = sequenceLayouts + [ arrangeWithSideBar 0 LeftSide 260 True + , arrangeSplit Vertical True + ] + + viewmTasks = listmTasks + >&^ \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 @! ()) where - f [] = [] - f [MTEmpty:xs] = f xs - f [x:xs] = [toString x:f xs] - - msgs - | not (trace_tn (fst (toReadableByteCode (unMain bc)))) = undef - = toMessages 500 (toRealByteCode (unMain bc)) - - bc :: Main (ByteCode Int Stmt) - bc = sds \x=1 In {main = - If (x ==. lit 3) - (x =. lit 1) - (x =. x +. lit 1) :. pub x} - -sendMsg :: [MTaskMessage] (Shared ([MTaskMessage],Bool,[MTaskMessage],Bool)) -> Task () -sendMsg m ch -| not (trace_tn (join "\n" (map (toString o toJSON) m))) = undef -= upd (\(r,rs,s,ss)->(r,rs,s ++ m,ss)) ch @! () - -syncNetworkChannel :: String Int String (String -> m) (n -> String) (Shared ([m],Bool,[n],Bool)) -> Task () | iTask m & iTask n -syncNetworkChannel server port msgSeparator decodeFun encodeFun channel - = tcpconnect server port channel {ConnectionHandlers|onConnect=onConnect,whileConnected=whileConnected,onDisconnect=onDisconnect} @! () - where - onConnect _ (received,receiveStopped,send,sendStopped) - = (Ok "",if (not (isEmpty send)) (Just (received,False,[],sendStopped)) Nothing, map encodeFun send,False) - whileConnected Nothing acc (received,receiveStopped,send,sendStopped) - = (Ok acc, Nothing, [], False) - whileConnected (Just newData) acc (received,receiveStopped,send,sendStopped) - # [acc:msgs] = reverse (split msgSeparator (concat [acc,newData])) - # write = if (not (isEmpty msgs && isEmpty send)) - (Just (received ++ map decodeFun (reverse msgs),receiveStopped,[],sendStopped)) - Nothing - = (Ok acc,write,map encodeFun send,False) - - onDisconnect l (received,receiveStopped,send,sendStopped) - = (Ok l,Just (received,True,send,sendStopped)) - -//consumeNetworkStream :: ([m] -> Task ()) (Shared ([m],Bool,[n],Bool)) -> Task () | iTask m & iTask n -//consumeNetworkStream processTask channel -// = ((watch channel >>* [OnValue (ifValue ifProcess process)]) >| if (isEmpty received) (return ()) (processTask received) -// @! receiveStopped -// -// empty :: ([m],Bool,[m],Bool) -> ([m],Bool,[m],Bool) -// empty (_,rs,s,ss) = ([],rs,s,ss) + listmTasks :: Task String + listmTasks = enterChoiceWithShared "Available mTasks" [ChooseFromList id] mTaskTaskStore + + sendmTask mTaskId ds = + (enterChoice "Choose Device" [ChooseFromDropdown \t->t.deviceName] ds + -&&- enterInformation "Timeout, 0 for one-shot" []) + >>* [OnAction (Action "Send") (withValue $ Just o sendToDevice mTaskMap mTaskId)] + + process :: MTaskDevice (Shared Channels) -> Task () + process device ch = forever (watch ch >>* [OnValue ( + ifValue (not o isEmpty o fst3) + (\t->upd (appFst3 (const [])) ch >>| proc (fst3 t)))]) + where + proc :: [MTaskMSGRecv] -> Task () + proc [] = treturn () + proc [m:ms] = (case m of +// MTSDSAck i = traceValue (toString m) @! () +// MTSDSDelAck i = traceValue (toString m) @! () + MTPub i val = getSDSRecord i >>= set (toInt val.[0]*256 + toInt val.[1]) o getSDSStore @! () + MTTaskAck i = deviceTaskAcked device i + MTTaskDelAck i = deviceTaskDeleteAcked device i @! () + MTEmpty = treturn () + _ = traceValue (toString m) @! () + ) >>| proc ms + + mapPar :: (a -> Task a) [a] -> Task () + mapPar f l = foldr1 (\x y->f x ||- y) l <<@ ArrangeWithTabs @! () + allAtOnce t = foldr1 (||-) t @! () + //allAtOnce = (flip (@!) ()) o foldr1 (||-)