From 3cb8d4bcfe1b851451bee8315be236d64e57ad48 Mon Sep 17 00:00:00 2001
From: Peter Buchegger <peter@pbuchegger.at>
Date: Wed, 1 Sep 2021 21:28:21 +0200
Subject: [PATCH 1/3] version bump to 21.35.0-dev

---
 src/LoRa_APRS_iGate.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
index eb29c1f..05739dd 100644
--- a/src/LoRa_APRS_iGate.cpp
+++ b/src/LoRa_APRS_iGate.cpp
@@ -18,7 +18,7 @@
 #include "TaskWifi.h"
 #include "project_configuration.h"
 
-#define VERSION "21.29.0-dev"
+#define VERSION "21.35.0-dev"
 
 String create_lat_aprs(double lat);
 String create_long_aprs(double lng);

From 86791ce4b90038a8eb823748d5252d4f86488fac Mon Sep 17 00:00:00 2001
From: Peter Buchegger <peter.buchegger7@gmail.com>
Date: Fri, 3 Sep 2021 20:37:22 +0100
Subject: [PATCH 2/3] fixing #103

---
 lib/System/TaskManager.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/System/TaskManager.cpp b/lib/System/TaskManager.cpp
index b53bc1d..d524ad0 100644
--- a/lib/System/TaskManager.cpp
+++ b/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) {

From c1193eba5348768c3a19b2079b3cea8edeb6e93c Mon Sep 17 00:00:00 2001
From: Peter Buchegger <peter.buchegger7@gmail.com>
Date: Fri, 3 Sep 2021 21:24:04 +0100
Subject: [PATCH 3/3] fixing #111

---
 lib/Display/Display.cpp | 5 +++++
 lib/Display/Display.h   | 2 ++
 src/TaskDisplay.cpp     | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/lib/Display/Display.cpp b/lib/Display/Display.cpp
index 95766b5..16a7e9d 100644
--- a/lib/Display/Display.cpp
+++ b/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()) {
 
diff --git a/lib/Display/Display.h b/lib/Display/Display.h
index 045e898..6347737 100644
--- a/lib/Display/Display.h
+++ b/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);
diff --git a/src/TaskDisplay.cpp b/src/TaskDisplay.cpp
index bfe6d0b..6d3ab19 100644
--- a/src/TaskDisplay.cpp
+++ b/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;
 }