X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=d4834902f701cfc37fde5b2ac48390ef3a8b71ad;hb=0efbd98973520d55ec4e80e443911f43b3c28a0d;hp=ab37901f54abd219f453353f0c113c478792af37;hpb=7edf1780ae3b91d9136db2d94b25e88d64896645;p=mTask.git diff --git a/miTask.icl b/miTask.icl index ab37901..d483490 100644 --- a/miTask.icl +++ b/miTask.icl @@ -1,45 +1,193 @@ module miTask import StdDebug, StdMisc - -from Text import class Text(concat,join,split), instance Text String -from Control.Monad import mapM +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) (\ch-> - enterInformation "Port Number?" [] >>= \port->mTaskTask port ch - )) 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" [] -mTaskTask :: Int (Shared ([MTaskMessage],Bool,[MTaskMessage],Bool)) -> Task () -mTaskTask port ch = - syncNetworkChannel "localhost" port "\n" decode encode ch ||- +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"] + +mTaskTask :: (Shared ([MTaskMSGRecv],Bool,[MTaskMSGSend],Bool)) -> Task () +mTaskTask ch = + deviceSelectorNetwork >>= \(p,h)->syncNetworkChannel h p "\n" decode encode` ch ||- +// deviceSelectorSerial >>= \(s,set)->syncSerialChannel s set decode` encode` ch ||- + sendMsg msgs ch ||- ( - sendMsg msgs ch >>= \_-> - viewSharedInformation "channels" [ViewWith lens] ch @! () - ) >>* [OnAction ActionFinish (always shutDown)] + ( + consumeNetworkStream (processSDSs sdsShares messageShare) ch ||- + viewSharedInformation "channels" [ViewWith lens] ch ||- + viewSh sdsShares ch + ) >>* [OnAction ActionFinish (always shutDown)] + ) where - lens :: ([MTaskMessage],Bool,[MTaskMessage],Bool) -> ([String], [String]) - lens (r,_,s,_) = (f r, f s) + encode` m + | not (trace_tn (toString (toJSON m))) = undef + = encode m + + decode` m + | not (trace_tn (toString (toJSON m))) = undef + = decode m + + 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->[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] - msgs = toMessages 500 (toRealByteCode (unMain bc)) + 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 = + x =. x +. pinnetje :. + pub x :. + IF (pinnetje ==. lit 1) ( + analogWrite A0 (lit 1) :. + analogWrite A1 (lit 0) :. + analogWrite A2 (lit 0) + ) ( + IF (pinnetje ==. lit 2) ( + analogWrite A0 (lit 0) :. + analogWrite A1 (lit 1) :. + analogWrite A2 (lit 0) + ) ( + analogWrite A0 (lit 0):. + analogWrite A1 (lit 0):. + analogWrite A2 (lit 1) + ) + )} +// bc :: Main (ByteCode Int Stmt) +// bc = sds \x=1 In {main = +// If (x ==. lit 3) +// (x =. lit 1) +// (x =. x +. lit 1) :. pub x} - bc :: Main (ByteCode Int Stmt) - bc = sds \x=0 In {main = x =. x +. lit 1 :. pub x} +makeShares :: BCState -> [(Int, Shared Int)] +makeShares {sdss=[]} = [] +makeShares s=:{sdss=[(i,d):xs]} = + [(i, sharedStore ("mTaskSDS-" +++ toString i) 1):makeShares {s & sdss=xs}] -sendMsg :: [MTaskMessage] (Shared ([MTaskMessage],Bool,[MTaskMessage],Bool)) -> Task () +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 en de iworld + = case read rw iworld of + (Error e, iworld) = iworld + (Ok (r,rs,s,ss), iworld) + # (Just (TTYd tty)) = iworld.resources + # tty = writet (map de s) tty + = case TTYavailable tty of + (False, tty) = {iworld & resources=Just (TTYd tty)} + (_, tty) + # (l, tty) = appFst en (TTYreadline tty) + # iworld = {iworld & resources=Just (TTYd tty)} + = snd (write (r ++ [l],rs,[],ss) rw iworld) + where + writet :: [String] !*TTY -> *TTY + writet [] t = t + writet [x:xs] t = writet xs (TTYwrite t x) + + 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} @! () @@ -58,17 +206,17 @@ 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,[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) +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)