
Proximity strip reader
Fork of StarterKit by
Revision 39:3bbb3dbb531b, committed 2016-09-27
- Comitter:
- elmkom
- Date:
- Tue Sep 27 15:45:21 2016 +0000
- Parent:
- 38:532a0d929756
- Child:
- 40:45e4636d20cc
- Commit message:
- changed datastr
Changed in this revision
Proximity.cpp | Show annotated file Show diff for this revision Revisions of this file |
main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/Proximity.cpp Mon Sep 26 18:02:16 2016 +0000 +++ b/Proximity.cpp Tue Sep 27 15:45:21 2016 +0000 @@ -124,12 +124,13 @@ { int i=0; int index = 0; + index += sprintf(&dataStr[index],"["); for (i=0; i<NUM_PROXIMIY_SENSORS; i++) { if(i<NUM_PROXIMIY_SENSORS-1) index += snprintf(&dataStr[index], 128, "{\"s\":%d,\"p\":%d,\"l\":%d,\"r\":%d},", i,proximityData[i][0],proximityData[i][1],proximityData[i][2]); else - index += snprintf(&dataStr[index], 128, "{\"s\":%d,\"p\":%d,\"l\":%d,\"r\":%d}", i,proximityData[i][0],proximityData[i][1],proximityData[i][2]); + index += snprintf(&dataStr[index], 128, "{\"s\":%d,\"p\":%d,\"l\":%d,\"r\":%d}]", i,proximityData[i][0],proximityData[i][1],proximityData[i][2]); lastProximityData[i][0] = proximityData[i][0]; lastProximityData[i][1] = proximityData[i][1]; lastProximityData[i][2] = proximityData[i][2];
--- a/main.cpp Mon Sep 26 18:02:16 2016 +0000 +++ b/main.cpp Tue Sep 27 15:45:21 2016 +0000 @@ -429,7 +429,7 @@ case PROXIMITY_ONLY: { char* data = proximityStrip.getDataStr(); - sprintf(modem_string, "GET %s%s?serial=%s&data=[%s] %s%s\r\n\r\n", FLOW_BASE_URL, FLOW_INPUT_NAME, FLOW_DEVICE_NAME, data, FLOW_URL_TYPE, MY_SERVER_URL); + sprintf(modem_string, "GET %s%s?serial=%s&data=%s %s%s\r\n\r\n", FLOW_BASE_URL, FLOW_INPUT_NAME, FLOW_DEVICE_NAME, data, FLOW_URL_TYPE, MY_SERVER_URL); break; } case TEMP_HUMIDITY_ONLY: