Diff: main.cpp

Revision:

4:e076884ef8bd

Parent:

3:accba7e07a0d

Child:

6:be97d38e0b01

--- a/main.cpp	Sat Apr 23 20:00:04 2016 +0000
+++ b/main.cpp	Tue May 03 09:23:26 2016 +0000
@@ -1,43 +1,52 @@
-#include   "mbed.h"
-#include    "cfg.h"
-#include   "time.h"
-#include    "log.h"
-#include     "at.h"
-#include    "ntp.h"
-#include    "esp.h"
-#include     "io.h"
-#include "server.h"
-#include   "wifi.h"
-#include   "uart.h"
+#include    "mbed.h"
+#include     "cfg.h"
+#include    "time.h"
+#include     "log.h"
+#include      "at.h"
+#include     "ntp.h"
+#include     "esp.h"
+#include      "io.h"
+#include  "server.h"
+#include    "wifi.h"
+#include    "uart.h"
+#include  "1-wire.h"
+#include "ds18b20.h"
 
 static Timer stopTimer;
+void Hello(void)
+{
+}
 
 int main()
 {
     int r = 0;
     
-    stopTimer.reset();
-    stopTimer.start();
+    //stopTimer.reset();
+    //stopTimer.start();
     
     Led1 = 0; Led2 = 0; Led3 = 0; Led4 = 0;
 
-    r =    CfgInit();
-    r =   TimeInit();
-    r =    LogInit();
-    r =   UartInit();
-    r =    EspInit();
-    r =     AtInit();
-    r =    NtpInit();
-    r = ServerInit(); //Call this after any connections (ntp) are reserved
-   
+    r =     CfgInit();
+    r =    TimeInit();
+    r =     LogInit();
+    r =    UartInit();
+    r =     EspInit();
+    r =      AtInit();
+    r =     NtpInit();
+    r =  ServerInit(); //Call this after any connections (ntp) are reserved
+    r = OneWireInit();
+    r = DS18B20Init();
+           
     while (1)
     {
-        r =   WifiMain(); if (r) break;
-        r =     AtMain(); if (r) break;
-        r =   UartMain(); 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 =    UartMain(); if (r) break;
+        r =     EspMain(); if (r) break;
+        r =     NtpMain(); if (r) break;
+        r =  ServerMain(); if (r) break;
+        r = OneWireMain(); if (r) break;
+        r = DS18B20Main(); if (r) break;
         
         
         switch (WifiStatus)
@@ -48,6 +57,7 @@
             case WIFI_GOT_IP:    Led2 = 0; Led3 = 0; Led4 = 0; break;
             
         }
+                
         //Led1 = AtBusy();
         //if (stopTimer.read() > 20) break;
     }