lora-aprs/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/lora-aprs/LoRa_APRS_iGate.git synced 2025-12-06 07:42:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup TimeLib

Browse source
This commit is contained in:
Peter Buchegger 2021-05-19 01:17:23 +02:00
parent 1ba1bbc9e3
commit f4bc68e710
9 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/Display/Display.h
View file

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

4
lib/System/Timer.cpp
View file

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

6
lib/System/Timer.h
View file

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

1
src/LoRa_APRS_iGate.cpp
View file

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

1
src/TaskAprsIs.cpp
View file

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

1
src/TaskDisplay.cpp
View file

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

3
src/TaskModem.cpp
View file

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

3
src/TaskNTP.cpp
View file

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

6
src/TaskRouter.cpp
View file

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