Merge branch 'lora-aprs:develop' into develop

lib/Display/Display.cpp

@@ -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()) {
 

lib/Display/Display.h

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

lib/System/TaskManager.cpp

@@ -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) {

src/TaskDisplay.cpp

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