repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update sub"
[mTask.git]
/
int
/
main.c
diff --git
a/int/main.c
b/int/main.c
index
dc28e0b
..
3388f21
100644
(file)
--- a/
int/main.c
+++ b/
int/main.c
@@
-3,7
+3,8
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#ifndef STM
+#ifdef STM
+#else
#include <stdio.h>
#endif
#include <stdio.h>
#endif
@@
-23,14
+24,15
@@
void read_message(void)
//Find next task
if(input_available()){
uint8_t c = read_byte();
//Find next task
if(input_available()){
uint8_t c = read_byte();
- debug("Receiving input: %c\n", c);
+ uint8_t ct;
+ debug("Receiving input: %c %02x\n", c, c);
switch(c){
case MSG_SDS_SPEC:
debug("Receiving an sds");
sds_register();
break;
case MSG_SDS_UPD:
switch(c){
case MSG_SDS_SPEC:
debug("Receiving an sds");
sds_register();
break;
case MSG_SDS_UPD:
- debug("Receiving an sds");
+ debug("Receiving an sds
update
");
//TODO do something with the return value
sds_update();
break;
//TODO do something with the return value
sds_update();
break;
@@
-40,9
+42,10
@@
void read_message(void)
break;
case MSG_GET_TASK:
debug("Receiving a task");
break;
case MSG_GET_TASK:
debug("Receiving a task");
- write_dpin(0, true);
- task_register();
- write_dpin(0, false);
+ ct = task_register();
+ write_byte('t');
+ write16(ct);
+ write_byte('\n');
break;
case '\0':
break;
break;
case '\0':
break;
@@
-61,7
+64,6
@@
void loop(void)
struct task *curtask;
read_message();
struct task *curtask;
read_message();
- write_byte('\n');
//Run tasks
cyclestart = millis();
//Run tasks
cyclestart = millis();
@@
-79,6
+81,13
@@
void loop(void)
debug("Current task to run: %d", ct);
run_task(curtask);
curtask->lastrun = cyclestart;
debug("Current task to run: %d", ct);
run_task(curtask);
curtask->lastrun = cyclestart;
+ if(curtask->interval == 0){
+ curtask->used = false;
+ write_byte('m');
+ write_byte('d');
+ write_byte('\n');
+ }
+ write_byte('\n');
}
}
}
}
@@
-94,13
+103,12
@@
int main(int argc, char *argv[]){
setup();
sds_init();
task_init();
setup();
sds_init();
task_init();
-
- debug("booting up");
+ //debug("booting up");
while(true){
//Check for newetasks
while(true){
//Check for newetasks
-
debug("loop");
+
//
debug("loop");
loop();
loop();
- delay(
10
0);
+ delay(
5
0);
}
return 0;
}
}
return 0;
}