Diff: main.cpp

Revision:

16:358604977188

Parent:

15:c63a080c6814

--- a/main.cpp	Thu Apr 05 16:41:34 2018 +0000
+++ b/main.cpp	Thu Apr 05 19:04:26 2018 +0000
@@ -277,20 +277,26 @@
 
 #define MAX_AMOC 16+(7*5)+11+12
 void run_amoc() {
-    pc.printf("Sending data to AMOC." CRLF);
+    pc.printf("Sending data over UDP to %s:%d ... ", conf.udpHost, conf.udpPort);
     WncEndpoint AmocEndpoint;
     WncUDPSocket AmocSocket;
     char buff[MAX_AMOC];
     
     if (!AmocEndpoint.set_address(conf.udpHost, conf.udpPort)) {
-        pc.printf("Cannot resolve AMOC endpoint." CRLF);
+        pc.printf("Cannot resolve UDP endpoint." CRLF);
         return;
     };
     
     snprintf(buff, MAX_AMOC, "'%s',%.2f,%.2f,%.2f,%.2f,%.2f,%2.6f,%3.6f", conf.devIMEI, SENSOR_DATA.Temperature, SENSOR_DATA.Humidity, SENSOR_DATA.AccelX, SENSOR_DATA.AccelY, SENSOR_DATA.AccelZ, conf.locLat, conf.locLong);
         
     int resp = AmocSocket.sendTo(AmocEndpoint, buff, strlen(buff));
-    pc.printf("%d bytes sent to AMOC" CRLF , resp);
+    pc.printf("%d bytes sent." CRLF , resp);
+    if (resp < 0) {
+         unsigned char aux = lastLedColor;
+         SetLedColor(3); //Yellow
+         lastLedColor = aux;
+    } else 
+        SetLedColor(lastLedColor);
 }
     
 
@@ -325,8 +331,10 @@
     pc.printf("Initialize the sensors" CRLF);    
     sensors_init();
     read_sensors();
-    
+
+    pc.printf(CYN);    
     conf.dumpConfig(pc);
+    pc.printf(WHT);    
     
     if (!conf.m2xConfigured) {
         pc.printf(RED "Waiting for SMS configuration" CRLF);
@@ -405,7 +413,8 @@
 #endif
             timeService.getTimestamp(timestamp, &length);
             pc.printf("%s waiting for %d seconds... " CRLF , timestamp, conf.commandDelay * conf.commandPolls);
-        };
+        } else 
+            pc.printf("Sensor values [%.2f,%.2f,%.2f,%.2f,%.2f]. Sleeping for %d seconds." CRLF, SENSOR_DATA.Humidity, SENSOR_DATA.Temperature, SENSOR_DATA.AccelX, SENSOR_DATA.AccelY, SENSOR_DATA.AccelZ, conf.commandDelay * conf.commandPolls);
         
         // save old sensor data, we will use them to check for accelerometer change
         OLD_SENSOR_DATA = SENSOR_DATA;