Revision 88:8ab476939897, committed 2015-03-16

Comitter:

xinlei

Date:

Mon Mar 16 10:16:48 2015 +0000

Parent:

87:b1de34154513

Child:

89:0525121f307e

Commit message:

Bumped version to v2.1rc1.

Changed in this revision

--- a/DeviceBootstrap.cpp	Wed Mar 11 10:02:35 2015 +0000
+++ b/DeviceBootstrap.cpp	Mon Mar 16 10:16:48 2015 +0000
@@ -50,7 +50,6 @@
 
 bool DeviceBootstrap::obtainFromPlatform()
 {
-    uint8_t ret;
     uint8_t tries;
     
     ComposedRecord record;

--- a/main.cpp	Wed Mar 11 10:02:35 2015 +0000
+++ b/main.cpp	Mon Mar 16 10:16:48 2015 +0000
@@ -33,7 +33,6 @@
 int main()
 {
     MDMParser::DevStatus devStatus;
-    int res;
     uint8_t status = 0;
 
     MDMRtos<MDMSerial> mdm;
@@ -51,7 +50,7 @@
         mdm.setDebug(-1);
     }        
     
-    io.lcdPrint("Device Init");
+    io.lcdPrint("Device Init V2.1rc1");
     if (!mdm.init(SIM_PIN, &devStatus)) {
         status = 1;
         io.lcdPrint("Modem Init Failure", "No SIM card found", "Or SIM has PIN code");

--- a/measurement/AnalogMeasurement.cpp	Wed Mar 11 10:02:35 2015 +0000
+++ b/measurement/AnalogMeasurement.cpp	Mon Mar 16 10:16:48 2015 +0000
@@ -53,12 +53,14 @@
                 lastSensorReadingSent=false;
             }
             aDebug("Similar analog readings found, no sending!\r\n");
+//            printf("[N] %f, %f\r\n", data[0], data[1]);
             return true;
         } else {
             aDebug("Analog sensor timed out at %f s, a sending is forced.\r\n", sendingTimer.read());
         } 
     }
     
+//    printf("[Y] %f, %f (%f, %f)\r\n", data[0], data[1], oldValues[0], oldValues[1]);
     char status[25] = {0};
     snprintf(status, 25, "Sending Poti %.1f,%.1f", data[0], data[1]);
     _io.lcdPrint(_displayInfo.getFirstLine(), _displayInfo.getSecondLine(), status);