remove traces

[mTask.git] / miTask.icl

diff --git a/miTask.icl b/miTask.icl
index a698ddd..2634ce8 100644 (file)
--- a/miTask.icl
+++ b/miTask.icl
@@ -59,9 +59,9 @@ deviceSelector ch = enterInformation "Type" []
        >>= \ty->case ty of
                TCP = (enterInformation "Host" [] -&&- enterInformation "Port" [])
                        >>= \(port,host)->syncNetworkChannel host port ch
-//             Serial = accWorld getDevices
-//                     >>= \dl->(enterChoice "Device" [] dl -&&- enterInformation "Settings" [])
-//                     >>= \(dev,set)->syncSerialChannel dev set decode encode ch
+               Serial = accWorld getDevices
+                       >>= \dl->(enterChoice "Device" [] dl -&&- updateInformation "Settings" [] zero)
+                       >>= \(dev,set)->syncSerialChannel dev set ch
        where
                getDevices :: !*World -> *(![String], !*World)
                getDevices w = case readDirectory "/dev" w of
@@ -75,7 +75,6 @@ mTaskTask :: Task ()
 mTaskTask = let (msgs, sdsShares) = makeMsgs 1000 bc in
        withShared ([], msgs, False) (\ch->
                        deviceSelector ch
-//             ||- sendTasks msgs ch//sendMsg msgs ch
                ||- processMessages ch messageShare sdsShares
                ||- viewSharedInformation "channels" [ViewWith lens] ch
                ||- viewSharedInformation "messages" [] messageShare
@@ -99,7 +98,8 @@ mTaskTask = let (msgs, sdsShares) = makeMsgs 1000 bc in
                # (msgs, st) = toMessages timeout (toRealByteCode (unMain bc))
                = (msgs, map f st.sdss)
                        where 
-                               f (i,d) = (i, sharedStore ("mTaskSDS-" +++ toString i) 0)
+                               f (i,d) = (i, sharedStore ("mTaskSDS-" +++ toString i) (dd d))
+                               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 @! ()
@@ -132,8 +132,8 @@ mTaskTask = let (msgs, sdsShares) = makeMsgs 1000 bc in
 sendMsg :: [MTaskMSGSend] (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) -> Task ()
 sendMsg m ch = upd (\(r,s,ss)->(r,s ++ m,True)) ch @! ()
 
-syncSerialChannel :: String TTYSettings (String -> m) (n -> String) (Shared ([m],Bool,[n],Bool)) -> Task () | iTask m & iTask n
-syncSerialChannel dev opts decodeFun encodeFun rw = Task eval
+syncSerialChannel :: String TTYSettings (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) -> Task ()
+syncSerialChannel dev opts rw = Task eval
        where
                eval event evalOpts tree=:(TCInit taskId ts) iworld=:{IWorld|world}
                = case TTYopen dev opts world of
@@ -142,7 +142,7 @@ syncSerialChannel dev opts decodeFun encodeFun rw = Task eval
                        = (ExceptionResult (exception err), {iworld & world=world})
                        (True, tty, world)
                        # iworld = {iworld & world=world, resources=Just (TTYd tty)}
-                       = case addBackgroundTask 42 (BackgroundTask (serialDeviceBackgroundTask rw decodeFun encodeFun)) iworld of
+                       = 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)
 
@@ -157,28 +157,28 @@ syncSerialChannel dev opts decodeFun encodeFun rw = Task eval
                        (Error e, iworld) = (ExceptionResult (exception "h"), iworld)
                        (Ok _, iworld) = (DestroyedResult, iworld)
 
-serialDeviceBackgroundTask :: (Shared ([m],Bool,[n],Bool)) (String -> m) (n -> String) !*IWorld -> *IWorld
-serialDeviceBackgroundTask rw de en iworld
+serialDeviceBackgroundTask :: (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) !*IWorld -> *IWorld
+serialDeviceBackgroundTask rw iworld
        = case read rw iworld of
                (Error e, iworld) = abort "share couldn't be read"
-               (Ok (r,rs,s,ss), iworld)
+               (Ok (r,s,ss), iworld)
                # (Just (TTYd tty)) = iworld.resources
-               # tty = writet (map en s) tty
+               # tty = writet (map encode s) tty
                # (ml, tty) = case TTYavailable tty of
                        (False, tty) = ([], tty)
                        (_, tty)
                        # (l, tty) = TTYreadline tty
-                       = ([de l], tty)
+                       = ([decode l], tty)
                # iworld = {iworld & resources=Just (TTYd tty)}
-               = case write (r++ml,rs,[],ss) rw iworld of
+               = case write (r++ml,[],False) rw iworld of
                        (Error e, iworld) = abort "share couldn't be written"
                        (Ok _, iworld) = case notify rw iworld of
                                (Error e, iworld) = abort "share couldn't be notified"
                                (Ok _, iworld) = iworld
        where
-               writet :: [String] !*TTY -> *TTY
-               writet [] t = t
-               writet [x:xs] t = writet xs (TTYwrite x t)
+               writet :: [String] -> (*TTY -> *TTY)
+               writet [] = id
+               writet [x:xs] = writet xs o TTYwrite x
 
 
 syncNetworkChannel :: String Int (Shared ([MTaskMSGRecv], [MTaskMSGSend], Bool)) -> Task ()