From f4bc68e7105bd66f679fec79b96e1444f88cf9c4 Mon Sep 17 00:00:00 2001
From: Peter Buchegger <peter@pbuchegger.at>
Date: Wed, 19 May 2021 01:17:23 +0200
Subject: [PATCH] cleanup TimeLib

---
 lib/Display/Display.h   | 1 -
 lib/System/Timer.cpp    | 4 +++-
 lib/System/Timer.h      | 6 ++----
 src/LoRa_APRS_iGate.cpp | 1 -
 src/TaskAprsIs.cpp      | 1 -
 src/TaskDisplay.cpp     | 1 -
 src/TaskModem.cpp       | 3 ++-
 src/TaskNTP.cpp         | 3 ++-
 src/TaskRouter.cpp      | 6 ++++--
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/Display/Display.h b/lib/Display/Display.h
index 4ff69ff..cda71ac 100644
--- a/lib/Display/Display.h
+++ b/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>
diff --git a/lib/System/Timer.cpp b/lib/System/Timer.cpp
index c22e34a..ebd17f6 100644
--- a/lib/System/Timer.cpp
+++ b/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;
 }
 
diff --git a/lib/System/Timer.h b/lib/System/Timer.h
index 239f995..4e3eee5 100644
--- a/lib/System/Timer.h
+++ b/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;
 
diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index f1902dc..f17a5b4 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/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>
 
diff --git a/src/TaskAprsIs.cpp b/src/TaskAprsIs.cpp
index af69735..43526fe 100644
--- a/src/TaskAprsIs.cpp
+++ b/src/TaskAprsIs.cpp
@@ -1,4 +1,3 @@
-#include <TimeLib.h>
 #include <logger.h>
 
 #include "Task.h"
diff --git a/src/TaskDisplay.cpp b/src/TaskDisplay.cpp
index 1f5fc00..bfe6d0b 100644
--- a/src/TaskDisplay.cpp
+++ b/src/TaskDisplay.cpp
@@ -1,4 +1,3 @@
-#include <TimeLib.h>
 #include <logger.h>
 
 #include "TaskDisplay.h"
diff --git a/src/TaskModem.cpp b/src/TaskModem.cpp
index deac31c..3a1d233 100644
--- a/src/TaskModem.cpp
+++ b/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"
diff --git a/src/TaskNTP.cpp b/src/TaskNTP.cpp
index 3e03f5b..14b3808 100644
--- a/src/TaskNTP.cpp
+++ b/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"
diff --git a/src/TaskRouter.cpp b/src/TaskRouter.cpp
index 68a2b8a..249c5a0 100644
--- a/src/TaskRouter.cpp
+++ b/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;
 }