thooge/esp32-nmea2000-obp60
1
0
Fork 0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2025-12-29 13:33:06 +01:00
Code Releases Activity

Merge pull request #209 from TobiasE-github/master

Browse Source 
WindRoseFlex: less clutter, display A or T in the cetner
This commit is contained in:
Norbert Walter
2025-11-22 19:58:39 +01:00
committed by GitHub
parent 470c0e5f4d 469a81f87d
commit a90689228d
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/obp60task/PageWindRoseFlex.cpp
View File

@@ -8,7 +8,6 @@ class PageWindRoseFlex : public Page
{ {
int16_t lp = 80; // Pointer length int16_t lp = 80; // Pointer length
char source = 'A'; // data source (A)pparent | (T)rue char source = 'A'; // data source (A)pparent | (T)rue
String ssource="App."; // String for Data Source
public: public:
PageWindRoseFlex(CommonData &common){ PageWindRoseFlex(CommonData &common){
@@ -26,10 +25,8 @@ public:
// Code for set source // Code for set source
if(source == 'A'){ if(source == 'A'){
source = 'T'; source = 'T';
ssource = "True"; // String to display
} else { } else {
source = 'A'; source = 'A';
ssource = "App."; // String to display
} }
} }
return key; // Commit the key return key; // Commit the key
@@ -381,12 +378,22 @@ public:
} }
// Center circle // Center circle
getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor); getdisplay().fillCircle(200, 150, startwidth + 8, commonData->bgcolor);
getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor); getdisplay().fillCircle(200, 150, startwidth + 6, commonData->fgcolor);
getdisplay().fillCircle(200, 150, startwidth + 4, commonData->bgcolor);
getdisplay().setFont(&Ubuntu_Bold10pt8b);
if (source=='A'){
getdisplay().setCursor(193, 155);
}
else {
getdisplay().setCursor(195, 156);
}
getdisplay().print({source});
//******************************************************************************************* //*******************************************************************************************
// Show value6 (=fourth user-configured parameter) and ssource, so that they do not collide with the wind pointer // Show value6 (=fourth user-configured parameter)
if ( cos(value1) > 0){ if ( cos(value1) > 0){
//pointer points upwards //pointer points upwards
getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b); getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
@@ -401,13 +408,6 @@ if ( cos(value1) > 0){
else{ else{
getdisplay().print(unit6old); // Unit getdisplay().print(unit6old); // Unit
} }
if (sin(value1)>0){
getdisplay().setCursor(160, 130);
}
else{
getdisplay().setCursor(220, 130);
}
getdisplay().print(ssource); // true or app.
} }
else{ else{
// pointer points downwards // pointer points downwards
@@ -423,13 +423,6 @@ else{
else{ else{
getdisplay().print(unit6old); // Unit getdisplay().print(unit6old); // Unit
} }
if (sin(value1)>0){
getdisplay().setCursor(160, 200);
}
else{
getdisplay().setCursor(220, 200);
}
getdisplay().print(ssource); //true or app.
} }
return PAGE_UPDATE; return PAGE_UPDATE;