Diff: main/main.c

Revision:

23:da63f48b0d9e

Parent:

22:81cafe287ab8

Child:

31:1a1d20352fca

--- a/main/main.c	Mon Jan 07 09:35:10 2019 +0000
+++ b/main/main.c	Tue Jan 08 15:07:03 2019 +0000
@@ -3,7 +3,7 @@
 #include "periphs.h"
 #include "system.h"
 #include "led.h"
-#include "clock.h"
+#include "clk.h"
 #include "time.h"
 #include "log.h"
 #include "net.h"
@@ -12,6 +12,7 @@
 #include "http-server.h"
 #include "gps.h"
 #include "fault.h"
+#include "userfault.h"
 
 int main()
 {
@@ -20,8 +21,8 @@
            SystemInit();
               LedInit();
          SettingsInit();
-            ClockInit();
-              LogInit(ClockTmUtc, 115200);
+              ClkInit();
+              LogInit(ClkNowTmUtc, 115200);
               GpsInit();
               NetInit("gps", "gps");
        HttpServerInit();
@@ -31,8 +32,8 @@
     while (1)
     {   
         FaultZone = FAULT_ZONE_LOG;     LogMain();
-        FaultZone = FAULT_ZONE_CLOCK; ClockMain();
-        FaultZone = FAULT_ZONE_NONE;    GpsMain();
+        FaultZone = FAULT_ZONE_CLOCK;   ClkMain();
+        FaultZone = FAULT_ZONE_GPS;     GpsMain();
         FaultZone = FAULT_ZONE_NET;     NetMain();
         FaultZone = FAULT_ZONE_FAULT; FaultMain();
     }