From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 23 Jan 2017 11:14:39 +0000 (+0100)
Subject: try something
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=b55c1c423b6f00357b2ae2bbdd2abcf4456fd0cd;p=mTask.git

try something
---

diff --git a/int/interface.c b/int/interface.c
index bec4f09..9212720 100644
--- a/int/interface.c
+++ b/int/interface.c
@@ -75,13 +75,13 @@ void setup(void)
 
 void debug(char *fmt, ...)
 {
-#ifdef DEBUG
 	unsigned int i;
 	write_byte('m');
 	for(i = 0; i<strlen(fmt); i++){
 		write_byte((uint8_t)fmt[i]);
 	}
 	write_byte('\n');
+#ifdef DEBUG
 #endif
 	(void)fmt;
 }
diff --git a/int/interface_linux.c b/int/interface_linux.c
index 381df88..dd94993 100644
--- a/int/interface_linux.c
+++ b/int/interface_linux.c
@@ -73,7 +73,7 @@ void write_dpin(uint8_t i, bool b)
 bool read_dpin(uint8_t i)
 {
 	debug("dread %d", i);
-	return false;
+	return true;
 	(void) i;
 }
 
diff --git a/int/interpret.c b/int/interpret.c
index c3c6bd1..6c43852 100644
--- a/int/interpret.c
+++ b/int/interpret.c
@@ -8,7 +8,7 @@
 #include "sds.h"
 
 #ifdef STM
-#define trace(op, ...) ;
+#define trace(op, ...) {};
 #else
 #define trace(op, ...) printf("pc: %d, sp: %d, op: " op "\n", pc, sp, ##__VA_ARGS__);
 #endif
diff --git a/int/main.c b/int/main.c
index 9b6a88b..b813ab2 100644
--- a/int/main.c
+++ b/int/main.c
@@ -96,7 +96,6 @@ int main(int argc, char *argv[]){
 	task_init();
 
 	debug("booting up");
-	write_byte('\n');
 	while(true){
 		//Check for newetasks
 		debug("loop");
diff --git a/int/task.c b/int/task.c
index 882baa4..567fd9f 100644
--- a/int/task.c
+++ b/int/task.c
@@ -37,8 +37,8 @@ int task_register(void)
 	//Read task bytecode
 	for(unsigned int i = 0; i<tasks[ct].tlen; i++){
 		tasks[ct].bc[i] = read_byte();
-		debug("t[][%i]: 0x%02x %d", i,
-			tasks[ct].bc[i], tasks[ct].bc[i]);
+//		debug("t[][%i]: 0x%02x %d", i,
+//			tasks[ct].bc[i], tasks[ct].bc[i]);
 	}
 	//Return the task number for later removal
 	debug("Received a task of length %d", tasks[ct].tlen);
diff --git a/miTask.icl b/miTask.icl
index a1f6e56..1274601 100644
--- a/miTask.icl
+++ b/miTask.icl
@@ -61,6 +61,7 @@ mTaskTask ch =
 		(
 			consumeNetworkStream (processSDSs sdsShares messageShare) ch ||-
 			viewSharedInformation "channels" [ViewWith lens] ch ||-
+			viewSharedInformation "messages" [] messageShare ||-
 			viewSh sdsShares ch
 		) >>* [OnAction ActionFinish (always shutDown)]
 	)
@@ -104,9 +105,7 @@ mTaskTask ch =
 				)
 			) ||- viewSh xs ch
 
-		sdsShares = makeShares st
-
-		(msgs, st) = toMessages 500 (toRealByteCode (unMain bc))
+		(msgs, sdsShares) = makeBytecode 500 bc
 
 		bc :: Main (ByteCode () Stmt)
 		bc = sds \x=1 In sds \pinnetje=1 In {main =
@@ -131,18 +130,16 @@ 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}]
+
+makeBytecode :: Int (Main (ByteCode () Stmt)) -> ([MTaskMSGSend], [(Int, Shared Int)])
+makeBytecode timeout bc
+# (msgs, st) = toMessages timeout (toRealByteCode (unMain bc))
+# shares = map (\(i,d)->(i, sdsFocus (s i) (memoryStore (s i) (Just (dd d))))) st.sdss
+= (msgs, shares)
 	where
-		ms name i = sdsFocus name (memoryStore name (Just i))
+		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 @! ()