Diff: main.cpp

Revision:

42:104746744af8

Parent:

41:804f6a0bda26

Child:

45:5d8feae26fe3

--- a/main.cpp	Tue Jul 15 12:44:34 2014 +0000
+++ b/main.cpp	Thu Jul 24 14:17:07 2014 +0000
@@ -8,43 +8,54 @@
 int main()
 {
     MDMParser::DevStatus devStatus;
+    DeviceIO io;
+
+    io.lcdPrint("DEVICE INIT");
 
     MDMSerial mdm;
     //mdm.setDebug(4);
 
     if (!mdm.init(NULL, &devStatus)) {
         puts("Modem initialization failed. Check your PIN number.");
+        io.lcdPrint("MODEM INIT FAILURE");
         return 1;
     }
 
+    io.lcdPrint("IMEI", devStatus.imei);
+
+    // print out basic device data
+    printf("IMEI: %s\n", devStatus.imei);
+    printf("IMSI: %s\n", devStatus.imsi);
+
     puts("Searching for login...");
     apndb_t *apn = apndb_get(devStatus.imsi);
     if (apn == NULL) {
         puts("No APN found. Stop.");
+        io.lcdPrint("NO APN FOUND");
         return 1;
     }
     
-    // print out basic device data
-    printf("IMEI: %s\n", devStatus.imei);
-    printf("IMSI: %s\n", devStatus.imsi);
-
     if (!mdm.registerNet()) {
         puts("Network registration failed.");
+        io.lcdPrint("NETWORK REG ERROR");
         return 1;
     }
 
     printf("Carrier: %s\n", apn->carrier);
     puts("Joining Network.");
+    io.lcdPrint("JOINING CARRIER", apn->carrier);
     if (mdm.join(apn->apn) == NOIP) {
+        io.lcdPrint("NETWORK JOIN FAILURE");
         puts("Could not join network. Make sure chosen carrier is correct and no credentials are required.");
         return 1;
     }
     
     DeviceInfo deviceInfo(mdm, devStatus);
-    MbedAgent agent(mdm, deviceInfo);
+    MbedAgent agent(io, mdm, deviceInfo);
 
     puts("Starting agent ...");
     if (!agent.init()) {
+        io.lcdPrint("AGENT INIT FAILURE");
         puts("Initialization failure.");
         mdm.disconnect();
         return 1;
@@ -53,6 +64,7 @@
     size_t tries = 3;
 
     do {
+        io.lcdPrint("RUN AGENT");
         puts("Running agent ...");
 
         if (!agent.run()) {