X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=2b9d4e0856294ae711d28ad23be0396cfe7f3b68;hb=7ab8606c3d22a2bc2743eae7a398407c84d502f2;hp=a20108ca773fec0014e24072484727545df11ca4;hpb=bdebf34a1e281db5b2de64d5dd177cf7ea5cee51;p=mTask.git diff --git a/miTask.icl b/miTask.icl index a20108c..2b9d4e0 100644 --- a/miTask.icl +++ b/miTask.icl @@ -5,6 +5,10 @@ from StdFunc import flip import iTasks import mTask +import Devices.mTaskDevice +import Shares.mTaskShare +import Tasks.Examples +import Utils.SDS from Text import class Text(startsWith,concat,split,join), instance Text String @@ -15,350 +19,57 @@ 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 iTasks._Framework.Serialization import TTY, iTasksTTY -derive class iTask Queue, TTYSettings, Parity, BaudRate, ByteSize -derive class iTask MTaskMSGRecv, MTaskMSGSend, SerTCP, UserLED - -:: *Resource | TTYd !*TTY -:: Channels :== ([MTaskMSGRecv], [MTaskMSGSend], Bool) - -:: SerTCP = SerialDevice | TCPDevice -:: MTaskDevice = { - deviceTask :: Maybe TaskId, - deviceConnected :: Maybe String, - deviceName :: String, - deviceTasks :: [(String, Int)] - } -:: MTaskShare = { - initValue :: Int, - withTask :: String, - identifier :: Int, - realShare :: String - } - Start :: *World -> *World Start world = startEngine (mTaskManager >>* [OnAction (Action "Shutdown") (always $ shutDown)]) world -memoryShare :: String a -> Shared a | iTask a -memoryShare s d = sdsFocus s $ memoryStore "" $ Just d - -deviceStore :: Shared [MTaskDevice] -deviceStore = memoryShare "mTaskDevices" [] - -sdsStore :: Shared [MTaskShare] -sdsStore = memoryShare "mTaskShares" [] - -bcStateStore :: Shared BCState -bcStateStore = memoryShare "mTaskBCState" zero - -mTaskTaskStore :: Shared [String] -mTaskTaskStore = memoryShare "mTaskTasks" ["ledder", "ledon", "ledoff"] - -mTaskMap :: Map String (Main (ByteCode () Stmt)) -mTaskMap = 'DM'.fromList [("ledder", bc), ("ledon", bc2 LED1), ("ledoff", bc3 LED3)] - -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, tasks :: [(String, Int)]} -derive class iTask MTaskDeviceStatus, MTaskDevice, MTaskShare, BCState - mTaskManager :: Task () -mTaskManager = anyTask +mTaskManager = startupDevices >>| anyTask [ viewmTasks @! () - , viewShares - , whileUnchanged deviceStore viewDevices - ] <<@ ApplyLayout layout - where - layout = sequenceLayouts + , whileUnchanged sdsStore manageShares + , whileUnchanged deviceStore $ manageDevices process + ] <<@ ApplyLayout (sequenceLayouts [ arrangeWithSideBar 0 LeftSide 260 True , arrangeSplit Vertical True - ] - - viewmTasks = listmTasks - >&^ \sh->whileUnchanged sh $ \mi->case mi of + ]) + where + viewmTasks :: Task String + viewmTasks = enterChoiceWithShared "Available mTasks" [ChooseFromList id] mTaskTaskStore + >&^ \sh->whileUnchanged sh $ \mi->forever (case mi of Nothing = viewInformation "No task selected" [] () Just mTaskTask = get deviceStore >>= \devices->case devices of [] = viewInformation "No devices yet" [] () - ds = sendmTask mTaskTask ds @! () + ds = fromJust ('DM'.get mTaskTask allmTasks) + >>= \bc->(enterChoice "Choose Device" [ChooseFromDropdown \t->t.deviceName] ds + -&&- enterInformation "Timeout" [] + ) >>* [OnAction (Action "Send") (withValue $ Just o sendToDevice mTaskTask bc)] + @! () + ) + + process :: MTaskDevice (Shared Channels) -> Task () + process device ch = forever (watch ch >>* [OnValue ( + ifValue (not o isEmpty o fst3) + (\t->upd (appFst3 (const [])) ch >>| proc (fst3 t)))]) where - listmTasks :: Task String - listmTasks = enterChoiceWithShared "Available mTasks" [ChooseFromList id] mTaskTaskStore - - sendmTask mTaskId ds = - (enterChoice "Choose Device" [ChooseFromDropdown \t->t.deviceName] ds - -&&- enterInformation "Timeout, 0 for one-shot" []) - >>* [OnAction (Action "Send") (withValue $ Just o sendToDevice mTaskId)] - - sendToDevice :: String (MTaskDevice, Int) -> Task () - sendToDevice mTask (device, timeout) = - get bcStateStore @ createBytecode - >>= \(msgs, st1)->set st1 bcStateStore @ toSDSRecords - >>= \sdss->upd ((++)sdss) sdsStore//MTaskShareaddToSDSShare - >>| makeShares sdss - >>| upd (\(r,s,ss)->(r,s++msgs,ss)) (channels device) - @! () - where - createBytecode st = toMessages timeout $ toRealByteCode (unMain $ fromJust ('DM'.get mTask mTaskMap)) st - sharename i = fromJust (device.deviceConnected) +++ "-" +++ toString i - toSDSRecords st = [{MTaskShare | - initValue=toInt d1*265 + toInt d2, - withTask=mTask, - identifier=i, - realShare="mTaskSDS-" +++ toString i} - \\(i,[d1,d2])<-st.sdss] - makeShares = foldr (\sh t->set sh.initValue (getSDSStore sh) >>| t) (treturn ()) - - getSDSStore :: MTaskShare -> Shared Int - getSDSStore sh = memoryShare sh.realShare 0 - - channels :: MTaskDevice -> Shared Channels - channels d = memoryShare (fromJust d.deviceConnected) ([], [], False) - - viewShares :: Task () - viewShares = forever $ viewSharedInformation "Shares" [] sdsStore @! () -// enterChoiceWithShared "Shares" [ChooseFromList id] sdsStore -// >>* [OnValue $ withValue $ Just o updateShare] -// >>* [OnAction (Action "Back") (const $ Just $ treturn ())] -// where -// sdsvw (k, v) = concat ["SDS ", toString k, ": ", toString v] -// updateShare s = viewInformation "" [] () -// updateShare (k, v) = (viewInformation "Key" [] k -// ||- updateInformation "Value" [] v) - - - viewDevices :: [MTaskDevice] -> Task () - viewDevices ds = anyTask [ - addDevice deviceStore <<@ Title "Add new device" @! (): - [viewDevice d <<@ Title d.deviceName\\d<-ds]] - <<@ ArrangeWithTabs @! () - - viewDevice :: MTaskDevice -> Task () - viewDevice d = (viewInformation "Device settings" [] d - ||- (case d.deviceConnected of - Just s = viewSharedInformation "Channels" [ViewAs dropEmpty] (channels d) @! () - Nothing = viewInformation "No channels yet" [] "" @! () - )) <<@ ArrangeHorizontal - where - dropEmpty (r,s,ss) = (filter ((=!=)MTEmpty) r,s,ss) - - addDevice :: (Shared [MTaskDevice]) -> Task SerTCP - addDevice devices = enterInformation "Device type" [] - >&^ \sh->whileUnchanged sh $ \mty->case mty of - Nothing = viewInformation "No type selected yet" [] "" @! () - Just ty = case ty of - TCPDevice = (enterInformation "Name" [] -&&- enterInformation "Hostname" [] -&&- enterInformation "Port" []) - >>= \(name, (host, port))->cont name (syncNetworkChannel host port) - SerialDevice = accWorld getTTYDevices - >>= \dl->(enterInformation "Name" [] -&&- enterChoice "Device" [] dl -&&- updateInformation "Settings" [] zero) - >>= \(name, (dev, set))->cont name (syncSerialChannel dev set) - where - cont :: String ((Shared Channels) -> Task ()) -> Task () - cont name synfun = get randomInt - @ (\randint->{deviceConnected=Just (name +++ toString randint), deviceName=name, deviceTasks=[], deviceTask=Nothing}) - >>= \dev->appendTopLevelTask 'DM'.newMap True (synfun $ channels dev) - >>= \tid->upd (\l->[{dev & deviceTask=Just tid}:l]) devices - @! () - -// >= \ty->get randomInt @ (\randint->{deviceConnected=Just (name +++ toString randint), deviceName=name, deviceTasks=[]}) -// >>= \dev->let ch = channels dev in case ty of -// TCPDevice = enterInformation "Hostname and port" [] -// >>= \(host, port)->cont dev ||- syncNetworkChannel host port ch -// SerialDevice = accWorld getDevices -// >>= \dl->(enterChoice "Device" [] dl -&&- updateInformation "Settings" [] zero) -// >>= \(device, settings)->cont dev ||- syncSerialChannel device settings ch -// where -// cont d = (upd (\l->[d:l]) devices >>| addDevice devices) - -// 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 - - deviceviewer :: [MTaskDevice] -> [MTaskDeviceStatus] - deviceviewer ds = [{MTaskDeviceStatus | name = d.deviceName, - connected = if (isNothing d.deviceConnected) False True, - tasks = d.deviceTasks}\\d<-ds] - -// 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 + proc :: [MTaskMSGRecv] -> Task () + proc [] = treturn () + proc [MTEmpty:ms] = proc ms + proc [m:ms] = traceValue (toString m) >>| (case m of +// MTSDSAck i = traceValue (toString m) @! () +// MTSDSDelAck i = traceValue (toString m) @! () + MTPub i val = updateShare i val + MTTaskAck i = deviceTaskAcked device i + MTTaskDelAck i = deviceTaskDeleteAcked device i @! () + _ = treturn () + ) >>| proc ms 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 (||-) - - -//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" [] -// -// 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 - 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) - - eval _ _ tree=:(TCBasic _ ts _ _) 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 - (Error e, iworld) = (ExceptionResult (exception "h"), iworld) - (Ok _, iworld) = (DestroyedResult, iworld) - -serialDeviceBackgroundTask :: (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) !*IWorld -> (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 - 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 = catchAll - (tcpconnect server port channel {ConnectionHandlers|onConnect=onConnect,whileConnected=whileConnected,onDisconnect=onDisconnect} @! ()) - (\v->traceValue v @! ()) - 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) - - whileConnected (Just newData) acc (msgs,send,sendStopped) - = (Ok acc, Just (msgs ++ [decode newData],[],False), map encode send, False) - //| sendStopped = (Ok acc, Just (msgs ++ [decode newData],[],False), map encode send, False) -// = (Ok acc, Just (msgs ++ [decode newData],[],False), [], False) - - onDisconnect :: String ([MTaskMSGRecv],[MTaskMSGSend],Bool) -> (MaybeErrorString String, Maybe ([MTaskMSGRecv],[MTaskMSGSend],Bool)) - onDisconnect l (msgs,send,sendStopped) = (Ok l, Nothing)