X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=5df0450c3c6fc3f02903f7d19e04d8b44060af11;hb=8449be73c124cdccd37500c0d67d9404b94fc9c8;hp=6aace410b3969b6d2b219370bdcb3b800b9c1648;hpb=3717889965f37ab0670a4e74f5e378c5cd9996f7;p=mTask.git

diff --git a/miTask.icl b/miTask.icl
index 6aace41..5df0450 100644
--- a/miTask.icl
+++ b/miTask.icl
@@ -47,18 +47,23 @@ 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 ||- 
-	sendMsg msgs ch ||-
+mTaskTask 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 >>= \_->(
 			consumeNetworkStream (processSDSs sdsShares messageShare) ch ||-
 			viewSharedInformation "channels" [ViewWith lens] ch ||-
+			viewSharedInformation "messages" [] messageShare ||-
 			viewSh sdsShares ch
-		) >>* [OnAction ActionFinish (always shutDown)]
-	)
+		)
+	) >>* [OnAction ActionFinish (always shutDown)]
 	where
 		messageShare :: Shared [String]
 		messageShare = sharedStore "mTaskMessagesRecv" []
@@ -100,36 +105,47 @@ mTaskTask ch =
 			) ||- viewSh xs ch
 
 		sdsShares = makeShares st
-
 		(msgs, st) = toMessages 1000 (toRealByteCode (unMain bc))
 
 		bc :: Main (ByteCode () Stmt)
 		bc = sds \x=1 In sds \pinnetje=1 In {main =
-				x =. x +. pinnetje :.
-				pub x :.
-				digitalWrite D0 (lit False) :.
-				digitalWrite D1 (lit False) :.
-				digitalWrite D2 (lit False) :.
+				IF (digitalRead D3 ==. lit True) (
+					x =. x +. lit 1 :.
+					pub x
+				) (
+					noOp
+				) :.
 				IF (pinnetje ==. lit 1) (
-					digitalWrite D0 (lit True)
+					digitalWrite D0 (lit True) :.
+					digitalWrite D1 (lit False) :.
+					digitalWrite D2 (lit False)
 				) (
 					IF (pinnetje ==. lit 2) (
-						digitalWrite D1 (lit True)
+						digitalWrite D0 (lit False) :.
+						digitalWrite D1 (lit True) :.
+						digitalWrite D2 (lit False)
 					) (
+						digitalWrite D0 (lit False) :.
+						digitalWrite D1 (lit False) :.
 						digitalWrite D2 (lit True)
 					)
 				)}
-//		bc :: Main (ByteCode Int Stmt)
-//		bc = sds \x=1 In {main =
-//			If (x ==. lit 3)
-//			(x =. lit 1)
-//			(x =. x +. lit 1) :. pub x}
 
 makeShares :: BCState -> [(Int, Shared Int)]
 makeShares {sdss=[]} = []
 makeShares s=:{sdss=[(i,d):xs]} =
 	[(i, sharedStore ("mTaskSDS-" +++ toString i) 1):makeShares {s & sdss=xs}]
 
+//makeBytecode :: Int (Main (ByteCode () Stmt)) -> ([MTaskMSGSend], [(Int, Shared Int)])
+//makeBytecode timeout bc
+//# (msgs, st) = toMessages timeout (toRealByteCode (unMain bc))
+//# shares = map (\(i,d)->(i, sharedStore (s i) (dd d))) st.sdss
+//= (msgs, shares)
+//	where
+//		s i = "mTaskSDS-" +++ toString i
+//		dd [x,y] = (toInt x)*265+(toInt y)
+	
+
 sendMsg :: [MTaskMSGSend] (Shared ([MTaskMSGRecv],Bool,[MTaskMSGSend],Bool)) -> Task ()
 sendMsg m ch = upd (\(r,rs,s,ss)->(r,rs,s ++ m,ss)) ch @! ()
 
@@ -189,8 +205,10 @@ syncNetworkChannel server port msgSeparator decodeFun encodeFun channel
 		onConnect _ (received,receiveStopped,send,sendStopped)
 			= (Ok "",if (not (isEmpty send)) (Just (received,False,[],sendStopped)) Nothing, map encodeFun send,False)
 		whileConnected Nothing acc (received,receiveStopped,send,sendStopped)
+		| not (trace_tn "whilec nothing") = undef
 			= (Ok acc, Nothing, [], False)
 		whileConnected (Just newData) acc (received,receiveStopped,send,sendStopped)
+		| not (trace_tn "whilec just") = undef
 		# [acc:msgs] = reverse (split msgSeparator (concat [acc,newData]))
 		# write = if (not (isEmpty msgs && isEmpty send))
 			(Just (received ++ map decodeFun (reverse msgs),receiveStopped,[],sendStopped))