1
0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2025-12-15 15:03:07 +01:00

Merge branch 'master' into keyboard

This commit is contained in:
2025-01-15 18:27:13 +01:00
13 changed files with 615 additions and 161 deletions

View File

@@ -66,12 +66,14 @@ static unsigned char fish_bits[] = {
class PageFluid : public Page
{
bool holdvalues = false;
int fluidtype;
public:
PageFluid(CommonData &common){
commonData = &common;
common.logger->logDebug(GwLog::LOG,"Instantiate PageFluid");
holdvalues = common.config->getBool(common.config->holdvalues);
}
virtual int handleKey(int key){
@@ -92,6 +94,9 @@ class PageFluid : public Page
GwConfigHandler *config = commonData->config;
GwLog *logger = commonData->logger;
// Old values for hold function
static double value1old;
// Get config data
String flashLED = config->getString(config->flashLED);
String backlightMode = config->getString(config->backlight);
@@ -102,13 +107,14 @@ class PageFluid : public Page
setFlashLED(false);
}
// Logging boat values
LOG_DEBUG(GwLog::LOG,"Drawing at PageFluid");
GwApi::BoatValue *bvalue1 = pageData.values[0];
String name1 = bvalue1->getName();
double value1 = bvalue1->value;
bool valid1 = bvalue1->valid;
if (holdvalues and bvalue1->valid) {
value1old = bvalue1->value;
}
// Logging boat values
LOG_DEBUG(GwLog::LOG,"Drawing at PageFluid: value=%f", bvalue1->value);
// Draw page
//***********************************************************