Diff: main.cpp

Revision:

2:06fa34661f19

Parent:

0:09f915e6f9f6

Child:

3:accba7e07a0d

--- a/main.cpp	Fri Apr 15 09:03:54 2016 +0000
+++ b/main.cpp	Fri Apr 22 09:23:57 2016 +0000
@@ -1,4 +1,5 @@
 #include   "mbed.h"
+#include    "cfg.h"
 #include   "time.h"
 #include    "log.h"
 #include     "at.h"
@@ -12,47 +13,28 @@
 
 int main()
 {
+    int r = 0;
     
     stopTimer.reset();
     stopTimer.start();
     
     Led1 = 0; Led2 = 0; Led3 = 0; Led4 = 0;
 
-    TimeInit();
-     LogInit();
-     EspInit();
-      AtInit();
-     NtpInit();
-  ServerInit(); //Call this after any connections (ntp) are reserved
+    r =    CfgInit();
+    r =   TimeInit();
+    r =    LogInit();
+    r =    EspInit();
+    r =     AtInit();
+    r =    NtpInit();
+    r = ServerInit(); //Call this after any connections (ntp) are reserved
    
-    int r = 0;
     while (1)
     {
-        r =  WifiMain();
-        if (r) 
-        {
-            break;
-        }
-        r =  AtMain();
-        if (r) 
-        {
-            break;
-        }
-        r = EspMain();
-        if (r) 
-        {
-            break;
-        }
-        r = NtpMain();
-        if (r) 
-        {
-            break;
-        }
-        r = ServerMain();
-        if (r)
-        {
-            break;
-        }
+        r =   WifiMain(); if (r) break;
+        r =     AtMain(); if (r) break;
+        r =    EspMain(); if (r) break;
+        r =    NtpMain(); if (r) break;
+        r = ServerMain(); if (r) break;
         
         
         switch (WifiStatus)