X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=a20108ca773fec0014e24072484727545df11ca4;hb=bdebf34a1e281db5b2de64d5dd177cf7ea5cee51;hp=d84121a59d9a4d1d81328b8a4e22a04993b5bd50;hpb=24a37bfbe248331eee720fc06c6aa0390be13005;p=mTask.git diff --git a/miTask.icl b/miTask.icl index d84121a..a20108c 100644 --- a/miTask.icl +++ b/miTask.icl @@ -8,6 +8,8 @@ import mTask from Text import class Text(startsWith,concat,split,join), instance Text String +import qualified Data.Map as DM + from Data.Func import $ import Data.Tuple import Data.List @@ -20,25 +22,50 @@ import iTasks._Framework.TaskServer import iTasks._Framework.IWorld import iTasks._Framework.Store -import TTY + +import TTY, iTasksTTY 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 +:: Channels :== ([MTaskMSGRecv], [MTaskMSGSend], Bool) + +:: SerTCP = SerialDevice | TCPDevice :: MTaskDevice = { - deviceConnected :: Maybe (Shared ([String], [String], Bool)), + deviceTask :: Maybe TaskId, + deviceConnected :: Maybe String, deviceName :: String, - deviceSettings :: Either (String, Int) (String, TTYSettings) + 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 -//Start world = startEngine mTaskTask 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 = @@ -64,38 +91,130 @@ bc2 d = {main = ledOn d} bc3 :: UserLED -> Main (ByteCode () Stmt) bc3 d = {main = ledOff d} -:: MTaskDeviceStatus = {connected :: Bool, name :: String} -derive class iTask MTaskDeviceStatus +:: MTaskDeviceStatus = {connected :: Bool, name :: String, tasks :: [(String, Int)]} +derive class iTask MTaskDeviceStatus, MTaskDevice, MTaskShare, BCState 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)) @! () -// ) +mTaskManager = anyTask + [ viewmTasks @! () + , viewShares + , whileUnchanged deviceStore viewDevices + ] <<@ ApplyLayout layout 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 @! () + layout = sequenceLayouts + [ arrangeWithSideBar 0 LeftSide 260 True + , arrangeSplit Vertical True + ] + + viewmTasks = listmTasks + >&^ \sh->whileUnchanged sh $ \mi->case mi of + Nothing = viewInformation "No task selected" [] () + Just mTaskTask = get deviceStore + >>= \devices->case devices of + [] = viewInformation "No devices yet" [] () + ds = sendmTask mTaskTask ds @! () + 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}\\d<-ds] + connected = if (isNothing d.deviceConnected) False True, + tasks = d.deviceTasks}\\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 @@ -114,27 +233,6 @@ mTaskManager = forever (addDevice >>= \d->upd (\l->[d:l]) deviceStore) 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 - 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 :: Task () //mTaskTask = let (msgs, sdsShares) = makeMsgs 1000 bc in @@ -153,14 +251,6 @@ addDevice = enterInformation "Device name" [] // 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)) @@ -253,8 +343,9 @@ serialDeviceBackgroundTask rw iworld syncNetworkChannel :: String Int (Shared ([MTaskMSGRecv], [MTaskMSGSend], Bool)) -> Task () -syncNetworkChannel server port channel - = tcpconnect server port channel {ConnectionHandlers|onConnect=onConnect,whileConnected=whileConnected,onDisconnect=onDisconnect} @! () +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) @@ -263,11 +354,11 @@ syncNetworkChannel server port channel 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) + = (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)