X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=miTask.icl;h=47778b2506d94f04390f8d4191a1e0ebd40b9042;hb=b3d2bd33a99a2dbdc4907b6876a965c16c37314c;hp=81c765b4dc8443d73bc690b1eeff92d40efecc58;hpb=4f2bcb0778dca37ec53ebd6ca087554c19672849;p=mTask.git

diff --git a/miTask.icl b/miTask.icl
index 81c765b..47778b2 100644
--- a/miTask.icl
+++ b/miTask.icl
@@ -5,6 +5,9 @@ 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
 
@@ -19,44 +22,12 @@ import iTasks._Framework.Store
 
 import TTY, iTasksTTY
 
-derive class iTask MTaskMSGRecv, MTaskMSGSend, SerTCP, 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,
-		identifier :: Int,
-		realShare :: String
-	}
+derive class iTask UserLED
 
 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 = sharedStore "mTaskDevices" []
-
-sdsStore :: Shared [MTaskShare]
-sdsStore = memoryShare "mTaskShares" []
-
-bcStateStore :: Shared BCState
-bcStateStore = memoryShare "mTaskBCState" zero
-
-mTaskTaskStore :: Shared [String]
-mTaskTaskStore = memoryShare "mTaskTasks" ["count", "ledon", "ledoff"]
-
 mTaskMap :: Map String (Main (ByteCode () Stmt))
 mTaskMap = 'DM'.fromList [("count", bc), ("ledon", bc2 LED1), ("ledoff", bc3 LED3)]
 
@@ -85,7 +56,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, BCState
 
 mTaskManager :: Task ()
 mTaskManager = anyTask 
@@ -140,9 +111,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
@@ -159,40 +127,6 @@ mTaskManager = anyTask
 //					||- 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 
-				||- viewSharedInformation "Channels" [ViewAs dropEmpty] (channels d) @! ()
-				) <<@ 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 = (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" []
 //			>&^ \sh->whileUnchanged sh $ \mty->case mty of