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

diff --git a/miTask.icl b/miTask.icl
index d07c760..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 ||-
 	(
 		(
@@ -68,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 @! ()
@@ -101,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)
@@ -131,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 @! ()