thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

Use placeholder from formatter for missing data text

This commit is contained in:
Thomas Hooge 2025-08-22 14:13:35 +02:00
parent cba21574cb
commit 63ae42588f
13 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/obp60task/OBP60Formatter.cpp
View File

@ -43,7 +43,7 @@ FormattedData Formatter::formatValue(GwApi::BoatValue *value, CommonData &common
// If boat value not valid // If boat value not valid
if (! value->valid && !usesimudata){ if (! value->valid && !usesimudata){
result.svalue = "---"; result.svalue = placeholder;
return result; return result;
} }

3
lib/obp60task/OBP60Formatter.h
View File

@ -70,7 +70,7 @@ XDR units
*/ */
// Possible formats as scoped enums // Possible formats as scoped enums
enum class fmtDate {DE, EN, GB, ISO}; enum class fmtDate {DE, GB, US, ISO};
enum class fmtTime {MMHH, MMHHSS}; enum class fmtTime {MMHH, MMHHSS};
enum class fmtLength {METER, FEET, FATHOM, CABLE}; enum class fmtLength {METER, FEET, FATHOM, CABLE};
enum class fmtDepth {METER, FEET, FATHOM}; enum class fmtDepth {METER, FEET, FATHOM};
@ -116,6 +116,7 @@ private:
public: public:
Formatter(GwConfigHandler *config); Formatter(GwConfigHandler *config);
FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata); FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata);
String placeholder = "---";
}; };
// Standard format functions without overhead // Standard format functions without overhead

6
lib/obp60task/PageBattery.cpp
View File

@ -227,7 +227,7 @@ public:
epd->print(value1,2); // Real value as formated string epd->print(value1,2); // Real value as formated string
} }
else{ else{
epd->print("---"); // No sensor data (sensor is off) epd->print(commonData->fmt->placeholder); // No sensor data (sensor is off)
} }
// ############### Horizontal Line ################ // ############### Horizontal Line ################
@ -256,7 +256,7 @@ public:
epd->print(value2,1); // Real value as formated string epd->print(value2,1); // Real value as formated string
} }
else{ else{
epd->print("---"); // No sensor data (sensor is off) epd->print(commonData->fmt->placeholder); // No sensor data (sensor is off)
} }
// ############### Horizontal Line ################ // ############### Horizontal Line ################
@ -285,7 +285,7 @@ public:
epd->print(value3,1); // Real value as formated string epd->print(value3,1); // Real value as formated string
} }
else{ else{
epd->print("---"); // No sensor data (sensor is off) epd->print(commonData->fmt->placeholder); // No sensor data (sensor is off)
} }
return PAGE_UPDATE; return PAGE_UPDATE;

10
lib/obp60task/PageBattery2.cpp
View File

@ -286,7 +286,7 @@ public:
if(value1 > 99.9) epd->print(value1, 0); if(value1 > 99.9) epd->print(value1, 0);
} }
else{ else{
epd->print("---"); // Missing bus data epd->print(commonData->fmt->placeholder); // Missing bus data
} }
} }
epd->setFont(&Ubuntu_Bold16pt8b); epd->setFont(&Ubuntu_Bold16pt8b);
@ -300,7 +300,9 @@ public:
if(value2 > 9.9 && value2 <= 99.9)epd->print(value2, 1); if(value2 > 9.9 && value2 <= 99.9)epd->print(value2, 1);
if(value2 > 99.9) epd->print(value2, 0); if(value2 > 99.9) epd->print(value2, 0);
} }
else epd->print("---"); else {
epd->print(commonData->fmt->placeholder);
}
epd->setFont(&Ubuntu_Bold16pt8b); epd->setFont(&Ubuntu_Bold16pt8b);
epd->print("A"); epd->print("A");
@ -312,7 +314,9 @@ public:
if(value3 > 9.9 && value3 <= 99.9)epd->print(value3, 1); if(value3 > 9.9 && value3 <= 99.9)epd->print(value3, 1);
if(value3 > 99.9) epd->print(value3, 0); if(value3 > 99.9) epd->print(value3, 0);
} }
else epd->print("---"); else {
epd->print(commonData->fmt->placeholder);
}
epd->setFont(&Ubuntu_Bold16pt8b); epd->setFont(&Ubuntu_Bold16pt8b);
epd->print("W"); epd->print("W");

8
lib/obp60task/PageClock.cpp
View File

