X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=5436ffe698d7d526a65dbf9704aa1acc7d329b27;hb=c6709b5f2b35baa57f11e557d4baa96d6b9a54cf;hp=407e93093c79dae97a63190aedbf8c4091997803;hpb=5ffe54378cb4b91ee2a5717d57c1bf4ba4ca563e;p=mTask.git

diff --git a/miTask.icl b/miTask.icl
index 407e930..5436ffe 100644
--- a/miTask.icl
+++ b/miTask.icl
@@ -8,6 +8,7 @@ import mTask
 
 from Text import class Text(startsWith,concat,split,join), instance Text String
 
+from Data.Func import $
 import Data.Tuple
 import System.Directory
 
@@ -21,7 +22,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
@@ -39,20 +40,20 @@ bc = sds \x=1 In sds \pinnetje=1 In {main =
 			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,11 +79,11 @@ 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 "channels" [ViewAs lens] ch
 		||- viewSharedInformation "messages" [] messageShare
 		||- viewSh sdsShares ch
 		>>* [OnAction ActionFinish (always shutDown)]
@@ -111,8 +112,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])
@@ -151,10 +152,10 @@ syncSerialChannel dev opts rw = Task eval
 			# iworld = {iworld & world=world, resources=Just (TTYd tty)}
 			= case addBackgroundTask 42 (BackgroundTask (serialDeviceBackgroundTask rw)) iworld of
 				(Error e, iworld) = (ExceptionResult (exception "h"), iworld)
-				(Ok _, iworld) = (ValueResult NoValue {TaskEvalInfo|lastEvent=ts,removedTasks=[],refreshSensitive=True} NoRep (TCBasic taskId ts JSONNull False), iworld)
+				(Ok _, iworld) = (ValueResult NoValue {TaskEvalInfo|lastEvent=ts,removedTasks=[],refreshSensitive=True} NoChange (TCBasic taskId ts JSONNull False), iworld)
 
 		eval _ _ tree=:(TCBasic _ ts _ _) iworld
-		= (ValueResult NoValue {TaskEvalInfo|lastEvent=ts,removedTasks=[],refreshSensitive=False} NoRep tree, iworld)
+		= (ValueResult NoValue {TaskEvalInfo|lastEvent=ts,removedTasks=[],refreshSensitive=False} NoChange tree, iworld)
 
 		eval event evalOpts tree=:(TCDestroy _) iworld=:{IWorld|resources,world}
 		# (TTYd tty) = fromJust resources
@@ -164,10 +165,10 @@ syncSerialChannel dev opts rw = Task eval
 			(Error e, iworld) = (ExceptionResult (exception "h"), iworld)
 			(Ok _, iworld) = (DestroyedResult, iworld)
 
-serialDeviceBackgroundTask :: (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) !*IWorld -> *IWorld
+serialDeviceBackgroundTask :: (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) !*IWorld -> (MaybeError TaskException (), *IWorld)
 serialDeviceBackgroundTask rw iworld
 	= case read rw iworld of
-		(Error e, iworld) = abort "share couldn't be read"
+		(Error e, iworld) = (Error $ exception "share couldn't be read", iworld)
 		(Ok (r,s,ss), iworld)
 		# (Just (TTYd tty)) = iworld.resources
 		# tty = writet (map encode s) tty
@@ -178,10 +179,10 @@ serialDeviceBackgroundTask rw iworld
 			= ([decode l], tty)
 		# iworld = {iworld & resources=Just (TTYd tty)}
 		= case write (r++ml,[],False) rw iworld of
-			(Error e, iworld) = abort "share couldn't be written"
+			(Error e, iworld) = (Error $ exception "share couldn't be written", iworld)
 			(Ok _, iworld) = case notify rw iworld of
-				(Error e, iworld) = abort "share couldn't be notified"
-				(Ok _, iworld) = iworld
+				(Error e, iworld) = (Error $ exception "share couldn't be notified", iworld)
+				(Ok _, iworld) = (Ok (), iworld)
 	where
 		writet :: [String] -> (*TTY -> *TTY)
 		writet [] = id