X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=2634ce8a6eae6d49da48cf4f09407bd6917a9292;hb=ee5171fbc1c8e1ea7454e95b3e89c24338423523;hp=a00d6f0a6f5b06ca27ccd366304b299b3134695a;hpb=a0182655c28502ffcadbe36de99d9a4e503e310e;p=mTask.git diff --git a/miTask.icl b/miTask.icl index a00d6f0..2634ce8 100644 --- a/miTask.icl +++ b/miTask.icl @@ -1,59 +1,202 @@ module miTask import StdDebug, StdMisc - -from Text import class Text(concat,join,split), instance Text String +from StdFunc import flip import iTasks import mTask +from Text import class Text(startsWith,concat,split,join), instance Text String + +import Data.Tuple +import System.Directory + +import iTasks.UI.Definition + +import iTasks._Framework.TaskState +import iTasks._Framework.TaskServer +import iTasks._Framework.IWorld +import iTasks._Framework.Store + +import TTY + +derive class iTask Queue, TTYSettings, Parity, BaudRate, ByteSize +derive class iTask MTaskMSGRecv, MTaskMSGSend, SerTCP + +:: SerTCP = Serial | TCP +:: *Resource | TTYd !*TTY + 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) + ) + )} + +deviceSelector :: (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) -> Task () +deviceSelector ch = enterInformation "Type" [] + >>= \ty->case ty of + TCP = (enterInformation "Host" [] -&&- enterInformation "Port" []) + >>= \(port,host)->syncNetworkChannel host port ch + Serial = accWorld getDevices + >>= \dl->(enterChoice "Device" [] dl -&&- updateInformation "Settings" [] zero) + >>= \(dev,set)->syncSerialChannel dev set ch + 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 = withShared ([],False,[],False) (\ch-> - syncNetworkChannel "localhost" 8123 "\n" id id ch ||- - sendByteCode ||- - updateSharedInformation "channels" [] ch @! ()) - -sendByteCode :: Task () -sendByteCode = viewInformation "send" [] "4" @! () -// (toReadableByteCode (unMain bc)) @! () +mTaskTask = let (msgs, sdsShares) = makeMsgs 1000 bc in + withShared ([], msgs, False) (\ch-> + deviceSelector ch + ||- processMessages ch messageShare sdsShares + ||- viewSharedInformation "channels" [ViewWith lens] ch + ||- viewSharedInformation "messages" [] messageShare + ||- viewSh sdsShares ch + >>* [OnAction ActionFinish (always shutDown)] + ) where - bc :: Main (ByteCode Int Expr) - bc = sds \x=41 In - sds \y=1 In - {main = x =. x +. y} + messageShare :: Shared [String] + messageShare = sharedStore "mTaskMessagesRecv" [] -syncNetworkChannel :: String Int String (String -> m) (m -> String) (Shared ([m],Bool,[m],Bool)) -> Task () | iTask m -syncNetworkChannel server port msgSeparator decodeFun encodeFun channel - = tcpconnect server port channel {ConnectionHandlers|onConnect=onConnect,whileConnected=whileConnected,onDisconnect=onDisconnect} @! () + 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 _ _ 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], [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 + @! () + ) + )] + ) + ) ||- 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 - 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)) + 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) -consumeNetworkStream :: ([m] -> Task ()) (Shared ([m],Bool,[m],Bool)) -> Task () | iTask m -consumeNetworkStream processTask channel - = ((watch channel >>* [OnValue (ifValue ifProcess process)]) *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 - ifProcess (received,receiveStopped,_,_) - = receiveStopped || (not (isEmpty received)) + 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) - process (received,receiveStopped,_,_) - = upd empty channel - >>| if (isEmpty received) (return ()) (processTask received) - @! receiveStopped + 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) - empty :: ([m],Bool,[m],Bool) -> ([m],Bool,[m],Bool) - empty (_,rs,s,ss) = ([],rs,s,ss) + onDisconnect :: String ([MTaskMSGRecv],[MTaskMSGSend],Bool) -> (MaybeErrorString String, Maybe ([MTaskMSGRecv],[MTaskMSGSend],Bool)) + onDisconnect l (msgs,send,sendStopped) = (Ok l, Nothing)