@ -208,7 +208,7 @@ public:
epd->print(formatDate(dateformat, commonData->data.rtcTime.tm_year + 1900, commonData->data.rtcTime.tm_mon + 1, commonData->data.rtcTime.tm_mday)); epd->print(formatDate(dateformat, commonData->data.rtcTime.tm_year + 1900, commonData->data.rtcTime.tm_mon + 1, commonData->data.rtcTime.tm_mday));
} }
} else { } else {
epd->print("---"); epd->print(commonData->fmt->placeholder);
} }
} else { } else {
epd->print(svalue2old); epd->print(svalue2old);
@ -235,7 +235,7 @@ public:
epd->print(formatTime('s', commonData->data.rtcTime.tm_hour, commonData->data.rtcTime.tm_min, commonData->data.rtcTime.tm_sec)); epd->print(formatTime('s', commonData->data.rtcTime.tm_hour, commonData->data.rtcTime.tm_min, commonData->data.rtcTime.tm_sec));
} }
} else { } else {
epd->print("---"); epd->print(commonData->fmt->placeholder);
} }
} }
else { else {
@ -246,7 +246,7 @@ public:
epd->print("Time"); // Name epd->print("Time"); // Name
// Show values sunrise // Show values sunrise
String sunrise = "---"; String sunrise = commonData->fmt->placeholder;
if (((source == 'G') and gpsvalid) or (homevalid and commonData->data.rtcValid)) { if (((source == 'G') and gpsvalid) or (homevalid and commonData->data.rtcValid)) {
sunrise = String(commonData->sundata.sunriseHour) + ":" + String(commonData->sundata.sunriseMinute + 100).substring(1); sunrise = String(commonData->sundata.sunriseHour) + ":" + String(commonData->sundata.sunriseMinute + 100).substring(1);
svalue5old = sunrise; svalue5old = sunrise;
@ -266,7 +266,7 @@ public:
epd->fillRect(340, 149, 80, 3, commonData->fgcolor); epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
// Show values sunset // Show values sunset
String sunset = "---"; String sunset = commonData->fmt->placeholder;
if (((source == 'G') and gpsvalid) or (homevalid and commonData->data.rtcValid)) { if (((source == 'G') and gpsvalid) or (homevalid and commonData->data.rtcValid)) {
sunset = String(commonData->sundata.sunsetHour) + ":" + String(commonData->sundata.sunsetMinute + 100).substring(1); sunset = String(commonData->sundata.sunsetHour) + ":" + String(commonData->sundata.sunsetMinute + 100).substring(1);
svalue6old = sunset; svalue6old = sunset;

10
lib/obp60task/PageGenerator.cpp
View File

@ -168,7 +168,7 @@ public:
if(value1 > 99.9) epd->print(value1, 0); if(value1 > 99.9) epd->print(value1, 0);
} }
else{ else{
epd->print("---"); // Missing bus data epd->print(commonData->fmt->placeholder); // Missing bus data
} }
} }
epd->setFont(&Ubuntu_Bold16pt8b); epd->setFont(&Ubuntu_Bold16pt8b);
@ -182,7 +182,9 @@ public:
if(value2 > 9.9 && value2 <= 99.9)epd->print(value2, 1); if(value2 > 9.9 && value2 <= 99.9)epd->print(value2, 1);
if(value2 > 99.9) epd->print(value2, 0); if(value2 > 99.9) epd->print(value2, 0);
} }
else epd->print("---"); else {
epd->print(commonData->fmt->placeholder);
}
epd->setFont(&Ubuntu_Bold16pt8b); epd->setFont(&Ubuntu_Bold16pt8b);
epd->print("A"); epd->print("A");
@ -194,7 +196,9 @@ public:
if(value3 > 9.9 && value3 <= 99.9)epd->print(value3, 1); if(value3 > 9.9 && value3 <= 99.9)epd->print(value3, 1);
if(value3 > 99.9) epd->print(value3, 0); if(value3 > 99.9) epd->print(value3, 0);
} }
else epd->print("---"); else {
epd->print(commonData->fmt->placeholder);
}
epd->setFont(&Ubuntu_Bold16pt8b); epd->setFont(&Ubuntu_Bold16pt8b);
epd->print("W"); epd->print("W");

2
lib/obp60task/PageSkyView.cpp
View File

@ -88,7 +88,7 @@ public:
// directions // directions
int16_t x1, y1; int16_t x1, y1;
uint16_t w, h; uint16_t w, h;
epd->setFont(&Ubuntu_Bold12pt8b); epd->setFont(&Ubuntu_Bold12pt8b);

12
lib/obp60task/PageSolar.cpp
View File

