thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2026-02-11 15:13:06 +01:00
Code Releases Activity

Auto stash before merge of "master" and "origin/master"

Browse Source
This commit is contained in:
norbert-walter
2026-01-30 10:14:11 +01:00
parent 0b79b7e2ef
commit 1da26a90ec
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/obp60task/PageDigitalOut.cpp
View File

@@ -28,7 +28,10 @@ bool button5 = false;
common.logger->logDebug(GwLog::LOG,"Instantiate PageDigitalOut"); common.logger->logDebug(GwLog::LOG,"Instantiate PageDigitalOut");
} }
<<<<<<< Updated upstream
// Set botton labels // Set botton labels
=======
>>>>>>> Stashed changes
virtual void setupKeys(){ virtual void setupKeys(){
Page::setupKeys(); Page::setupKeys();
commonData->keydata[0].label = "BTN 1"; commonData->keydata[0].label = "BTN 1";
@@ -36,7 +39,11 @@ bool button5 = false;
commonData->keydata[2].label = "BTN 3"; commonData->keydata[2].label = "BTN 3";
commonData->keydata[3].label = "BTN 4"; commonData->keydata[3].label = "BTN 4";
commonData->keydata[4].label = "BTN 5"; commonData->keydata[4].label = "BTN 5";
<<<<<<< Updated upstream
} }
=======
}
>>>>>>> Stashed changes
virtual int handleKey(int key){ virtual int handleKey(int key){
// Code for keylock // Code for keylock

12
lib/obp60task/PageNavigation.cpp
View File

@@ -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); imageBackupData = (uint8_t*)heap_caps_malloc((GxEPD_WIDTH * GxEPD_HEIGHT), MALLOC_CAP_SPIRAM);
} }
<<<<<<< Updated upstream
// Set botton labels // Set botton labels
=======
>>>>>>> Stashed changes
virtual void setupKeys(){ virtual void setupKeys(){
Page::setupKeys(); Page::setupKeys();
commonData->keydata[0].label = "ZOOM -"; commonData->keydata[0].label = "ZOOM -";
commonData->keydata[1].label = "ZOOM +"; commonData->keydata[1].label = "ZOOM +";
commonData->keydata[4].label = "VALUES"; commonData->keydata[4].label = "VALUES";
<<<<<<< Updated upstream
} }
=======
}
>>>>>>> Stashed changes
virtual int handleKey(int key){ virtual int handleKey(int key){
// Code for keylock // Code for keylock
if(key == 11){ if(key == 11){
@@ -483,7 +491,11 @@ bool showValues = false; // Show values HDT, SOG, DBT in navigation map
getdisplay().setCursor(70, 85); getdisplay().setCursor(70, 85);
getdisplay().print(svalue6); getdisplay().print(svalue6);
} }
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
return PAGE_UPDATE; return PAGE_UPDATE;
}; };
}; };