X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=275745077ebc771b12583452dd8c56337423864a;hb=f90517d738696125a067f113edf93f404873115b;hp=2634ce8a6eae6d49da48cf4f09407bd6917a9292;hpb=ee5171fbc1c8e1ea7454e95b3e89c24338423523;p=mTask.git

diff --git a/miTask.icl b/miTask.icl
index 2634ce8..2757450 100644
--- a/miTask.icl
+++ b/miTask.icl
@@ -21,7 +21,7 @@ import iTasks._Framework.Store
 import TTY
 
 derive class iTask Queue, TTYSettings, Parity, BaudRate, ByteSize
-derive class iTask MTaskMSGRecv, MTaskMSGSend, SerTCP
+derive class iTask MTaskMSGRecv, MTaskMSGSend, SerTCP, UserLED
 
 :: SerTCP = Serial | TCP
 :: *Resource | TTYd !*TTY
@@ -32,36 +32,38 @@ Start world = startEngine mTaskTask world
 
 bc :: Main (ByteCode () Stmt)
 bc = sds \x=1 In sds \pinnetje=1 In {main =
-		IF (digitalRead D3 ==. lit True) (
+		IF (digitalRead D3) (
 			x =. x +. lit 1 :.
 			pub x
 		) (
 			noOp
 		) :.
 		IF (pinnetje ==. lit 1) (
-			digitalWrite D0 (lit True) :.
-			digitalWrite D1 (lit False) :.
-			digitalWrite D2 (lit False)
+			ledOn LED1
 		) (
 			IF (pinnetje ==. lit 2) (
-				digitalWrite D0 (lit False) :.
-				digitalWrite D1 (lit True) :.
-				digitalWrite D2 (lit False)
+				ledOn LED2
 			) (
-				digitalWrite D0 (lit False) :.
-				digitalWrite D1 (lit False) :.
-				digitalWrite D2 (lit True)
+				ledOn LED3
 			)
 		)}
 
-deviceSelector :: (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) -> Task ()
-deviceSelector ch = enterInformation "Type" []
+bc2 :: UserLED -> Main (ByteCode () Stmt)
+bc2 d = {main = ledOn d}
+
+bc3 :: UserLED -> Main (ByteCode () Stmt)
+bc3 d = {main = ledOff d}
+
+
+withDevice :: ((Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) -> Task a) -> Task a | iTask a
+withDevice t = withShared ([], [], False) \ch->
+		enterInformation "Type" []
 	>>= \ty->case ty of
 		TCP = (enterInformation "Host" [] -&&- enterInformation "Port" [])
-			>>= \(port,host)->syncNetworkChannel host port ch
+			>>= \(port,host)->t ch -|| syncNetworkChannel host port ch
 		Serial = accWorld getDevices
 			>>= \dl->(enterChoice "Device" [] dl -&&- updateInformation "Settings" [] zero)
-			>>= \(dev,set)->syncSerialChannel dev set ch
+			>>= \(dev,set)->t ch -|| syncSerialChannel dev set ch
 	where
 		getDevices :: !*World -> *(![String], !*World)
 		getDevices w = case readDirectory "/dev" w of
@@ -73,14 +75,17 @@ deviceSelector ch = enterInformation "Type" []
 
 mTaskTask :: Task ()
 mTaskTask = let (msgs, sdsShares) = makeMsgs 1000 bc in
-	withShared ([], msgs, False) (\ch->
-			deviceSelector ch
+	withDevice \ch->
+			sendMsg msgs ch
 		||- processMessages ch messageShare sdsShares
+		||- forever (enterChoice "Choose led to enable" [] [LED1, LED2, LED3]
+				>>= \p->sendMsg (fst (makeMsgs 0 (bc2 p))) ch)
+		||- forever (enterChoice "Choose led to disable" [] [LED1, LED2, LED3]
+				>>= \p->sendMsg (fst (makeMsgs 0 (bc3 p))) ch)
 		||- viewSharedInformation "channels" [ViewWith lens] ch
 		||- viewSharedInformation "messages" [] messageShare
 		||- viewSh sdsShares ch
 		>>* [OnAction ActionFinish (always shutDown)]
-	)
 	where
 		messageShare :: Shared [String]
 		messageShare = sharedStore "mTaskMessagesRecv" []
@@ -102,11 +107,13 @@ mTaskTask = let (msgs, sdsShares) = makeMsgs 1000 bc in
 				dd [x,y] = toInt x*265 + toInt y
 
 		updateSDSs :: [(Int, Shared Int)] (Shared [String]) MTaskMSGRecv -> Task ()
-		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 @! ()
 		= updateSDSs xs m n
+		updateSDSs _ m mtm = case mtm of
+			MTMessage s = upd (\l->take 5 [s:l]) m @! ()
+			mta=:(MTTaskAdded _) = upd (\l->take 5 [toString mta:l]) m @! ()
+			_ = return ()
 
 		lens :: ([MTaskMSGRecv], [MTaskMSGSend],Bool) -> ([String], [String])
 		lens (r,s,_) = (map toString r, map toString s)