Merge branch 'develop' into dj1an-dev-sf

This commit is contained in:
Peter Buchegger 2021-09-13 22:27:44 +02:00 committed by GitHub
commit e6d5ebfbe9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 2 deletions

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);

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;
}