thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2026-03-28 18:06:37 +01:00
Code Releases Activity

Integrate changes from master

Browse Source
This commit is contained in:
Thomas Hooge
2025-08-19 09:11:51 +02:00
parent c6df6eac56
commit 318a218470
11 changed files with 609 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
lib/obp60task/PageWindRoseFlex.cpp
View File

@@ -9,7 +9,9 @@ class PageWindRoseFlex : public Page
{
private:
String lengthformat;
int16_t lp = 80; // Pointer length
int16_t lp = 80; // Pointer length
char source = 'A'; // data source (A)pparent | (T)rue
String ssource="App."; // String for Data Source
public:
PageWindRoseFlex(CommonData &common) : Page(common)
@@ -20,6 +22,11 @@ public:
lengthformat = config->getString(config->lengthFormat);
}
void setupKeys() {
Page::setupKeys();
commonData->keydata[1].label = "SRC";
}
// Key functions
int handleKey(int key) {
// Code for keylock
@@ -55,37 +62,50 @@ public:
static String svalue6old = "";
static String unit6old = "";
// Get boat values #1
GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
String name1 = xdrDelete(bvalue1->getName()); // Value name
GwApi::BoatValue *bvalue1; // Value 1 for angle
GwApi::BoatValue *bvalue2; // Value 2 for speed
// Get boat value for wind angle (AWA/TWA), shown by pointer
if (source == 'A') {
bvalue1 = pageData.values[4];
} else {
bvalue1 = pageData.values[6];
}
String name1 = bvalue1->getName().c_str(); // Value name
name1 = name1.substring(0, 6); // String length limit for value name
calibrationData.calibrateInstance(bvalue1, logger); // Check if boat data value is to be calibrated
double value1 = bvalue1->value; // Value as double in SI unit
bool valid1 = bvalue1->valid; // Valid information
value1 = formatValue(bvalue1, *commonData).value;// Format only nesaccery for simulation data for pointer
String svalue1 = formatValue(bvalue1, *commonData).svalue; // Formatted value as string including unit conversion and switching decimal places
String unit1 = formatValue(bvalue1, *commonData).unit; // Unit of value
if(valid1 == true){
if (valid1 == true) {
svalue1old = svalue1; // Save old value
unit1old = unit1; // Save old unit
}
// Get boat values #2
GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list
String name2 = xdrDelete(bvalue2->getName()); // Value name
// Get boat value for wind speed (AWS/TWS), shown in top left corner
if (source == 'A') {
bvalue2 =pageData.values[5];
} else {
bvalue2 = pageData.values[7];
}
String name2 = bvalue2->getName().c_str(); // Value name
name2 = name2.substring(0, 6); // String length limit for value name
calibrationData.calibrateInstance(bvalue2, logger); // Check if boat data value is to be calibrated
double value2 = bvalue2->value; // Value as double in SI unit
bool valid2 = bvalue2->valid; // Valid information
if (simulation) {
value2 = 0.62731; // some random value
}
String svalue2 = formatValue(bvalue2, *commonData).svalue; // Formatted value as string including unit conversion and switching decimal places
String unit2 = formatValue(bvalue2, *commonData).unit; // Unit of value
if(valid2 == true){
if (valid2 == true) {
svalue2old = svalue2; // Save old value
unit2old = unit2; // Save old unit
}
// Get boat values #3
GwApi::BoatValue *bvalue3 = pageData.values[2]; // Third element in list
// Get boat value for bottom left corner
GwApi::BoatValue *bvalue3 = pageData.values[0];
String name3 = xdrDelete(bvalue3->getName()); // Value name
name3 = name3.substring(0, 6); // String length limit for value name
calibrationData.calibrateInstance(bvalue3, logger); // Check if boat data value is to be calibrated
@@ -98,8 +118,8 @@ public:
unit3old = unit3; // Save old unit
}
// Get boat values #4
GwApi::BoatValue *bvalue4 = pageData.values[3]; // Fourth element in list
// Get boat value for top right corner
GwApi::BoatValue *bvalue4 = pageData.values[1];
String name4 = xdrDelete(bvalue4->getName()); // Value name
name4 = name4.substring(0, 6); // String length limit for value name
calibrationData.calibrateInstance(bvalue4, logger); // Check if boat data value is to be calibrated
@@ -112,8 +132,8 @@ public:
unit4old = unit4; // Save old unit
}
// Get boat values #5
GwApi::BoatValue *bvalue5 = pageData.values[4]; // Fifth element in list
// Get boat value for bottom right corner
GwApi::BoatValue *bvalue5 = pageData.values[2];
String name5 = xdrDelete(bvalue5->getName()); // Value name
name5 = name5.substring(0, 6); // String length limit for value name
calibrationData.calibrateInstance(bvalue5, logger); // Check if boat data value is to be calibrated
@@ -126,8 +146,8 @@ public:
unit5old = unit5; // Save old unit
}
// Get boat values #5
GwApi::BoatValue *bvalue6 = pageData.values[5]; // Sixth element in list
// Get boat value for center
GwApi::BoatValue *bvalue6 = pageData.values[3];
String name6 = xdrDelete(bvalue6->getName()); // Value name
name6 = name6.substring(0, 6); // String length limit for value name
calibrationData.calibrateInstance(bvalue6, logger); // Check if boat data value is to be calibrated
@@ -152,7 +172,7 @@ public:
epd->setTextColor(commonData->fgcolor);
// Show value 2 at position of value 1 (top left)
// Show AWS or TWS top left
epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
epd->setCursor(10, 65);
epd->print(svalue2); // Value
@@ -167,7 +187,7 @@ public:
// Horizintal separator left
epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
// Show value 3 at bottom left
// Show value 3 (=first user-configured parameter) at bottom left
epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
epd->setCursor(10, 270);
epd->print(svalue3); // Value
@@ -180,11 +200,10 @@ public:
epd->print(holdvalues ? unit3old : unit3);
// Show value 4 at top right
// Show value 4 (=second user-configured parameter) at top right
epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
epd->setCursor(295, 65);
if(valid3 == true){
// epd->print(abs(value3 * 180 / M_PI), 0); // Value
epd->print(svalue4); // Value
}
else{
@@ -202,7 +221,7 @@ public:
// Horizintal separator right
epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
// Show value 5 at bottom right
// Show value 5 (=third user-configured parameter) at bottom right
epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
epd->setCursor(295, 270);
epd->print(svalue5); // Value
@@ -311,21 +330,37 @@ public:
//*******************************************************************************************
// Show value6, so that it does not collide with the wind pointer
// Show value6 (=fourth user-configured parameter) and ssource, so that they do not collide with the wind pointer
if (cos(value1) > 0) {
epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
if (cos(value1) > 0){
epd->setCursor(160, 200);
epd->print(svalue6); // Value
epd->setFont(&Ubuntu_Bold8pt8b);
epd->setCursor(190, 215);
} else{
epd->setCursor(160, 130);
epd->print(svalue6); // Value
epd->setFont(&Ubuntu_Bold8pt8b);
epd->setCursor(190, 90);
}
epd->setCursor(160, 200);
epd->print(svalue6); // Value
epd->setFont(&Ubuntu_Bold8pt8b);
epd->setCursor(190, 215);
epd->print(" ");
epd->print(holdvalues ? unit6old : unit6);
if (sin(value1) > 0) {
epd->setCursor(160, 130);
} else {
epd->setCursor(220, 130);
}
epd->print(ssource); // true or app.
}
else {
epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
epd->setCursor(160, 130);
epd->print(svalue6);
epd->setFont(&Ubuntu_Bold8pt8b);
epd->setCursor(190, 90);
epd->print(" ");
epd->print(holdvalues ? unit6old : unit6);
if (sin(value1) > 0) {
epd->setCursor(160, 130);
} else {
epd->setCursor(220, 130);
}
epd->print(ssource); //true or app.
}
return PAGE_UPDATE;
};
@@ -338,13 +373,14 @@ static Page *createPage(CommonData &common){
* with the code below we make this page known to the PageTask
* we give it a type (name) that can be selected in the config
* we define which function is to be called
* and we provide the number of user parameters we expect (0 here)
* and we provide the number of user parameters we expect (4 here)
* and will will provide the names of the fixed values we need
*/
PageDescription registerPageWindRoseFlex(
"WindRoseFlex", // Page name
createPage, // Action
6, // Number of bus values depends on selection in Web configuration; was zero
4, // Number of bus values depends on selection in Web configuration
{"AWA", "AWS", "TWA", "TWS"}, // fixed values we need in the page. They are inserted AFTER the web-configured values.
true // Show display header on/off
);