lora-aprs/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/lora-aprs/LoRa_APRS_iGate.git synced 2026-01-02 06:40:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into dj1an-dev-sf

Browse source
This commit is contained in:
Peter Buchegger 2021-09-13 22:27:44 +02:00 committed by GitHub
parent 1b8531dc80 b73029c190
commit e6d5ebfbe9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Display/Display.cpp
View file

@ -42,6 +42,11 @@ void Display::setDisplaySaveTimeout(uint32_t timeout) {
_displaySaveModeTimer.setTimeout(timeout * 1000);
}
void Display::activateDistplay()
{
_disp->displayOn();
}
void Display::update() {
if (_displayFrameRate.check()) {

2
lib/Display/Display.h
View file

@ -37,6 +37,8 @@ public:
void activateDisplaySaveMode();
void setDisplaySaveTimeout(uint32_t timeout);
void activateDistplay();
// functions for update loop
void update();
void addFrame(std::shared_ptr<DisplayFrame> frame);

4
lib/System/TaskManager.cpp
View file

@ -14,7 +14,9 @@ void TaskManager::addAlwaysRunTask(Task *task) {
}
std::list<Task *> TaskManager::getTasks() {
return _tasks;
std::list<Task *> tasks = _alwaysRunTasks;
std::copy(_tasks.begin(), _tasks.end(), std::back_inserter(tasks));
return tasks;
}
bool TaskManager::setup(System &system) {

2
src/LoRa_APRS_iGate.cpp
View file

@ -18,7 +18,7 @@
#include "TaskWifi.h"
#include "project_configuration.h"
#define VERSION "21.35.0"
#define VERSION "21.35.0-dev"
String create_lat_aprs(double lat);
String create_long_aprs(double lng);

3
src/TaskDisplay.cpp
View file

@ -25,6 +25,9 @@ bool DisplayTask::setup(System &system) {
}
bool DisplayTask::loop(System &system) {
if (system.getUserConfig()->display.overwritePin != 0 && !digitalRead(system.getUserConfig()->display.overwritePin)) {
system.getDisplay().activateDistplay();
}
system.getDisplay().update();
return true;
}