not working again.

[mTask.git] / miTask.icl

diff --git a/miTask.icl b/miTask.icl
index a1f6e56..5df0450 100644 (file)
--- a/miTask.icl
+++ b/miTask.icl
@@ -51,19 +51,19 @@ derive class iTask SerTCP
 :: SerTCP = Serial | TCP
 
 mTaskTask :: (Shared ([MTaskMSGRecv],Bool,[MTaskMSGSend],Bool)) -> Task ()
-mTaskTask ch =
+mTaskTask 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 ||-
+       ) ||-
        (
-               (
+               sendMsg msgs ch >>= \_->(
                        consumeNetworkStream (processSDSs sdsShares messageShare) ch ||-
                        viewSharedInformation "channels" [ViewWith lens] ch ||-
+                       viewSharedInformation "messages" [] messageShare ||-
                        viewSh sdsShares ch
-               ) >>* [OnAction ActionFinish (always shutDown)]
-       )
+               )
+       ) >>* [OnAction ActionFinish (always shutDown)]
        where
                messageShare :: Shared [String]
                messageShare = sharedStore "mTaskMessagesRecv" []
@@ -105,8 +105,7 @@ mTaskTask ch =
                        ) ||- viewSh xs ch
 
                sdsShares = makeShares st
-
-               (msgs, st) = toMessages 500 (toRealByteCode (unMain bc))
+               (msgs, st) = toMessages 1000 (toRealByteCode (unMain bc))
 
                bc :: Main (ByteCode () Stmt)
                bc = sds \x=1 In sds \pinnetje=1 In {main =
@@ -131,18 +130,21 @@ mTaskTask ch =
                                                digitalWrite D2 (lit True)
                                        )
                                )}
-//             bc :: Main (ByteCode Int Stmt)
-//             bc = sds \x=1 In {main =
-//                     If (x ==. lit 3)
-//                     (x =. lit 1)
-//                     (x =. x +. lit 1) :. pub x}
 
 makeShares :: BCState -> [(Int, Shared Int)]
 makeShares {sdss=[]} = []
 makeShares s=:{sdss=[(i,d):xs]} =
-       [(i, ms ("mTaskSDS-" +++ toString i) 1):makeShares {s & sdss=xs}]
-       where
-               ms name i = sdsFocus name (memoryStore name (Just i))
+       [(i, sharedStore ("mTaskSDS-" +++ toString i) 1):makeShares {s & sdss=xs}]
+
+//makeBytecode :: Int (Main (ByteCode () Stmt)) -> ([MTaskMSGSend], [(Int, Shared Int)])
+//makeBytecode timeout bc
+//# (msgs, st) = toMessages timeout (toRealByteCode (unMain bc))
+//# shares = map (\(i,d)->(i, sharedStore (s i) (dd d))) st.sdss
+//= (msgs, shares)
+//     where
+//             s i = "mTaskSDS-" +++ toString i
+//             dd [x,y] = (toInt x)*265+(toInt y)
+       
 
 sendMsg :: [MTaskMSGSend] (Shared ([MTaskMSGRecv],Bool,[MTaskMSGSend],Bool)) -> Task ()
 sendMsg m ch = upd (\(r,rs,s,ss)->(r,rs,s ++ m,ss)) ch @! ()
@@ -203,8 +205,10 @@ syncNetworkChannel server port msgSeparator decodeFun encodeFun channel
                onConnect _ (received,receiveStopped,send,sendStopped)
                        = (Ok "",if (not (isEmpty send)) (Just (received,False,[],sendStopped)) Nothing, map encodeFun send,False)
                whileConnected Nothing acc (received,receiveStopped,send,sendStopped)
+               | not (trace_tn "whilec nothing") = undef
                        = (Ok acc, Nothing, [], False)
                whileConnected (Just newData) acc (received,receiveStopped,send,sendStopped)
+               | not (trace_tn "whilec just") = undef
                # [acc:msgs] = reverse (split msgSeparator (concat [acc,newData]))
                # write = if (not (isEmpty msgs && isEmpty send))
                        (Just (received ++ map decodeFun (reverse msgs),receiveStopped,[],sendStopped))