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

Modify page Battery2

This commit is contained in:
norbert-walter 2022-04-10 15:50:03 +02:00
parent 6d5d932d1a
commit 3c83d644a1
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/obp60task/PageBattery2.cpp
View File

@ -271,7 +271,7 @@ public:
display.setTextColor(textcolor); display.setTextColor(textcolor);
display.setFont(&DSEG7Classic_BoldItalic20pt7b); display.setFont(&DSEG7Classic_BoldItalic20pt7b);
display.setCursor(150, 260); display.setCursor(150, 260);
if(powerSensor == "INA219" || powerSensor == "INA226"){ if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
if(batRange < 9.9) display.print(batRange, 1); if(batRange < 9.9) display.print(batRange, 1);
else display.print(batRange, 0); else display.print(batRange, 0);
} }
@ -279,6 +279,15 @@ public:
display.setFont(&Ubuntu_Bold16pt7b); display.setFont(&Ubuntu_Bold16pt7b);
display.print("h"); display.print("h");
// Show sensor type info
display.setFont(&Ubuntu_Bold8pt7b);
display.setCursor(270, 60);
if(powerSensor == "off") display.print("Internal");
if(powerSensor == "INA219") display.print("INA219");
if(powerSensor == "INA226") display.print("INA226");
display.setCursor(270, 80);
display.print("Sensor Modul");
// Reading bus data or using simulation data // Reading bus data or using simulation data
display.setTextColor(textcolor); display.setTextColor(textcolor);
display.setFont(&DSEG7Classic_BoldItalic20pt7b); display.setFont(&DSEG7Classic_BoldItalic20pt7b);
@ -312,7 +321,7 @@ public:
display.setTextColor(textcolor); display.setTextColor(textcolor);
display.setFont(&DSEG7Classic_BoldItalic20pt7b); display.setFont(&DSEG7Classic_BoldItalic20pt7b);
display.setCursor(260, 200); display.setCursor(260, 200);
if(powerSensor == "INA219" || powerSensor == "INA226"){ if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
if(value2 <= 9.9) display.print(value2, 2); if(value2 <= 9.9) display.print(value2, 2);
if(value2 > 9.9 && value2 <= 99.9)display.print(value2, 1); if(value2 > 9.9 && value2 <= 99.9)display.print(value2, 1);
if(value2 > 99.9) display.print(value2, 0); if(value2 > 99.9) display.print(value2, 0);
@ -325,7 +334,7 @@ public:
display.setTextColor(textcolor); display.setTextColor(textcolor);
display.setFont(&DSEG7Classic_BoldItalic20pt7b); display.setFont(&DSEG7Classic_BoldItalic20pt7b);
display.setCursor(260, 260); display.setCursor(260, 260);
if(powerSensor == "INA219" || powerSensor == "INA226"){ if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
if(value3 <= 9.9) display.print(value3, 2); if(value3 <= 9.9) display.print(value3, 2);
if(value3 > 9.9 && value3 <= 99.9)display.print(value3, 1); if(value3 > 9.9 && value3 <= 99.9)display.print(value3, 1);
if(value3 > 99.9) display.print(value3, 0); if(value3 > 99.9) display.print(value3, 0);