X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=47778b2506d94f04390f8d4191a1e0ebd40b9042;hb=b3d2bd33a99a2dbdc4907b6876a965c16c37314c;hp=5a87999bbf3d4f66ec70ae227718c3e3b917c191;hpb=7df511557f1e750bac4b45847f65e1e51aabdf54;p=mTask.git

diff --git a/miTask.icl b/miTask.icl
index 5a87999..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,43 +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,
-		deviceConnected :: Maybe String,
-		deviceName :: String,
-		deviceTasks :: [(String, Int)]
-	}
-:: 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)]
 
@@ -84,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 
@@ -124,7 +96,7 @@ mTaskManager = anyTask
 					@! ()
 					where
 						createBytecode st = toMessages timeout $ toRealByteCode (unMain $ fromJust ('DM'.get mTask mTaskMap)) st
-						sharename i = fromJust (device.deviceConnected) +++ "-" +++ toString i
+						sharename i = device.deviceChannels +++ "-" +++ toString i
 						toSDSRecords st = [{MTaskShare |
 							initValue=toInt d1*265 + toInt d2,
 							withTask=mTask,
@@ -139,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 (fromJust d.deviceConnected) ([], [], False)
-
 		viewShares :: [MTaskShare] -> Task ()
 		viewShares st = anyTask $ map viewer st
 			where
@@ -158,37 +127,22 @@ 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 
-				||- (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 = (enterInformation "Name" [] -&&- enterTTYSettings)
-						>>= \(name, set)->cont name (syncSerialChannel set encode decode)
-			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 (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
+//				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 (
@@ -209,7 +163,7 @@ mTaskManager = anyTask
 
 		deviceviewer :: [MTaskDevice] -> [MTaskDeviceStatus]
 		deviceviewer ds = [{MTaskDeviceStatus | name = d.deviceName,
-			connected = if (isNothing d.deviceConnected) False True,
+			connected = if (isNothing d.deviceTask) False True,
 			tasks = [s +++ toString i\\(s, i)<-d.deviceTasks]}\\d<-ds]
 
 		mapPar :: (a -> Task a) [a] -> Task ()
@@ -230,11 +184,11 @@ syncNetworkChannel server port channel = catchAll
 			= (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)
+		
+		//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)