X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=2b9d4e0856294ae711d28ad23be0396cfe7f3b68;hb=7ab8606c3d22a2bc2743eae7a398407c84d502f2;hp=09fb5dd53fd09348b1a8d72821ec79b36a9ba658;hpb=71787cb6678d7a0d2014d373af5e55447796f78d;p=mTask.git

diff --git a/miTask.icl b/miTask.icl
index 09fb5dd..2b9d4e0 100644
--- a/miTask.icl
+++ b/miTask.icl
@@ -24,16 +24,14 @@ import iTasks._Framework.Serialization
 
 import TTY, iTasksTTY
 
-derive class iTask UserLED
-
 Start :: *World -> *World
 Start world = startEngine (mTaskManager
 	>>* [OnAction (Action "Shutdown") (always $ shutDown)]) world
 
 mTaskManager :: Task ()
-mTaskManager = anyTask 
+mTaskManager = startupDevices >>| anyTask 
 		[ viewmTasks @! ()
-		, whileUnchanged sdsStore viewShares
+		, whileUnchanged sdsStore manageShares
 		, whileUnchanged deviceStore $ manageDevices process
 		] <<@ ApplyLayout (sequenceLayouts 
 			[ arrangeWithSideBar 0 LeftSide 260 True
@@ -49,8 +47,9 @@ mTaskManager = anyTask
 						[] = viewInformation "No devices yet" [] ()
 						ds = fromJust ('DM'.get mTaskTask allmTasks)
 							>>= \bc->(enterChoice "Choose Device" [ChooseFromDropdown \t->t.deviceName] ds
-								-&&- enterInformation "Timeout, 0 for one-shot" []
+								-&&- enterInformation "Timeout" []
 							) >>* [OnAction (Action "Send") (withValue $ Just o sendToDevice mTaskTask bc)]
+							@! ()
 				)
 
 		process :: MTaskDevice (Shared Channels) -> Task ()
@@ -60,14 +59,14 @@ mTaskManager = anyTask
 			where
 				proc :: [MTaskMSGRecv] -> Task ()
 				proc [] = treturn ()
-				proc [m:ms] = (case m of
+				proc [MTEmpty:ms] = proc ms
+				proc [m:ms] = traceValue (toString m) >>| (case m of
 //					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 @! ()
+					MTPub i val = updateShare i val
 					MTTaskAck i = deviceTaskAcked device i
 					MTTaskDelAck i = deviceTaskDeleteAcked device i @! ()
-					MTEmpty = treturn ()
-					_ = traceValue (toString m) @! ()
+					_ = treturn ()
 					) >>| proc ms
 
 		mapPar :: (a -> Task a) [a] -> Task ()