timesource display

include/display.h

@@ -4,7 +4,9 @@
 #include <U8x8lib.h>
 #include "cyclic.h"
 
-extern uint8_t volatile DisplayState;
+extern uint8_t DisplayState;
+extern char timeSource;
+
 extern HAS_DISPLAY u8x8;
 
 void init_display(const char *Productname, const char *Version);

include/rtctime.h

@@ -2,6 +2,7 @@
 #define _RTCTIME_H
 
 #include "globals.h"
+#include "timemanager.h"
 #include <Wire.h> // must be included here so that Arduino library object file references work
 #include <RtcDS3231.h>
 

include/timemanager.h

@@ -13,18 +13,20 @@
 #include "dcf77.h"
 #endif
 
-time_t tmConvert_t(uint16_t YYYY, uint8_t MM, uint8_t DD, uint8_t hh,
-                   uint8_t mm, uint8_t ss);
+enum timesources { pps, rtc, lora, unsynced };
+
 void clock_init(void);
 void clock_loop(void *pvParameters);
 void time_sync(void);
 int wait_for_pulse(void);
-int syncTime(time_t);
-int syncTime(uint32_t t);
+int syncTime(time_t const t, uint8_t const timesource);
+int syncTime(uint32_t const t, uint8_t const timesource);
 void IRAM_ATTR CLOCKIRQ(void);
 int timepulse_init(void);
 void timepulse_start(void);
-int TimeIsValid(time_t t);
+int TimeIsValid(time_t const t);
 time_t compiledUTC(void);
+time_t tmConvert(uint16_t YYYY, uint8_t MM, uint8_t DD, uint8_t hh,
+                   uint8_t mm, uint8_t ss);
 
 #endif // _timemanager_H