Diff: main.cpp

Revision:

29:83d9bf7b52a4

Parent:

26:8d6e7e7cdcae

--- a/main.cpp	Fri Jul 15 13:17:26 2016 +0000
+++ b/main.cpp	Sat Jul 16 17:24:50 2016 +0000
@@ -183,6 +183,7 @@
 }
 
 int mdm_sendAtCmdRsp(const char *cmd, const char **rsp_list, int timeout_ms, string * rsp, int * len) {
+        printf("\n\nENTERING SEND AT CMD REP \n\n");
     static char cmd_buf[3200];  // Need enough room for the WNC sockreads (over 3000 chars)
     size_t n = strlen(cmd);
     if (cmd && n > 0) {
@@ -197,6 +198,7 @@
         wait_ms(1);
         mdm.putc('\n');
         wait_ms(1);
+        printf("\n\nAAAA\n\n");
     }
 
     if (rsp_list) {
@@ -232,6 +234,7 @@
         return MDM_ERR_TIMEOUT;
     }
     pc.printf("D %s",rsp);
+    printf("\n\nBBBB\n\n");
     return MDM_OK;
 }
 
@@ -276,7 +279,8 @@
 };
 
 void GenerateModemString(char * modem_string)
-{
+{   
+   // iSensorsToReport = TEMP_HUMIDITY_ONLY;
     switch(iSensorsToReport)
     {
         case TEMP_HUMIDITY_ONLY:
@@ -286,7 +290,8 @@
         }
         case TEMP_HUMIDITY_ACCELEROMETER:
         {
-            sprintf(modem_string, "GET %s%s?serial=%s&temp=%s&humidity=%s&accelX=%s&accelY=%s&accelZ=%s %s%s\r\n\r\n", FLOW_BASE_URL, FLOW_INPUT_NAME, FLOW_DEVICE_NAME, SENSOR_DATA.Temperature, SENSOR_DATA.Humidity, SENSOR_DATA.AccelX,SENSOR_DATA.AccelY,SENSOR_DATA.AccelZ, FLOW_URL_TYPE, MY_SERVER_URL);
+            //sprintf(modem_string, "GET %s%s?serial=%s&temp=%s&humidity=%s&accelX=%s&accelY=%s&accelZ=%s %s%s\r\n\r\n", FLOW_BASE_URL, FLOW_INPUT_NAME, FLOW_DEVICE_NAME, SENSOR_DATA.Temperature, SENSOR_DATA.Humidity, SENSOR_DATA.AccelX,SENSOR_DATA.AccelY,SENSOR_DATA.AccelZ, FLOW_URL_TYPE, MY_SERVER_URL);
+            sprintf(modem_string, "GET %s%s?serial=%s&temp=%s&humidity=%s&proximity=%s&accelY=%s&accelZ=%s %s%s\r\n\r\n", FLOW_BASE_URL, FLOW_INPUT_NAME, FLOW_DEVICE_NAME, SENSOR_DATA.Temperature, SENSOR_DATA.Humidity, SENSOR_DATA.AccelX,SENSOR_DATA.AccelY,SENSOR_DATA.AccelZ, FLOW_URL_TYPE, MY_SERVER_URL);
             break;
         }
         case TEMP_HUMIDITY_ACCELEROMETER_PMODSENSORS:
@@ -493,7 +498,9 @@
             char modem_string[512];
             GenerateModemString(&modem_string[0]);
             printf(BLU "Sending to modem : %s" DEF "\n", modem_string); 
+            printf("\n\nStarting SOCKWRITE\n\n");
             sockwrite_mdm(modem_string);
+            printf("\n\nENDING SOCKWRITE\n\n");
             sockread_mdm(&MySocketData, 1024, 20);
             
             // If any non-zero response from server, make it GREEN one-time
@@ -509,13 +516,15 @@
             if (extract_JSON(&MySocketData[0], &myJsonResponse[0]))
             {
                 printf(GRN "JSON : %s" DEF "\n", &myJsonResponse[0]);
-                parse_JSON(&myJsonResponse[0]);
+                //parse_JSON(&myJsonResponse[0]);
             }
             else
             {
                 printf(RED "JSON : %s" DEF "\n", &myJsonResponse[0]); //most likely an incomplete JSON string
-                parse_JSON(&myJsonResponse[0]); //This is risky, as the string may be corrupted
+                //parse_JSON(&myJsonResponse[0]); //This is risky, as the string may be corrupted
             }
+            printf("\n\nEND OF LOOP\n\n");
         } //bTimerExpiredFlag
+      //NVIC_SystemReset();
     } //forever loop
 }