X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=5a65116f18945012a6ae2026a67313b59d789c4f;hb=18c1286739897b65578e87b17167c6cef1922a3b;hp=1274601adda4c686925055e523dece2accbbeaf8;hpb=b55c1c423b6f00357b2ae2bbdd2abcf4456fd0cd;p=mTask.git diff --git a/miTask.icl b/miTask.icl index 1274601..5a65116 100644 --- a/miTask.icl +++ b/miTask.icl @@ -5,223 +5,71 @@ 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 - -derive class iTask Queue, TTYSettings, Parity, BaudRate, ByteSize -derive class iTask MTaskMSGRecv, MTaskMSGSend - -:: *Resource | TTYd !*TTY +import TTY, iTasksTTY Start :: *World -> *World -Start world = startEngine (withShared ([], False, [], False) mTaskTask) world -//Start world = startEngine mTaskTask world -// -deviceSelectorNetwork :: Task (Int, String) -deviceSelectorNetwork = enterInformation "Port Number?" [] - -&&- enterInformation "Network address" [] - -deviceSelectorSerial :: Task (String, TTYSettings) -deviceSelectorSerial = accWorld getDevices - >>= \dl->(enterChoice "Device" [] dl -&&- deviceSettings) - where - deviceSettings = updateInformation "Settings" [] zero - - 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"] - -derive class iTask SerTCP -:: SerTCP = Serial | TCP - -mTaskTask :: (Shared ([MTaskMSGRecv],Bool,[MTaskMSGSend],Bool)) -> Task () -mTaskTask ch = - (enterInformation "Choose" [] >>= \st->case st of - Serial = deviceSelectorSerial >>= \(s,set)->syncSerialChannel s set decode encode ch - TCP = deviceSelectorNetwork >>= \(p,h)->syncNetworkChannel h p "\n" decode encode ch - ) ||- - sendMsg msgs ch ||- - ( - ( - consumeNetworkStream (processSDSs sdsShares messageShare) ch ||- - viewSharedInformation "channels" [ViewWith lens] ch ||- - viewSharedInformation "messages" [] messageShare ||- - viewSh sdsShares ch - ) >>* [OnAction ActionFinish (always shutDown)] - ) +Start world = startEngine (mTaskManager + >>* [OnAction (Action "Shutdown") (always $ shutDown)]) world + +mTaskManager :: Task () +mTaskManager = startupDevices >>| anyTask + [ viewmTasks @! () + , whileUnchanged sdsStore manageShares + , whileUnchanged deviceStore $ manageDevices process + ] <<@ ApplyLayout (sequenceLayouts + [ arrangeWithSideBar 0 LeftSide 260 True + , arrangeSplit Vertical True + ]) where - messageShare :: Shared [String] - messageShare = sharedStore "mTaskMessagesRecv" [] - - processSDSs :: [(Int, Shared Int)] (Shared [String]) [MTaskMSGRecv] -> Task () - processSDSs _ _ [] = return () - processSDSs s y [x:xs] = updateSDSs s y x >>= \_->processSDSs s y xs - - updateSDSs :: [(Int, Shared Int)] (Shared [String]) MTaskMSGRecv -> Task () - updateSDSs _ m (MTMessage s) = upd (\l->take 20 [s:l]) m @! () - updateSDSs _ _ MTEmpty = return () - updateSDSs [(id, sh):xs] m n=:(MTPub i d) - | id == i = set ((toInt d.[0])*265 + toInt d.[1]) sh @! () - = updateSDSs xs m n - - lens :: ([MTaskMSGRecv],Bool,[MTaskMSGSend],Bool) -> ([String], [String]) - lens (r,_,s,_) = (f r, map toString s) - where - f [] = [] - f [MTEmpty:xs] = f xs - f [x:xs] = [toString x:f xs] - - viewSh :: [(Int, Shared Int)] (Shared ([MTaskMSGRecv],Bool,[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" [] + ) >>* [OnAction (Action "Send") (withValue $ Just o sendToDevice mTaskTask bc)] + @! () ) - ) ||- viewSh xs ch - - (msgs, sdsShares) = makeBytecode 500 bc - 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) - ) - )} - -makeBytecode :: Int (Main (ByteCode () Stmt)) -> ([MTaskMSGSend], [(Int, Shared Int)]) -makeBytecode timeout bc -# (msgs, st) = toMessages timeout (toRealByteCode (unMain bc)) -# shares = map (\(i,d)->(i, sdsFocus (s i) (memoryStore (s i) (Just (dd d))))) st.sdss -= (msgs, shares) - where - s i = "mTaskSDS-" +++ toString i - dd [x,y] = (toInt x)*265+(toInt y) - - -sendMsg :: [MTaskMSGSend] (Shared ([MTaskMSGRecv],Bool,[MTaskMSGSend],Bool)) -> Task () -sendMsg m ch = upd (\(r,rs,s,ss)->(r,rs,s ++ m,ss)) ch @! () - -syncSerialChannel :: String TTYSettings (String -> m) (n -> String) (Shared ([m],Bool,[n],Bool)) -> Task () | iTask m & iTask n -syncSerialChannel dev opts decodeFun encodeFun 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 decodeFun encodeFun)) 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 ([m],Bool,[n],Bool)) (String -> m) (n -> String) !*IWorld -> *IWorld -serialDeviceBackgroundTask rw de en iworld - = case read rw iworld of - (Error e, iworld) = abort "share couldn't be read" - (Ok (r,rs,s,ss), iworld) - # (Just (TTYd tty)) = iworld.resources - # tty = writet (map en s) tty - # (ml, tty) = case TTYavailable tty of - (False, tty) = ([], tty) - (_, tty) - # (l, tty) = TTYreadline tty - = ([de l], tty) - # iworld = {iworld & resources=Just (TTYd tty)} - = case write (r++ml,rs,[],ss) 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 [] t = t - writet [x:xs] t = writet xs (TTYwrite x t) - - -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,[n],Bool) -> ([m],Bool,[n],Bool) - empty (_,rs,s,ss) = ([],rs,s,ss) + 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 (||-)