X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=5df0450c3c6fc3f02903f7d19e04d8b44060af11;hb=8449be73c124cdccd37500c0d67d9404b94fc9c8;hp=f8fa8bae4785cae9628977b3617d402a509b0229;hpb=4dff4046c87727f8b09558969f7c655b9e4de3c1;p=mTask.git diff --git a/miTask.icl b/miTask.icl index f8fa8ba..5df0450 100644 --- a/miTask.icl +++ b/miTask.icl @@ -1,55 +1,214 @@ module miTask import StdDebug, StdMisc - -from Text import class Text(concat,join,split), instance Text String +from StdFunc import flip import iTasks import mTask -derive class iTask MTaskMessage +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 + +:: *Resource | TTYd !*TTY 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 -mTaskTask :: (Shared ([MTaskMessage],Bool,[MTaskMessage],Bool)) -> Task () -mTaskTask ch = - syncNetworkChannel "localhost" 8124 "\n" decode encode ch ||- + 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 (hd msgs) ch >>= \_-> - sendMsg (hd (tl msgs)) ch >>= \_-> - viewSharedInformation "channels" [ViewWith lens] ch @! () - ) + sendMsg msgs ch >>= \_->( + consumeNetworkStream (processSDSs sdsShares messageShare) ch ||- + viewSharedInformation "channels" [ViewWith lens] ch ||- + viewSharedInformation "messages" [] messageShare ||- + viewSh sdsShares ch + ) + ) >>* [OnAction ActionFinish (always shutDown)] where - lens :: ([MTaskMessage],Bool,[MTaskMessage],Bool) -> ([String], [String]) - lens (r,_,s,_) = (map toString r, map toString s) + 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 - msgs = toMessages 500 (toRealByteCode (unMain bc)) + 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 - bc :: Main (ByteCode Int Expr) - bc = sds \x=0 In {main = x =. x +. lit 1} + 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] -makemTask :: Int (Main (ByteCode a Expr)) -> String -makemTask to bc -# (bc, st) = toRealByteCode (unMain bc) -= "t" +++ toString (toChar (to / 265)) - +++ toString (toChar (to rem 265)) +++ toString bc +++ "\n" + 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 + @! () + ) + )] + ) + ) ||- viewSh xs ch + + sdsShares = makeShares st + (msgs, st) = toMessages 1000 (toRealByteCode (unMain 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) + ) + )} + +makeShares :: BCState -> [(Int, Shared Int)] +makeShares {sdss=[]} = [] +makeShares s=:{sdss=[(i,d):xs]} = + [(i, sharedStore ("mTaskSDS-" +++ toString i) 1):makeShares {s & sdss=xs}] + +//makeBytecode :: Int (Main (ByteCode () Stmt)) -> ([MTaskMSGSend], [(Int, Shared Int)]) +//makeBytecode timeout bc +//# (msgs, st) = toMessages timeout (toRealByteCode (unMain bc)) +//# shares = map (\(i,d)->(i, sharedStore (s i) (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) -sendMsg :: MTaskMessage (Shared ([MTaskMessage],Bool,[MTaskMessage],Bool)) -> Task () -sendMsg m ch -| not (trace_tn ("\'" +++ toString m +++ "\'")) = undef -= upd (\(r,rs,s,ss)->(r,rs,s ++ [m],ss)) ch @! () -syncNetworkChannel :: String Int String (String -> m) (m -> String) (Shared ([m],Bool,[m],Bool)) -> Task () | iTask m +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) + | not (trace_tn "whilec nothing") = undef = (Ok acc, Nothing, [], False) whileConnected (Just newData) acc (received,receiveStopped,send,sendStopped) + | not (trace_tn "whilec just") = undef # [acc:msgs] = reverse (split msgSeparator (concat [acc,newData])) # write = if (not (isEmpty msgs && isEmpty send)) (Just (received ++ map decodeFun (reverse msgs),receiveStopped,[],sendStopped)) @@ -59,7 +218,7 @@ syncNetworkChannel server port msgSeparator decodeFun encodeFun channel onDisconnect l (received,receiveStopped,send,sendStopped) = (Ok l,Just (received,True,send,sendStopped)) -consumeNetworkStream :: ([m] -> Task ()) (Shared ([m],Bool,[m],Bool)) -> Task () | iTask m +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 :: ([m],Bool,[n],Bool) -> ([m],Bool,[n],Bool) empty (_,rs,s,ss) = ([],rs,s,ss)