sidestep

[mTask.git] / int / nucleo-f767-blinky / src / sds.c

diff --git a/int/nucleo-f767-blinky/src/sds.c b/int/nucleo-f767-blinky/src/sds.c
index 4751284..cd6452b 100644 (file)
--- a/int/nucleo-f767-blinky/src/sds.c
+++ b/int/nucleo-f767-blinky/src/sds.c
@@ -6,9 +6,8 @@
 #include <stdio.h>
 #endif
 
-#include "main.h"
+#include "interface.h"
 #include "interpret.h"
-#include "misc.h"
 #include "sds.h"
 
 struct sds sdss[MAXSDSS];
@@ -27,7 +26,7 @@ void sds_register()
                        break;
 
        if(cs == MAXSDSS)
-               die("Trying to add too much tasks...\n");
+               die("Trying to add too much sdss...");
 
        memset(&sdss[cs], 0, sizeof(struct sds));
        //Read identifier
@@ -35,7 +34,7 @@ void sds_register()
        //Read value
        sdss[cs].value = read16();
 
-       debug("\nReceived sds %d: %d\n", sdss[cs].id, sdss[cs].value);
+       debug("Received sds %d: %d", sdss[cs].id, sdss[cs].value);
        sdss[cs].used = true;
 }
 
@@ -43,7 +42,7 @@ bool sds_update()
 {
        uint8_t cs, id;
        //Read identifier
-       id = read_byte();
+       id = read16();
 
        for(cs = 0; cs<MAXSDSS; cs++){
                if(!sdss[cs].used)
@@ -51,6 +50,10 @@ bool sds_update()
                if(sdss[cs].id == id){
                        //Read value
                        sdss[cs].value = read16();
+                       debug("Received sds update %d: %d",
+                             sdss[cs].id, sdss[cs].value);
+                       printf("Received sds update %d: %d",
+                             sdss[cs].id, sdss[cs].value);
                        return true;
                }
        }
@@ -62,7 +65,7 @@ void sds_publish(int id)
        uint8_t cs;
        for(cs = 0; cs<MAXSDSS; cs++){
                if(sdss[cs].used && sdss[cs].id == id){
-                       debug("Publish %d=%d\n", sdss[cs].id, sdss[cs].value);
+                       debug("Publish %d=%d", sdss[cs].id, sdss[cs].value);
                        write_byte('u');
                        write_byte(0);
                        write_byte(sdss[cs].id);
@@ -71,7 +74,7 @@ void sds_publish(int id)
                        return;
                }
        }
-       debug("SDS identifier unknown: %d\n", id);
+       debug("SDS identifier unknown: %d", id);
 }
 
 int sds_fetch(int id)
@@ -80,7 +83,7 @@ int sds_fetch(int id)
        for(cs = 0; cs<MAXSDSS; cs++)
                if(sdss[cs].used && sdss[cs].id == id)
                        return sdss[cs].value;
-       debug("SDS identifier unknown: %d\n", id);
+       debug("SDS identifier unknown: %d", id);
        return 0;
 }
 
@@ -93,5 +96,5 @@ void sds_store(int id, int val)
                        return;
                }
        }
-       debug("SDS identifier unknown: %d\n", id);
+       debug("SDS identifier unknown: %d", id);
 }