X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=e81f47d369ecf336b0ad9753e4621e1b9db3d76d;hb=184c730e7c9ab350be853218f5e1f9b8866531ce;hp=d07c760fdaa377f9f7ea10720e2c9a2e801a2137;hpb=64f379e7446a716257f6030157f2cb254200aa7b;p=mTask.git diff --git a/miTask.icl b/miTask.icl index d07c760..e81f47d 100644 --- a/miTask.icl +++ b/miTask.icl @@ -8,6 +8,7 @@ import mTask from Text import class Text(startsWith,concat,split,join), instance Text String +from Data.Func import $ import Data.Tuple import System.Directory @@ -21,24 +22,77 @@ import iTasks._Framework.Store import TTY derive class iTask Queue, TTYSettings, Parity, BaudRate, ByteSize -derive class iTask MTaskMSGRecv, MTaskMSGSend +derive class iTask MTaskMSGRecv, MTaskMSGSend, SerTCP, UserLED +derive class iTask MTaskDevice + +:: SerTCP = Serial | TCP :: *Resource | TTYd !*TTY +:: MTaskDevice = SerialDevice String TTYSettings | TCPDevice String Int Start :: *World -> *World -Start world = startEngine (withShared ([], False, [], False) mTaskTask) world +Start world = startEngine (mTaskManager + >>* [OnAction (Action "Shutdown") (always $ shutDown)]) 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) + +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} + +withDevice :: ((Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) -> Task a) -> Task a | iTask a +withDevice t = withShared ([], [], False) \ch-> + enterInformation "Type" [] + >>= \ty->case ty of + TCP = (enterInformation "Host" [] -&&- enterInformation "Port" []) + >>= \(port,host)->t ch -|| syncNetworkChannel host port ch + Serial = accWorld getDevices + >>= \dl->(enterChoice "Device" [] dl -&&- updateInformation "Settings" [] zero) + >>= \(dev,set)->t ch -|| syncSerialChannel dev set ch 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"] +mTaskManager :: Task () +mTaskManager = viewSharedInformation "Devices" [] deviceStore + ||- forever (addDevice >>= \d->upd (\l->[d:l]) deviceStore) @! () + where + deviceStore :: Shared [MTaskDevice] + deviceStore = sdsFocus "mTaskDevices" $ memoryStore "" (Just []) + +addDevice :: Task MTaskDevice +addDevice = enterInformation "Enter device type" [] + >>= \ty->case ty of + TCP = (enterInformation "Host" [] -&&- enterInformation "Port" []) + >>= return o uncurry TCPDevice + Serial = accWorld getDevices + >>= \dl->(enterChoice "Device" [] dl -&&- updateInformation "Settings" [] zero) + >>= return o uncurry SerialDevice + where getDevices :: !*World -> *(![String], !*World) getDevices w = case readDirectory "/dev" w of (Error (errcode, errmsg), w) = abort errmsg @@ -47,41 +101,53 @@ deviceSelectorSerial = accWorld getDevices 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 ||- - ( - ( - consumeNetworkStream (processSDSs sdsShares messageShare) ch ||- - viewSharedInformation "channels" [ViewWith lens] ch ||- - viewSh sdsShares ch - ) >>* [OnAction ActionFinish (always shutDown)] - ) +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" [] - processSDSs :: [(Int, Shared Int)] (Shared [String]) [MTaskMSGRecv] -> Task () - processSDSs _ _ [] = return () - processSDSs s y [x:xs] = updateSDSs s y x >>= \_->processSDSs s y xs + 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->[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 + 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],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] + lens :: ([MTaskMSGRecv], [MTaskMSGSend],Bool) -> ([String], [String]) + lens (r,s,_) = (map toString r, map toString s) - viewSh :: [(Int, Shared Int)] (Shared ([MTaskMSGRecv],Bool,[MTaskMSGSend],Bool)) -> Task () + viewSh :: [(Int, Shared Int)] (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) -> Task () viewSh [] ch = return () viewSh [(i, sh):xs] ch # sharename = "SDS-" +++ toString i @@ -99,45 +165,11 @@ mTaskTask 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} - -makeShares :: BCState -> [(Int, Shared Int)] -makeShares {sdss=[]} = [] -makeShares s=:{sdss=[(i,d):xs]} = - [(i, sharedStore ("mTaskSDS-" +++ toString i) 1):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 @! () - -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 +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 eval event evalOpts tree=:(TCInit taskId ts) iworld=:{IWorld|world} = case TTYopen dev opts world of @@ -146,74 +178,61 @@ syncSerialChannel dev opts decodeFun encodeFun rw = Task eval = (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 + = 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) + (Ok _, iworld) = (ValueResult NoValue {TaskEvalInfo|lastEvent=ts,removedTasks=[],refreshSensitive=True} NoChange (TCBasic taskId ts JSONNull False), iworld) eval _ _ tree=:(TCBasic _ ts _ _) iworld - = (ValueResult NoValue {TaskEvalInfo|lastEvent=ts,removedTasks=[],refreshSensitive=False} NoRep tree, iworld) + = (ValueResult NoValue {TaskEvalInfo|lastEvent=ts,removedTasks=[],refreshSensitive=False} NoChange 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 + = 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 +serialDeviceBackgroundTask :: (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) !*IWorld -> (MaybeError TaskException (), *IWorld) +serialDeviceBackgroundTask rw iworld = case read rw iworld of - (Error e, iworld) = abort "share couldn't be read" - (Ok (r,rs,s,ss), iworld) + (Error e, iworld) = (Error $ exception "share couldn't be read", iworld) + (Ok (r,s,ss), iworld) # (Just (TTYd tty)) = iworld.resources - # tty = writet (map en s) tty + # tty = writet (map encode s) tty # (ml, tty) = case TTYavailable tty of (False, tty) = ([], tty) (_, tty) # (l, tty) = TTYreadline tty - = ([de l], tty) + = ([decode 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" + = 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) = abort "share couldn't be notified" - (Ok _, iworld) = iworld + (Error e, iworld) = (Error $ exception "share couldn't be notified", iworld) + (Ok _, iworld) = (Ok (), iworld) where - writet :: [String] !*TTY -> *TTY - writet [] t = t - writet [x:xs] t = writet xs (TTYwrite x t) + writet :: [String] -> (*TTY -> *TTY) + writet [] = id + writet [x:xs] = writet xs o TTYwrite 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 +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 _ (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 + 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) + + 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)