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

Add info no sensor data by missing sensor values

This commit is contained in:
norbert-walter 2022-03-19 20:04:13 +01:00
parent 51f8bfc0ee
commit 3a5c36cc6c
2 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/obp60task/PageKeelPosition.cpp
View File

@ -37,17 +37,18 @@ public:
bool holdvalues = config->getBool(config->holdvalues); bool holdvalues = config->getBool(config->holdvalues);
String flashLED = config->getString(config->flashLED); String flashLED = config->getString(config->flashLED);
String backlightMode = config->getString(config->backlight); String backlightMode = config->getString(config->backlight);
String rotsensor = config->getString(config->useRotSensor);
String rotfunction = config->getString(config->rotFunction);
// Get boat values for Keel position // Get boat values for Keel position
GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list bool valid1 = commonData.data.validRotAngle; // Valid information
if(simulation == false){ if(simulation == false && rotsensor == "AS5600" && rotfunction == "Keel"){
value1 = commonData.data.rotationAngle; // Raw value without unit convertion value1 = commonData.data.rotationAngle; // Raw value without unit convertion
} }
else{ else{
value1 = (170 + float(random(0, 40)) / 10.0) * 2 * PI / 360; // Simulation data in radiant value1 = (170 + float(random(0, 40)) / 10.0) * 2 * PI / 360; // Simulation data in radiant
} }
bool valid1 = commonData.data.validRotAngle; // Valid information
String unit1 = "Deg"; // Unit of value String unit1 = "Deg"; // Unit of value
if(valid1 == true){ if(valid1 == true){
value1old = value1; // Save old value value1old = value1; // Save old value
@ -60,7 +61,6 @@ public:
} }
// Logging boat values // Logging boat values
if (bvalue1 == NULL) return;
LOG_DEBUG(GwLog::LOG,"Drawing at PageKeelPosition, Keel:%f", value1); LOG_DEBUG(GwLog::LOG,"Drawing at PageKeelPosition, Keel:%f", value1);
// Draw page // Draw page
@ -168,7 +168,7 @@ public:
// Draw keel position pointer // Draw keel position pointer
float startwidth = 8; // Start width of pointer float startwidth = 8; // Start width of pointer
if(valid1 == true || holdvalues == true || simulation == true){ if(rotsensor == "AS5600" && rotfunction == "Keel" && (valid1 == true || holdvalues == true || simulation == true)){
float sinx=sin(value1); float sinx=sin(value1);
float cosx=cos(value1); float cosx=cos(value1);
// Normal pointer // Normal pointer
@ -207,10 +207,18 @@ public:
display.setCursor(100, 70); display.setCursor(100, 70);
display.print("Keel Position"); // Label display.print("Keel Position"); // Label
// Print Unit of keel position if(rotsensor == "AS5600" && rotfunction == "Keel" && (valid1 == true || holdvalues == true || simulation == true)){
// Print Unit of keel position
display.setFont(&Ubuntu_Bold12pt7b); display.setFont(&Ubuntu_Bold12pt7b);
display.setCursor(175, 110); display.setCursor(175, 110);
display.print(unit1); // Unit display.print(unit1); // Unit
}
else{
// Print Unit of keel position
display.setFont(&Ubuntu_Bold8pt7b);
display.setCursor(145, 110);
display.print("No sensor data"); // Info missing sensor
}
//******************************************************************************************* //*******************************************************************************************
// Key Layout // Key Layout
@ -246,10 +254,10 @@ static Page *createPage(CommonData &common){
*/ */
PageDescription registerPageKeelPosition( PageDescription registerPageKeelPosition(
"KeelPosition", // Page name "KeelPosition", // Page name
createPage, // Action createPage, // Action
0, // Number of bus values depends on selection in Web configuration 0, // Number of bus values depends on selection in Web configuration
{"RPOS"}, // Bus values we need in the page {}, // Bus values we need in the page
true // Show display header on/off true // Show display header on/off
); );
#endif #endif

24
lib/obp60task/PageRudderPosition.cpp
View File

@ -156,16 +156,24 @@ public:
display.print("Rudder Position"); // Label display.print("Rudder Position"); // Label
// Print Unit in RudderPosition // Print Unit in RudderPosition
if(holdvalues == false){ if(valid1 == true || simulation == true){
display.setFont(&Ubuntu_Bold12pt7b); if(holdvalues == false){
display.setCursor(175, 110); display.setFont(&Ubuntu_Bold12pt7b);
display.print(unit1); // Unit display.setCursor(175, 110);
display.print(unit1); // Unit
}
else{
display.setFont(&Ubuntu_Bold12pt7b);
display.setCursor(175, 110);
display.print(unit1old); // Unit
}
} }
else{ else{
display.setFont(&Ubuntu_Bold12pt7b); // Print Unit of keel position
display.setCursor(175, 110); display.setFont(&Ubuntu_Bold8pt7b);
display.print(unit1old); // Unit display.setCursor(145, 110);
} display.print("No sensor data"); // Info missing sensor
}
// Calculate rudder position // Calculate rudder position
if(holdvalues == true && valid1 == false){ if(holdvalues == true && valid1 == false){