modularize more
[mTask.git] / miTask.icl
index 6aace41..47778b2 100644 (file)
@@ -5,212 +5,192 @@ from StdFunc import flip
 
 import iTasks
 import mTask
+import Devices.mTaskDevice
+import Shares.mTaskShare
+import Utils.SDS
 
 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
 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
+import TTY, iTasksTTY
 
-:: *Resource | TTYd !*TTY
+derive class iTask UserLED
 
 Start :: *World -> *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" []
-
-deviceSelectorSerial :: Task (String, TTYSettings)
-deviceSelectorSerial = accWorld getDevices
-       >>= \dl->(enterChoice "Device" [] dl -&&- deviceSettings)
+Start world = startEngine (mTaskManager
+       >>* [OnAction (Action "Shutdown") (always $ shutDown)]) world
+
+mTaskMap :: Map String (Main (ByteCode () Stmt))
+mTaskMap = 'DM'.fromList [("count", 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]}
+derive class iTask MTaskDeviceStatus, BCState
+
+mTaskManager :: Task ()
+mTaskManager = anyTask 
+               [ viewmTasks @! ()
+               , whileUnchanged sdsStore viewShares
+               , whileUnchanged deviceStore viewDevices
+               ] <<@ ApplyLayout layout
        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)
+               layout = sequenceLayouts
+                       [ arrangeWithSideBar 0 LeftSide 260 True
+                       , arrangeSplit Vertical True
+                       ]
+
+               viewmTasks = listmTasks
+                       >&^ \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 @! ())
                        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 ||-
-       (
-               (
-                       consumeNetworkStream (processSDSs sdsShares messageShare) ch ||-
-                       viewSharedInformation "channels" [ViewWith lens] ch ||-
-                       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
-
-               updateSDSs :: [(Int, Shared Int)] (Shared [String]) MTaskMSGRecv -> Task ()
-               updateSDSs _ m (MTMessage s) = upd (\l->take 20 [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)
+                               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 = device.deviceChannels +++ "-" +++ 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
+
+               getSDSRecord :: Int -> Task MTaskShare
+               getSDSRecord i = get sdsStore @ \l->hd [s\\s<-l | s.identifier == i]
+
+               viewShares :: [MTaskShare] -> Task ()
+               viewShares st = anyTask $ map viewer st
                        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 1000 (toRealByteCode (unMain bc))
-
-               bc :: Main (ByteCode () Stmt)
-               bc = sds \x=1 In sds \pinnetje=1 In {main =
-                               x =. x +. pinnetje :.
-                               pub x :.
-                               digitalWrite D0 (lit False) :.
-                               digitalWrite D1 (lit False) :.
-                               digitalWrite D2 (lit False) :.
-                               IF (pinnetje ==. lit 1) (
-                                       digitalWrite D0 (lit True)
-                               ) (
-                                       IF (pinnetje ==. lit 2) (
-                                               digitalWrite D1 (lit True)
-                                       ) (
-                                               digitalWrite D2 (lit True)
-                                       )
-                               )}
-//             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
-       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 de en iworld
-       = case read rw iworld of
-               (Error e, iworld) = abort "share couldn't be read"
-               (Ok (r,rs,s,ss), iworld)
-               # (Just (TTYd tty)) = iworld.resources
-               # tty = writet (map en s) tty
-               # (ml, tty) = case TTYavailable tty of
-                       (False, tty) = ([], tty)
-                       (_, tty)
-                       # (l, tty) = TTYreadline tty
-                       = ([de 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"
-                       (Ok _, iworld) = case notify rw iworld of
-                               (Error e, iworld) = abort "share couldn't be notified"
-                               (Ok _, iworld) = iworld
+                               viewer :: MTaskShare -> Task ()
+                               viewer m = viewSharedInformation "" [] (getSDSStore m)
+                                       <<@ Title ("SDS: " +++ toString m.identifier) @! ()
+//                             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)
+                                       
+
+//             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 = (enterInformation "Name" [] -&&- enterTTYSettings)
+//                                             >>= \(name, set)->cont name (syncSerialChannel set encode decode)
+//                     where
+//                             cont :: String ((Shared Channels) -> Task ()) -> Task ()
+//                             cont name synfun = get randomInt 
+//                                     @ (\randint->{deviceChannels=name +++ toString randint, deviceName=name, deviceTasks=[], deviceTask=Nothing})
+//                                     >>= \dev->appendTopLevelTask 'DM'.newMap True (let ch = channels dev in process ch -||- synfun ch)
+//                                     >>= \tid->upd (\l->[{dev & deviceTask=Just tid}:l]) devices
+//                                     @! ()
+
+               process :: (Shared Channels) -> Task ()
+               process ch = forever (watch ch >>* [OnValue (
+                               ifValue (not o isEmpty o fst3)
+                               (\t->upd (appFst3 (const [])) ch >>| process (fst3 t)))])
+                       where
+                               process :: [MTaskMSGRecv] -> Task ()
+                               process [] = treturn ()
+                               process [m:ms] = (case m of
+                                       MTTaskAck i = traceValue (toString m) @! ()
+                                       MTTaskDelAck i = traceValue (toString m) @! ()
+                                       MTSDSAck i = traceValue (toString m) @! ()
+                                       MTSDSDelAck i = traceValue (toString m) @! ()
+                                       MTPub i val = getSDSRecord i >>= set (toInt val.[0]*256 + toInt val.[1]) o getSDSStore @! ()
+                                       MTMessage val = traceValue (toString m) @! ()
+                                       MTEmpty = treturn ()
+                                       ) >>| process ms
+
+               deviceviewer :: [MTaskDevice] -> [MTaskDeviceStatus]
+               deviceviewer ds = [{MTaskDeviceStatus | name = d.deviceName,
+                       connected = if (isNothing d.deviceTask) False True,
+                       tasks = [s +++ toString i\\(s, i)<-d.deviceTasks]}\\d<-ds]
+
+               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 (||-)
+
+sendMsg :: [MTaskMSGSend] (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) -> Task ()
+sendMsg m ch = upd (\(r,s,ss)->(r,s ++ m,True)) ch @! ()
+
+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
-               writet :: [String] !*TTY -> *TTY
-               writet [] t = t
-               writet [x:xs] t = writet xs (TTYwrite x t)
+               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)
 
-
-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} @! ()
-       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)
+               whileConnected :: (Maybe String) String ([MTaskMSGRecv], [MTaskMSGSend],Bool) -> (MaybeErrorString String, Maybe ([MTaskMSGRecv],[MTaskMSGSend],Bool), [String], Bool)
                
-               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)]) <! id) @! ()
-       where
-               ifProcess (received,receiveStopped,_,_)
-                       = receiveStopped || (not (isEmpty received))
-
-               process (received,receiveStopped,_,_)
-                       =   upd empty channel
-                       >>| if (isEmpty received) (return ()) (processTask received)
-                       @!  receiveStopped
+               //whileConnected Nothing acc (msgs,send,sendStopped)
+               //= (Ok acc, Just (msgs,[],sendStopped), map encode send, False)
+               whileConnected mnewData acc (msgs,send,sendStopped)
+               = (Ok acc, Just (msgs ++ map decode (maybeToList mnewData),[],sendStopped), map encode send, False)
+               //| 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)