modularize

[mTask.git] / miTask.icl

diff --git a/miTask.icl b/miTask.icl
index 81c765b..6c80f05 100644 (file)
--- a/miTask.icl
+++ b/miTask.icl
@@ -5,6 +5,7 @@ from StdFunc import flip
 
 import iTasks
 import mTask
+import Devices.mTaskDevice
 
 from Text import class Text(startsWith,concat,split,join), instance Text String
 
@@ -19,18 +20,8 @@ import iTasks._Framework.Store
 
 import TTY, iTasksTTY
 
-derive class iTask MTaskMSGRecv, MTaskMSGSend, SerTCP, UserLED
+derive class iTask UserLED
 
-:: Channels :== ([MTaskMSGRecv], [MTaskMSGSend], Bool)
-
-:: SerTCP = SerialDevice | TCPDevice
-:: MTaskDevice = {
-                deviceTask :: Maybe TaskId
-               ,deviceChannels :: String
-               ,deviceName :: String
-               ,deviceTasks :: [(String, Int)]
-//             ,deviceSyncfun :: (Shared Channels) -> Task ()
-       }
 :: MTaskShare = {
                initValue :: Int,
                withTask :: String,
@@ -85,7 +76,7 @@ bc3 :: UserLED -> Main (ByteCode () Stmt)
 bc3 d = {main = ledOff d}
 
 :: MTaskDeviceStatus = {connected :: Bool, name :: String, tasks :: [String]}
-derive class iTask MTaskDeviceStatus, MTaskDevice, MTaskShare, BCState
+derive class iTask MTaskDeviceStatus, MTaskShare, BCState
 
 mTaskManager :: Task ()
 mTaskManager = anyTask 
@@ -140,9 +131,6 @@ mTaskManager = anyTask
                getSDSRecord :: Int -> Task MTaskShare
                getSDSRecord i = get sdsStore @ \l->hd [s\\s<-l | s.identifier == i]
 
-               channels :: MTaskDevice -> Shared Channels
-               channels d = memoryShare d.deviceChannels ([], [], False)
-
                viewShares :: [MTaskShare] -> Task ()
                viewShares st = anyTask $ map viewer st
                        where
@@ -172,26 +160,6 @@ mTaskManager = anyTask
                        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 = (enterInformation "Name" [] -&&- enterTTYSettings)
-                                               >>= \(name, set)->cont name (syncSerialChannel set encode decode)
-                       where
-                               cont :: String ((Shared Channels) -> Task ()) -> Task ()
-                               cont name synfun = get randomInt 
-                                       @ (\randint->{MTaskDevice |
-                                               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
-                                       @! ()
 
 //             addDevice :: (Shared [MTaskDevice]) -> Task SerTCP
 //             addDevice devices = enterInformation "Device type" []