X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=int%2Fsds.c;h=3a14c605cc567ce47b6a0b8bec663497f4b7aca9;hb=955c4eb992b45e48a1a3dad6418236431ddcd095;hp=679ce428f27e0a23a9ebcaaa5606aafecc66e8d7;hpb=93cabbcd5d18b7b45d6f43a6ff39f94cfcb95522;p=mTask.git

diff --git a/int/sds.c b/int/sds.c
index 679ce42..3a14c60 100644
--- a/int/sds.c
+++ b/int/sds.c
@@ -8,7 +8,7 @@
 #include "misc.h"
 #include "sds.h"
 
-struct sds sdss[MAXSDSS] = {0};
+struct sds sdss[MAXSDSS];
 uint8_t c;
 
 void sds_register(int fd)
@@ -23,16 +23,11 @@ void sds_register(int fd)
 
 	memset(&sdss[cs], 0, sizeof(struct sds));
 	//Read identifier
-	read(fd, &c, 1);
-	sdss[cs].id = c;
-
+	read16(fd, c, sdss[cs].id);
 	//Read value
-	read(fd, &c, 1);
-	sdss[cs].value = 255*c;
-	read(fd, &c, 1);
-	sdss[cs].value += c;
+	read16(fd, c, sdss[cs].value);
 
-	debug("Received sds %d: %d\n", sdss[cs].id, sdss[cs].value);
+	debug("\nReceived sds %d: %d\n", sdss[cs].id, sdss[cs].value);
 	sdss[cs].used = true;
 }
 
@@ -47,10 +42,7 @@ bool sds_update(int fd)
 			continue;
 		if(sdss[cs].id == id){
 			//Read value
-			read(fd, &c, 1);
-			sdss[cs].value = 255*c;
-			read(fd, &c, 1);
-			sdss[cs].value += c;
+			read16(fd, c, sdss[cs].value);
 			return true;
 		}
 	}
@@ -60,11 +52,12 @@ bool sds_update(int fd)
 void sds_publish(int id, int fd)
 {
 	uint8_t cs;
+	char msg[6];
 	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);
-			char msg[6];
-			sprintf(msg, "s%c%c%c\n",
+			sprintf(msg, "u%c%c%c%c\n",
+				0,
 				sdss[cs].id,
 				sdss[cs].value/265,
 				sdss[cs].value%265);
@@ -95,5 +88,4 @@ void sds_store(int id, int val)
 		}
 	}
 	debug("SDS identifier unknown: %d\n", id);
-
 }