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

Finishing for values page, change format for AWA, HDG

This commit is contained in:
norbert-walter 2022-03-07 21:35:19 +01:00
parent c594464997
commit 0513974219
5 changed files with 380 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/obp60task/OBP60Formater.cpp
View File

@ -106,6 +106,9 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
course = 2.53 + float(random(0, 10) / 100.0);
}
course = course * 57.2958; // Unit conversion form rad to deg
snprintf(buffer,bsize,"%03.0f",course);
/*
if(course < 10){
snprintf(buffer,bsize,"%2.1f",course);
}
@ -115,6 +118,7 @@ FormatedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
if(course >= 100){
snprintf(buffer,bsize,"%3.0f",course);
}
*/
result.unit = "Deg";
}
//########################################################

64
lib/obp60task/PageDST810.cpp
View File

@ -125,19 +125,9 @@ class PageDST810 : public Page
display.print(unit1old);
}
// Switch font if format for any values
if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
display.setFont(&Ubuntu_Bold20pt7b);
display.setCursor(50, 90);
}
else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
display.setFont(&Ubuntu_Bold20pt7b);
display.setCursor(170, 68);
}
else{
display.setFont(&DSEG7Classic_BoldItalic30pt7b);
display.setCursor(180, 90);
}
// Set font
display.setFont(&DSEG7Classic_BoldItalic30pt7b);
display.setCursor(180, 90);
// Show bus data
if(holdvalues == false){
@ -175,19 +165,9 @@ class PageDST810 : public Page
display.print(unit2old);
}
// Switch font if format for any values
if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
display.setFont(&Ubuntu_Bold20pt7b);
display.setCursor(50, 180);
}
else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
display.setFont(&Ubuntu_Bold20pt7b);
display.setCursor(170, 158);
}
else{
display.setFont(&DSEG7Classic_BoldItalic30pt7b);
display.setCursor(180, 180);
}
// Setfont
display.setFont(&DSEG7Classic_BoldItalic30pt7b);
display.setCursor(180, 180);
// Show bus data
if(holdvalues == false){
@ -225,19 +205,9 @@ class PageDST810 : public Page
display.print(unit3old);
}
// Switch font if format for any values
if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){
display.setFont(&Ubuntu_Bold20pt7b);
display.setCursor(50, 270);
}
else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){
display.setFont(&Ubuntu_Bold20pt7b);
display.setCursor(140, 248);
}
else{
display.setFont(&DSEG7Classic_BoldItalic20pt7b);
display.setCursor(80, 270);
}
// Set font
display.setFont(&DSEG7Classic_BoldItalic20pt7b);
display.setCursor(80, 270);
// Show bus data
if(holdvalues == false){
@ -275,19 +245,9 @@ class PageDST810 : public Page
display.print(unit4old);
}
// Switch font if format for any values
if(bvalue4->getFormat() == "formatLatitude" || bvalue4->getFormat() == "formatLongitude"){
display.setFont(&Ubuntu_Bold12pt7b);
display.setCursor(120, 259);
}
else if(bvalue4->getFormat() == "formatTime" || bvalue4->getFormat() == "formatDate"){
display.setFont(&Ubuntu_Bold12pt7b);
display.setCursor(150, 259);
}
else{
display.setFont(&DSEG7Classic_BoldItalic20pt7b);
display.setCursor(280, 270);
}
// Set font
display.setFont(&DSEG7Classic_BoldItalic20pt7b);
display.setCursor(280, 270);
// Show bus data
if(holdvalues == false){

342
lib/obp60task/PageForValues2.cpp Normal file
View File

@ -0,0 +1,342 @@
#include "Pagedata.h"
#include "OBP60ExtensionPort.h"
class PageForValues2 : public Page
{
bool keylock = false; // Keylock
public:
PageForValues2(CommonData &comon){
comon.logger->logDebug(GwLog::LOG,"Show PageForValues2");
}
virtual int handleKey(int key){
if(key == 11){ // Code for keylock
keylock = !keylock; // Toggle keylock
return 0; // Commit the key
}
return key;
}
virtual void displayPage(CommonData &commonData, PageData &pageData){
GwConfigHandler *config = commonData.config;
GwLog *logger=commonData.logger;
// Old values for hold function
static String svalue1old = "";
static String unit1old = "";
static String svalue2old = "";
static String unit2old = "";
static String svalue3old = "";
static String unit3old = "";
static String svalue4old = "";
static String unit4old = "";
// Get config data
String lengthformat = config->getString(config->lengthFormat);
bool simulation = config->getBool(config->useSimuData);
String displaycolor = config->getString(config->displaycolor);
bool refresh = config->getBool(config->refresh);
bool holdvalues = config->getBool(config->holdvalues);
String flashLED = config->getString(config->flashLED);
String backlightMode = config->getString(config->backlight);
// Get boat values #1
GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
String name1 = bvalue1->getName().c_str(); // Value name
name1 = name1.substring(0, 6); // String length limit for value name
double value1 = bvalue1->value; // Value as double in SI unit
bool valid1 = bvalue1->valid; // Valid information
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
// Get boat values #2
GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list (only one value by PageOneValue)
String name2 = bvalue2->getName().c_str(); // Value name
name2 = name2.substring(0, 6); // String length limit for value name
double value2 = bvalue2->value; // Value as double in SI unit
bool valid2 = bvalue2->valid; // Valid information
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
// Get boat values #3
GwApi::BoatValue *bvalue3 = pageData.values[2]; // Second element in list (only one value by PageOneValue)
String name3 = bvalue3->getName().c_str(); // Value name
name3 = name3.substring(0, 6); // String length limit for value name
double value3 = bvalue3->value; // Value as double in SI unit
bool valid3 = bvalue3->valid; // Valid information
String svalue3 = formatValue(bvalue3, commonData).svalue; // Formatted value as string including unit conversion and switching decimal places
String unit3 = formatValue(bvalue3, commonData).unit; // Unit of value
// Get boat values #4
GwApi::BoatValue *bvalue4 = pageData.values[3]; // Second element in list (only one value by PageOneValue)
String name4 = bvalue4->getName().c_str(); // Value name
name4 = name4.substring(0, 6); // String length limit for value name
double value4 = bvalue4->value; // Value as double in SI unit
bool valid4 = bvalue4->valid; // Valid information
String svalue4 = formatValue(bvalue4, commonData).svalue; // Formatted value as string including unit conversion and switching decimal places
String unit4 = formatValue(bvalue4, commonData).unit; // Unit of value
// Optical warning by limit violation (unused)
if(String(flashLED) == "Limit Violation"){
setBlinkingLED(false);
setPortPin(OBP_FLASH_LED, false);
}
// Logging boat values
if (bvalue1 == NULL) return;
LOG_DEBUG(GwLog::LOG,"Drawing at PageForValues2, %s: %f, %s: %f, %s: %f, %s: %f", name1, value1, name2, value2, name3, value3, name4, value4);
// Draw page
//***********************************************************
// Set background color and text color
int textcolor = GxEPD_BLACK;
int pixelcolor = GxEPD_BLACK;
int bgcolor = GxEPD_WHITE;
if(displaycolor == "Normal"){
textcolor = GxEPD_BLACK;
pixelcolor = GxEPD_BLACK;
bgcolor = GxEPD_WHITE;
}
else{
textcolor = GxEPD_WHITE;
pixelcolor = GxEPD_WHITE;
bgcolor = GxEPD_BLACK;
}
// Clear display by call in obp60task.cpp in main loop
// ############### Value 1 ################
// Show name
display.setTextColor(textcolor);
display.setFont(&Ubuntu_Bold20pt7b);
display.setCursor(20, 55);
display.print(name1); // Page name
// Show unit
display.setTextColor(textcolor);
display.setFont(&Ubuntu_Bold12pt7b);
display.setCursor(20, 90);
if(holdvalues == false){
display.print(unit1); // Unit
}
else{
display.print(unit1old);
}
// Switch font if format for any values
if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
display.setFont(&Ubuntu_Bold12pt7b);
display.setCursor(100, 90);
}
else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
display.setFont(&Ubuntu_Bold12pt7b);
display.setCursor(180, 77);
}
else{
display.setFont(&DSEG7Classic_BoldItalic30pt7b);
display.setCursor(180, 90);
}
// Show bus data
if(holdvalues == false){
display.print(svalue1); // Real value as formated string
}
else{
display.print(svalue1old); // Old value as formated string
}
if(valid1 == true){
svalue1old = svalue1; // Save the old value
unit1old = unit1; // Save the old unit
}
// ############### Horizontal Line ################
// Horizontal line 3 pix
display.fillRect(0, 105, 400, 3, pixelcolor);
// ############### Value 2 ################
// Show name
display.setTextColor(textcolor);
display.setFont(&Ubuntu_Bold20pt7b);
display.setCursor(20, 145);
display.print(name2); // Page name
// Show unit
display.setTextColor(textcolor);
display.setFont(&Ubuntu_Bold12pt7b);
display.setCursor(20, 180);
if(holdvalues == false){
display.print(unit2); // Unit
}
else{
display.print(unit2old);
}
// Switch font if format for any values
if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
display.setFont(&Ubuntu_Bold12pt7b);
display.setCursor(100, 180);
}
else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
display.setFont(&Ubuntu_Bold12pt7b);
display.setCursor(180, 158);
}
else{
display.setFont(&DSEG7Classic_BoldItalic30pt7b);
display.setCursor(180, 180);
}
// Show bus data
if(holdvalues == false){
display.print(svalue2); // Real value as formated string
}
else{
display.print(svalue2old); // Old value as formated string
}
if(valid2 == true){
svalue2old = svalue2; // Save the old value
unit2old = unit2; // Save the old unit
}
// ############### Horizontal Line ################
// Horizontal line 3 pix
display.fillRect(0, 195, 400, 3, pixelcolor);
// ############### Value 3 ################
// Show name
display.setTextColor(textcolor);
display.setFont(&Ubuntu_Bold12pt7b);
display.setCursor(20, 220);
display.print(name3); // Page name
// Show unit
display.setTextColor(textcolor);
display.setFont(&Ubuntu_Bold8pt7b);
display.setCursor(20, 240);
if(holdvalues == false){
display.print(unit3); // Unit
}
else{
display.print(unit3old);
}
// Switch font if format for any values
if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){
display.setFont(&Ubuntu_Bold8pt7b);
display.setCursor(50, 240);
}
else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){
display.setFont(&Ubuntu_Bold8pt7b);
display.setCursor(100, 240);
}
else{
display.setFont(&DSEG7Classic_BoldItalic20pt7b);
display.setCursor(80, 270);
}
// Show bus data
if(holdvalues == false){
display.print(svalue3); // Real value as formated string
}
else{
display.print(svalue3old); // Old value as formated string
}
if(valid3 == true){
svalue3old = svalue3; // Save the old value
unit3old = unit3; // Save the old unit
}
// ############### Vertical Line ################
// Vertical line 3 pix
display.fillRect(200, 195, 3, 75, pixelcolor);
// ############### Value 4 ################
// Show name
display.setTextColor(textcolor);
display.setFont(&Ubuntu_Bold12pt7b);
display.setCursor(220, 220);
display.print(name4); // Page name
// Show unit
display.setTextColor(textcolor);
display.setFont(&Ubuntu_Bold8pt7b);
display.setCursor(220, 240);
if(holdvalues == false){
display.print(unit4); // Unit
}
else{
display.print(unit4old);
}
// Switch font if format for any values
if(bvalue4->getFormat() == "formatLatitude" || bvalue4->getFormat() == "formatLongitude"){
display.setFont(&Ubuntu_Bold8pt7b);
display.setCursor(250, 240);
}
else if(bvalue4->getFormat() == "formatTime" || bvalue4->getFormat() == "formatDate"){
display.setFont(&Ubuntu_Bold8pt7b);
display.setCursor(300, 240);
}
else{
display.setFont(&DSEG7Classic_BoldItalic20pt7b);
display.setCursor(280, 270);
}
// Show bus data
if(holdvalues == false){
display.print(svalue4); // Real value as formated string
}
else{
display.print(svalue4old); // Old value as formated string
}
if(valid4 == true){
svalue4old = svalue4; // Save the old value
unit4old = unit4; // Save the old unit
}
// ############### Key Layout ################
// Key Layout
display.setTextColor(textcolor);
display.setFont(&Ubuntu_Bold8pt7b);
display.setCursor(115, 290);
if(keylock == false){
display.print(" [ <<<<<< >>>>>> ]");
if(String(backlightMode) == "Control by Key"){ // Key for illumination
display.setCursor(343, 290);
display.print("[ILUM]");
}
}
else{
display.print(" [ Keylock active ]");
}
// Update display
display.updateWindow(0, 0, GxEPD_WIDTH, GxEPD_HEIGHT, true); // Partial update (fast)
};
};
static Page *createPage(CommonData &common){
return new PageForValues2(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
* this will be number of BoatValue pointers in pageData.values
*/
PageDescription registerPageForValues2(
"forValues2", // Page name
createPage, // Action
4, // Number of bus values depends on selection in Web configuration
true // Show display header on/off
);

40
lib/obp60task/config.json
View File

@ -492,7 +492,7 @@
"type": "list",
"default": "Voltage",
"description": "Type of page for page 1",
"list":["oneValue","twoValues","threeValues","forValues","apparentWind","Voltage","DST810"],
"list":["oneValue","twoValues","threeValues","forValues","forValues2","apparentWind","Voltage","DST810"],
"category": "OBP60 Page 1",
"capabilities": {
"obp60":"true"
@ -508,7 +508,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page1type":"oneValue"},{"page1type":"twoValues"},{"page1type":"threeValues"},{"page1type":"forValues"}]
"condition":[{"page1type":"oneValue"},{"page1type":"twoValues"},{"page1type":"threeValues"},{"page1type":"forValues"},{"page1type":"forValues2"}]
},
{
"name": "page1value2",
@ -520,7 +520,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page1type":"twoValues"},{"page1type":"threeValues"},{"page1type":"forValues"}]
"condition":[{"page1type":"twoValues"},{"page1type":"threeValues"},{"page1type":"forValues"},{"page1type":"forValues2"}]
},
{
"name": "page1value3",
@ -532,7 +532,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page1type":"threeValues"},{"page1type":"forValues"}]
"condition":[{"page1type":"threeValues"},{"page1type":"forValues"},{"page1type":"forValues2"}]
},
{
"name": "page1value4",
@ -544,7 +544,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page1type":"forValues"}]
"condition":[{"page1type":"forValues"},{"page1type":"forValues2"}]
},
{
"name": "page2type",
@ -552,7 +552,7 @@
"type": "list",
"default": "apparantWind",
"description": "Type of page for page 2",
"list":["oneValue","twoValues","threeValues","forValues","apparentWind","Voltage","DST810"],
"list":["oneValue","twoValues","threeValues","forValues","forValues2","apparentWind","Voltage","DST810"],
"category": "OBP60 Page 2",
"capabilities": {
"obp60":"true"
@ -569,7 +569,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page2type":"oneValue"},{"page2type":"twoValues"},{"page2type":"threeValues"},{"page2type":"forValues"}]
"condition":[{"page2type":"oneValue"},{"page2type":"twoValues"},{"page2type":"threeValues"},{"page2type":"forValues"},{"page2type":"forValues2"}]
},
{
"name": "page2value2",
@ -581,7 +581,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page2type":"twoValues"},{"page2type":"threeValues"},{"page2type":"forValues"}]
"condition":[{"page2type":"twoValues"},{"page2type":"threeValues"},{"page2type":"forValues"},{"page2type":"forValues2"}]
},
{
"name": "page2value3",
@ -593,7 +593,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page2type":"threeValues"},{"page2type":"forValues"}]
"condition":[{"page2type":"threeValues"},{"page2type":"forValues"},{"page2type":"forValues2"}]
},
{
"name": "page2value4",
@ -605,7 +605,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page2type":"forValues"}]
"condition":[{"page2type":"forValues"},{"page2type":"forValues2"}]
},
{
"name": "page3type",
@ -613,7 +613,7 @@
"type": "list",
"default": "oneValue",
"description": "Type of page for page 3",
"list":["oneValue","twoValues","threeValues","forValues","apparentWind","Voltage","DST810"],
"list":["oneValue","twoValues","threeValues","forValues","forValues2","apparentWind","Voltage","DST810"],
"category": "OBP60 Page 3",
"capabilities": {
"obp60":"true"
@ -630,7 +630,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page3type":"oneValue"},{"page3type":"twoValues"},{"page3type":"threeValues"},{"page3type":"forValues"}]
"condition":[{"page3type":"oneValue"},{"page3type":"twoValues"},{"page3type":"threeValues"},{"page3type":"forValues"},{"page3type":"forValues2"}]
},
{
"name": "page3value2",
@ -642,7 +642,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page3type":"twoValues"},{"page3type":"threeValues"},{"page3type":"forValues"}]
"condition":[{"page3type":"twoValues"},{"page3type":"threeValues"},{"page3type":"forValues"},{"page3type":"forValues2"}]
},
{
"name": "page3value3",
@ -654,7 +654,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page3type":"threeValues"},{"page3type":"forValues"}]
"condition":[{"page3type":"threeValues"},{"page3type":"forValues"},{"page3type":"forValues2"}]
},
{
"name": "page3value4",
@ -666,7 +666,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page3type":"forValues"}]
"condition":[{"page3type":"forValues"},{"page3type":"forValues2"}]
},
{
"name": "page4type",
@ -674,7 +674,7 @@
"type": "list",
"default": "oneValue",
"description": "Type of page for page 4",
"list":["oneValue","twoValues","threeValues","forValues","apparentWind","Voltage","DST810"],
"list":["oneValue","twoValues","threeValues","forValues","forValues2","apparentWind","Voltage","DST810"],
"category": "OBP60 Page 4",
"capabilities": {
"obp60":"true"
@ -691,7 +691,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page4type":"oneValue"},{"page4type":"twoValues"},{"page4type":"threeValues"},{"page4type":"forValues"}]
"condition":[{"page4type":"oneValue"},{"page4type":"twoValues"},{"page4type":"threeValues"},{"page4type":"forValues"},{"page4type":"forValues2"}]
},
{
"name": "page4value2",
@ -703,7 +703,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page4type":"twoValues"},{"page4type":"threeValues"},{"page4type":"forValues"}]
"condition":[{"page4type":"twoValues"},{"page4type":"threeValues"},{"page4type":"forValues"},{"page4type":"forValues2"}]
},
{
"name": "page4value3",
@ -715,7 +715,7 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page4type":"threeValues"},{"page4type":"forValues"}]
"condition":[{"page4type":"threeValues"},{"page4type":"forValues"},{"page4type":"forValues2"}]
},
{
"name": "page4value4",
@ -727,6 +727,6 @@
"capabilities": {
"obp60":"true"
},
"condition":[{"page4type":"forValues"}]
"condition":[{"page4type":"forValues"},{"page4type":"forValues2"}]
}
]

2
lib/obp60task/obp60task.cpp
View File

@ -274,6 +274,8 @@ void registerAllPages(PageList &list){
list.add(&registerPageThreeValues);
extern PageDescription registerPageForValues;
list.add(&registerPageForValues);
extern PageDescription registerPageForValues2;
list.add(&registerPageForValues2);
extern PageDescription registerPageApparentWind;
list.add(&registerPageApparentWind);
extern PageDescription registerPageVoltage;