diff --git a/lib/obp60task/PageAutobahn.cpp b/lib/obp60task/PageXTETrack.cpp similarity index 96% rename from lib/obp60task/PageAutobahn.cpp rename to lib/obp60task/PageXTETrack.cpp index 18c4b72..b16f9ab 100644 --- a/lib/obp60task/PageAutobahn.cpp +++ b/lib/obp60task/PageXTETrack.cpp @@ -4,7 +4,7 @@ #include "OBP60Extensions.h" /* - Autobahn view + XTETrack view XTE - Cross track error COG - Track / Course over ground 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, 0xf0, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00 }; -class PageAutobahn : public Page{ +class PageXTETrack : public Page{ bool keylock = false; // Keylock public: - PageAutobahn(CommonData &common){ - common.logger->logDebug(GwLog::LOG,"Show PageAutobahn"); + PageXTETrack(CommonData &common){ + common.logger->logDebug(GwLog::LOG,"Show PageXTETrack"); } 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 - LOG_DEBUG(GwLog::LOG,"Drawing at PageAutobahn"); + LOG_DEBUG(GwLog::LOG,"Drawing at PageXTETrack"); // Draw page //*********************************************************** @@ -138,7 +138,7 @@ class PageAutobahn : public Page{ bool valid = bv_cog->valid && bv_btw->valid; - // autobahn view + // XTETrack view // draw ship symbol (as bitmap) getdisplay().drawXBitmap(184, 68, ship_bits, ship_width, ship_height, pixelcolor); @@ -226,7 +226,7 @@ class PageAutobahn : public Page{ }; 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 * this will be number of BoatValue pointers in pageData.values */ -PageDescription registerPageAutobahn( - "Autobahn", // Page name +PageDescription registerPageXTETrack( + "XTETrack", // Page name createPage, // Action 0, // Number of bus values depends on selection in Web configuration {"XTE", "COG", "DTW", "BTW"}, // Bus values we need in the page diff --git a/lib/obp60task/config.json b/lib/obp60task/config.json index e9ce0e5..48933f1 100644 --- a/lib/obp60task/config.json +++ b/lib/obp60task/config.json @@ -904,7 +904,7 @@ "type": "list", "default": "Voltage", "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", "capabilities": { "obp60":"true" @@ -988,7 +988,7 @@ "type": "list", "default": "WindRose", "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", "capabilities": { "obp60":"true" @@ -1073,7 +1073,7 @@ "type": "list", "default": "OneValue", "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", "capabilities": { "obp60":"true" @@ -1158,7 +1158,7 @@ "type": "list", "default": "TwoValues", "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", "capabilities": { "obp60":"true" @@ -1243,7 +1243,7 @@ "type": "list", "default": "ThreeValues", "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", "capabilities": { "obp60":"true" @@ -1328,7 +1328,7 @@ "type": "list", "default": "FourValues", "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", "capabilities": { "obp60":"true" @@ -1413,7 +1413,7 @@ "type": "list", "default": "FourValues2", "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", "capabilities": { "obp60":"true" @@ -1498,7 +1498,7 @@ "type": "list", "default": "Clock", "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", "capabilities": { "obp60":"true" @@ -1583,7 +1583,7 @@ "type": "list", "default": "RollPitch", "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", "capabilities": { "obp60":"true" @@ -1668,7 +1668,7 @@ "type": "list", "default": "Battery2", "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", "capabilities": { "obp60":"true" diff --git a/lib/obp60task/obp60task.cpp b/lib/obp60task/obp60task.cpp index 9922e88..94481da 100644 --- a/lib/obp60task/obp60task.cpp +++ b/lib/obp60task/obp60task.cpp @@ -242,8 +242,8 @@ void registerAllPages(PageList &list){ list.add(®isterPageSolar); extern PageDescription registerPageGenerator; list.add(®isterPageGenerator); - extern PageDescription registerPageAutobahn; - list.add(®isterPageAutobahn); + extern PageDescription registerPageXTETrack; + list.add(®isterPageXTETrack); } // Undervoltage detection for shutdown display