X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=d07c760fdaa377f9f7ea10720e2c9a2e801a2137;hb=64f379e7446a716257f6030157f2cb254200aa7b;hp=89a3cd6f6667c478d8c71d33356bacf666f9079b;hpb=052b9089d5c18e54bea8333dfaa041c389da3289;p=mTask.git

diff --git a/miTask.icl b/miTask.icl
index 89a3cd6..d07c760 100644
--- a/miTask.icl
+++ b/miTask.icl
@@ -49,8 +49,8 @@ deviceSelectorSerial = accWorld getDevices
 
 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 ||- 
+//	deviceSelectorNetwork >>= \(p,h)->syncNetworkChannel h p "\n" decode encode ch ||-
+	deviceSelectorSerial >>= \(s,set)->syncSerialChannel s set decode encode ch ||- 
 	sendMsg msgs ch ||-
 	(
 		(
@@ -60,14 +60,6 @@ mTaskTask ch =
 		) >>* [OnAction ActionFinish (always shutDown)]
 	)
 	where
-		encode` m
-		| not (trace_tn (toString (toJSON m))) = undef
-		= encode m
-
-		decode` m
-		| not (trace_tn (toString (toJSON m))) = undef
-		= decode m
-
 		messageShare :: Shared [String]
 		messageShare = sharedStore "mTaskMessagesRecv" []
 
@@ -170,22 +162,27 @@ syncSerialChannel dev opts decodeFun encodeFun rw = Task eval
 			(Ok _, iworld) = (DestroyedResult, iworld)
 
 serialDeviceBackgroundTask :: (Shared ([m],Bool,[n],Bool)) (String -> m) (n -> String) !*IWorld -> *IWorld
-serialDeviceBackgroundTask rw en de iworld
+serialDeviceBackgroundTask rw de en iworld
 	= case read rw iworld of
-		(Error e, iworld) = iworld
+		(Error e, iworld) = abort "share couldn't be read"
 		(Ok (r,rs,s,ss), iworld)
 		# (Just (TTYd tty)) = iworld.resources
-		# tty = writet (map de s) tty
-		= case TTYavailable tty of
-			(False, tty) = {iworld & resources=Just (TTYd tty)}
+		# tty = writet (map en s) tty
+		# (ml, tty) = case TTYavailable tty of
+			(False, tty) = ([], tty)
 			(_, tty)
-			# (l, tty) = appFst en (TTYreadline tty)
-			# iworld = {iworld & resources=Just (TTYd tty)}
-			= snd (write (r ++ [l],rs,[],ss) rw iworld)
+			# (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
 	where
 		writet :: [String] !*TTY -> *TTY
 		writet [] t = t
-		writet [x:xs] t = writet xs (TTYwrite t x)
+		writet [x:xs] t = writet xs (TTYwrite x t)
 
 
 syncNetworkChannel :: String Int String (String -> m) (n -> String) (Shared ([m],Bool,[n],Bool)) -> Task () | iTask m & iTask n