Oliver Foyle / Mbed 2 deprecated GDP_NodeCore

GDP group 24 node core

Dependencies:   EthernetInterface SDFileSystem mbed-rtos mbed snail MbedJSONValue

Files at this revision

API Documentation at this revision

Revision 18:e68c8551d12c, committed 2015-01-13

Comitter:
jakehodges
Date:
Tue Jan 13 23:38:55 2015 +0000
Parent:
14:bc0e2fa25f94
Child:
19:70c911d35e67
Commit message:
Update sensor interface to use #define header chars

Changed in this revision

sensorinterface.cpp Show annotated file Show diff for this revision Revisions of this file
sensorinterface.h Show annotated file Show diff for this revision Revisions of this file 
--- a/sensorinterface.cpp	Tue Jan 13 22:48:25 2015 +0000
+++ b/sensorinterface.cpp	Tue Jan 13 23:38:55 2015 +0000
@@ -148,7 +148,7 @@
  
 int sensorinterface::sendRequest(char address)
 {
-    char cmd[1] = {'R'};
+    char cmd[1] = {I2C_REQUEST_HEADER};
  
     this->i2c.write(address, cmd, 1);
     
@@ -161,7 +161,7 @@
         printf("[SIF] Reading data from current device (0x%.2X)\r\n", currentSensor->first);
     #endif
     char address = currentSensor->first;
-    char cmd[1] = {'D'};
+    char cmd[1] = {I2C_DATA_HEADER};
     char bufSize = currentSensor->second.packetSize + 2;
     char buffer[bufSize];
     this->i2c.write(address, cmd, 1);
@@ -177,7 +177,7 @@
         reply.readings.push_back(buffer[i]);
     }
  
-    if (buffer[0] != 'D')
+    if (buffer[0] != I2C_DATA_HEADER)
     {
         //if it doesn't send the correct header bit, something has gone wrong
         #ifdef DEBUG

--- a/sensorinterface.h	Tue Jan 13 22:48:25 2015 +0000
+++ b/sensorinterface.h	Tue Jan 13 23:38:55 2015 +0000
@@ -7,8 +7,8 @@
 #include <vector>
 
 #define I2C_TYPE_HEADER     'T'
-#define I2C_TYPE_REQUEST    'R'
-#define I2C_TYPE_DATA       'D'
+#define I2C_REQUEST_HEADER  'R'
+#define I2C_DATA_HEADER     'D'
 #define I2C_TYPE_PACKET_SIZE    4
 
 #define DEBUG
@@ -24,7 +24,7 @@
 struct d_reply
 {
     char type;
-    vector<char> readings;
+    vector<int> readings;
 };