Diff: main.cpp

Revision:

90:0525121f307e

Parent:

89:8ab476939897

Child:

91:423177e8a401

--- a/main.cpp	Mon Mar 16 10:16:48 2015 +0000
+++ b/main.cpp	Mon Mar 16 12:12:04 2015 +0000
@@ -50,38 +50,38 @@
         mdm.setDebug(-1);
     }        
     
-    io.lcdPrint("Device Init V2.1rc1");
+    io.lcdPrint("Mbed Agent V2.1rc1", MBED_AGENT_HOST);
     if (!mdm.init(SIM_PIN, &devStatus)) {
         status = 1;
         io.lcdPrint("Modem Init Failure", "No SIM card found", "Or SIM has PIN code");
     } else if (!gps.init()) {
         status = 2;
         io.lcdPrint("GPS Init Failure");
-    }    
+    }
     if (status != 0) {
         mdm.disconnect();
         mdm.powerOff();
         return 1;
     }
     
-        DeviceInfo deviceInfo(mdm, devStatus);
-        DeviceMemory deviceMemory(mdm);
-        
-        if (io.resetButtonPressed()) {
-            io.lcdPrint("Factory Reset");
-            if (deviceMemory.resetPlatformCredentials()) {
-//                io.deviceFeedback().beepSuccess();
-                io.lcdPrint("Reset Success");
-            }
-            else {
-//                io.deviceFeedback().beepFailure();
-                io.lcdPrint("Reset Failure");
-            }
-            Thread::wait(1000);
-            return 0;
+    DeviceInfo deviceInfo(mdm, devStatus);
+    DeviceMemory deviceMemory(mdm);
+
+    if (io.resetButtonPressed()) {
+        io.lcdPrint("Factory Reset");
+        if (deviceMemory.resetPlatformCredentials()) {
+//            io.deviceFeedback().beepSuccess();
+            io.lcdPrint("Reset Success");
         }
+        else {
+//            io.deviceFeedback().beepFailure();
+            io.lcdPrint("Reset Failure");
+        }
+        Thread::wait(1000);
+        return 0;
+    }
 
-    io.lcdPrint("Register Network", "IMEI", devStatus.imei);
+    io.lcdPrint("Register Network...", "IMEI", devStatus.imei);
     if (!mdm.registerNet()) {
         io.lcdPrint("No Network Coverage");
         goto error;