cleanup TimeLib

lib/Display/Display.h

@@ -4,7 +4,6 @@
 #include <Arduino.h>
 #include <BoardFinder.h>
 #include <SSD1306.h>
-#include <TimeLib.h>
 #include <Timer.h>
 #include <Wire.h>
 #include <list>

lib/System/Timer.cpp

@@ -1,3 +1,5 @@
+#include <Arduino.h>
+
 #include "Timer.h"
 
 Timer::Timer() : _timeout_ms(0), _nextTimeout(0) {
@@ -7,7 +9,7 @@ void Timer::setTimeout(const uint32_t timeout_ms) {
   _timeout_ms = timeout_ms;
 }
 
-time_t Timer::getTriggerTimeInSec() const {
+uint32_t Timer::getTriggerTimeInSec() const {
   return (_nextTimeout - millis()) / 1000;
 }
 

lib/System/Timer.h

@@ -1,14 +1,12 @@
 #ifndef TIMER_H_
 #define TIMER_H_
 
-#include <TimeLib.h>
-
 class Timer {
 public:
   Timer();
 
-  void   setTimeout(const uint32_t timeout_ms);
-  time_t getTriggerTimeInSec() const;
+  void     setTimeout(const uint32_t timeout_ms);
+  uint32_t getTriggerTimeInSec() const;
 
   bool isActive() const;
 

src/LoRa_APRS_iGate.cpp

@@ -4,7 +4,6 @@
 #include <BoardFinder.h>
 #include <System.h>
 #include <TaskManager.h>
-#include <TimeLib.h>
 #include <logger.h>
 #include <power_management.h>
 

src/TaskAprsIs.cpp

@@ -1,4 +1,3 @@
-#include <TimeLib.h>
 #include <logger.h>
 
 #include "Task.h"

src/TaskDisplay.cpp

@@ -1,4 +1,3 @@
-#include <TimeLib.h>
 #include <logger.h>
 
 #include "TaskDisplay.h"

src/TaskModem.cpp

@@ -1,6 +1,7 @@
-#include <TimeLib.h>
 #include <logger.h>
 
+#include <TimeLib.h>
+
 #include "Task.h"
 #include "TaskAprsIs.h"
 #include "TaskModem.h"

src/TaskNTP.cpp

@@ -1,6 +1,7 @@
-#include <TimeLib.h>
 #include <logger.h>
 
+#include <TimeLib.h>
+
 #include "Task.h"
 #include "TaskNTP.h"
 #include "project_configuration.h"

src/TaskRouter.cpp

@@ -1,5 +1,7 @@
 #include <logger.h>
 
+#include <TimeLib.h>
+
 #include "Task.h"
 #include "TaskRouter.h"
 #include "project_configuration.h"
@@ -40,7 +42,7 @@ bool RouterTask::loop(System &system) {
     system.getDisplay().addFrame(std::shared_ptr<DisplayFrame>(new TextFrame("BEACON", _beaconMsg->toString())));
     _beacon_timer.start();
   }
-  time_t diff = _beacon_timer.getTriggerTimeInSec();
-  _stateInfo  = "beacon " + String(diff / 60) + ":" + String(diff % 60);
+  uint32_t diff = _beacon_timer.getTriggerTimeInSec();
+  _stateInfo    = "beacon " + String(uint32_t(diff / 60)) + ":" + String(uint32_t(diff % 60));
   return true;
 }