@ -164,8 +164,8 @@ public:
if(value1 > 9.9 && value1 <= 99.9)epd->print(value1, 1); if(value1 > 9.9 && value1 <= 99.9)epd->print(value1, 1);
if(value1 > 99.9) epd->print(value1, 0); if(value1 > 99.9) epd->print(value1, 0);
} }
else{ else {
epd->print("---"); // Missing bus data epd->print(commonData->fmt->placeholder); // Missing bus data
} }
} }
epd->setFont(&Ubuntu_Bold16pt8b); epd->setFont(&Ubuntu_Bold16pt8b);
@ -179,7 +179,9 @@ public:
if(value2 > 9.9 && value2 <= 99.9)epd->print(value2, 1); if(value2 > 9.9 && value2 <= 99.9)epd->print(value2, 1);
if(value2 > 99.9) epd->print(value2, 0); if(value2 > 99.9) epd->print(value2, 0);
} }
else epd->print("---"); else {
epd->print(commonData->fmt->placeholder);
}
epd->setFont(&Ubuntu_Bold16pt8b); epd->setFont(&Ubuntu_Bold16pt8b);
epd->print("A"); epd->print("A");
@ -191,7 +193,9 @@ public:
if(value3 > 9.9 && value3 <= 99.9)epd->print(value3, 1); if(value3 > 9.9 && value3 <= 99.9)epd->print(value3, 1);
if(value3 > 99.9) epd->print(value3, 0); if(value3 > 99.9) epd->print(value3, 0);
} }
else epd->print("---"); else {
epd->print(commonData->fmt->placeholder);
}
epd->setFont(&Ubuntu_Bold16pt8b); epd->setFont(&Ubuntu_Bold16pt8b);
epd->print("W"); epd->print("W");

2
lib/obp60task/PageVoltage.cpp
View File

@ -249,7 +249,7 @@ public:
} }
} }
else{ else{
epd->print("---"); // Missing bus data epd->print(commonData->fmt->placeholder); // Missing bus data
} }
} }

6
lib/obp60task/PageWindRose.cpp
View File

@ -182,11 +182,11 @@ public:
// Show values TWD // Show values TWD
epd->setFont(&DSEG7Classic_BoldItalic20pt7b); epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
epd->setCursor(295, 65); epd->setCursor(295, 65);
if(valid3 == true){ if (valid3 == true) {
epd->print(abs(value3 * 180 / PI), 0); // Value epd->print(abs(value3 * 180 / PI), 0); // Value
} }
else{ else {
epd->print("---"); // Value epd->print(commonData->fmt->placeholder);
} }
epd->setFont(&Ubuntu_Bold12pt8b); epd->setFont(&Ubuntu_Bold12pt8b);
epd->setCursor(335, 95); epd->setCursor(335, 95);

2
lib/obp60task/PageWindRoseFlex.cpp
View File

@ -207,7 +207,7 @@ public:
epd->print(svalue4); // Value epd->print(svalue4); // Value
} }
else{ else{
epd->print("---"); // Value epd->print(commonData->fmt->placeholder);
} }
epd->setFont(&Ubuntu_Bold12pt8b); epd->setFont(&Ubuntu_Bold12pt8b);
epd->setCursor(335, 95); epd->setCursor(335, 95);

3
lib/obp60task/obp60task.cpp
View File

@ -156,7 +156,7 @@ class BoatValueList{
//additionally we put the necessary values into the paga data - see below //additionally we put the necessary values into the paga data - see below
GwApi::BoatValue *allBoatValues[MAXVALUES]; GwApi::BoatValue *allBoatValues[MAXVALUES];
int numValues=0; int numValues=0;
bool addValueToList(GwApi::BoatValue *v){ bool addValueToList(GwApi::BoatValue *v){
for (int i=0;i<numValues;i++){ for (int i=0;i<numValues;i++){
if (allBoatValues[i] == v){ if (allBoatValues[i] == v){
@ -186,7 +186,6 @@ class BoatValueList{
//this way each page can easily be added here //this way each page can easily be added here
//needs some minor tricks for the safe static initialization //needs some minor tricks for the safe static initialization
typedef std::vector<PageDescription*> Pages; typedef std::vector<PageDescription*> Pages;
//the page list class
class PageList{ class PageList{
public: public:
Pages pages; Pages pages;

7
lib/obp60task/obp60task.h
View File

@ -41,5 +41,10 @@
#ifdef BOARD_OBP40S3 #ifdef BOARD_OBP40S3
DECLARE_CAPABILITY(obp40,true) DECLARE_CAPABILITY(obp40,true)
#endif #endif
DECLARE_STRING_CAPABILITY(HELP_URL, "https://obp60-v2-docu.readthedocs.io/de/latest/"); // Link to help pages #ifdef BOARD_OBP60S3
DECLARE_STRING_CAPABILITY(HELP_URL, "https://obp60-v2-docu.readthedocs.io/en/latest/"); // Link to help pages
#endif
#ifdef BOARD_OBP40S3
DECLARE_STRING_CAPABILITY(HELP_URL, "https://obp40-v1-docu.readthedocs.io/en/latest/"); // Link to help pages
#endif
#endif #endif