Revision 22:835a6c6dcfbb, committed 2015-01-13

Comitter:

Trumple

Date:

Tue Jan 13 23:53:24 2015 +0000

Parent:

20:fb2a9f4d2de7

Parent:

21:a32666afce7a

Child:

23:b57a47c7862a

Child:

24:3218af115be3

Commit message:

Merge master branch

Changed in this revision

--- a/main.cpp	Tue Jan 13 23:43:09 2015 +0000
+++ b/main.cpp	Tue Jan 13 23:53:24 2015 +0000
@@ -306,7 +306,7 @@
                 #ifdef DEBUG
                     pc.printf("[MAIN] Got data: ");
                     for (int i = 0; i < data.readings.size(); i++)
-                        pc.printf("0x%.2X|", data.readings[i]);
+                        pc.printf("0x%.4X|", data.readings[i]);
                     pc.printf("\r\n");
                 #endif
                 
@@ -315,7 +315,7 @@
                 memcpy(readings, readings_str.c_str(), sizeof(readings));
                 
                 //TODO: Get real I2C address
-                snail::sensordata message(baseNodeAddress, data.type, data.type, time(NULL), readings, data.readings.size());
+                snail::sensordata message(baseNodeAddress, data.type, data.type, time(NULL), readings, readings_str.size());
                 
                 messageQueue.push(message);