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

diff --git a/miTask.icl b/miTask.icl
index 18c78c8..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,27 +32,27 @@ 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)
+			ledOn LED1
 		) (
 			IF (pinnetje ==. lit 2) (
-				digitalWrite D1 (lit True)
+				ledOn LED2
 			) (
-				digitalWrite D2 (lit True)
+				ledOn LED3
 			)
 		)}
 
-bc2 :: DigitalPin -> Main (ByteCode () Stmt)
-bc2 d = {main = digitalWrite d (lit True) :. noOp}
+bc2 :: UserLED -> Main (ByteCode () Stmt)
+bc2 d = {main = ledOn d}
 
-bc3 :: DigitalPin -> Main (ByteCode () Stmt)
-bc3 d = {main = digitalWrite d (lit False) :. noOp}
+bc3 :: UserLED -> Main (ByteCode () Stmt)
+bc3 d = {main = ledOff d}
 
 
 withDevice :: ((Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) -> Task a) -> Task a | iTask a
@@ -78,9 +78,9 @@ mTaskTask = let (msgs, sdsShares) = makeMsgs 1000 bc in
 	withDevice \ch->
 			sendMsg msgs ch
 		||- processMessages ch messageShare sdsShares
-		||- forever (enterChoice "Choose led to enable" [] [D0, D1, D2]
+		||- forever (enterChoice "Choose led to enable" [] [LED1, LED2, LED3]
 				>>= \p->sendMsg (fst (makeMsgs 0 (bc2 p))) ch)
-		||- forever (enterChoice "Choose led to disable" [] [D0, D1, D2]
+		||- 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
@@ -111,8 +111,8 @@ mTaskTask = let (msgs, sdsShares) = makeMsgs 1000 bc in
 		| 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 20 [s:l]) m @! ()
-			mta=:(MTTaskAdded _) = upd (\l->take 20 [toString mta:l]) m @! ()
+			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])