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

diff --git a/miTask.icl b/miTask.icl
index 89a3cd6..a1f6e56 100644
--- a/miTask.icl
+++ b/miTask.icl
@@ -47,10 +47,15 @@ deviceSelectorSerial = accWorld getDevices
 				isTTY s = not (isEmpty (filter (flip startsWith s) prefixes))
 				prefixes = ["ttyS", "ttyACM", "ttyUSB", "tty.usbserial"]
 
+derive class iTask SerTCP
+:: SerTCP = Serial | TCP
+
 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 ||- 
+	(enterInformation "Choose" [] >>= \st->case st of
+		Serial = deviceSelectorSerial >>= \(s,set)->syncSerialChannel s set decode encode ch
+		TCP = deviceSelectorNetwork >>= \(p,h)->syncNetworkChannel h p "\n" decode encode ch
+		) ||-
 	sendMsg msgs ch ||-
 	(
 		(
@@ -60,14 +65,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" []
 
@@ -76,7 +73,7 @@ mTaskTask ch =
 		processSDSs s y [x:xs] = updateSDSs s y x >>= \_->processSDSs s y xs
 
 		updateSDSs :: [(Int, Shared Int)] (Shared [String]) MTaskMSGRecv -> Task ()
-		updateSDSs _ m (MTMessage s) = upd (\l->[s:l]) m @! ()
+		updateSDSs _ m (MTMessage s) = upd (\l->take 20 [s:l]) m @! ()
 		updateSDSs _ _ MTEmpty = return ()
 		updateSDSs [(id, sh):xs] m n=:(MTPub i d)
 		| id == i = set ((toInt d.[0])*265 + toInt d.[1]) sh @! ()
@@ -109,25 +106,29 @@ mTaskTask ch =
 
 		sdsShares = makeShares st
 
-		(msgs, st) = toMessages 1000 (toRealByteCode (unMain bc))
+		(msgs, st) = toMessages 500 (toRealByteCode (unMain bc))
 
 		bc :: Main (ByteCode () Stmt)
 		bc = sds \x=1 In sds \pinnetje=1 In {main =
-				x =. x +. pinnetje :.
-				pub x :.
+				IF (digitalRead D3 ==. lit True) (
+					x =. x +. lit 1 :.
+					pub x
+				) (
+					noOp
+				) :.
 				IF (pinnetje ==. lit 1) (
-					analogWrite A0 (lit 1) :.
-					analogWrite A1 (lit 0) :.
-					analogWrite A2 (lit 0)
+					digitalWrite D0 (lit True) :.
+					digitalWrite D1 (lit False) :.
+					digitalWrite D2 (lit False)
 				) (
 					IF (pinnetje ==. lit 2) (
-						analogWrite A0 (lit 0) :.
-						analogWrite A1 (lit 1) :.
-						analogWrite A2 (lit 0)
+						digitalWrite D0 (lit False) :.
+						digitalWrite D1 (lit True) :.
+						digitalWrite D2 (lit False)
 					) (
-						analogWrite A0 (lit 0):.
-						analogWrite A1 (lit 0):.
-						analogWrite A2 (lit 1)
+						digitalWrite D0 (lit False) :.
+						digitalWrite D1 (lit False) :.
+						digitalWrite D2 (lit True)
 					)
 				)}
 //		bc :: Main (ByteCode Int Stmt)
@@ -139,7 +140,9 @@ mTaskTask ch =
 makeShares :: BCState -> [(Int, Shared Int)]
 makeShares {sdss=[]} = []
 makeShares s=:{sdss=[(i,d):xs]} =
-	[(i, sharedStore ("mTaskSDS-" +++ toString i) 1):makeShares {s & sdss=xs}]
+	[(i, ms ("mTaskSDS-" +++ toString i) 1):makeShares {s & sdss=xs}]
+	where
+		ms name i = sdsFocus name (memoryStore name (Just i))
 
 sendMsg :: [MTaskMSGSend] (Shared ([MTaskMSGRecv],Bool,[MTaskMSGSend],Bool)) -> Task ()
 sendMsg m ch = upd (\(r,rs,s,ss)->(r,rs,s ++ m,ss)) ch @! ()
@@ -170,22 +173,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