X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=d84121a59d9a4d1d81328b8a4e22a04993b5bd50;hb=24a37bfbe248331eee720fc06c6aa0390be13005;hp=e5483ccad3eccec4adcf49f236dab682e845a0c7;hpb=ddfd196fa4999b117701121a2f4cb1fe378f902d;p=mTask.git diff --git a/miTask.icl b/miTask.icl index e5483cc..d84121a 100644 --- a/miTask.icl +++ b/miTask.icl @@ -1,142 +1,273 @@ 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 MTaskMSGRecv, MTaskMSGSend +from Text import class Text(startsWith,concat,split,join), instance Text String + +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 TTY + +derive class iTask Queue, TTYSettings, Parity, BaudRate, ByteSize +derive class iTask MTaskMSGRecv, MTaskMSGSend, SerTCP, UserLED + +derive class iTask MTaskDevice + +:: SerTCP = Serial | TCP +:: *Resource | TTYd !*TTY +:: MTaskDevice = { + deviceConnected :: Maybe (Shared ([String], [String], Bool)), + deviceName :: String, + deviceSettings :: Either (String, Int) (String, TTYSettings) + } Start :: *World -> *World -Start world = startEngine ( - enterInformation "Port Number?" [] - >>= \port->withShared ([], False, [], False) (mTaskTask port) - ) world +Start world = startEngine (mTaskManager + >>* [OnAction (Action "Shutdown") (always $ shutDown)]) world //Start world = startEngine mTaskTask world -mTaskTask :: Int (Shared ([MTaskMSGRecv],Bool,[MTaskMSGSend],Bool)) -> Task () -mTaskTask port ch = - syncNetworkChannel "localhost" port "\n" decode encode` ch ||- - sendMsg msgs ch ||- - ( - ( - consumeNetworkStream (processSDSs sdsShares messageShare) ch ||- - viewSharedInformation "channels" [ViewWith lens] ch ||- - viewSh sdsShares ch - ) >>* [OnAction ActionFinish (always shutDown)] - ) +bc :: Main (ByteCode () Stmt) +bc = sds \x=1 In sds \pinnetje=1 In {main = + IF (digitalRead D3) ( + x =. x +. lit 1 :. + pub x + ) ( + noOp + ) :. + IF (pinnetje ==. lit 1) ( + ledOn LED1 + ) ( + IF (pinnetje ==. lit 2) ( + ledOn LED2 + ) ( + ledOn LED3 + ) + )} + +bc2 :: UserLED -> Main (ByteCode () Stmt) +bc2 d = {main = ledOn d} + +bc3 :: UserLED -> Main (ByteCode () Stmt) +bc3 d = {main = ledOff d} + +:: MTaskDeviceStatus = {connected :: Bool, name :: String} +derive class iTask MTaskDeviceStatus + +mTaskManager :: Task () +mTaskManager = forever (addDevice >>= \d->upd (\l->[d:l]) deviceStore) + ||- viewSharedInformation "Devices" [ViewAs deviceviewer] deviceStore + ||- whileUnchanged deviceStore (\m->if (isEmpty m) + (viewInformation "No devices yet" [] "" @! ()) (connectDevice m)) @! () +// ) + where + connectDevice :: [MTaskDevice] -> Task () + connectDevice [] = treturn () + connectDevice [d:ds] = (case d.deviceConnected of + (Just sh) = viewSharedInformation "Buffers" [] sh @! () + Nothing = viewInformation ("Connect " +++ d.deviceName) [] "" >>* [ + OnAction (Action "connect") (const $ Just $ connect d)] + ) -|| connectDevice ds + + connect :: MTaskDevice -> Task () + connect d=:{deviceSettings} = withShared ([], [], False) $ \ch-> + case deviceSettings of + Left (host, port) = syncNetworkChannel host port ch + Right (dev, sett) = syncSerialChannel dev sett ch + ||- viewSharedInformation "Buffers" [] ch @! () + + deviceviewer :: [MTaskDevice] -> [MTaskDeviceStatus] + deviceviewer ds = [{MTaskDeviceStatus | name = d.deviceName, + connected = if (isNothing d.deviceConnected) False True}\\d<-ds] + + deviceStore :: Shared [MTaskDevice] + deviceStore = sdsFocus "mTaskDevices" $ memoryStore "" (Just []) + +// showTabbed :: [MTaskDevice] -> Task () +// showTabbed [] = viewInformation "" [] "No devices yet" @! () +// showTabbed [l:ls] = foldr (\e es->manageDevice e ||- es) (manageDevice l) ls +// +// manageDevice :: MTaskDevice -> Task () +// manageDevice md = +// either viewTCP viewSer md.deviceSettings +// ||- maybe +// (treturn () >>* [OnAction (Action "Connect") (always shutDown)] @! ()) +// (\b->viewSharedInformation "Buffers" [] b @! ()) +// md.deviceConnected +// <<@ ArrangeVertical + + 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 (||-) + +addDevice :: Task MTaskDevice +addDevice = enterInformation "Device name" [] + -&&- enterInformation "Device type" [] + >>= \(name, ty)->(case ty of + TCP = (enterInformation "Host" [] -&&- enterInformation "Port" []) + >>= treturn o Left + Serial = accWorld getDevices + >>= \dl->(enterChoice "Device" [] dl -&&- updateInformation "Settings" [] zero) + >>= treturn o Right + ) >>= \set->treturn {MTaskDevice | + deviceConnected=Nothing, + deviceName=name, + deviceSettings=set} where - encode` m - | not (trace_tn (toString (toJSON m))) = undef - = encode 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) + 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 - 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 - @! () - ) - )] - ) - ) ||- viewSh xs ch - - sdsShares = makeShares st - - (msgs, st) = toMessages 500 (toRealByteCode (unMain bc)) - - bc :: Main (ByteCode () Stmt) - bc = sds \x=1 In sds \pinnetje=1 In {main = - x =. x +. lit 1 :. - 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} - -makeShares :: BCState -> [(Int, Shared Int)] -makeShares {sdss=[]} = [] -makeShares s=:{sdss=[(i,d):xs]} = - [(i, sharedStore ("mTaskSDS-" +++ toString i) 0):makeShares {s & sdss=xs}] - -sendMsg :: [MTaskMSGSend] (Shared ([MTaskMSGRecv],Bool,[MTaskMSGSend],Bool)) -> Task () -sendMsg m ch = upd (\(r,rs,s,ss)->(r,rs,s ++ m,ss)) ch @! () - -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} @! () + 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 +// ||- forever (enterChoice "Choose led to enable" [] [LED1, LED2, LED3] +// >>= \p->sendMsg (fst (makeMsgs 0 (bc2 p))) ch) +// ||- forever (enterChoice "Choose led to disable" [] [LED1, LED2, LED3] +// >>= \p->sendMsg (fst (makeMsgs 0 (bc3 p))) ch) +// ||- viewSharedInformation "channels" [ViewAs 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 [(id, sh):xs] m n=:(MTPub i d) +// | id == i = set ((toInt d.[0])*265 + toInt d.[1]) sh @! () +// = updateSDSs xs m n +// updateSDSs _ m mtm = case mtm of +// MTMessage s = upd (\l->take 5 [s:l]) m @! () +// mta=:(MTTaskAck _) = upd (\l->take 5 [toString mta:l]) m @! () +// //TODO other recv msgs +// _ = 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 +// @! () +// ) +// )] +// ) +// ) ||- 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} NoChange (TCBasic taskId ts JSONNull False), iworld) -consumeNetworkStream :: ([m] -> Task ()) (Shared ([m],Bool,[n],Bool)) -> Task () | iTask m & iTask n -consumeNetworkStream processTask channel - = ((watch channel >>* [OnValue (ifValue ifProcess process)]) (MaybeError TaskException (), *IWorld) +serialDeviceBackgroundTask rw iworld + = case read rw iworld of + (Error e, iworld) = (Error $ exception "share couldn't be read", iworld) + (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) = (Error $ exception "share couldn't be written", iworld) + (Ok _, iworld) = case notify rw iworld of + (Error e, iworld) = (Error $ exception "share couldn't be notified", iworld) + (Ok _, iworld) = (Ok (), iworld) where - ifProcess (received,receiveStopped,_,_) - = receiveStopped || (not (isEmpty received)) + 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) - 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,[n],Bool) -> ([m],Bool,[n],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)