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

Change page name from Autobahn to PageXTETrack

This commit is contained in:
norbert-walter 2024-11-30 17:53:37 +01:00
parent 4f0fd9721e
commit 360f02dc9d
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/obp60task/PageAutobahn.cpp → lib/obp60task/PageXTETrack.cpp
View File

@ -4,7 +4,7 @@
#include "OBP60Extensions.h" #include "OBP60Extensions.h"
/* /*
Autobahn view XTETrack view
XTE - Cross track error XTE - Cross track error
COG - Track / Course over ground COG - Track / Course over ground
DTW - Distance to waypoint DTW - Distance to waypoint
@ -26,12 +26,12 @@ static unsigned char ship_bits[] PROGMEM = {
0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00, 0x00, 0xf8, 0x3f, 0x00,
0x00, 0xf0, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00 }; 0x00, 0xf0, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00 };
class PageAutobahn : public Page{ class PageXTETrack : public Page{
bool keylock = false; // Keylock bool keylock = false; // Keylock
public: public:
PageAutobahn(CommonData &common){ PageXTETrack(CommonData &common){
common.logger->logDebug(GwLog::LOG,"Show PageAutobahn"); common.logger->logDebug(GwLog::LOG,"Show PageXTETrack");
} }
void drawSegment(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, void drawSegment(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1,
@ -78,7 +78,7 @@ class PageAutobahn : public Page{
} }
// Logging boat values // Logging boat values
LOG_DEBUG(GwLog::LOG,"Drawing at PageAutobahn"); LOG_DEBUG(GwLog::LOG,"Drawing at PageXTETrack");
// Draw page // Draw page
//*********************************************************** //***********************************************************
@ -138,7 +138,7 @@ class PageAutobahn : public Page{
bool valid = bv_cog->valid && bv_btw->valid; bool valid = bv_cog->valid && bv_btw->valid;
// autobahn view // XTETrack view
// draw ship symbol (as bitmap) // draw ship symbol (as bitmap)
getdisplay().drawXBitmap(184, 68, ship_bits, ship_width, ship_height, pixelcolor); getdisplay().drawXBitmap(184, 68, ship_bits, ship_width, ship_height, pixelcolor);
@ -226,7 +226,7 @@ class PageAutobahn : public Page{
}; };
static Page* createPage(CommonData &common){ static Page* createPage(CommonData &common){
return new PageAutobahn(common); return new PageXTETrack(common);
} }
/** /**
@ -236,8 +236,8 @@ static Page* createPage(CommonData &common){
* and we provide the number of user parameters we expect * and we provide the number of user parameters we expect
* this will be number of BoatValue pointers in pageData.values * this will be number of BoatValue pointers in pageData.values
*/ */
PageDescription registerPageAutobahn( PageDescription registerPageXTETrack(
"Autobahn", // Page name "XTETrack", // 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
{"XTE", "COG", "DTW", "BTW"}, // Bus values we need in the page {"XTE", "COG", "DTW", "BTW"}, // Bus values we need in the page

20
lib/obp60task/config.json
View File

@ -904,7 +904,7 @@
"type": "list", "type": "list",
"default": "Voltage", "default": "Voltage",
"description": "Type of page for page 1", "description": "Type of page for page 1",
"list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","Autobahn"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","XTETrack"],
"category": "OBP60 Page 1", "category": "OBP60 Page 1",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -988,7 +988,7 @@
"type": "list", "type": "list",
"default": "WindRose", "default": "WindRose",
"description": "Type of page for page 2", "description": "Type of page for page 2",
"list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","Autobahn"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","XTETrack"],
"category": "OBP60 Page 2", "category": "OBP60 Page 2",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -1073,7 +1073,7 @@
"type": "list", "type": "list",
"default": "OneValue", "default": "OneValue",
"description": "Type of page for page 3", "description": "Type of page for page 3",
"list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","Autobahn"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","XTETrack"],
"category": "OBP60 Page 3", "category": "OBP60 Page 3",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -1158,7 +1158,7 @@
"type": "list", "type": "list",
"default": "TwoValues", "default": "TwoValues",
"description": "Type of page for page 4", "description": "Type of page for page 4",
"list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","Autobahn"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","XTETrack"],
"category": "OBP60 Page 4", "category": "OBP60 Page 4",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -1243,7 +1243,7 @@
"type": "list", "type": "list",
"default": "ThreeValues", "default": "ThreeValues",
"description": "Type of page for page 5", "description": "Type of page for page 5",
"list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","Autobahn"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","XTETrack"],
"category": "OBP60 Page 5", "category": "OBP60 Page 5",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -1328,7 +1328,7 @@
"type": "list", "type": "list",
"default": "FourValues", "default": "FourValues",
"description": "Type of page for page 6", "description": "Type of page for page 6",
"list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","Autobahn"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","XTETrack"],
"category": "OBP60 Page 6", "category": "OBP60 Page 6",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -1413,7 +1413,7 @@
"type": "list", "type": "list",
"default": "FourValues2", "default": "FourValues2",
"description": "Type of page for page 7", "description": "Type of page for page 7",
"list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","Autobahn"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","XTETrack"],
"category": "OBP60 Page 7", "category": "OBP60 Page 7",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -1498,7 +1498,7 @@
"type": "list", "type": "list",
"default": "Clock", "default": "Clock",
"description": "Type of page for page 8", "description": "Type of page for page 8",
"list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","Autobahn"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","XTETrack"],
"category": "OBP60 Page 8", "category": "OBP60 Page 8",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -1583,7 +1583,7 @@
"type": "list", "type": "list",
"default": "RollPitch", "default": "RollPitch",
"description": "Type of page for page 9", "description": "Type of page for page 9",
"list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","Autobahn"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","XTETrack"],
"category": "OBP60 Page 9", "category": "OBP60 Page 9",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"
@ -1668,7 +1668,7 @@
"type": "list", "type": "list",
"default": "Battery2", "default": "Battery2",
"description": "Type of page for page 10", "description": "Type of page for page 10",
"list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","Autobahn"], "list":["OneValue","TwoValues","ThreeValues","FourValues","FourValues2","ApparentWind","WindRose","WindRoseFlex","Voltage","DST810","Clock","WhitePage","BME280","RudderPosition","KeelPosition","Battery","Battery2","RollPitch","Solar","Generator","XTETrack"],
"category": "OBP60 Page 10", "category": "OBP60 Page 10",
"capabilities": { "capabilities": {
"obp60":"true" "obp60":"true"

4
lib/obp60task/obp60task.cpp
View File

@ -242,8 +242,8 @@ void registerAllPages(PageList &list){
list.add(&registerPageSolar); list.add(&registerPageSolar);
extern PageDescription registerPageGenerator; extern PageDescription registerPageGenerator;
list.add(&registerPageGenerator); list.add(&registerPageGenerator);
extern PageDescription registerPageAutobahn; extern PageDescription registerPageXTETrack;
list.add(&registerPageAutobahn); list.add(&registerPageXTETrack);
} }
// Undervoltage detection for shutdown display // Undervoltage detection for shutdown display