From 1da26a90ec13a091d66e048583617da14ae17d24 Mon Sep 17 00:00:00 2001
From: norbert-walter <norbert-walter@web.de>
Date: Fri, 30 Jan 2026 10:14:11 +0100
Subject: [PATCH] Auto stash before merge of "master" and "origin/master"

---
 lib/obp60task/PageDigitalOut.cpp |  7 +++++++
 lib/obp60task/PageNavigation.cpp | 12 ++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/lib/obp60task/PageDigitalOut.cpp b/lib/obp60task/PageDigitalOut.cpp
index 9988aed..10db020 100644
--- a/lib/obp60task/PageDigitalOut.cpp
+++ b/lib/obp60task/PageDigitalOut.cpp
@@ -28,7 +28,10 @@ bool button5 = false;
         common.logger->logDebug(GwLog::LOG,"Instantiate PageDigitalOut");
     }
 
+<<<<<<< Updated upstream
     // Set botton labels
+=======
+>>>>>>> Stashed changes
     virtual void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "BTN 1";
@@ -36,7 +39,11 @@ bool button5 = false;
         commonData->keydata[2].label = "BTN 3";
         commonData->keydata[3].label = "BTN 4";
         commonData->keydata[4].label = "BTN 5";
+<<<<<<< Updated upstream
     }
+=======
+   }
+>>>>>>> Stashed changes
 
     virtual int handleKey(int key){
         // Code for keylock
diff --git a/lib/obp60task/PageNavigation.cpp b/lib/obp60task/PageNavigation.cpp
index 8a3da06..1e0d16f 100644
--- a/lib/obp60task/PageNavigation.cpp
+++ b/lib/obp60task/PageNavigation.cpp
@@ -33,14 +33,22 @@ bool showValues = false; // Show values HDT, SOG, DBT in navigation map
         imageBackupData = (uint8_t*)heap_caps_malloc((GxEPD_WIDTH * GxEPD_HEIGHT), MALLOC_CAP_SPIRAM);
     }
 
+<<<<<<< Updated upstream
     // Set botton labels
+=======
+>>>>>>> Stashed changes
     virtual void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "ZOOM -";
         commonData->keydata[1].label = "ZOOM +";
         commonData->keydata[4].label = "VALUES";
+<<<<<<< Updated upstream
     }
 
+=======
+   }
+    
+>>>>>>> Stashed changes
     virtual int handleKey(int key){
         // Code for keylock
         if(key == 11){
@@ -483,7 +491,11 @@ bool showValues = false; // Show values HDT, SOG, DBT in navigation map
             getdisplay().setCursor(70, 85);
             getdisplay().print(svalue6);
         }
+<<<<<<< Updated upstream
         
+=======
+
+>>>>>>> Stashed changes
         return PAGE_UPDATE;
     };
 };