X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=09fb5dd53fd09348b1a8d72821ec79b36a9ba658;hb=71787cb6678d7a0d2014d373af5e55447796f78d;hp=92fbff2de2f8acd40edfeddccee16556528c2e50;hpb=3698f150b0c5e5ebed23b0885ced2711ef16d9f5;p=mTask.git diff --git a/miTask.icl b/miTask.icl index 92fbff2..09fb5dd 100644 --- a/miTask.icl +++ b/miTask.icl @@ -5,199 +5,72 @@ from StdFunc import flip import iTasks import mTask +import Devices.mTaskDevice +import Shares.mTaskShare +import Tasks.Examples +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.UI.Definition - -import iTasks._Framework.TaskState -import iTasks._Framework.TaskServer -import iTasks._Framework.IWorld import iTasks._Framework.Store +import iTasks._Framework.Serialization -import TTY +import TTY, iTasksTTY -derive class iTask Queue, TTYSettings, Parity, BaudRate, ByteSize -derive class iTask MTaskMSGRecv, MTaskMSGSend, SerTCP - -:: SerTCP = Serial | TCP -:: *Resource | TTYd !*TTY +derive class iTask UserLED Start :: *World -> *World -Start world = startEngine mTaskTask world -//Start world = startEngine mTaskTask world - -bc :: Main (ByteCode () Stmt) -bc = sds \x=1 In sds \pinnetje=1 In {main = - IF (digitalRead D3 ==. lit True) ( - x =. x +. lit 1 :. - pub x - ) ( - noOp - ) :. - IF (pinnetje ==. lit 1) ( - digitalWrite D0 (lit True) :. - digitalWrite D1 (lit False) :. - digitalWrite D2 (lit False) - ) ( - IF (pinnetje ==. lit 2) ( - digitalWrite D0 (lit False) :. - digitalWrite D1 (lit True) :. - digitalWrite D2 (lit False) - ) ( - digitalWrite D0 (lit False) :. - digitalWrite D1 (lit False) :. - digitalWrite D2 (lit True) - ) - )} - -withDevice :: ((Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) -> Task a) -> Task a | iTask a -withDevice t = withShared ([], [], False) \ch-> - enterInformation "Type" [] - >>= \ty->case ty of - TCP = (enterInformation "Host" [] -&&- enterInformation "Port" []) - >>= \(port,host)->t ch -|| syncNetworkChannel host port ch - Serial = accWorld getDevices - >>= \dl->(enterChoice "Device" [] dl -&&- updateInformation "Settings" [] zero) - >>= \(dev,set)->t ch -|| syncSerialChannel dev set ch +Start world = startEngine (mTaskManager + >>* [OnAction (Action "Shutdown") (always $ shutDown)]) world + +mTaskManager :: Task () +mTaskManager = anyTask + [ viewmTasks @! () + , whileUnchanged sdsStore viewShares + , whileUnchanged deviceStore $ manageDevices process + ] <<@ ApplyLayout (sequenceLayouts + [ arrangeWithSideBar 0 LeftSide 260 True + , arrangeSplit Vertical True + ]) where - getDevices :: !*World -> *(![String], !*World) - getDevices w = case readDirectory "/dev" w of - (Error (errcode, errmsg), w) = abort errmsg - (Ok entries, w) = (map ((+++) "/dev/") (filter isTTY entries), w) - where - isTTY s = not (isEmpty (filter (flip startsWith s) prefixes)) - prefixes = ["ttyS", "ttyACM", "ttyUSB", "tty.usbserial"] - -mTaskTask :: Task () -mTaskTask = let (msgs, sdsShares) = makeMsgs 1000 bc in - withDevice (\ch-> - sendMsg msgs ch - ||- processMessages ch messageShare sdsShares - ||- viewSharedInformation "channels" [ViewWith lens] ch - ||- viewSharedInformation "messages" [] messageShare - ||- viewSh sdsShares ch - >>* [OnAction ActionFinish (always shutDown)] - ) - where - messageShare :: Shared [String] - messageShare = sharedStore "mTaskMessagesRecv" [] - - processMessages ch msgs sdss = forever (watch ch - >>* [OnValue (ifValue (not o isEmpty o fst3) (process ch))]) - where - process :: (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) ([MTaskMSGRecv],[MTaskMSGSend],Bool) -> Task () - process ch (r,_,_) = upd (appFst3 (const [])) ch >>| process` r - where - process` = foldr (\r t->updateSDSs sdss msgs r >>| t) (return ()) - - makeMsgs :: Int (Main (ByteCode () Stmt)) -> ([MTaskMSGSend], [(Int, Shared Int)]) - makeMsgs timeout bc - # (msgs, st) = toMessages timeout (toRealByteCode (unMain bc)) - = (msgs, map f st.sdss) - where - f (i,d) = (i, sharedStore ("mTaskSDS-" +++ toString i) (dd d)) - dd [x,y] = toInt x*265 + toInt y - - updateSDSs :: [(Int, Shared Int)] (Shared [String]) MTaskMSGRecv -> Task () - updateSDSs _ m (MTMessage s) = upd (\l->take 20 [s:l]) m @! () - updateSDSs [(id, sh):xs] m n=:(MTPub i d) - | id == i = set ((toInt d.[0])*265 + toInt d.[1]) sh @! () - = updateSDSs xs m n - updateSDSs _ _ _ = return () - - lens :: ([MTaskMSGRecv], [MTaskMSGSend],Bool) -> ([String], [String]) - lens (r,s,_) = (map toString r, map toString s) - - viewSh :: [(Int, Shared Int)] (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) -> Task () - viewSh [] ch = return () - viewSh [(i, sh):xs] ch - # sharename = "SDS-" +++ toString i - = ( - viewSharedInformation ("SDS-" +++ toString i) [] sh ||- - forever ( - enterInformation sharename [] - >>* [OnAction ActionOk - (ifValue (\j->j>=1 && j <= 3) - (\c->set c sh - >>= \_->sendMsg (toSDSUpdate i c) ch - @! () - ) - )] + viewmTasks :: Task String + viewmTasks = enterChoiceWithShared "Available mTasks" [ChooseFromList id] mTaskTaskStore + >&^ \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 = fromJust ('DM'.get mTaskTask allmTasks) + >>= \bc->(enterChoice "Choose Device" [ChooseFromDropdown \t->t.deviceName] ds + -&&- enterInformation "Timeout, 0 for one-shot" [] + ) >>* [OnAction (Action "Send") (withValue $ Just o sendToDevice mTaskTask bc)] ) - ) ||- viewSh xs ch - -sendMsg :: [MTaskMSGSend] (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) -> Task () -sendMsg m ch = upd (\(r,s,ss)->(r,s ++ m,True)) ch @! () - -syncSerialChannel :: String TTYSettings (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) -> Task () -syncSerialChannel dev opts rw = Task eval - where - eval event evalOpts tree=:(TCInit taskId ts) iworld=:{IWorld|world} - = case TTYopen dev opts world of - (False, _, world) - # (err, world) = TTYerror world - = (ExceptionResult (exception err), {iworld & world=world}) - (True, tty, world) - # iworld = {iworld & world=world, resources=Just (TTYd tty)} - = case addBackgroundTask 42 (BackgroundTask (serialDeviceBackgroundTask rw)) iworld of - (Error e, iworld) = (ExceptionResult (exception "h"), iworld) - (Ok _, iworld) = (ValueResult NoValue {TaskEvalInfo|lastEvent=ts,removedTasks=[],refreshSensitive=True} NoRep (TCBasic taskId ts JSONNull False), iworld) - eval _ _ tree=:(TCBasic _ ts _ _) iworld - = (ValueResult NoValue {TaskEvalInfo|lastEvent=ts,removedTasks=[],refreshSensitive=False} NoRep tree, iworld) - - eval event evalOpts tree=:(TCDestroy _) iworld=:{IWorld|resources,world} - # (TTYd tty) = fromJust resources - # (ok, world) = TTYclose tty world - # iworld = {iworld & world=world,resources=Nothing} - = case removeBackgroundTask 42 iworld of - (Error e, iworld) = (ExceptionResult (exception "h"), iworld) - (Ok _, iworld) = (DestroyedResult, iworld) - -serialDeviceBackgroundTask :: (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) !*IWorld -> *IWorld -serialDeviceBackgroundTask rw iworld - = case read rw iworld of - (Error e, iworld) = abort "share couldn't be read" - (Ok (r,s,ss), iworld) - # (Just (TTYd tty)) = iworld.resources - # tty = writet (map encode s) tty - # (ml, tty) = case TTYavailable tty of - (False, tty) = ([], tty) - (_, tty) - # (l, tty) = TTYreadline tty - = ([decode l], tty) - # iworld = {iworld & resources=Just (TTYd tty)} - = case write (r++ml,[],False) rw iworld of - (Error e, iworld) = abort "share couldn't be written" - (Ok _, iworld) = case notify rw iworld of - (Error e, iworld) = abort "share couldn't be notified" - (Ok _, iworld) = iworld - where - writet :: [String] -> (*TTY -> *TTY) - writet [] = id - writet [x:xs] = writet xs o TTYwrite x - - -syncNetworkChannel :: String Int (Shared ([MTaskMSGRecv], [MTaskMSGSend], Bool)) -> Task () -syncNetworkChannel server port channel - = tcpconnect server port channel {ConnectionHandlers|onConnect=onConnect,whileConnected=whileConnected,onDisconnect=onDisconnect} @! () - where - onConnect :: String ([MTaskMSGRecv],[MTaskMSGSend],Bool) -> (MaybeErrorString String, Maybe ([MTaskMSGRecv],[MTaskMSGSend],Bool), [String], Bool) - onConnect _ (msgs,send,sendStopped) - = (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) -// = (Ok acc, Just (msgs,[],sendStopped), map encode send, False) - - whileConnected (Just newData) acc (msgs,send,sendStopped) - | sendStopped = (Ok acc, Just (msgs ++ [decode newData],[],False), map encode send, False) - = (Ok acc, Just (msgs ++ [decode newData],[],False), [], False) - - onDisconnect :: String ([MTaskMSGRecv],[MTaskMSGSend],Bool) -> (MaybeErrorString String, Maybe ([MTaskMSGRecv],[MTaskMSGSend],Bool)) - onDisconnect l (msgs,send,sendStopped) = (Ok l, Nothing) + 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 (||-)