More work on page anchor

Add feature to optionally apply patches to gateway code

lib/obp60task/ConfigMenu.cpp

@@ -0,0 +1,217 @@
+/*
+  Menu system for online configuration
+
+  A menu consists of a list of menuitems.
+
+  Graphical representation is stored:
+     upper left corner: x, y
+     bounding box:
+  A menu consists of three columns
+    - menu text, if selected highlighted
+    - menu value with optional unit
+    - menu description or additional data for value
+
+*/
+#include "ConfigMenu.h"
+
+ConfigMenuItem::ConfigMenuItem(String itemtype, String itemlabel, uint16_t itemval, String itemunit) {
+    if (! (itemtype == "int" or itemtype == "bool")) {
+        valtype = "int";
+    } else {
+        valtype = itemtype;
+    }
+    label = itemlabel;
+    min = 0;
+    max = std::numeric_limits<uint16_t>::max();
+    value = itemval;
+    unit = itemunit;
+    step = 1;
+}
+
+void ConfigMenuItem::setRange(uint16_t valmin, uint16_t valmax, std::vector<uint16_t> valsteps) {
+    min = valmin;
+    max = valmax;
+    steps = valsteps;
+    step = steps[0];
+};
+
+bool ConfigMenuItem::checkRange(uint16_t checkval) {
+    return (checkval >= min) and (checkval <= max);
+}
+
+String ConfigMenuItem::getLabel() {
+    return label;
+};
+
+uint16_t ConfigMenuItem::getValue() {
+    return value;
+}
+
+bool ConfigMenuItem::setValue(uint16_t newval) {
+    if (valtype == "int") {
+        if (newval >= min and newval <= max) {
+            value = newval;
+            return true;
+        }
+        return false; // out of range
+    } else if (valtype == "bool") {
+        value = (newval != 0) ? 1 : 0;
+        return true;
+    }
+    return false; // invalid type
+};
+
+void ConfigMenuItem::incValue() {
+    // increase value by step
+    if (valtype == "int") {
+        if (value + step < max) {
+            value += step;
+        } else {
+            value = max;
+        }
+    } else if (valtype == "bool") {
+        value = !value;
+    }
+};
+
+void ConfigMenuItem::decValue() {
+    // decrease value by step
+    if (valtype == "int") {
+        if (value - step > min) {
+            value -= step;
+        } else {
+            value = min;
+        }
+    } else if (valtype == "bool") {
+        value = !value;
+    }
+};
+
+String ConfigMenuItem::getUnit() {
+    return unit;
+}
+
+uint16_t ConfigMenuItem::getStep() {
+    return step;
+}
+
+void ConfigMenuItem::setStep(uint16_t newstep) {
+    if (std::find(steps.begin(), steps.end(), newstep) == steps.end()) {
+        return; // invalid step: not in list of possible steps
+    }
+    step = newstep;
+}
+
+int8_t ConfigMenuItem::getPos() {
+    return position;
+};
+
+void ConfigMenuItem::setPos(int8_t newpos) {
+    position = newpos;
+};
+
+String ConfigMenuItem::getType() {
+    return valtype;
+}
+
+ConfigMenu::ConfigMenu(String menutitle, uint16_t menu_x, uint16_t menu_y) {
+    title = menutitle;
+    x = menu_x;
+    y = menu_y;
+};
+
+ConfigMenuItem* ConfigMenu::addItem(String key, String label, String valtype, uint16_t val, String valunit) {
+    if (items.find(key) != items.end()) {
+        // duplicate keys not allowed
+        return nullptr;
+    }
+    ConfigMenuItem *itm = new ConfigMenuItem(valtype, label, val, valunit);
+    items.insert(std::pair<String, ConfigMenuItem*>(key, itm));
+    // Append key to index, index starting with 0
+    int8_t ix = items.size() - 1;
+    index[ix] = key;
+    itm->setPos(ix);
+    return itm;
+};
+
+void ConfigMenu::setItemDimension(uint16_t itemwidth, uint16_t itemheight) {
+    w = itemwidth;
+    h = itemheight;
+};
+
+void ConfigMenu::setItemActive(String key) {
+    if (items.find(key) != items.end()) {
+        activeitem = items[key]->getPos();
+    } else {
+        activeitem = -1;
+    }
+};
+
+int8_t ConfigMenu::getActiveIndex() {
+    return activeitem;
+}
+
+ConfigMenuItem* ConfigMenu::getActiveItem() {
+    if (activeitem < 0) {
+        return nullptr;
+    }
+    return items[index[activeitem]];
+};
+
+ConfigMenuItem* ConfigMenu::getItemByIndex(uint8_t ix) {
+    if (ix > index.size() - 1) {
+        return nullptr;
+    }
+    return items[index[ix]];
+};
+
+ConfigMenuItem* ConfigMenu::getItemByKey(String key) {
+    if (items.find(key) == items.end()) {
+        return nullptr;
+    }
+    return items[key];
+};
+
+uint8_t ConfigMenu::getItemCount() {
+    return items.size();
+};
+
+void ConfigMenu::goPrev() {
+    if (activeitem == 0) {
+        activeitem = items.size() - 1;
+    } else {
+        activeitem--;
+    }
+}
+
+void ConfigMenu::goNext() {
+    if (activeitem == items.size() - 1) {
+        activeitem = 0;
+    } else {
+        activeitem++;
+    }
+}
+
+Point ConfigMenu::getXY() {
+    return {static_cast<double>(x), static_cast<double>(y)};
+}
+
+Rect ConfigMenu::getRect() {
+    return {static_cast<double>(x), static_cast<double>(y),
+            static_cast<double>(w), static_cast<double>(h)};
+}
+
+Rect ConfigMenu::getItemRect(int8_t index) {
+    return {static_cast<double>(x), static_cast<double>(y + index * h),
+            static_cast<double>(w), static_cast<double>(h)};
+}
+
+void ConfigMenu::setCallback(void (*callback)()) {
+    fptrCallback = callback;
+}
+
+void ConfigMenu::storeValues() {
+    if (fptrCallback) {
+        fptrCallback();
+    }
+}

lib/obp60task/ConfigMenu.h

@@ -0,0 +1,67 @@
+#pragma once
+
+#include <Arduino.h>
+#include <vector>
+#include <map>
+#include "Graphics.h"  // for Point and Rect
+
+class ConfigMenuItem {
+private:
+    String label;
+    uint16_t value;
+    String unit;
+    String desc; // optional data to display
+    String valtype; // "int" | "bool" -> TODO "list"
+    uint16_t min;
+    uint16_t max;
+    std::vector<uint16_t> steps;
+    uint16_t step;
+    int8_t position; // counted fom 0
+
+public:
+    ConfigMenuItem(String itemtype, String itemlabel, uint16_t itemval, String itemunit);
+    void setRange(uint16_t valmin, uint16_t valmax, std::vector<uint16_t> steps);
+    bool checkRange(uint16_t checkval);
+    String getLabel();
+    uint16_t getValue();
+    bool setValue(uint16_t newval);
+    void incValue();
+    void decValue();
+    String getUnit();
+    uint16_t getStep();
+    void setStep(uint16_t newstep);
+    int8_t getPos();
+    void setPos(int8_t newpos);
+    String getType();
+};
+
+class ConfigMenu {
+private:
+    String title;
+    std::map <String,ConfigMenuItem*> items;
+    std::map <uint8_t,String> index;
+    int8_t activeitem = -1; // refers to position of item
+    uint16_t x;
+    uint16_t y;
+    uint16_t w;
+    uint16_t h;
+    void (*fptrCallback)();
+
+public:
+    ConfigMenu(String title, uint16_t menu_x, uint16_t menu_y);
+    ConfigMenuItem* addItem(String key, String label, String valtype, uint16_t val, String valunit);
+    void setItemDimension(uint16_t itemwidth, uint16_t itemheight);
+    int8_t getActiveIndex();
+    void setItemActive(String key);
+    ConfigMenuItem* getActiveItem();
+    ConfigMenuItem* getItemByIndex(uint8_t index);
+    ConfigMenuItem* getItemByKey(String key);
+    uint8_t getItemCount();
+    void goPrev();
+    void goNext();
+    Point getXY();
+    Rect getRect();
+    Rect getItemRect(int8_t index);
+    void setCallback(void (*callback)());
+    void storeValues();
+};

lib/obp60task/OBP60Extensions.cpp

@@ -475,6 +475,30 @@ std::vector<String> wordwrap(String &line, uint16_t maxwidth) {
     return lines;
 }
 
+// Helper function to just get the exact width of a string
+uint16_t getStringPixelWidth(const char* str, const GFXfont* font) {
+    int16_t minx = INT16_MAX;
+    int16_t maxx = INT16_MIN;
+    int16_t cursor_x = 0;
+    while (*str) {
+        char c = *str++;
+        if (c < font->first || c > font->last) {
+            continue;
+        }
+        GFXglyph* glyph = &font->glyph[c - font->first];
+        if (glyph->width > 0) {
+            int16_t glyphStart = cursor_x + glyph->xOffset;
+            int16_t glyphEnd = glyphStart + glyph->width;
+            if (glyphStart < minx) minx = glyphStart;
+            if (glyphEnd > maxx) maxx = glyphEnd;
+        }
+        cursor_x += glyph->xAdvance;
+    }
+    if (minx > maxx)
+        return 0;
+    return maxx - minx;
+}
+
 // Draw centered text
 void drawTextCenter(int16_t cx, int16_t cy, String text) {
     int16_t x1, y1;
@@ -638,20 +662,19 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
         // Date and time
         String fmttype = commonData.config->getString(commonData.config->dateFormat);
         String timesource = commonData.config->getString(commonData.config->timeSource);
-        double tz = commonData.config->getString(commonData.config->timeZone).toDouble();
         getdisplay().setTextColor(commonData.fgcolor);
         getdisplay().setFont(&Ubuntu_Bold8pt8b);
         getdisplay().setCursor(230, 15);
         if (timesource == "RTC" or timesource == "iRTC") {
             // TODO take DST into account
             if (commonData.data.rtcValid) {
-                time_t tv = mktime(&commonData.data.rtcTime) + (int)(tz * 3600);
+                time_t tv = mktime(&commonData.data.rtcTime) + (int)(commonData.tz * 3600);
                 struct tm *local_tm = localtime(&tv);
                 getdisplay().print(formatTime('m', local_tm->tm_hour, local_tm->tm_min, 0));
                 getdisplay().print(" ");
                 getdisplay().print(formatDate(fmttype, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
                 getdisplay().print(" ");
-                getdisplay().print(tz == 0 ? "UTC" : "LOT");
+                getdisplay().print(commonData.tz == 0 ? "UTC" : "LOT");
             } else {
                 drawTextRalign(396, 15, "RTC invalid");
             }
@@ -666,7 +689,7 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
                 getdisplay().print(" ");
                 getdisplay().print(actdate);
                 getdisplay().print(" ");
-                getdisplay().print(tz == 0 ? "UTC" : "LOT");
+                getdisplay().print(commonData.tz == 0 ? "UTC" : "LOT");
             }
             else{
                 if(commonData.config->getBool(commonData.config->useSimuData) == true){

lib/obp60task/OBP60Hardware.h

@@ -1,7 +1,7 @@
     // General hardware definitions
     // CAN and RS485 bus pin definitions see obp60task.h
 
-#ifdef HARDWARE_V21
+#if defined HARDWARE_V20 || HARDWARE_V21
     // Direction pin for RS485 NMEA0183
     #define OBP_DIRECTION_PIN 18
     // I2C

lib/obp60task/OBP60Keypad.h

@@ -58,7 +58,7 @@ void initKeys(CommonData &commonData) {
     commonData.keydata[5].h = height;
 }
 
-  #ifdef HARDWARE_V21
+  #if defined HARDWARE_V20 || HARDWARE_V21
   // Keypad functions for original OBP60 hardware
   int readKeypad(GwLog* logger, uint thSensitivity, bool use_syspage) {
     

lib/obp60task/OBPDataOperations.cpp

@@ -135,7 +135,7 @@ bool CalibrationData::calibrateInstance(GwApi::BoatValue* boatDataValue)
     double dataValue = 0;
     std::string format = "";
 
-    // we test this earlier, but for safety reason ...
+    // we test this earlier, but for safety reasons ...
     if (calibrationMap.find(instance) == calibrationMap.end()) {
         LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s not in calibration list", instance.c_str());
         return false;
@@ -151,7 +151,7 @@ bool CalibrationData::calibrateInstance(GwApi::BoatValue* boatDataValue)
     slope = calibrationMap[instance].slope;
     dataValue = boatDataValue->value;
     format = boatDataValue->getFormat().c_str();
-    LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: value: %f, format: %s", instance.c_str(), dataValue, format.c_str());
+    // LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: value: %f, format: %s", instance.c_str(), dataValue, format.c_str());
 
     if (format == "formatWind") { // instance is of type angle
         dataValue = (dataValue * slope) + offset;
@@ -174,7 +174,7 @@ bool CalibrationData::calibrateInstance(GwApi::BoatValue* boatDataValue)
     calibrationMap[instance].value = dataValue; // store the calibrated value in the list
     calibrationMap[instance].isCalibrated = true;
 
-    LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: Offset: %f, Slope: %f, Result: %f", instance.c_str(), offset, slope, calibrationMap[instance].value);
+    // LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: Offset: %f, Slope: %f, Result: %f", instance.c_str(), offset, slope, calibrationMap[instance].value);
     return true;
 }
 
@@ -189,7 +189,7 @@ bool CalibrationData::smoothInstance(GwApi::BoatValue* boatDataValue)
 
     // we test this earlier, but for safety reason ...
     if (calibrationMap.find(instance) == calibrationMap.end()) {
-        LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s not in calibration list", instance.c_str());
+        // LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s not in calibration list", instance.c_str());
         return false;
     }
 
@@ -211,7 +211,7 @@ bool CalibrationData::smoothInstance(GwApi::BoatValue* boatDataValue)
     calibrationMap[instance].value = dataValue; // store the smoothed value in the list
     calibrationMap[instance].isCalibrated = true;
 
-    LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: smooth: %f, oldValue: %f, result: %f", instance.c_str(), smoothFactor, oldValue, calibrationMap[instance].value);
+    // LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: smooth: %f, oldValue: %f, result: %f", instance.c_str(), smoothFactor, oldValue, calibrationMap[instance].value);
 
     return true;
 }
@@ -241,7 +241,7 @@ void HstryBuf::add(double value)
 {
     if (value >= hstryMin && value <= hstryMax) {
         hstryBuf.add(value);
-        LOG_DEBUG(GwLog::DEBUG, "HstryBuf::add:  name: %s, value: %.3f", hstryBuf.getName(), value);
+        // LOG_DEBUG(GwLog::DEBUG, "HstryBuf::add:  name: %s, value: %.3f", hstryBuf.getName(), value);
     }
 }
 
@@ -405,7 +405,7 @@ void WindUtils::calcTwdSA(const double* AWA, const double* AWS,
     double stw = -*STW;
     addPolar(AWD, AWS, CTW, &stw, TWD, TWS);
 
-    // Normalize TWD and TWA to 0-360°/2PI
+    // Normalize TWD to [0..360°] (2PI) and TWA to [-180..180] (PI)
     *TWD = to2PI(*TWD);
     *TWA = toPI(*TWD - *HDT);
 }
@@ -487,8 +487,8 @@ bool WindUtils::addWinds()
     double hdtVal = hdtBVal->valid ? hdtBVal->value : DBL_MAX;
     double hdmVal = hdmBVal->valid ? hdmBVal->value : DBL_MAX;
     double varVal = varBVal->valid ? varBVal->value : DBL_MAX;
-    LOG_DEBUG(GwLog::DEBUG, "WindUtils:addWinds: AWA %.1f, AWS %.1f, COG %.1f, STW %.1f, SOG %.2f, HDT %.1f, HDM %.1f, VAR %.1f", awaBVal->value * RAD_TO_DEG, awsBVal->value * 3.6 / 1.852,
-        cogBVal->value * RAD_TO_DEG, stwBVal->value * 3.6 / 1.852, sogBVal->value * 3.6 / 1.852, hdtBVal->value * RAD_TO_DEG, hdmBVal->value * RAD_TO_DEG, varBVal->value * RAD_TO_DEG);
+    //LOG_DEBUG(GwLog::DEBUG, "WindUtils:addWinds: AWA %.1f, AWS %.1f, COG %.1f, STW %.1f, SOG %.2f, HDT %.1f, HDM %.1f, VAR %.1f", awaBVal->value * RAD_TO_DEG, awsBVal->value * 3.6 / 1.852,
+    //     cogBVal->value * RAD_TO_DEG, stwBVal->value * 3.6 / 1.852, sogBVal->value * 3.6 / 1.852, hdtBVal->value * RAD_TO_DEG, hdmBVal->value * RAD_TO_DEG, varBVal->value * RAD_TO_DEG);
 
     // Check if TWD can be calculated from TWA and HDT/HDM
     if (twaBVal->valid) {
@@ -528,8 +528,8 @@ bool WindUtils::addWinds()
             }
         }
     }
-    LOG_DEBUG(GwLog::DEBUG, "WindUtils:addWinds: twCalculated %d, TWD %.1f, TWA %.1f, TWS %.2f kn, AWD: %.1f", twCalculated, twdBVal->value * RAD_TO_DEG,
-        twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852, awdBVal->value * RAD_TO_DEG);
+    // LOG_DEBUG(GwLog::DEBUG, "WindUtils:addWinds: twCalculated %d, TWD %.1f, TWA %.1f, TWS %.2f kn, AWD: %.1f", twCalculated, twdBVal->value * RAD_TO_DEG,
+    //     twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852, awdBVal->value * RAD_TO_DEG);
 
     return twCalculated;
 }

lib/obp60task/OBPSensorTask.cpp

@@ -425,7 +425,7 @@ void sensorTask(void *param){
         N2K = GPS time on N2K od 183 bus
         0 = device not ready
         1 = device ready
-        X = undependend
+        X = independend
         () = source for set time N2K
         -> = set RTC via iRTC
         <- = set RTC via GPS
@@ -442,8 +442,8 @@ void sensorTask(void *param){
 
         */
 
-        // If RTC DS1388 ready, then copy iRTC and GPS data to RTC all 5min
-        if(millis() > starttime11 + 5*60*1000){
+        // If RTC DS1388 ready, then copy iRTC and GPS data to RTC all 1min
+        if(millis() > starttime11 + 1*60*1000){
             starttime11 = millis();
             // Set RTC chip via iRTC (NTP)
             if(iRTC_ready == true && RTC_ready == true && GPS_ready == false){
@@ -497,7 +497,7 @@ void sensorTask(void *param){
         // Send RTC date and time to N2K all 500ms
         if (millis() > starttime12 + 500) {
             starttime12 = millis();
-            // Send date and time from RTC chip
+            // Send date and time from RTC chip if GPS not ready
             if (rtcOn == "DS1388" && RTC_ready) {
                 DateTime dt = ds1388.now();
                 sensors.rtcTime.tm_year  = dt.year() - 1900; // Save values in SensorData

lib/obp60task/OBPcharts.cpp

@@ -161,8 +161,8 @@ bool Chart::setChartDimensions(const char direction, const int8_t size)
             break;
         }
     }
-    LOG_DEBUG(GwLog::ERROR, "obp60:setChartDimensions %s: direction: %c, size: %d, dWidth: %d, dHeight: %d, timAxis: %d, valAxis: %d, cRoot{%d, %d}, top: %d, bottom: %d, hGap: %d, vGap: %d",
-        dataBuf.getName(), direction, size, dWidth, dHeight, timAxis, valAxis, cRoot.x, cRoot.y, top, bottom, hGap, vGap);
+    //LOG_DEBUG(GwLog::DEBUG, "obp60:setChartDimensions %s: direction: %c, size: %d, dWidth: %d, dHeight: %d, timAxis: %d, valAxis: %d, cRoot{%d, %d}, top: %d, bottom: %d, hGap: %d, vGap: %d",
+    //     dataBuf.getName(), direction, size, dWidth, dHeight, timAxis, valAxis, cRoot.x, cRoot.y, top, bottom, hGap, vGap);
     return true;
 }
 
@@ -176,7 +176,7 @@ void Chart::drawChrt(const char chrtDir, const int8_t chrtIntv, GwApi::BoatValue
     // LOG_DEBUG(GwLog::DEBUG, "Chart:drawChart: min: %.1f, mid: %.1f, max: %.1f, rng: %.1f", chrtMin, chrtMid, chrtMax, chrtRng);
     calcChrtBorders(chrtMin, chrtMid, chrtMax, chrtRng);
     chrtScale = double(valAxis) / chrtRng; // Chart scale: pixels per value step
-    LOG_DEBUG(GwLog::DEBUG, "Chart:drawChart: min: %.1f, mid: %.1f, max: %.1f, rng: %.1f", chrtMin, chrtMid, chrtMax, chrtRng);
+    // LOG_DEBUG(GwLog::DEBUG, "Chart:drawChart: min: %.1f, mid: %.1f, max: %.1f, rng: %.1f", chrtMin, chrtMid, chrtMax, chrtRng);
 
     // Do we have valid buffer data?
     if (dataBuf.getMax() == dbMAX_VAL) { // only <MAX_VAL> values in buffer -> no valid wind data available
@@ -261,8 +261,8 @@ void Chart::calcChrtBorders(double& rngMin, double& rngMid, double& rngMax, doub
                 }
                 recalcRngMid = false; // Reset flag for <rngMid> determination
 
-                LOG_DEBUG(GwLog::DEBUG, "calcChrtRange: rngMin: %.1f°, rngMid: %.1f°, rngMax: %.1f°, rng: %.1f°, rngStep: %.1f°", rngMin * RAD_TO_DEG, rngMid * RAD_TO_DEG, rngMax * RAD_TO_DEG,
-                    rng * RAD_TO_DEG, rngStep * RAD_TO_DEG);
+                // LOG_DEBUG(GwLog::DEBUG, "calcChrtRange: rngMin: %.1f°, rngMid: %.1f°, rngMax: %.1f°, rng: %.1f°, rngStep: %.1f°", rngMin * RAD_TO_DEG, rngMid * RAD_TO_DEG, rngMax * RAD_TO_DEG,
+                //     rng * RAD_TO_DEG, rngStep * RAD_TO_DEG);
             }
         }
 
@@ -287,8 +287,8 @@ void Chart::calcChrtBorders(double& rngMin, double& rngMid, double& rngMax, doub
 
         rng = halfRng * 2.0;
 
-        LOG_DEBUG(GwLog::DEBUG, "calcChrtBorders: rngMin: %.1f°, rngMid: %.1f°, rngMax: %.1f°, tmpRng: %.1f°, rng: %.1f°, rngStep: %.1f°", rngMin * RAD_TO_DEG, rngMid * RAD_TO_DEG, rngMax * RAD_TO_DEG,
-            tmpRng * RAD_TO_DEG, rng * RAD_TO_DEG, rngStep * RAD_TO_DEG);
+        // LOG_DEBUG(GwLog::DEBUG, "calcChrtBorders: rngMin: %.1f°, rngMid: %.1f°, rngMax: %.1f°, tmpRng: %.1f°, rng: %.1f°, rngStep: %.1f°", rngMin * RAD_TO_DEG, rngMid * RAD_TO_DEG, rngMax * RAD_TO_DEG,
+        //     tmpRng * RAD_TO_DEG, rng * RAD_TO_DEG, rngStep * RAD_TO_DEG);
 
     } else { // chart data is of any other type
 
@@ -320,8 +320,8 @@ void Chart::calcChrtBorders(double& rngMin, double& rngMid, double& rngMax, doub
         rngMid = (rngMin + rngMax) / 2.0;
         rng = rngMax - rngMin;
 
-        LOG_DEBUG(GwLog::DEBUG, "calcChrtRange-end: currMinVal: %.1f, currMaxVal: %.1f, rngMin: %.1f, rngMid: %.1f, rngMax: %.1f, rng: %.1f, rngStep: %.1f, zeroValue: %.1f, dbMIN_VAL: %.1f",
-            currMinVal, currMaxVal, rngMin, rngMid, rngMax, rng, rngStep, zeroValue, dbMIN_VAL);
+        // LOG_DEBUG(GwLog::DEBUG, "calcChrtRange-end: currMinVal: %.1f, currMaxVal: %.1f, rngMin: %.1f, rngMid: %.1f, rngMax: %.1f, rng: %.1f, rngStep: %.1f, zeroValue: %.1f, dbMIN_VAL: %.1f",
+        //     currMinVal, currMaxVal, rngMin, rngMid, rngMax, rng, rngStep, zeroValue, dbMIN_VAL);
     }
 }
 
@@ -397,6 +397,8 @@ void Chart::drawChartLines(const char direction, const int8_t chrtIntv, const do
             }
             break;
         }
+
+        taskYIELD(); // we run for 50-150ms; be polite to other tasks with same priority
     }
 }
 
@@ -656,7 +658,7 @@ void Chart::prntHorizChartThreeValueAxisLabel(const GFXfont* font)
 
     if (font == &Ubuntu_Bold10pt8b) {
         xOffset = 39;
-        yOffset = 15;
+        yOffset = 16;
     } else if (font == &Ubuntu_Bold12pt8b) {
         xOffset = 51;
         yOffset = 18;
@@ -718,7 +720,7 @@ void Chart::prntHorizChartMultiValueAxisLabel(const GFXfont* font)
     axSlots = valAxis / static_cast<double>(VALAXIS_STEP); // number of axis labels (and we want to have a double calculation, no integer)
     axIntv = chrtRng / axSlots;
     axLabel = chrtMin + axIntv;
-    LOG_DEBUG(GwLog::DEBUG, "Chart::printHorizMultiValueAxisLabel: chrtRng: %.2f, th-chrtRng: %.2f, axSlots: %.2f, axIntv: %.2f, axLabel: %.2f, chrtMin: %.2f, chrtMid: %.2f, chrtMax: %.2f", chrtRng, this->chrtRng, axSlots, axIntv, axLabel, this->chrtMin, chrtMid, chrtMax);
+    // LOG_DEBUG(GwLog::DEBUG, "Chart::printHorizMultiValueAxisLabel: chrtRng: %.2f, th-chrtRng: %.2f, axSlots: %.2f, axIntv: %.2f, axLabel: %.2f, chrtMin: %.2f, chrtMid: %.2f, chrtMax: %.2f", chrtRng, this->chrtRng, axSlots, axIntv, axLabel, this->chrtMin, chrtMid, chrtMax);
 
     int loopStrt, loopEnd, loopStp;
     if (chrtDataFmt == SPEED || chrtDataFmt == TEMPERATURE || chrtDataFmt == OTHER) {

lib/obp60task/PageAnchor.cpp

@@ -0,0 +1,771 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+
+/*
+  This page is in experimental stage so be warned!
+  North is up.
+  Anchor page with background map from mapservice
+
+  Boatdata used
+    DBS - Water depth
+    HDT - Boat heading, true
+    AWS - Wind strength; Boat not moving so we assume AWS=TWS and AWD=TWD
+    AWD - Wind direction
+    LAT/LON - Boat position, current
+    HDOP - Position error, horizontal
+
+   Raise function in device OBP40 has to be done inside config mode
+   because of limited number of buttons.
+
+  TODO 
+    gzip for data transfer,
+       miniz.c from ROM?
+       manually inflating with tinflate from ROM
+    Save position in FRAM
+    Alarm: gps fix lost
+    switch unit feet/meter
+    force map update if new position is different from old position by 
+    a certain level (e.g. 10m)
+    windlass integration
+    chain counter
+
+    Map service options / URL parameters
+      - mandatory
+          lat: latitude
+          lon: longitude
+          width: image width in px (400)
+          height: image height in px (300)
+      - optional
+          zoom: zoom level, default 15
+          mrot: map rotation angle in degrees
+          mtype: map type, default="Open Street Map"
+          dtype: dithering type, default="Atkinson"
+          cutout: image cutout type 0=none
+          alpha: alpha blending for cutout
+          tab: tab size, 0=none
+          border: border line zize in px, default 2
+          symbol: synmol number, default=2 triangle
+          srot: symbol rotation in degrees
+          ssize: symbol size in px, default=15
+          grid: show map grid
+
+*/
+
+#include <WiFi.h>
+#include <HTTPClient.h>
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+#include "ConfigMenu.h"
+// #include "miniz.h" // devices without PSRAM use <rom/miniz.h>
+
+// extern "C" {
+  #include "rom/miniz.h"
+// }
+
+#define anchor_width 16
+#define anchor_height 16
+static unsigned char anchor_bits[] PROGMEM = {
+   0x80, 0x01, 0x40, 0x02, 0x40, 0x02, 0x80, 0x01, 0xf0, 0x0f, 0x80, 0x01,
+   0x80, 0x01, 0x88, 0x11, 0x8c, 0x31, 0x8e, 0x71, 0x84, 0x21, 0x86, 0x61,
+   0x86, 0x61, 0xfc, 0x3f, 0xf8, 0x1f, 0x80, 0x01 };
+
+class PageAnchor : public Page
+{
+private:
+    char mode = 'N'; // (N)ormal, (C)onfig
+    int8_t editmode = -1; // marker for menu/edit/set function
+    ConfigMenu *menu;
+
+    //uint8_t *mapbuf = new uint8_t[10000]; // 8450 Byte without header
+    //int mapbuf_size = 10000;
+    //uint8_t *mapbuf = (uint8_t*) heap_caps_malloc(mapbuf_size, MALLOC_CAP_SPIRAM);
+    GFXcanvas1 *canvas;
+    const uint16_t map_width = 264;
+    const uint16_t map_height = 260;
+    bool map_valid = false;
+    char map_service = 'R'; // (O)BP Service, (L)ocal Service, (R)emote Service
+    double map_lat = 0; // current center of valid map
+    double map_lon = 0;
+    String server_name; // server with map service
+    uint16_t server_port = 80;
+    String tile_path;
+
+    String lengthformat;
+
+    double scale = 50; // Radius of display circle in meter, depends on lat
+    uint8_t zoom = 15; // map zoom level
+
+    bool alarm = false;
+    bool alarm_enabled = false;
+    uint8_t alarm_range;
+
+    uint8_t chain_length;
+    uint8_t chain = 0;
+
+    bool anchor_set = false;
+    double anchor_lat;
+    double anchor_lon;
+    double anchor_depth;
+    int anchor_ts; // time stamp anchor dropped
+
+    GwApi::BoatValue *bv_dbs; // depth below surface
+    GwApi::BoatValue *bv_hdt; // true heading
+    GwApi::BoatValue *bv_aws; // apparent wind speed
+    GwApi::BoatValue *bv_awd; // apparent wind direction
+    GwApi::BoatValue *bv_lat; // latitude, current
+    GwApi::BoatValue *bv_lon; // longitude, current
+    GwApi::BoatValue *bv_hdop; // horizontal position error
+
+    bool simulation = false;
+    int last_mapsize = 0;
+    String errmsg = "";
+    int loops;
+    int readbytes = 0;
+
+    void displayModeNormal(PageData &pageData) {
+
+        // get currrent boatvalues
+        bv_dbs = pageData.values[0]; // DBS
+        String sval_dbs = formatValue(bv_dbs, *commonData).svalue;
+        String sunit_dbs = formatValue(bv_dbs, *commonData).unit; 
+        bv_hdt = pageData.values[1]; // HDT
+        String sval_hdt = formatValue(bv_hdt, *commonData).svalue;
+        bv_aws = pageData.values[2]; // AWS
+        String sval_aws = formatValue(bv_aws, *commonData).svalue;
+        String sunit_aws = formatValue(bv_aws, *commonData).unit; 
+        bv_awd = pageData.values[3]; // AWD
+        String sval_awd = formatValue(bv_awd, *commonData).svalue;
+        bv_lat = pageData.values[4]; // LAT
+        String sval_lat = formatValue(bv_lat, *commonData).svalue;
+        bv_lon = pageData.values[5]; // LON
+        String sval_lon = formatValue(bv_lon, *commonData).svalue;
+        bv_hdop = pageData.values[6]; // HDOP
+        String sval_hdop = formatValue(bv_hdop, *commonData).svalue;
+        String sunit_hdop = formatValue(bv_hdop, *commonData).unit; 
+
+        commonData->logger->logDebug(GwLog::DEBUG, "Drawing at PageAnchor; DBS=%f, HDT=%f, AWS=%f", bv_dbs->value, bv_hdt->value, bv_aws->value);
+
+        // Draw canvas with background map
+        // rhumb(map_lat, map_lon, bv_lat->value, bv_lon->value)
+        int posdiff = 0;
+        if (map_valid) {
+            if (bv_lat->valid and bv_lon->valid) {
+                // calculate movement since last map refresh
+                posdiff = rhumb(map_lat, map_lon, bv_lat->value, bv_lon->value);
+                if (posdiff > 25) {
+                    map_lat = bv_lat->value;
+                    map_lon = bv_lon->value;
+                    map_valid = getBackgroundMap(map_lat, map_lon, zoom);
+                    if (map_valid) {
+                        // prepare visible space for anchor-symbol or boat
+                        canvas->fillCircle(132, 130, 12, commonData->fgcolor);
+                    }
+                }
+            }
+            getdisplay().drawBitmap(68, 20, canvas->getBuffer(), map_width, map_height, commonData->fgcolor);
+        }
+
+        Point c = {200, 150}; // center = anchor position
+        uint16_t r = 125;
+
+        // Circle as map border
+        getdisplay().drawCircle(c.x, c.y, r, commonData->fgcolor);
+        getdisplay().drawCircle(c.x, c.y, r + 1, commonData->fgcolor);
+
+        Point b = {200, 180}; // boat position while dropping anchor
+
+        const std::vector<Point> pts_boat = { // polygon lines
+            {b.x - 5, b.y},
+            {b.x - 5, b.y - 10},
+            {b.x, b.y - 16},
+            {b.x + 5, b.y - 10},
+            {b.x + 5, b.y}
+        };
+        //rotatePoints then draw lines
+        // TODO rotate boat according to current heading
+        if (bv_hdt->valid) {
+            if (map_valid) {
+                Point b1 = rotatePoint(c, {b.x, b.y - 8}, bv_hdt->value * RAD_TO_DEG);
+                getdisplay().fillCircle(b1.x, b1.y, 10, commonData->bgcolor);
+            }
+            drawPoly(rotatePoints(c, pts_boat, bv_hdt->value * RAD_TO_DEG), commonData->fgcolor);
+        } else {
+            // no heading available: draw north oriented
+            if (map_valid) {
+                getdisplay().fillCircle(b.x, b.y - 8, 10, commonData->bgcolor);
+            }
+            drawPoly(pts_boat, commonData->fgcolor);
+        }
+
+        // Draw wind arrow
+        const std::vector<Point> pts_wind = {
+            {c.x, c.y - r + 25},
+            {c.x - 12, c.y - r - 4},
+            {c.x, c.y - r + 6},
+            {c.x + 12, c.y - r - 4}
+        };
+        if (bv_awd->valid) {
+            fillPoly4(rotatePoints(c, pts_wind, bv_awd->value), commonData->fgcolor);
+        }
+
+        // Title and corner value headings
+        getdisplay().setTextColor(commonData->fgcolor);
+        getdisplay().setFont(&Ubuntu_Bold10pt8b);
+        // Left
+        getdisplay().setCursor(8, 36);
+        getdisplay().print("Anchor");
+        getdisplay().setCursor(8, 210);
+        getdisplay().print("Depth");
+        // Right
+        drawTextRalign(392, 80, "Chain");
+        drawTextRalign(392, 210, "Wind");
+
+        // Units
+        getdisplay().setCursor(8, 272);
+        getdisplay().print(sunit_dbs);
+        drawTextRalign(392, 272, sunit_aws);
+        // drawTextRalign(392, 100, lengthformat); // chain unit not implemented
+
+        // Corner values
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setCursor(8, 54);
+        getdisplay().print(anchor_set ? "Dropped" : "Ready"); // Anchor state
+        getdisplay().setCursor(8, 72);
+        getdisplay().print("Alarm: "); // Alarm state
+        getdisplay().print(alarm_enabled ? "on" : "off");
+
+        getdisplay().setCursor(8, 120);
+        getdisplay().print("Zoom");
+        getdisplay().setCursor(8, 136);
+        getdisplay().print(zoom);
+
+        getdisplay().setCursor(8, 160);
+        getdisplay().print("diff");
+        getdisplay().setCursor(8, 176);
+        if (map_valid and bv_lat->valid and bv_lon->valid) {
+            getdisplay().print(String(posdiff));
+        } else {
+            getdisplay().print("n/a");
+        }
+
+        // Chain out TODO lengthformat ft/m
+        drawTextRalign(392, 96, String(chain) + " m");
+        drawTextRalign(392, 96+16, "of " + String(chain_length) + " m");
+
+        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+
+        // Depth
+        getdisplay().setCursor(8, 250);
+        getdisplay().print(sval_dbs);
+
+        // Wind
+        getdisplay().setCursor(320, 250);
+        getdisplay().print(sval_aws);
+
+        // Position of boat in center of map
+        getdisplay().setFont(&IBM8x8px);
+        drawTextRalign(392, 34, sval_lat);
+        drawTextRalign(392, 44, sval_lon);
+        // quality
+        String hdop = "HDOP: ";
+        if (bv_hdop->valid) {
+            hdop += String(round(bv_hdop->value));
+        } else {
+            hdop += " n/a";
+        }
+        drawTextRalign(392, 54, hdop);
+
+        // zoom scale
+        getdisplay().drawLine(c.x + 10, c.y, c.x + r - 4, c.y, commonData->fgcolor);
+        // arrow left
+        getdisplay().drawLine(c.x + 10, c.y, c.x + 16, c.y - 4, commonData->fgcolor);
+        getdisplay().drawLine(c.x + 10, c.y, c.x + 16, c.y + 4, commonData->fgcolor);
+        // arrow right
+        getdisplay().drawLine(c.x + r - 4, c.y, c.x + r - 10, c.y - 4, commonData->fgcolor);
+        getdisplay().drawLine(c.x + r - 4, c.y, c.x + r - 10, c.y + 4, commonData->fgcolor);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        drawTextCenter(c.x + r / 2, c.y + 8, String(scale, 0) + "m");
+
+        // draw anchor symbol (as bitmap)
+        getdisplay().drawXBitmap(c.x - anchor_width / 2, c.y - anchor_height / 2,
+            anchor_bits, anchor_width, anchor_height, commonData->fgcolor);
+
+    }
+
+    void displayModeConfig(PageData &pageData) {
+
+        getdisplay().setTextColor(commonData->fgcolor);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setCursor(8, 48);
+        getdisplay().print("Anchor configuration");
+
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+
+        getdisplay().setCursor(8, 260);
+        getdisplay().print("Press BACK to leave config");
+
+/*        getdisplay().setCursor(8, 68);
+        getdisplay().printf("Server: %s", server_name.c_str());
+        getdisplay().setCursor(8, 88);
+        getdisplay().printf("Port: %d", server_port);
+        getdisplay().setCursor(8, 108);
+        getdisplay().printf("Tilepath: %s", tile_path.c_str());
+        getdisplay().setCursor(8, 128);
+        getdisplay().printf("Last mapsize: %d", last_mapsize);
+        getdisplay().setCursor(8, 148);
+        getdisplay().printf("Last error: %s", errmsg);
+        getdisplay().setCursor(8, 168);
+        getdisplay().printf("Loops: %d, Readbytes: %d", loops, readbytes);
+        */
+
+        GwApi::BoatValue *bv_lat = pageData.values[4]; // LAT
+        GwApi::BoatValue *bv_lon = pageData.values[5]; // LON
+        if (!bv_lat->valid or !bv_lon->valid) {
+            getdisplay().setCursor(8, 228);
+            getdisplay().printf("No valid position: background map disabled");
+        }
+
+        // Display menu
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        for (int i = 0 ; i < menu->getItemCount(); i++) {
+            ConfigMenuItem *itm = menu->getItemByIndex(i);
+            if (!itm) {
+               commonData->logger->logDebug(GwLog::ERROR, "Menu item not found: %d", i);
+            } else {
+                Rect r = menu->getItemRect(i);
+                bool inverted = (i == menu->getActiveIndex());
+                drawTextBoxed(r, itm->getLabel(), commonData->fgcolor, commonData->bgcolor, inverted, false);
+                if (inverted and editmode > 0) {
+                    // triangle as edit marker
+                    getdisplay().fillTriangle(r.x + r.w + 20, r.y, r.x + r.w + 30, r.y + r.h / 2, r.x + r.w + 20, r.y + r.h,  commonData->fgcolor);
+                }
+                getdisplay().setCursor(r.x + r.w + 40, r.y + r.h - 4);
+                if (itm->getType() == "int") {
+                    getdisplay().print(itm->getValue());
+                    getdisplay().print(itm->getUnit());
+                } else {
+                     getdisplay().print(itm->getValue() == 0 ? "No" : "Yes");
+                }
+            }
+        }
+
+    }
+
+public:
+    PageAnchor(CommonData &common) 
+    {
+        commonData = &common;
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageAnchor");
+
+        String mapsource = common.config->getString(common.config->mapsource);
+        if (mapsource == "Local Service") {
+            map_service = 'L';
+            server_name = common.config->getString(common.config->ipAddress);
+            server_port = common.config->getInt(common.config->localPort);
+            tile_path = "";
+        } else if (mapsource == "Remote Service") {
+            map_service = 'R';
+            server_name = common.config->getString(common.config->mapServer);
+            tile_path = common.config->getString(common.config->mapTilePath);
+        } else { // OBP Service or undefined
+            map_service = 'O';
+            server_name = "norbert-walter.dnshome.de";
+            tile_path = "";
+        }
+        zoom = common.config->getInt(common.config->zoomlevel);
+
+        lengthformat = common.config->getString(common.config->lengthFormat);
+        chain_length = common.config->getInt(common.config->chainLength);
+
+        if (simulation) {
+            map_lat = 53.56938345759218;
+            map_lon = 9.679658234303275;
+        }
+
+        canvas = new GFXcanvas1(264, 260); // Byte aligned, no padding!
+
+        // Initialize config menu
+        menu = new ConfigMenu("Options", 40, 80);
+        menu->setItemDimension(150, 20);
+        ConfigMenuItem *newitem;
+        newitem = menu->addItem("chain", "Chain out", "int", 0, "m");
+        newitem->setRange(0, 200, {1, 2, 5, 10});
+        newitem = menu->addItem("alarm", "Alarm", "bool", 0, "");
+        newitem = menu->addItem("alarm", "Alarm range", "int", 50, "m");
+        newitem->setRange(0, 200, {1, 2, 5, 10});
+        newitem = menu->addItem("raise", "Raise Anchor", "bool", 0, "");
+        newitem = menu->addItem("zoom", "Zoom", "int", 15, "");
+        newitem->setRange(14, 17, {1});
+        menu->setItemActive("chain");
+
+    }
+
+    void setupKeys(){
+        Page::setupKeys();
+        commonData->keydata[0].label = "CFG";
+#ifdef BOARD_OBP40S3
+        commonData->keydata[1].label = "DROP";
+#endif
+#ifdef BOARD_OBP60S3
+        commonData->keydata[4].label = "DROP";
+#endif
+    }
+
+    // TODO OBP40 / OBP60 different handling
+    int handleKey(int key) {
+        commonData->logger->logDebug(GwLog::LOG, "Page Anchor handle key %d", key);
+        if (key == 1) { // Switch between normal and config mode
+            if (mode == 'N') {
+                mode = 'C';
+#ifdef BOARD_OBP40S3
+                commonData->keydata[0].label = "BACK";
+                commonData->keydata[1].label = "EDIT";
+#endif
+            } else {
+                mode = 'N';
+#ifdef BOARD_OBP40S3
+                commonData->keydata[0].label = "CFG";
+                commonData->keydata[1].label = anchor_set ? "RAISE": "DROP";
+#endif
+#ifdef BOARD_OBP60S3
+                commonData->keydata[4].label = anchor_set ? "RAISE": "DROP";
+#endif
+            }
+            return 0;
+        }
+        if (key == 2) {
+            if (mode == 'N') {
+                anchor_set = !anchor_set;
+                commonData->keydata[1].label = anchor_set ? "ALARM": "DROP";
+                if (anchor_set) {
+                    anchor_lat = bv_lat->value;
+                    anchor_lon =  bv_lon->value;
+                    anchor_depth = bv_dbs->value;
+                    // TODO set timestamp
+                    // anchor_ts =
+                }
+                return 0;
+            } else if (mode == 'C') {
+                // Change edit mode
+                if (editmode > 0) {
+                    editmode = 0;
+                    commonData->keydata[1].label = "EDIT";
+                } else {
+                    editmode = 1;
+                    commonData->keydata[1].label = "OK";
+                }
+            }
+        }
+        if (key == 9) {
+            // OBP40 Down
+            if (mode == 'C') {
+                if (editmode > 0) {
+                    // decrease current menu item
+                     menu->getActiveItem()->decValue();
+                } else {
+                    // move to next menu item
+                     menu->goNext();
+                }
+                return 0;
+            }
+        }
+        if (key == 10) {
+            // OBP40 Up
+            if (mode == 'C') {
+                if (editmode > 0) {
+                    // increase current menu item
+                     ConfigMenuItem *itm = menu->getActiveItem();                    
+                     commonData->logger->logDebug(GwLog::LOG, "step = %d", itm->getStep());
+                     itm->incValue();
+                } else {
+                    // move to previous menu item
+                     menu->goPrev();
+                }
+                return 0;
+            }
+        }
+        // Code for keylock
+        if (key == 11) {
+            commonData->keylock = !commonData->keylock;
+            return 0;
+        }
+        return key;
+    }
+
+    int rhumb(double lat1, double lon1, double lat2, double lon2) {
+        // calc distance in m between two geo points
+        static const double degToRad = M_PI / 180.0;
+        lat1 = degToRad * lat1;
+        lon1 = degToRad * lon1;
+        lat2 = degToRad * lat2;
+        lon2 = degToRad * lon2;
+        double dlon = lon2 - lon1;
+        double dlat = lat2 - lat1;
+        double mlat = (lat1 + lat2) / 2;
+        return (int) (6371000 * sqrt(pow(dlat, 2) + pow(cos(mlat) * dlon, 2)));
+    }
+
+    bool getBackgroundMap(double lat, double lon, uint8_t zoom) {
+        // HTTP-Request for map
+        // TODO über pagedata -> status abfragen?
+        if (WiFi.status() != WL_CONNECTED) {
+            return false;
+        }
+        bool valid = false;
+        HTTPClient http;
+        const char* headerKeys[] = { "Content-Encoding", "Content-Length" };
+        http.collectHeaders(headerKeys, 2);
+        String url = "http://" + server_name + "/" + tile_path;
+        String parameter = "?lat=" + String(lat, 6) + "&lon=" + String(lon, 6)+ "&zoom=" + String(zoom)
+                         + "&width=" + String(map_width) + "&height=" + String(map_height);
+        commonData->logger->logDebug(GwLog::LOG, "HTTP query: %s", String(url + parameter).c_str());
+        http.begin(url + parameter);
+        http.addHeader("Accept-Encoding", "deflate");
+        int httpCode = http.GET();
+        if (httpCode > 0) {
+            commonData->logger->logDebug(GwLog::LOG, "HTTP GET result code: %d", httpCode);
+            if (httpCode == HTTP_CODE_OK) {
+                WiFiClient* stream = http.getStreamPtr();
+                int size = http.getSize();
+                String encoding = http.header("Content-Encoding");
+                commonData->logger->logDebug(GwLog::LOG, "HTTP size: %d, encoding: '%s'", size, encoding);
+                bool is_gzip = encoding.equalsIgnoreCase("deflate");
+
+                uint8_t header[14]; // max: P4<LF>wwww wwww<LF>
+                int header_size = 0;
+                bool header_read = false;
+                int n = 0;
+                int ix = 0;
+
+                uint8_t* buf = canvas->getBuffer();
+
+                if (is_gzip) {
+                    /* gzip compressed data
+                     * has to be decompressed into a buffer big enough 
+                     * to hold the whole data.
+                     * so the PBM header is included
+                     * search a method to use that as canvas without
+                     * additional copy 
+                     */
+                    commonData->logger->logDebug(GwLog::LOG, "Map received in gzip encoding");
+
+                    #define HEADER_MAX 24
+                    #define HTTP_CHUNK 512
+                    uint8_t in_buf[HTTP_CHUNK];
+                    uint8_t header_buf[HEADER_MAX];
+                    tinfl_decompressor decomp;
+                    tinfl_init(&decomp);
+                    size_t bitmap_written = 0;
+                    size_t header_written = 0;
+                    bool header_done = false;
+                    int row_bytes = 0;
+                    size_t expected_bitmap = 0;
+
+                    while (stream->connected() || stream->available()) {
+                        int bytes_read = stream->read(in_buf, HTTP_CHUNK);
+                        if (bytes_read <= 0) break;
+commonData->logger->logDebug(GwLog::LOG, "stream: bytes_read=%d", bytes_read);
+                        size_t in_ofs = 0; // offset
+                        while (in_ofs < (size_t)bytes_read) {
+                            size_t in_size = bytes_read - in_ofs;
+                            size_t out_size;
+                            uint8_t *out_ptr;
+                            uint8_t *out_ptr_next;
+                            if (!header_done) {
+                                if (header_written >= HEADER_MAX) {
+                                    commonData->logger->logDebug(GwLog::LOG, "PBM header too large");
+                                    return false;
+                                }
+                                out_ptr = header_buf + header_written;
+                                out_size = HEADER_MAX - header_written;
+                            } else {
+                                out_ptr = buf + bitmap_written;
+                                out_size = expected_bitmap - bitmap_written;
+                            }
+commonData->logger->logDebug(GwLog::LOG, "in_size=%d, out_size=%d", in_size, out_size);
+ // TODO correct loop !!!
+ // tinfl_status tinfl_decompress(
+ // tinfl_decompressor *r,
+ // const mz_uint8 *pIn_buf_next,
+ // size_t *pIn_buf_size,
+ // mz_uint8 *pOut_buf_start
+ // mz_uint8 *pOut_buf_next,
+ // size_t *pOut_buf_size,
+ // const mz_uint32 decomp_flags)
+                            tinfl_status status = tinfl_decompress(
+                                &decomp,
+                                in_buf + in_ofs, // start address in input buffer
+                                &in_size,        // number of bytes to process
+                                out_ptr,         // start of output buffer
+                                out_ptr,         // next write position in output buffer
+                                &out_size,       // free size in output buffer
+                                // TINFL_FLAG_PARSE_ZLIB_HEADER |
+                                TINFL_FLAG_HAS_MORE_INPUT |
+                                TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF
+                            );
+                            if (status < 0) {
+                                commonData->logger->logDebug(GwLog::LOG, "Decompression error (%d)", status);
+                                return false;
+                            }
+                            in_ofs += in_size;
+                            commonData->logger->logDebug(GwLog::LOG, "in_size=%d, in_ofs=%d", in_size, in_ofs);
+
+                            if (!header_done) {
+                                commonData->logger->logDebug(GwLog::LOG, "Decoding header");
+                                header_written += out_size;
+
+                                // Detect header end: two '\n'
+                                char *first_nl = strchr((char*)header_buf, '\n');
+                                if (!first_nl) continue;
+
+                                char *second_nl = strchr(first_nl + 1, '\n');
+                                if (!second_nl) continue;
+
+                                // Null-terminate header for sscanf
+                                header_buf[header_written < HEADER_MAX ? header_written : HEADER_MAX - 1] = 0;
+
+                                // Check magic
+                                if (strncmp((char*)header_buf, "P4", 2) != 0) {
+                                    commonData->logger->logDebug(GwLog::LOG, "Invalid PBM magic");
+                                    return false;
+                                }
+
+                                // Parse width and height strictly
+                                int header_width = 0, header_height = 0;
+                                if (sscanf((char*)header_buf, "P4\n%d %d", &header_width, &header_height) != 2) {
+                                    commonData->logger->logDebug(GwLog::LOG, "Failed to parse PBM dimensions");
+                                    return false;
+                                }
+
+                                if (header_width != map_width || header_height != map_height) {
+                                    commonData->logger->logDebug(GwLog::LOG, "PBM size mismatch: header %dx%d, requested %dx%d\n",
+                                        header_width, header_height, map_width, map_height);
+                                    return false;
+                                }
+                                commonData->logger->logDebug(GwLog::LOG, "Header: %dx%d", header_width, header_height);
+
+                                // Compute row bytes and expected bitmap size
+                                row_bytes = (header_width + 7) / 8;
+                                commonData->logger->logDebug(GwLog::LOG, "row_bytes=%d", row_bytes);
+                                expected_bitmap = (size_t)row_bytes * header_height;
+                                commonData->logger->logDebug(GwLog::LOG, "expected_bitmap=%d", expected_bitmap);
+
+                                // Copy any extra decompressed bitmap after header
+                                size_t header_size = (second_nl + 1) - (char*)header_buf;
+                                commonData->logger->logDebug(GwLog::LOG, "header_size=%d", header_size);
+                                size_t extra_bitmap = header_written - header_size;
+                                commonData->logger->logDebug(GwLog::LOG, "extra bitmap=%d", extra_bitmap);
+
+                                header_done = true;
+
+                                if (extra_bitmap > 0) {
+                                    memcpy(buf, header_buf + header_size, extra_bitmap);
+                                    bitmap_written = extra_bitmap;
+                                }
+                            } else {
+                                bitmap_written += out_size;
+                                if (bitmap_written >= expected_bitmap) {
+                                    commonData->logger->logDebug(GwLog::LOG, "Image fully received");
+                                }
+                            }
+                            commonData->logger->logDebug(GwLog::LOG, "bitmap_written=%d", bitmap_written);
+                        }
+                    }
+                } else {
+                    // uncompressed data
+                    commonData->logger->logDebug(GwLog::LOG, "Map received uncompressed");
+                    while (stream->available()) {
+                        uint8_t b = stream->read();
+                        n += 1;
+                        if ((! header_read) and (n < 13) ) {
+                            header[n-1] = b;
+                            if ((n > 3) and (b == 0x0a)) {
+                                header_read = true;
+                                header_size = n;
+                                header[n] = 0;
+                            }
+                        } else {
+                            // write image data to canvas buffer
+                            buf[ix++] = b;
+                        }
+                    }
+                    if (n == size) {
+                        valid = true;
+                    }
+                }
+                commonData->logger->logDebug(GwLog::LOG, "HTTP: final bytesRead=%d, header-size=%d", n, header_size);
+            } else {
+                commonData->logger->logDebug(GwLog::LOG, "HTTP result #%d", httpCode);
+            }
+        } else {
+            commonData->logger->logDebug(GwLog::ERROR, "HTTP error #%d", httpCode);
+        }
+        http.end();
+        return valid;
+    }
+
+    void displayNew(PageData &pageData){
+
+        GwApi::BoatValue *bv_lat = pageData.values[4]; // LAT
+        GwApi::BoatValue *bv_lon = pageData.values[5]; // LON
+
+        // check if valid data available
+        if (!bv_lat->valid or !bv_lon->valid) {
+            map_valid = false;
+            return;
+        }
+
+        errmsg = "";
+
+        map_lat = bv_lat->value; // save for later comparison
+        map_lon = bv_lon->value;
+        map_valid = getBackgroundMap(map_lat, map_lon, zoom);
+
+        if (map_valid) {
+            // prepare visible space for anchor-symbol or boat
+            canvas->fillCircle(132, 130, 10, commonData->fgcolor);
+        }
+    };
+
+    void display_side_keys() {
+        // An rechter Seite neben dem Rad inc, dec, set etc ?
+    }
+
+    int displayPage(PageData &pageData) {
+
+        // Logging boat values
+        commonData->logger->logDebug(GwLog::LOG, "Drawing at PageAnchor; Mode=%c", mode);
+
+        // Set display in partial refresh mode
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+
+       if (mode == 'N') {
+           displayModeNormal(pageData);
+       } else if (mode == 'C') {
+           displayModeConfig(pageData);
+       }
+
+        return PAGE_UPDATE;
+    };
+};
+
+static Page *createPage(CommonData &common){
+    return new PageAnchor(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 registerPageAnchor(
+    "Anchor",   // Page name
+    createPage, // Action
+    0,          // Number of bus values depends on selection in Web configuration
+    {"DBS", "HDT", "AWS", "AWD", "LAT", "LON", "HDOP"}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h)
+    true        // Show display header on/off
+);
+
+#endif

lib/obp60task/PageClock.cpp

@@ -15,7 +15,7 @@
  *      K4: 
  *      K5: TZ  (Local/UTC)
  *
- * Timer mode:
+ * Regatta timer mode:
  *  - Format HH:MM:SS (24h, leading zeros)
  *  - Keys in timer mode:
  *      K1: MODE (A/D/T)
@@ -53,6 +53,8 @@ class PageClock : public Page
     static int timerHours;
     static int timerMinutes;
     static int timerSeconds;
+    // Preset seconds for sync button (default 4 minutes)
+    static const int timerPresetSeconds = 4 * 60;
     // Initial timer setting at start (so we can restore it)
     static int timerStartHours;
     static int timerStartMinutes;
@@ -135,9 +137,10 @@ public:
             // Timer mode: MODE, POS, +, -, RUN
             commonData->keydata[0].label = "MODE";
             commonData->keydata[1].label = "POS";
-            commonData->keydata[2].label = "+";
+            // K3: '+' while editing, 'SYNC' while running to set a preset countdown
+            commonData->keydata[2].label = timerRunning ? "SYNC" : "+";
             commonData->keydata[3].label = "-";
-            commonData->keydata[4].label = "START";
+            commonData->keydata[4].label = timerRunning ? "RESET" : "START";
         } else {
             // Clock modes: like original
             commonData->keydata[0].label = "MODE";
@@ -184,7 +187,26 @@ public:
                 incrementSelected();
                 return 0;
             }
-            if (key == 3 && timerRunning) { // No action if timer running
+            if (key == 3 && timerRunning) {
+                // When timer is running, K3 acts as a synchronization button:
+                // set remaining countdown to the preset value (e.g. 4 minutes).
+                if (commonData->data.rtcValid) {
+                    int preset = timerPresetSeconds;
+                    // update start-setting so STOP will restore this preset
+                    timerStartHours = preset / 3600;
+                    timerStartMinutes = (preset % 3600) / 60;
+                    timerStartSeconds = preset % 60;
+
+                    struct tm rtcCopy = commonData->data.rtcTime;
+                    time_t nowEpoch = mktime(&rtcCopy);
+                    timerEndEpoch = nowEpoch + preset;
+
+                    // Update visible timer fields immediately
+                    timerHours = timerStartHours;
+                    timerMinutes = timerStartMinutes;
+                    timerSeconds = timerStartSeconds;
+//                    commonData->keydata[4].label = "RESET";
+                }
                 return 0;
             }
 
@@ -220,6 +242,7 @@ public:
                     timerMinutes = timerStartMinutes;
                     timerSeconds = timerStartSeconds;
                     timerRunning = false;
+                    showSelectionMarker = true;
                     // marker will become visible again only after POS press
                 }
                 return 0;
@@ -360,8 +383,8 @@ public:
         struct tm* local_tm = localtime(&tv);
 
         if (mode == 'T') {
-            // TIMER MODE: countdown timer HH:MM:SS in the center with 7-segment font
-            //************************************************************************
+            // REGATTA TIMER MODE: countdown timer HH:MM:SS in the center with 7-segment font
+            //*******************************************************************************
 
             int dispH = timerHours;
             int dispM = timerMinutes;
@@ -381,7 +404,9 @@ public:
                 if (remaining <= 0) {
                     remaining = 0;
                     timerRunning = false;
+                    commonData->keydata[3].label = "-";
                     commonData->keydata[4].label = "START";
+                    showSelectionMarker = true;
                     // Buzzer alarm (100% power)
                     setBuzzerPower(100);
                     buzzer(TONE2, 800);
@@ -393,6 +418,7 @@ public:
                     timerSeconds = timerStartSeconds;
                 }
                 else{
+                    commonData->keydata[3].label = "";
                     commonData->keydata[4].label = "RESET";
                 }
                 int rem = static_cast<int>(remaining);
@@ -431,8 +457,8 @@ public:
             int16_t textX = (static_cast<int16_t>(getdisplay().width()) - static_cast<int16_t>(wb)) / 2;
             int16_t textY = centerY + hb / 2;
 
-            //getdisplay().setCursor(textX, textY);
-            getdisplay().setCursor(47, textY);
+            //getdisplay().setCursor(textX, textY); // horzontal jitter
+            getdisplay().setCursor(47, textY);      // static X position
             getdisplay().print(timeStr);
 
             // Selection marker (only visible when not running and POS pressed)
@@ -451,8 +477,8 @@ public:
 
             // Page label
             getdisplay().setFont(&Ubuntu_Bold16pt8b);
-            getdisplay().setCursor(65, 70);
-            getdisplay().print("Count Down Timer");
+            getdisplay().setCursor(100, 70);
+            getdisplay().print("Regatta Timer");
 
         } else if (mode == 'D') {
             // DIGITAL CLOCK MODE: large 7-segment time based on GPS/RTC
@@ -499,8 +525,8 @@ public:
             int16_t x = (static_cast<int16_t>(getdisplay().width()) - static_cast<int16_t>(wb)) / 2;
             int16_t y = 150 + hb / 2;
 
-            //getdisplay().setCursor(x, y);
-            getdisplay().setCursor(47, y);
+            //getdisplay().setCursor(x, y); // horizontal jitter
+            getdisplay().setCursor(47, y);  // static X position
             getdisplay().print(timeStr); // Display actual time
 
             // Small indicators: timezone and source

lib/obp60task/PageClock.old

@@ -1,467 +0,0 @@
-#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
-
-#include "Pagedata.h"
-#include "OBP60Extensions.h"
-
-/*
- * TODO mode: race timer: keys
- *   - prepare: set countdown to 5min
- *     reset: abort current countdown and start over with 5min preparation
- *   - 5min: key press
- *   - 4min: key press to sync
- *   - 1min: buzzer signal
- *   - start: buzzer signal for start
- *
- */
-
-class PageClock : public Page
-{
-bool simulation = false;
-int simtime;
-bool keylock = false;
-#ifdef BOARD_OBP60S3
-char source = 'G';  // time source (R)TC | (G)PS | (N)TP
-#endif
-#ifdef BOARD_OBP40S3
-char source = 'R';  // time source (R)TC | (G)PS | (N)TP
-#endif
-char mode = 'A';    // display mode (A)nalog | (D)igital | race (T)imer
-char tz = 'L';      // time zone (L)ocal | (U)TC
-double timezone = 0; // there are timezones with non int offsets, e.g. 5.5 or 5.75
-double homelat;
-double homelon;
-bool homevalid = false; // homelat and homelon are valid
-
-    public:
-    PageClock(CommonData &common){
-        commonData = &common;
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageClock");
-        simulation = common.config->getBool(common.config->useSimuData);
-        timezone = common.config->getString(common.config->timeZone).toDouble();
-        homelat = common.config->getString(common.config->homeLAT).toDouble();
-        homelon = common.config->getString(common.config->homeLON).toDouble();
-        homevalid = homelat >= -180.0 and homelat <= 180 and homelon >= -90.0 and homelon <= 90.0;
-        simtime = 38160; // time value 11:36
-    }
-
-    virtual void setupKeys(){
-        Page::setupKeys();
-        commonData->keydata[0].label = "SRC";
-        commonData->keydata[1].label = "MODE";
-        commonData->keydata[4].label = "TZ";
-    }
-
-    // Key functions
-    virtual int handleKey(int key){
-        // Time source
-        if (key == 1) {
-            switch (source) {
-                case 'G': source = 'R'; break;
-                case 'R': source = 'G'; break;
-                default:  source = 'G'; break;
-            }
-            return 0;
-        }
-        if (key == 2) {
-            switch (mode) {
-                case 'A': mode = 'D'; break;
-                case 'D': mode = 'T'; break;
-                case 'T': mode = 'A'; break;
-                default:  mode = 'A'; break;
-            }
-            return 0;
-        }
-        // Time zone: Local / UTC
-        if (key == 5) {
-            switch (tz) {
-                case 'L': tz = 'U'; break;
-                case 'U': tz = 'L'; break;
-                default:  tz = 'L'; break;
-            }
-            return 0;
-        }
-
-        // Keylock function
-        if(key == 11){              // Code for keylock
-            keylock = !keylock;     // Toggle keylock
-            return 0;               // Commit the key
-        }
-        return key;
-    }
-
-    int displayPage(PageData &pageData)
-    {
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
-
-        static String svalue1old = "";
-        static String unit1old = "";
-        static String svalue2old = "";
-        static String unit2old = "";
-        static String svalue3old = "";
-        static String unit3old = "";
-
-        static String svalue5old = "";
-        static String svalue6old = "";
-
-        double value1 = 0;
-        double value2 = 0;
-        double value3 = 0;
-
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        String dateformat = config->getString(config->dateFormat);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-
-        // Get boat values for GPS time
-        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
-        if(simulation == false){
-            value1 = bvalue1->value;                    // Value as double in SI unit
-        }
-        else{
-            value1 = simtime++;                         // Simulation data for time value 11:36 in seconds
-        }                                               // Other simulation data see OBP60Formatter.cpp
-        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
-        if(valid1 == true){
-            svalue1old = svalue1;                       // Save old value
-            unit1old = unit1;                           // Save old unit
-        }
-
-        // Get boat values for GPS date
-        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
-        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
-        if(valid2 == true){
-            svalue2old = svalue2;                       // Save old value
-            unit2old = unit2;                           // Save old unit
-        }
-
-        // Get boat values for HDOP date
-        GwApi::BoatValue *bvalue3 = pageData.values[2]; // Third 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
-        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
-        if(valid3 == true){
-            svalue3old = svalue3;                       // Save old value
-            unit3old = unit3;                           // Save old unit
-        }
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false);
-        }
-
-        // Logging boat values
-        if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageClock, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
-
-        // Draw page
-        //***********************************************************
-
-        // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-
-        getdisplay().setTextColor(commonData->fgcolor);
-
-        time_t tv = mktime(&commonData->data.rtcTime) + timezone * 3600;
-        struct tm *local_tm = localtime(&tv);
-
-        // Show values GPS date
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 65);
-        if (holdvalues == false) {
-            if (source == 'G') {
-                 // GPS value
-                 getdisplay().print(svalue2);
-            } else if (commonData->data.rtcValid) {
-                // RTC value
-                 if (tz == 'L') {
-                     getdisplay().print(formatDate(dateformat, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
-                 }
-                 else {
-                     getdisplay().print(formatDate(dateformat, commonData->data.rtcTime.tm_year + 1900, commonData->data.rtcTime.tm_mon + 1, commonData->data.rtcTime.tm_mday));
-                 }
-            } else {
-                getdisplay().print("---");
-            }
-        } else {
-            getdisplay().print(svalue2old);
-        }
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 95);
-        getdisplay().print("Date");                          // Name
-
-        // Horizintal separator left
-        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
-
-        // Show values GPS time
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 250);
-        if (holdvalues == false) {
-            if (source == 'G') {
-                getdisplay().print(svalue1); // Value
-            }
-            else if (commonData->data.rtcValid) {
-                 if (tz == 'L') {
-                      getdisplay().print(formatTime('s', local_tm->tm_hour, local_tm->tm_min, local_tm->tm_sec));
-                 }
-                 else {
-                      getdisplay().print(formatTime('s', commonData->data.rtcTime.tm_hour, commonData->data.rtcTime.tm_min, commonData->data.rtcTime.tm_sec));
-                 }
-            } else {
-                getdisplay().print("---");
-            }
-        }
-        else {
-             getdisplay().print(svalue1old);
-        }
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 220);
-        getdisplay().print("Time");                          // Name
-
-        // Show values sunrise
-        String sunrise = "---";
-        if ((valid1 and valid2 and valid3 == true) or (homevalid and commonData->data.rtcValid)) {
-            sunrise = String(commonData->sundata.sunriseHour) + ":" + String(commonData->sundata.sunriseMinute + 100).substring(1);
-            svalue5old = sunrise;
-        } else if (simulation) {
-            sunrise = String("06:42");
-        }
-
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 65);
-        if(holdvalues == false) getdisplay().print(sunrise); // Value
-        else getdisplay().print(svalue5old);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 95);
-        getdisplay().print("SunR");                          // Name
-
-        // Horizintal separator right
-        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
-
-        // Show values sunset
-        String sunset = "---";
-        if ((valid1 and valid2 and valid3 == true) or (homevalid and commonData->data.rtcValid)) {
-            sunset = String(commonData->sundata.sunsetHour) + ":" +  String(commonData->sundata.sunsetMinute + 100).substring(1);
-            svalue6old = sunset;
-        } else if (simulation) {
-            sunset = String("21:03");
-        }
-
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 250);
-        if(holdvalues == false) getdisplay().print(sunset);  // Value
-        else getdisplay().print(svalue6old);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 220);
-        getdisplay().print("SunS");                          // Name
-
-//*******************************************************************************************
-
-        // Draw clock
-        int rInstrument = 110;     // Radius of clock
-        float pi = 3.141592;
-
-        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
-
-        for(int i=0; i<360; i=i+1)
-        {
-            // Scaling values
-            float x = 200 + (rInstrument-30)*sin(i/180.0*pi);  //  x-coordinate dots
-            float y = 150 - (rInstrument-30)*cos(i/180.0*pi);  //  y-coordinate cots 
-            const char *ii = "";
-            switch (i)
-            {
-            case 0: ii="12"; break;
-            case 30 : ii=""; break;
-            case 60 : ii=""; break;
-            case 90 : ii="3"; break;
-            case 120 : ii=""; break;
-            case 150 : ii=""; break;
-            case 180 : ii="6"; break;
-            case 210 : ii=""; break;
-            case 240 : ii=""; break;
-            case 270 : ii="9"; break;
-            case 300 : ii=""; break;
-            case 330 : ii=""; break;
-            default: break;
-            }
-
-            // Print text centered on position x, y
-            int16_t x1, y1;     // Return values of getTextBounds
-            uint16_t w, h;      // Return values of getTextBounds
-            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            getdisplay().setCursor(x-w/2, y+h/2);
-            if(i % 30 == 0){
-                getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                getdisplay().print(ii);
-            }
-
-            // Draw sub scale with dots
-            float sinx = 0;
-            float cosx = 0;
-             if(i % 6 == 0){
-                float x1c = 200 + rInstrument*sin(i/180.0*pi);
-                float y1c = 150 - rInstrument*cos(i/180.0*pi);
-                getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
-                sinx=sin(i/180.0*pi);
-                cosx=cos(i/180.0*pi);
-             }
-
-            // Draw sub scale with lines (two triangles)
-            if(i % 30 == 0){
-                float dx=2;   // Line thickness = 2*dx+1
-                float xx1 = -dx;
-                float xx2 = +dx;
-                float yy1 =  -(rInstrument-10);
-                float yy2 =  -(rInstrument+10);
-                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
-                        200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
-                        200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
-                        200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),
-                        200+(int)(cosx*xx2-sinx*yy2),150+(int)(sinx*xx2+cosx*yy2),commonData->fgcolor);
-            }
-        }
-
-        // Print Unit in clock
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(175, 110);
-        if(holdvalues == false){
-            getdisplay().print(tz == 'L' ? "LOT" : "UTC");
-        }
-        else{
-            getdisplay().print(unit2old); // date unit
-        }
-
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(185, 190);
-        if (source == 'G') {
-            getdisplay().print("GPS");
-        } else {
-            getdisplay().print("RTC");
-        }
-
-        // Clock values
-        double hour = 0;
-        double minute = 0;
-        if (source == 'R') {
-            if (tz == 'L') {
-                time_t tv = mktime(&commonData->data.rtcTime) + timezone * 3600;
-                struct tm *local_tm = localtime(&tv);
-                minute = local_tm->tm_min;
-                hour = local_tm->tm_hour;
-            } else {
-                minute = commonData->data.rtcTime.tm_min;
-                hour = commonData->data.rtcTime.tm_hour;
-            }
-            hour += minute / 60;
-        } else {
-            if (tz == 'L') {
-                value1 += timezone * 3600;
-            }
-            if (value1 > 86400) {value1 -= 86400;}
-            if (value1 < 0) {value1 += 86400;}
-            hour = (value1 / 3600.0);
-    //        minute = (hour - int(hour)) * 3600.0 / 60.0;        // Analog minute pointer smooth moving
-            minute = int((hour - int(hour)) * 3600.0 / 60.0);   // Jumping minute pointer from minute to minute
-        }
-        if (hour > 12) {
-            hour -= 12.0;
-        }
-        LOG_DEBUG(GwLog::DEBUG,"... PageClock, value1: %f hour: %f minute:%f", value1, hour, minute);
-
-        // Draw hour pointer
-        float startwidth = 8;       // Start width of pointer
-        if(valid1 == true || (source == 'R' && commonData->data.rtcValid) || holdvalues == true || simulation == true){
-            float sinx=sin(hour * 30.0 * pi / 180);     // Hour
-            float cosx=cos(hour * 30.0 * pi / 180);
-            // Normal pointer
-            // Pointer as triangle with center base 2*width
-            float xx1 = -startwidth;
-            float xx2 = startwidth;
-            float yy1 = -startwidth;
-            float yy2 = -(rInstrument * 0.5);
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
-                200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
-                200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
-            // Inverted pointer
-            // Pointer as triangle with center base 2*width
-            float endwidth = 2;         // End width of pointer
-            float ix1 = endwidth;
-            float ix2 = -endwidth;
-            float iy1 = -(rInstrument * 0.5);
-            float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
-                200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
-                200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
-        }
-
-        // Draw minute pointer
-        startwidth = 8;       // Start width of pointer
-        if(valid1 == true || (source == 'R' && commonData->data.rtcValid) || holdvalues == true || simulation == true){
-            float sinx=sin(minute * 6.0 * pi / 180);     // Minute
-            float cosx=cos(minute * 6.0 * pi / 180);
-            // Normal pointer
-            // Pointer as triangle with center base 2*width
-            float xx1 = -startwidth;
-            float xx2 = startwidth;
-            float yy1 = -startwidth;
-            float yy2 = -(rInstrument - 15);
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
-                200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
-                200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
-            // Inverted pointer
-            // Pointer as triangle with center base 2*width
-            float endwidth = 2;         // End width of pointer
-            float ix1 = endwidth;
-            float ix2 = -endwidth;
-            float iy1 = -(rInstrument - 15);
-            float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
-                200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
-                200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
-        }
-
-        // Center circle
-        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
-
-        return PAGE_UPDATE;
-    };
-};
-
-static Page *createPage(CommonData &common){
-    return new PageClock(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 (0 here)
- * and will will provide the names of the fixed values we need
- */
-PageDescription registerPageClock(
-    "Clock",            // Page name
-    createPage,         // Action
-    0,                  // Number of bus values depends on selection in Web configuration
-    {"GPST", "GPSD", "HDOP"},   // Bus values we need in the page
-    true                // Show display header on/off
-);
-
-#endif

lib/obp60task/PageClock2.new

@@ -1,548 +0,0 @@
-#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
-
-#include "Pagedata.h"
-#include "OBP60Extensions.h"
-
-/*
- * Variant of PageClock with switchable analog / digital clock display.
- * mode: (A)nalog | (D)igital | race (T)imer (T not implemented yet, falls back to analog)
- */
-
-class PageClock2 : public Page
-{
-    bool simulation = false;
-    int simtime;
-    bool keylock = false;
-#ifdef BOARD_OBP60S3
-    char source = 'G'; // time source (R)TC | (G)PS | (N)TP
-#endif
-#ifdef BOARD_OBP40S3
-    char source = 'R'; // time source (R)TC | (G)PS | (N)TP
-#endif
-    char mode = 'A';   // display mode (A)nalog | (D)igital | race (T)imer
-    char tz = 'L';     // time zone (L)ocal | (U)TC
-    double timezone = 0; // there are timezones with non int offsets, e.g. 5.5 or 5.75
-    double homelat;
-    double homelon;
-    bool homevalid = false; // homelat and homelon are valid
-
-public:
-    PageClock2(CommonData& common)
-    {
-        commonData = &common;
-        common.logger->logDebug(GwLog::LOG, "Instantiate PageClock2");
-        simulation = common.config->getBool(common.config->useSimuData);
-        timezone = common.config->getString(common.config->timeZone).toDouble();
-        homelat = common.config->getString(common.config->homeLAT).toDouble();
-        homelon = common.config->getString(common.config->homeLON).toDouble();
-        homevalid = homelat >= -180.0 and homelat <= 180 and homelon >= -90.0 and homelon <= 90.0;
-        simtime = 38160; // time value 11:36
-    }
-
-    virtual void setupKeys()
-    {
-        Page::setupKeys();
-        commonData->keydata[0].label = "SRC";
-        commonData->keydata[1].label = "MODE";
-        commonData->keydata[4].label = "TZ";
-    }
-
-    // Key functions
-    virtual int handleKey(int key)
-    {
-        // Time source
-        if (key == 1) {
-            switch (source) {
-            case 'G':
-                source = 'R';
-                break;
-            case 'R':
-                source = 'G';
-                break;
-            default:
-                source = 'G';
-                break;
-            }
-            return 0;
-        }
-        if (key == 2) {
-            switch (mode) {
-            case 'A':
-                mode = 'D';
-                break;
-            case 'D':
-                mode = 'T';
-                break;
-            case 'T':
-                mode = 'A';
-                break;
-            default:
-                mode = 'A';
-                break;
-            }
-            return 0;
-        }
-        // Time zone: Local / UTC
-        if (key == 5) {
-            switch (tz) {
-            case 'L':
-                tz = 'U';
-                break;
-            case 'U':
-                tz = 'L';
-                break;
-            default:
-                tz = 'L';
-                break;
-            }
-            return 0;
-        }
-
-        // Keylock function
-        if (key == 11) {          // Code for keylock
-            keylock = !keylock;   // Toggle keylock
-            return 0;             // Commit the key
-        }
-        return key;
-    }
-
-    int displayPage(PageData& pageData)
-    {
-        GwConfigHandler* config = commonData->config;
-
-        static String svalue1old = "";
-        static String unit1old = "";
-        static String svalue2old = "";
-        static String unit2old = "";
-        static String svalue3old = "";
-        static String unit3old = "";
-
-        static String svalue5old = "";
-        static String svalue6old = "";
-
-        double value1 = 0;
-        double value2 = 0;
-        double value3 = 0;
-
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        String dateformat = config->getString(config->dateFormat);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-
-        // Get boat values for GPS time
-        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
-        if (simulation == false) {
-            value1 = bvalue1->value;                    // Value as double in SI unit
-        } else {
-            value1 = simtime++;                         // Simulation data for time value 11:36 in seconds
-        }                                               // Other simulation data see OBP60Formatter.cpp
-        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
-        if (valid1 == true) {
-            svalue1old = svalue1;                       // Save old value
-            unit1old = unit1;                           // Save old unit
-        }
-
-        // Get boat values for GPS date
-        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
-        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
-        if (valid2 == true) {
-            svalue2old = svalue2;                       // Save old value
-            unit2old = unit2;                           // Save old unit
-        }
-
-        // Get boat values for HDOP date
-        GwApi::BoatValue* bvalue3 = pageData.values[2]; // Third 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
-        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
-        if (valid3 == true) {
-            svalue3old = svalue3;                       // Save old value
-            unit3old = unit3;                           // Save old unit
-        }
-
-        // Optical warning by limit violation (unused)
-        if (String(flashLED) == "Limit Violation") {
-            setBlinkingLED(false);
-            setFlashLED(false);
-        }
-
-        // Logging boat values
-        if (bvalue1 == NULL)
-            return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG, "Drawing at PageClock2, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
-
-        // Draw page
-        //***********************************************************
-
-        // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-
-        getdisplay().setTextColor(commonData->fgcolor);
-
-        time_t tv = mktime(&commonData->data.rtcTime) + timezone * 3600;
-        struct tm* local_tm = localtime(&tv);
-
-        // Show values GPS date
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 65);
-        if (holdvalues == false) {
-            if (source == 'G') {
-                // GPS value
-                getdisplay().print(svalue2);
-            } else if (commonData->data.rtcValid) {
-                // RTC value
-                if (tz == 'L') {
-                    getdisplay().print(formatDate(dateformat, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
-                } else {
-                    getdisplay().print(formatDate(dateformat, commonData->data.rtcTime.tm_year + 1900, commonData->data.rtcTime.tm_mon + 1, commonData->data.rtcTime.tm_mday));
-                }
-            } else {
-                getdisplay().print("---");
-            }
-        } else {
-            getdisplay().print(svalue2old);
-        }
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 95);
-        getdisplay().print("Date");                          // Name
-
-        // Horizintal separator left
-        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
-
-        // Show values GPS time (small text bottom left, same as original)
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 250);
-        if (holdvalues == false) {
-            if (source == 'G') {
-                getdisplay().print(svalue1); // Value
-            } else if (commonData->data.rtcValid) {
-                if (tz == 'L') {
-                    getdisplay().print(formatTime('s', local_tm->tm_hour, local_tm->tm_min, local_tm->tm_sec));
-                } else {
-                    getdisplay().print(formatTime('s', commonData->data.rtcTime.tm_hour, commonData->data.rtcTime.tm_min, commonData->data.rtcTime.tm_sec));
-                }
-            } else {
-                getdisplay().print("---");
-            }
-        } else {
-            getdisplay().print(svalue1old);
-        }
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 220);
-        getdisplay().print("Time");                          // Name
-
-        // Show values sunrise
-        String sunrise = "---";
-        if ((valid1 and valid2 and valid3 == true) or (homevalid and commonData->data.rtcValid)) {
-            sunrise = String(commonData->sundata.sunriseHour) + ":" + String(commonData->sundata.sunriseMinute + 100).substring(1);
-            svalue5old = sunrise;
-        } else if (simulation) {
-            sunrise = String("06:42");
-        }
-
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 65);
-        if (holdvalues == false)
-            getdisplay().print(sunrise); // Value
-        else
-            getdisplay().print(svalue5old);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 95);
-        getdisplay().print("SunR");                          // Name
-
-        // Horizintal separator right
-        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
-
-        // Show values sunset
-        String sunset = "---";
-        if ((valid1 and valid2 and valid3 == true) or (homevalid and commonData->data.rtcValid)) {
-            sunset = String(commonData->sundata.sunsetHour) + ":" + String(commonData->sundata.sunsetMinute + 100).substring(1);
-            svalue6old = sunset;
-        } else if (simulation) {
-            sunset = String("21:03");
-        }
-
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 250);
-        if (holdvalues == false)
-            getdisplay().print(sunset);  // Value
-        else
-            getdisplay().print(svalue6old);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 220);
-        getdisplay().print("SunS");                          // Name
-
-        //*******************************************************************************************
-
-        if (mode == 'D') {
-            // Digital clock mode: large 7-segment time centered on display
-
-            // Determine current time in hours/minutes/seconds (24h)
-            int hour24 = 0;
-            int minute24 = 0;
-            int second24 = 0;
-
-            if (source == 'R' && commonData->data.rtcValid) {
-                // RTC based
-                time_t tv2 = mktime(&commonData->data.rtcTime);
-                if (tz == 'L') {
-                    tv2 += static_cast<time_t>(timezone * 3600);
-                }
-                struct tm* tm2 = localtime(&tv2);
-                hour24 = tm2->tm_hour;
-                minute24 = tm2->tm_min;
-                second24 = tm2->tm_sec;
-            } else {
-                // GPS / simulation based
-                double t = value1;
-                if (tz == 'L') {
-                    t += timezone * 3600;
-                }
-                if (t >= 86400)
-                    t -= 86400;
-                if (t < 0)
-                    t += 86400;
-                hour24 = static_cast<int>(t / 3600.0);
-                int rest = static_cast<int>(t) - hour24 * 3600;
-                minute24 = rest / 60;
-                second24 = rest % 60;
-            }
-
-            char buf[9]; // "HH:MM:SS" + '\0'
-            snprintf(buf, sizeof(buf), "%02d:%02d:%02d", hour24, minute24, second24);
-            String timeStr = String(buf);
-
-            // Clear central area and draw large digital time
-            getdisplay().fillRect(0, 110, getdisplay().width(), 80, commonData->bgcolor);
-
-            getdisplay().setFont(&DSEG7Classic_BoldItalic60pt7b);
-
-            int16_t x1b, y1b;
-            uint16_t wb, hb;
-            getdisplay().getTextBounds(timeStr, 0, 0, &x1b, &y1b, &wb, &hb);
-
-            int16_t x = (static_cast<int16_t>(getdisplay().width()) - static_cast<int16_t>(wb)) / 2;
-            int16_t y = 150 + hb / 2; // vertically around center (y=150)
-
-            getdisplay().setCursor(x, y);
-            getdisplay().print(timeStr);
-
-            // Small indicators inside the digital area
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(180, 110);
-            if (holdvalues == false) {
-                getdisplay().print(tz == 'L' ? "LOT" : "UTC");
-            } else {
-                getdisplay().print(unit2old); // date unit
-            }
-
-            getdisplay().setCursor(185, 190);
-            if (source == 'G') {
-                getdisplay().print("GPS");
-            } else {
-                getdisplay().print("RTC");
-            }
-
-        } else {
-            // Analog clock mode (A/T) - original drawing
-
-            int rInstrument = 110;     // Radius of clock
-            float pi = 3.141592;
-
-            getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-            getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
-
-            for (int i = 0; i < 360; i = i + 1)
-            {
-                // Scaling values
-                float x = 200 + (rInstrument - 30) * sin(i / 180.0 * pi);  //  x-coordinate dots
-                float y = 150 - (rInstrument - 30) * cos(i / 180.0 * pi);  //  y-coordinate dots
-                const char* ii = "";
-                switch (i)
-                {
-                case 0: ii = "12"; break;
-                case 90: ii = "3"; break;
-                case 180: ii = "6"; break;
-                case 270: ii = "9"; break;
-                default: break;
-                }
-
-                // Print text centered on position x, y
-                int16_t x1c, y1c;     // Return values of getTextBounds
-                uint16_t wc, hc;      // Return values of getTextBounds
-                getdisplay().getTextBounds(ii, int(x), int(y), &x1c, &y1c, &wc, &hc); // Calc width of new string
-                getdisplay().setCursor(x - wc / 2, y + hc / 2);
-                if (i % 90 == 0) {
-                    getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                    getdisplay().print(ii);
-                }
-
-                // Draw sub scale with dots
-                float sinx = 0;
-                float cosx = 0;
-                if (i % 6 == 0) {
-                    float x1d = 200 + rInstrument * sin(i / 180.0 * pi);
-                    float y1d = 150 - rInstrument * cos(i / 180.0 * pi);
-                    getdisplay().fillCircle((int)x1d, (int)y1d, 2, commonData->fgcolor);
-                    sinx = sin(i / 180.0 * pi);
-                    cosx = cos(i / 180.0 * pi);
-                }
-
-                // Draw sub scale with lines (two triangles)
-                if (i % 30 == 0) {
-                    float dx = 2;   // Line thickness = 2*dx+1
-                    float xx1 = -dx;
-                    float xx2 = +dx;
-                    float yy1 = -(rInstrument - 10);
-                    float yy2 = -(rInstrument + 10);
-                    getdisplay().fillTriangle(200 + (int)(cosx * xx1 - sinx * yy1), 150 + (int)(sinx * xx1 + cosx * yy1),
-                        200 + (int)(cosx * xx2 - sinx * yy1), 150 + (int)(sinx * xx2 + cosx * yy1),
-                        200 + (int)(cosx * xx1 - sinx * yy2), 150 + (int)(sinx * xx1 + cosx * yy2), commonData->fgcolor);
-                    getdisplay().fillTriangle(200 + (int)(cosx * xx2 - sinx * yy1), 150 + (int)(sinx * xx2 + cosx * yy1),
-                        200 + (int)(cosx * xx1 - sinx * yy2), 150 + (int)(sinx * xx1 + cosx * yy2),
-                        200 + (int)(cosx * xx2 - sinx * yy2), 150 + (int)(sinx * xx2 + cosx * yy2), commonData->fgcolor);
-                }
-            }
-
-            // Print Unit in clock
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(175, 110);
-            if (holdvalues == false) {
-                getdisplay().print(tz == 'L' ? "LOT" : "UTC");
-            } else {
-                getdisplay().print(unit2old); // date unit
-            }
-
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(185, 190);
-            if (source == 'G') {
-                getdisplay().print("GPS");
-            } else {
-                getdisplay().print("RTC");
-            }
-
-            // Clock values
-            double hour = 0;
-            double minute = 0;
-            if (source == 'R') {
-                if (tz == 'L') {
-                    time_t tv2 = mktime(&commonData->data.rtcTime) + timezone * 3600;
-                    struct tm* local_tm2 = localtime(&tv2);
-                    minute = local_tm2->tm_min;
-                    hour = local_tm2->tm_hour;
-                } else {
-                    minute = commonData->data.rtcTime.tm_min;
-                    hour = commonData->data.rtcTime.tm_hour;
-                }
-                hour += minute / 60;
-            } else {
-                if (tz == 'L') {
-                    value1 += timezone * 3600;
-                }
-                if (value1 > 86400) { value1 -= 86400; }
-                if (value1 < 0) { value1 += 86400; }
-                hour = (value1 / 3600.0);
-                // minute = (hour - int(hour)) * 3600.0 / 60.0;        // Analog minute pointer smooth moving
-                minute = int((hour - int(hour)) * 3600.0 / 60.0);   // Jumping minute pointer from minute to minute
-            }
-            if (hour > 12) {
-                hour -= 12.0;
-            }
-            LOG_DEBUG(GwLog::DEBUG, "... PageClock2, value1: %f hour: %f minute:%f", value1, hour, minute);
-
-            // Draw hour pointer
-            float startwidth = 8;       // Start width of pointer
-            if (valid1 == true || (source == 'R' && commonData->data.rtcValid) || holdvalues == true || simulation == true) {
-                float sinx = sin(hour * 30.0 * pi / 180);     // Hour
-                float cosx = cos(hour * 30.0 * pi / 180);
-                // Normal pointer
-                // Pointer as triangle with center base 2*width
-                float xx1 = -startwidth;
-                float xx2 = startwidth;
-                float yy1 = -startwidth;
-                float yy2 = -(rInstrument * 0.5);
-                getdisplay().fillTriangle(200 + (int)(cosx * xx1 - sinx * yy1), 150 + (int)(sinx * xx1 + cosx * yy1),
-                    200 + (int)(cosx * xx2 - sinx * yy1), 150 + (int)(sinx * xx2 + cosx * yy1),
-                    200 + (int)(cosx * 0 - sinx * yy2), 150 + (int)(sinx * 0 + cosx * yy2), commonData->fgcolor);
-                // Inverted pointer
-                // Pointer as triangle with center base 2*width
-                float endwidth = 2;         // End width of pointer
-                float ix1 = endwidth;
-                float ix2 = -endwidth;
-                float iy1 = -(rInstrument * 0.5);
-                float iy2 = -endwidth;
-                getdisplay().fillTriangle(200 + (int)(cosx * ix1 - sinx * iy1), 150 + (int)(sinx * ix1 + cosx * iy1),
-                    200 + (int)(cosx * ix2 - sinx * iy1), 150 + (int)(sinx * ix2 + cosx * iy1),
-                    200 + (int)(cosx * 0 - sinx * iy2), 150 + (int)(sinx * 0 + cosx * iy2), commonData->fgcolor);
-            }
-
-            // Draw minute pointer
-            startwidth = 8;       // Start width of pointer
-            if (valid1 == true || (source == 'R' && commonData->data.rtcValid) || holdvalues == true || simulation == true) {
-                float sinx = sin(minute * 6.0 * pi / 180);     // Minute
-                float cosx = cos(minute * 6.0 * pi / 180);
-                // Normal pointer
-                // Pointer as triangle with center base 2*width
-                float xx1 = -startwidth;
-                float xx2 = startwidth;
-                float yy1 = -startwidth;
-                float yy2 = -(rInstrument - 15);
-                getdisplay().fillTriangle(200 + (int)(cosx * xx1 - sinx * yy1), 150 + (int)(sinx * xx1 + cosx * yy1),
-                    200 + (int)(cosx * xx2 - sinx * yy1), 150 + (int)(sinx * xx2 + cosx * yy1),
-                    200 + (int)(cosx * 0 - sinx * yy2), 150 + (int)(sinx * 0 + cosx * yy2), commonData->fgcolor);
-                // Inverted pointer
-                // Pointer as triangle with center base 2*width
-                float endwidth = 2;         // End width of pointer
-                float ix1 = endwidth;
-                float ix2 = -endwidth;
-                float iy1 = -(rInstrument - 15);
-                float iy2 = -endwidth;
-                getdisplay().fillTriangle(200 + (int)(cosx * ix1 - sinx * iy1), 150 + (int)(sinx * ix1 + cosx * iy1),
-                    200 + (int)(cosx * ix2 - sinx * iy1), 150 + (int)(sinx * ix2 + cosx * iy1),
-                    200 + (int)(cosx * 0 - sinx * iy2), 150 + (int)(sinx * 0 + cosx * iy2), commonData->fgcolor);
-            }
-
-            // Center circle
-            getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-            getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
-        }
-
-        return PAGE_UPDATE;
-    };
-};
-
-static Page* createPage(CommonData& common)
-{
-    return new PageClock2(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
- * we provide the number of user parameters we expect (0 here)
- * and we provide the names of the fixed values we need
- */
-PageDescription registerPageClock2(
-    "Clock2",            // Page name
-    createPage,         // Action
-    0,                  // Number of bus values depends on selection in Web configuration
-    {"GPST", "GPSD", "HDOP"},   // Bus values we need in the page
-    true                // Show display header on/off
-);
-
-#endif
-

lib/obp60task/PageClock3.new

@@ -1,777 +0,0 @@
-#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
-
-#include "Pagedata.h"
-#include "OBP60Extensions.h"
-
-/*
- * PageClock3: Clock page with
- *  - Analog mode  (mode == 'A')
- *  - Digital mode (mode == 'D')
- *  - Countdown timer mode (mode == 'T')
- *
- * Timer mode:
- *  - Format HH:MM:SS (24h, leading zeros)
- *  - Keys in timer mode:
- *      K1: MODE (A/D/T)
- *      K2: POS  (select field: HH / MM / SS)
- *      K3: +    (increment selected field)
- *      K4: -    (decrement selected field)
- *      K5: RUN  (start/stop countdown)
- *  - Selection marker: line under active field (width 2px, not wider than digits)
- *  - Editing only possible when timer is not running
- *  - When page is left, running timer continues in background using RTC time
- *    (on re-entry, remaining time is recalculated from RTC)
- */
-
-class PageClock3 : public Page
-{
-    bool simulation = false;
-    int simtime;
-    bool keylock = false;
-#ifdef BOARD_OBP60S3
-    char source = 'G';  // time source (R)TC | (G)PS | (N)TP
-#endif
-#ifdef BOARD_OBP40S3
-    char source = 'R';  // time source (R)TC | (G)PS | (N)TP
-#endif
-    char mode = 'A';    // display mode (A)nalog | (D)igital | race (T)imer
-    char tz = 'L';      // time zone (L)ocal | (U)TC
-    double timezone = 0; // there are timezones with non int offsets, e.g. 5.5 or 5.75
-    double homelat;
-    double homelon;
-    bool homevalid = false; // homelat and homelon are valid
-
-    // Timer state (static so it survives page switches)
-    static bool timerInitialized;
-    static bool timerRunning;
-    static int timerHours;
-    static int timerMinutes;
-    static int timerSeconds;
-    static int selectedField;       // 0 = hours, 1 = minutes, 2 = seconds
-    static bool showSelectionMarker;
-    static time_t timerEndEpoch;    // absolute end time based on RTC
-
-    void setupTimerDefaults()
-    {
-        if (!timerInitialized) {
-            timerInitialized = true;
-            timerRunning = false;
-            timerHours = 0;
-            timerMinutes = 0;
-            timerSeconds = 0;
-            selectedField = 0;
-            showSelectionMarker = true;
-            timerEndEpoch = 0;
-        }
-    }
-
-    static int clamp(int value, int minVal, int maxVal)
-    {
-        if (value < minVal) return minVal;
-        if (value > maxVal) return maxVal;
-        return value;
-    }
-
-    void incrementSelected()
-    {
-        if (selectedField == 0) {
-            timerHours = clamp(timerHours + 1, 0, 23);
-        } else if (selectedField == 1) {
-            timerMinutes = clamp(timerMinutes + 1, 0, 59);
-        } else {
-            timerSeconds = clamp(timerSeconds + 1, 0, 59);
-        }
-    }
-
-    void decrementSelected()
-    {
-        if (selectedField == 0) {
-            timerHours = clamp(timerHours - 1, 0, 23);
-        } else if (selectedField == 1) {
-            timerMinutes = clamp(timerMinutes - 1, 0, 59);
-        } else {
-            timerSeconds = clamp(timerSeconds - 1, 0, 59);
-        }
-    }
-
-    int totalTimerSeconds() const
-    {
-        return timerHours * 3600 + timerMinutes * 60 + timerSeconds;
-    }
-
-public:
-    PageClock3(CommonData& common)
-    {
-        commonData = &common;
-        common.logger->logDebug(GwLog::LOG, "Instantiate PageClock3");
-        simulation = common.config->getBool(common.config->useSimuData);
-        timezone = common.config->getString(common.config->timeZone).toDouble();
-        homelat = common.config->getString(common.config->homeLAT).toDouble();
-        homelon = common.config->getString(common.config->homeLON).toDouble();
-        homevalid = homelat >= -180.0 and homelat <= 180 and homelon >= -90.0 and homelon <= 90.0;
-        simtime = 38160; // time value 11:36
-        setupTimerDefaults();
-    }
-
-    virtual void setupKeys()
-    {
-        Page::setupKeys();
-
-        if (mode == 'T') {
-            // Timer mode: MODE, POS, +, -, RUN
-            commonData->keydata[0].label = "MODE";
-            commonData->keydata[1].label = "POS";
-            commonData->keydata[2].label = "+";
-            commonData->keydata[3].label = "-";
-            commonData->keydata[4].label = "RUN";
-        } else {
-            // Clock modes: like original
-            commonData->keydata[0].label = "SRC";
-            commonData->keydata[1].label = "MODE";
-            commonData->keydata[4].label = "TZ";
-        }
-    }
-
-    // Key functions
-    virtual int handleKey(int key)
-    {
-        setupTimerDefaults();
-
-        // Keylock function
-        if (key == 11) {              // Code for keylock
-            keylock = !keylock;       // Toggle keylock
-            return 0;                 // Commit the key
-        }
-
-        if (mode == 'T') {
-            // Timer mode key handling
-
-            // MODE (K1): cycle display mode A/D/T
-            if (key == 1) {
-                switch (mode) {
-                case 'A': mode = 'D'; break;
-                case 'D': mode = 'T'; break;
-                case 'T': mode = 'A'; break;
-                default:  mode = 'A'; break;
-                }
-                setupKeys();
-                return 0;
-            }
-
-            // POS (K2): select field HH / MM / SS (only if timer not running)
-            if (key == 2 && !timerRunning) {
-                selectedField = (selectedField + 1) % 3;
-                showSelectionMarker = true;
-                return 0;
-            }
-
-            // + (K3): increment selected field (only if timer not running)
-            if (key == 3 && !timerRunning) {
-                incrementSelected();
-                return 0;
-            }
-
-            // - (K4): decrement selected field (only if timer not running)
-            if (key == 4 && !timerRunning) {
-                decrementSelected();
-                return 0;
-            }
-
-            // RUN (K5): start/stop timer
-            if (key == 5) {
-                if (!timerRunning) {
-                    // Start timer if a non-zero duration is set
-                    int total = totalTimerSeconds();
-                    if (total > 0 && commonData->data.rtcValid) {
-                        struct tm rtcCopy = commonData->data.rtcTime;
-                        time_t nowEpoch = mktime(&rtcCopy);
-                        timerEndEpoch = nowEpoch + total;
-                        timerRunning = true;
-                        showSelectionMarker = false;
-                    }
-                } else {
-                    // Stop timer: compute remaining time and keep as new setting
-                    if (commonData->data.rtcValid) {
-                        struct tm rtcCopy = commonData->data.rtcTime;
-                        time_t nowEpoch = mktime(&rtcCopy);
-                        time_t remaining = timerEndEpoch - nowEpoch;
-                        if (remaining < 0) remaining = 0;
-                        int rem = static_cast<int>(remaining);
-                        timerHours = rem / 3600;
-                        rem -= timerHours * 3600;
-                        timerMinutes = rem / 60;
-                        timerSeconds = rem % 60;
-                    }
-                    timerRunning = false;
-                    // marker will become visible again only after POS press
-                }
-                return 0;
-            }
-
-            // In timer mode, other keys are passed through
-            return key;
-        }
-
-        // Clock (A/D) modes key handling – like original PageClock
-
-        // Time source (K1)
-        if (key == 1) {
-            switch (source) {
-            case 'G': source = 'R'; break;
-            case 'R': source = 'G'; break;
-            default:  source = 'G'; break;
-            }
-            return 0;
-        }
-
-        // MODE (K2)
-        if (key == 2) {
-            switch (mode) {
-            case 'A': mode = 'D'; break;
-            case 'D': mode = 'T'; break;
-            case 'T': mode = 'A'; break;
-            default:  mode = 'A'; break;
-            }
-            setupKeys();
-            return 0;
-        }
-
-        // Time zone: Local / UTC (K5)
-        if (key == 5) {
-            switch (tz) {
-            case 'L': tz = 'U'; break;
-            case 'U': tz = 'L'; break;
-            default:  tz = 'L'; break;
-            }
-            return 0;
-        }
-
-        return key;
-    }
-
-    int displayPage(PageData& pageData)
-    {
-        GwConfigHandler* config = commonData->config;
-        GwLog* logger = commonData->logger;
-
-        setupTimerDefaults();
-        setupKeys(); // ensure correct key labels for current mode
-
-        static String svalue1old = "";
-        static String unit1old = "";
-        static String svalue2old = "";
-        static String unit2old = "";
-        static String svalue3old = "";
-        static String unit3old = "";
-
-        static String svalue5old = "";
-        static String svalue6old = "";
-
-        double value1 = 0;
-        double value2 = 0;
-        double value3 = 0;
-
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        String dateformat = config->getString(config->dateFormat);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-
-        // Get boat values for GPS time
-        GwApi::BoatValue* bvalue1 = pageData.values[0]; // First element in list
-        String name1 = bvalue1->getName().c_str();      // Value name
-        name1 = name1.substring(0, 6);                  // String length limit for value name
-        if (simulation == false) {
-            value1 = bvalue1->value;                    // Value as double in SI unit
-        } else {
-            value1 = simtime++;                         // Simulation data for time value 11:36 in seconds
-        }                                               // Other simulation data see OBP60Formatter.cpp
-        bool valid1 = bvalue1->valid;                   // Valid information
-        String svalue1 = formatValue(bvalue1, *commonData).svalue;    // Formatted value
-        String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
-        if (valid1 == true) {
-            svalue1old = svalue1;                       // Save old value
-            unit1old = unit1;                           // Save old unit
-        }
-
-        // Get boat values for GPS date
-        GwApi::BoatValue* bvalue2 = pageData.values[1]; // Second element in list
-        String name2 = bvalue2->getName().c_str();      // Value name
-        name2 = name2.substring(0, 6);                  // String length limit for value name
-        value2 = bvalue2->value;                        // Value as double in SI unit
-        bool valid2 = bvalue2->valid;                   // Valid information
-        String svalue2 = formatValue(bvalue2, *commonData).svalue;    // Formatted value
-        String unit2 = formatValue(bvalue2, *commonData).unit;        // Unit of value
-        if (valid2 == true) {
-            svalue2old = svalue2;                       // Save old value
-            unit2old = unit2;                           // Save old unit
-        }
-
-        // Get boat values for HDOP
-        GwApi::BoatValue* bvalue3 = pageData.values[2]; // Third element in list
-        String name3 = bvalue3->getName().c_str();      // Value name
-        name3 = name3.substring(0, 6);                  // String length limit for value name
-        value3 = bvalue3->value;                        // Value as double in SI unit
-        bool valid3 = bvalue3->valid;                   // Valid information
-        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value
-        String unit3 = formatValue(bvalue3, *commonData).unit;        // Unit of value
-        if (valid3 == true) {
-            svalue3old = svalue3;                       // Save old value
-            unit3old = unit3;                           // Save old unit
-        }
-
-        // Optical warning by limit violation (unused)
-        if (String(flashLED) == "Limit Violation") {
-            setBlinkingLED(false);
-            setFlashLED(false);
-        }
-
-        // Logging boat values
-        if (bvalue1 == NULL) return PAGE_OK;
-        LOG_DEBUG(GwLog::LOG, "Drawing at PageClock3, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
-
-        // Draw page
-        //***********************************************************
-
-        // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-
-        getdisplay().setTextColor(commonData->fgcolor);
-
-        time_t tv = mktime(&commonData->data.rtcTime) + timezone * 3600;
-        struct tm* local_tm = localtime(&tv);
-
-        // Show values GPS date
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 65);
-        if (holdvalues == false) {
-            if (source == 'G') {
-                // GPS value
-                getdisplay().print(svalue2);
-            } else if (commonData->data.rtcValid) {
-                // RTC value
-                if (tz == 'L') {
-                    getdisplay().print(formatDate(dateformat, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
-                } else {
-                    getdisplay().print(formatDate(dateformat, commonData->data.rtcTime.tm_year + 1900, commonData->data.rtcTime.tm_mon + 1, commonData->data.rtcTime.tm_mday));
-                }
-            } else {
-                getdisplay().print("---");
-            }
-        } else {
-            getdisplay().print(svalue2old);
-        }
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 95);
-        getdisplay().print("Date");                          // Name
-
-        // Horizontal separator left
-        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
-
-        // Show values GPS time (small text bottom left)
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 250);
-        if (holdvalues == false) {
-            if (source == 'G') {
-                getdisplay().print(svalue1); // Value
-            } else if (commonData->data.rtcValid) {
-                if (tz == 'L') {
-                    getdisplay().print(formatTime('s', local_tm->tm_hour, local_tm->tm_min, local_tm->tm_sec));
-                } else {
-                    getdisplay().print(formatTime('s', commonData->data.rtcTime.tm_hour, commonData->data.rtcTime.tm_min, commonData->data.rtcTime.tm_sec));
-                }
-            } else {
-                getdisplay().print("---");
-            }
-        } else {
-            getdisplay().print(svalue1old);
-        }
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 220);
-        getdisplay().print("Time");                          // Name
-
-        // Show values sunrise
-        String sunrise = "---";
-        if ((valid1 and valid2 and valid3 == true) or (homevalid and commonData->data.rtcValid)) {
-            sunrise = String(commonData->sundata.sunriseHour) + ":" + String(commonData->sundata.sunriseMinute + 100).substring(1);
-            svalue5old = sunrise;
-        } else if (simulation) {
-            sunrise = String("06:42");
-        }
-
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 65);
-        if (holdvalues == false) getdisplay().print(sunrise); // Value
-        else getdisplay().print(svalue5old);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 95);
-        getdisplay().print("SunR");                          // Name
-
-        // Horizontal separator right
-        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
-
-        // Show values sunset
-        String sunset = "---";
-        if ((valid1 and valid2 and valid3 == true) or (homevalid and commonData->data.rtcValid)) {
-            sunset = String(commonData->sundata.sunsetHour) + ":" + String(commonData->sundata.sunsetMinute + 100).substring(1);
-            svalue6old = sunset;
-        } else if (simulation) {
-            sunset = String("21:03");
-        }
-
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 250);
-        if (holdvalues == false) getdisplay().print(sunset);  // Value
-        else getdisplay().print(svalue6old);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 220);
-        getdisplay().print("SunS");                          // Name
-
-        //*******************************************************************************************
-
-        if (mode == 'T') {
-            // TIMER MODE: countdown timer HH:MM:SS in the center with 7-segment font
-
-            int dispH = timerHours;
-            int dispM = timerMinutes;
-            int dispS = timerSeconds;
-
-            // Update remaining time if timer is running (based on RTC)
-            if (timerRunning && commonData->data.rtcValid) {
-                struct tm rtcCopy = commonData->data.rtcTime;
-                time_t nowEpoch = mktime(&rtcCopy);
-                time_t remaining = timerEndEpoch - nowEpoch;
-                if (remaining <= 0) {
-                    remaining = 0;
-                    timerRunning = false;
-                }
-                int rem = static_cast<int>(remaining);
-                dispH = rem / 3600;
-                rem -= dispH * 3600;
-                dispM = rem / 60;
-                dispS = rem % 60;
-            }
-
-            char buf[9]; // "HH:MM:SS"
-            snprintf(buf, sizeof(buf), "%02d:%02d:%02d", dispH, dispM, dispS);
-            String timeStr = String(buf);
-
-            // Clear central area and draw large digital time
-            getdisplay().fillRect(0, 110, getdisplay().width(), 80, commonData->bgcolor);
-
-            getdisplay().setFont(&DSEG7Classic_BoldItalic60pt7b);
-
-            // Determine widths for digits and colon to position selection underline exactly
-            int16_t x0, y0;
-            uint16_t wDigit, hDigit;
-            uint16_t wColon, hColon;
-
-            getdisplay().getTextBounds("00", 0, 0, &x0, &y0, &wDigit, &hDigit);
-            getdisplay().getTextBounds(":", 0, 0, &x0, &y0, &wColon, &hColon);
-
-            uint16_t totalWidth = 3 * wDigit + 2 * wColon;
-
-            int16_t baseX = (static_cast<int16_t>(getdisplay().width()) - static_cast<int16_t>(totalWidth)) / 2;
-            int16_t centerY = 150;
-
-            // Draw time string centered
-            int16_t x1b, y1b;
-            uint16_t wb, hb;
-            getdisplay().getTextBounds(timeStr, 0, 0, &x1b, &y1b, &wb, &hb);
-            int16_t textX = (static_cast<int16_t>(getdisplay().width()) - static_cast<int16_t>(wb)) / 2;
-            int16_t textY = centerY + hb / 2;
-
-            getdisplay().setCursor(textX, textY);
-            getdisplay().print(timeStr);
-
-            // Selection marker (only visible when not running and POS pressed)
-            if (!timerRunning && showSelectionMarker) {
-                int16_t selX = baseX;
-                if (selectedField == 1) {
-                    selX = baseX + wDigit + wColon; // minutes start
-                } else if (selectedField == 2) {
-                    selX = baseX + 2 * wDigit + 2 * wColon; // seconds start
-                }
-
-                int16_t underlineY = centerY + hb / 2 + 2;
-                getdisplay().fillRect(selX, underlineY, wDigit, 2, commonData->fgcolor);
-            }
-
-            // Small indicators: timezone and source
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(180, 110);
-            if (holdvalues == false) {
-                getdisplay().print(tz == 'L' ? "LOT" : "UTC");
-            } else {
-                getdisplay().print(unit2old); // date unit
-            }
-
-            getdisplay().setCursor(185, 190);
-            if (source == 'G') {
-                getdisplay().print("GPS");
-            } else {
-                getdisplay().print("RTC");
-            }
-
-        } else if (mode == 'D') {
-            // DIGITAL CLOCK MODE: large 7-segment time based on GPS/RTC
-
-            int hour24 = 0;
-            int minute24 = 0;
-            int second24 = 0;
-
-            if (source == 'R' && commonData->data.rtcValid) {
-                time_t tv2 = mktime(&commonData->data.rtcTime);
-                if (tz == 'L') {
-                    tv2 += static_cast<time_t>(timezone * 3600);
-                }
-                struct tm* tm2 = localtime(&tv2);
-                hour24 = tm2->tm_hour;
-                minute24 = tm2->tm_min;
-                second24 = tm2->tm_sec;
-            } else {
-                double t = value1;
-                if (tz == 'L') {
-                    t += timezone * 3600;
-                }
-                if (t >= 86400) t -= 86400;
-                if (t < 0) t += 86400;
-                hour24 = static_cast<int>(t / 3600.0);
-                int rest = static_cast<int>(t) - hour24 * 3600;
-                minute24 = rest / 60;
-                second24 = rest % 60;
-            }
-
-            char buf[9]; // "HH:MM:SS"
-            snprintf(buf, sizeof(buf), "%02d:%02d:%02d", hour24, minute24, second24);
-            String timeStr = String(buf);
-
-            getdisplay().fillRect(0, 110, getdisplay().width(), 80, commonData->bgcolor);
-
-            getdisplay().setFont(&DSEG7Classic_BoldItalic60pt7b);
-
-            int16_t x1b, y1b;
-            uint16_t wb, hb;
-            getdisplay().getTextBounds(timeStr, 0, 0, &x1b, &y1b, &wb, &hb);
-
-            int16_t x = (static_cast<int16_t>(getdisplay().width()) - static_cast<int16_t>(wb)) / 2;
-            int16_t y = 150 + hb / 2;
-
-            getdisplay().setCursor(x, y);
-            getdisplay().print(timeStr);
-
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(180, 110);
-            if (holdvalues == false) {
-                getdisplay().print(tz == 'L' ? "LOT" : "UTC");
-            } else {
-                getdisplay().print(unit2old); // date unit
-            }
-
-            getdisplay().setCursor(185, 190);
-            if (source == 'G') {
-                getdisplay().print("GPS");
-            } else {
-                getdisplay().print("RTC");
-            }
-
-        } else {
-            // ANALOG CLOCK MODE (mode == 'A')
-
-            int rInstrument = 110;     // Radius of clock
-            float pi = 3.141592;
-
-            getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-            getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
-
-            for (int i = 0; i < 360; i = i + 1)
-            {
-                // Scaling values
-                float x = 200 + (rInstrument - 30) * sin(i / 180.0 * pi);  //  x-coordinate dots
-                float y = 150 - (rInstrument - 30) * cos(i / 180.0 * pi);  //  y-coordinate dots
-                const char* ii = "";
-                switch (i)
-                {
-                case 0: ii = "12"; break;
-                case 90: ii = "3"; break;
-                case 180: ii = "6"; break;
-                case 270: ii = "9"; break;
-                default: break;
-                }
-
-                // Print text centered on position x, y
-                int16_t x1c, y1c;     // Return values of getTextBounds
-                uint16_t wc, hc;      // Return values of getTextBounds
-                getdisplay().getTextBounds(ii, int(x), int(y), &x1c, &y1c, &wc, &hc); // Calc width of new string
-                getdisplay().setCursor(x - wc / 2, y + hc / 2);
-                if (i % 90 == 0) {
-                    getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                    getdisplay().print(ii);
-                }
-
-                // Draw sub scale with dots
-                float sinx = 0;
-                float cosx = 0;
-                if (i % 6 == 0) {
-                    float x1d = 200 + rInstrument * sin(i / 180.0 * pi);
-                    float y1d = 150 - rInstrument * cos(i / 180.0 * pi);
-                    getdisplay().fillCircle((int)x1d, (int)y1d, 2, commonData->fgcolor);
-                    sinx = sin(i / 180.0 * pi);
-                    cosx = cos(i / 180.0 * pi);
-                }
-
-                // Draw sub scale with lines (two triangles)
-                if (i % 30 == 0) {
-                    float dx = 2;   // Line thickness = 2*dx+1
-                    float xx1 = -dx;
-                    float xx2 = +dx;
-                    float yy1 = -(rInstrument - 10);
-                    float yy2 = -(rInstrument + 10);
-                    getdisplay().fillTriangle(200 + (int)(cosx * xx1 - sinx * yy1), 150 + (int)(sinx * xx1 + cosx * yy1),
-                        200 + (int)(cosx * xx2 - sinx * yy1), 150 + (int)(sinx * xx2 + cosx * yy1),
-                        200 + (int)(cosx * xx1 - sinx * yy2), 150 + (int)(sinx * xx1 + cosx * yy2), commonData->fgcolor);
-                    getdisplay().fillTriangle(200 + (int)(cosx * xx2 - sinx * yy1), 150 + (int)(sinx * xx2 + cosx * yy1),
-                        200 + (int)(cosx * xx1 - sinx * yy2), 150 + (int)(sinx * xx1 + cosx * yy2),
-                        200 + (int)(cosx * xx2 - sinx * yy2), 150 + (int)(sinx * xx2 + cosx * yy2), commonData->fgcolor);
-                }
-            }
-
-            // Print Unit in clock
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(175, 110);
-            if (holdvalues == false) {
-                getdisplay().print(tz == 'L' ? "LOT" : "UTC");
-            } else {
-                getdisplay().print(unit2old); // date unit
-            }
-
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(185, 190);
-            if (source == 'G') {
-                getdisplay().print("GPS");
-            } else {
-                getdisplay().print("RTC");
-            }
-
-            // Clock values
-            double hour = 0;
-            double minute = 0;
-            if (source == 'R') {
-                if (tz == 'L') {
-                    time_t tv2 = mktime(&commonData->data.rtcTime) + timezone * 3600;
-                    struct tm* local_tm2 = localtime(&tv2);
-                    minute = local_tm2->tm_min;
-                    hour = local_tm2->tm_hour;
-                } else {
-                    minute = commonData->data.rtcTime.tm_min;
-                    hour = commonData->data.rtcTime.tm_hour;
-                }
-                hour += minute / 60;
-            } else {
-                if (tz == 'L') {
-                    value1 += timezone * 3600;
-                }
-                if (value1 > 86400) { value1 -= 86400; }
-                if (value1 < 0) { value1 += 86400; }
-                hour = (value1 / 3600.0);
-                // minute = (hour - int(hour)) * 3600.0 / 60.0;        // Analog minute pointer smooth moving
-                minute = int((hour - int(hour)) * 3600.0 / 60.0);   // Jumping minute pointer from minute to minute
-            }
-            if (hour > 12) {
-                hour -= 12.0;
-            }
-            LOG_DEBUG(GwLog::DEBUG, "... PageClock3, value1: %f hour: %f minute:%f", value1, hour, minute);
-
-            // Draw hour pointer
-            float startwidth = 8;       // Start width of pointer
-            if (valid1 == true || (source == 'R' && commonData->data.rtcValid) || holdvalues == true || simulation == true) {
-                float sinx = sin(hour * 30.0 * pi / 180);     // Hour
-                float cosx = cos(hour * 30.0 * pi / 180);
-                // Normal pointer
-                // Pointer as triangle with center base 2*width
-                float xx1 = -startwidth;
-                float xx2 = startwidth;
-                float yy1 = -startwidth;
-                float yy2 = -(rInstrument * 0.5);
-                getdisplay().fillTriangle(200 + (int)(cosx * xx1 - sinx * yy1), 150 + (int)(sinx * xx1 + cosx * yy1),
-                    200 + (int)(cosx * xx2 - sinx * yy1), 150 + (int)(sinx * xx2 + cosx * yy1),
-                    200 + (int)(cosx * 0 - sinx * yy2), 150 + (int)(sinx * 0 + cosx * yy2), commonData->fgcolor);
-                // Inverted pointer
-                // Pointer as triangle with center base 2*width
-                float endwidth = 2;         // End width of pointer
-                float ix1 = endwidth;
-                float ix2 = -endwidth;
-                float iy1 = -(rInstrument * 0.5);
-                float iy2 = -endwidth;
-                getdisplay().fillTriangle(200 + (int)(cosx * ix1 - sinx * iy1), 150 + (int)(sinx * ix1 + cosx * iy1),
-                    200 + (int)(cosx * ix2 - sinx * iy1), 150 + (int)(sinx * ix2 + cosx * iy1),
-                    200 + (int)(cosx * 0 - sinx * iy2), 150 + (int)(sinx * 0 + cosx * iy2), commonData->fgcolor);
-            }
-
-            // Draw minute pointer
-            startwidth = 8;       // Start width of pointer
-            if (valid1 == true || (source == 'R' && commonData->data.rtcValid) || holdvalues == true || simulation == true) {
-                float sinx = sin(minute * 6.0 * pi / 180);     // Minute
-                float cosx = cos(minute * 6.0 * pi / 180);
-                // Normal pointer
-                // Pointer as triangle with center base 2*width
-                float xx1 = -startwidth;
-                float xx2 = startwidth;
-                float yy1 = -startwidth;
-                float yy2 = -(rInstrument - 15);
-                getdisplay().fillTriangle(200 + (int)(cosx * xx1 - sinx * yy1), 150 + (int)(sinx * xx1 + cosx * yy1),
-                    200 + (int)(cosx * xx2 - sinx * yy1), 150 + (int)(sinx * xx2 + cosx * yy1),
-                    200 + (int)(cosx * 0 - sinx * yy2), 150 + (int)(sinx * 0 + cosx * yy2), commonData->fgcolor);
-                // Inverted pointer
-                // Pointer as triangle with center base 2*width
-                float endwidth = 2;         // End width of pointer
-                float ix1 = endwidth;
-                float ix2 = -endwidth;
-                float iy1 = -(rInstrument - 15);
-                float iy2 = -endwidth;
-                getdisplay().fillTriangle(200 + (int)(cosx * ix1 - sinx * iy1), 150 + (int)(sinx * ix1 + cosx * iy1),
-                    200 + (int)(cosx * ix2 - sinx * iy1), 150 + (int)(sinx * ix2 + cosx * iy1),
-                    200 + (int)(cosx * 0 - sinx * iy2), 150 + (int)(sinx * 0 + cosx * iy2), commonData->fgcolor);
-            }
-
-            // Center circle
-            getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-            getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
-        }
-
-        return PAGE_UPDATE;
-    };
-};
-
-// Static member definitions
-bool PageClock3::timerInitialized = false;
-bool PageClock3::timerRunning = false;
-int PageClock3::timerHours = 0;
-int PageClock3::timerMinutes = 0;
-int PageClock3::timerSeconds = 0;
-int PageClock3::selectedField = 0;
-bool PageClock3::showSelectionMarker = true;
-time_t PageClock3::timerEndEpoch = 0;
-
-static Page* createPage(CommonData& common)
-{
-    return new PageClock3(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
- * we provide the number of user parameters we expect (0 here)
- * and we provide the names of the fixed values we need
- */
-PageDescription registerPageClock3(
-    "Clock3",            // Page name
-    createPage,          // Action
-    0,                   // Number of bus values depends on selection in Web configuration
-    {"GPST", "GPSD", "HDOP"},   // Bus values we need in the page
-    true                 // Show display header on/off
-);
-
-#endif
-

lib/obp60task/PageClockDigital.new

@@ -1,224 +0,0 @@
-#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
-
-#include "Pagedata.h"
-#include "OBP60Extensions.h"
-
-/**
- * Simple digital clock page.
- *
- * - Shows system time as large digital value in the center
- * - Uses same data sources and configuration as PageClock (GPS / RTC, time zone)
- * - Keys:
- *   K1: toggle time source (GPS / RTC)
- *   K5: toggle time zone (Local / UTC)
- *   K11: keylock
- */
-class PageClockDigital : public Page
-{
-    bool simulation = false;
-    int simtime = 0;
-    char source;      // time source (R)TC | (G)PS
-    char tz = 'L';    // time zone (L)ocal | (U)TC
-    double timezone = 0.0;
-
-public:
-    PageClockDigital(CommonData& common)
-    {
-        commonData = &common;
-        common.logger->logDebug(GwLog::LOG, "Instantiate PageClockDigital");
-
-        simulation = common.config->getBool(common.config->useSimuData);
-        timezone = common.config->getString(common.config->timeZone).toDouble();
-
-#ifdef BOARD_OBP60S3
-        source = 'G'; // default to GPS time on OBP60
-#endif
-#ifdef BOARD_OBP40S3
-        source = 'R'; // default to RTC time on OBP40
-#endif
-        simtime = 38160; // time value 11:36 for simulation (seconds)
-    }
-
-    virtual void setupKeys()
-    {
-        Page::setupKeys();
-        commonData->keydata[0].label = "SRC";
-        commonData->keydata[4].label = "TZ";
-    }
-
-    // Key functions
-    virtual int handleKey(int key)
-    {
-        // Time source
-        if (key == 1) {
-            switch (source) {
-            case 'G':
-                source = 'R';
-                break;
-            case 'R':
-                source = 'G';
-                break;
-            default:
-                source = 'G';
-                break;
-            }
-            return 0;
-        }
-
-        // Time zone: Local / UTC
-        if (key == 5) {
-            switch (tz) {
-            case 'L':
-                tz = 'U';
-                break;
-            case 'U':
-                tz = 'L';
-                break;
-            default:
-                tz = 'L';
-                break;
-            }
-            return 0;
-        }
-
-        // Keylock function
-        if (key == 11) { // Code for keylock
-            commonData->keylock = !commonData->keylock;
-            return 0; // Commit the key
-        }
-        return key;
-    }
-
-    int displayPage(PageData& pageData)
-    {
-        GwConfigHandler* config = commonData->config;
-
-        static String svalueTimeOld = "";
-        static String svalueDateOld = "";
-
-        // Get config data
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-
-        // Get boat values for GPS time and date (same as PageClock)
-        if (pageData.values.size() < 2) {
-            return PAGE_OK;
-        }
-
-        GwApi::BoatValue* bvalueTime = pageData.values[0];
-        GwApi::BoatValue* bvalueDate = pageData.values[1];
-
-        if (bvalueTime == nullptr || bvalueDate == nullptr) {
-            return PAGE_OK;
-        }
-
-        double valueTime = 0;
-        if (!simulation) {
-            valueTime = bvalueTime->value; // Value as double in SI unit (seconds)
-        } else {
-            valueTime = simtime++; // Simulation data
-        }
-        bool validTime = bvalueTime->valid;
-        String svalueTime = formatValue(bvalueTime, *commonData).svalue; // formatted time string
-        if (validTime) {
-            svalueTimeOld = svalueTime; // Save old value
-        }
-
-        bool validDate = bvalueDate->valid;
-        String svalueDate = formatValue(bvalueDate, *commonData).svalue; // formatted date string
-        if (validDate) {
-            svalueDateOld = svalueDate; // Save old value
-        }
-
-        // Optical warning by limit violation (unused)
-        if (flashLED == "Limit Violation") {
-            setBlinkingLED(false);
-            setFlashLED(false);
-        }
-
-        // Draw page
-        //***********************************************************
-
-        // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-        getdisplay().setTextColor(commonData->fgcolor);
-
-        // Build time string depending on source and configuration
-        String timeStr = "---";
-
-        if (!holdvalues) {
-            if (source == 'G') {
-                // GPS value as formatted by formatter
-                timeStr = svalueTime;
-            } else if (commonData->data.rtcValid) {
-                // RTC value
-                time_t tv = mktime(&commonData->data.rtcTime);
-                if (tz == 'L') {
-                    tv += static_cast<time_t>(timezone * 3600);
-                }
-                struct tm* local_tm = localtime(&tv);
-                timeStr = formatTime('s', local_tm->tm_hour, local_tm->tm_min, local_tm->tm_sec);
-            }
-        } else {
-            timeStr = svalueTimeOld;
-        }
-
-        // Clear central area and draw large digital time
-        getdisplay().fillRect(0, 80, getdisplay().width(), 140, commonData->bgcolor);
-
-        getdisplay().setFont(&DSEG7Classic_BoldItalic60pt7b);
-
-        int16_t x1, y1;
-        uint16_t w, h;
-        getdisplay().getTextBounds(timeStr, 0, 0, &x1, &y1, &w, &h);
-
-        int16_t x = (static_cast<int16_t>(getdisplay().width()) - static_cast<int16_t>(w)) / 2;
-        int16_t y = (static_cast<int16_t>(getdisplay().height()) + static_cast<int16_t>(h)) / 2;
-
-        getdisplay().setCursor(x, y);
-        getdisplay().print(timeStr);
-
-        // Show date in the upper left corner
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 40);
-        getdisplay().print("Date");
-
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 60);
-        if (!holdvalues) {
-            getdisplay().print(svalueDate);
-        } else {
-            getdisplay().print(svalueDateOld);
-        }
-
-        // Show small labels for source and timezone in the lower right corner
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(getdisplay().width() - 80, getdisplay().height() - 40);
-        getdisplay().print(source == 'G' ? "GPS" : "RTC");
-
-        getdisplay().setCursor(getdisplay().width() - 80, getdisplay().height() - 20);
-        getdisplay().print(tz == 'L' ? "LOC" : "UTC");
-
-        return PAGE_UPDATE;
-    };
-};
-
-static Page* createPage(CommonData& common)
-{
-    return new PageClockDigital(common);
-}
-
-/**
- * Register page so it can be selected in the configuration.
- * Uses the same fixed values as PageClock.
- */
-PageDescription registerPageClockDigital(
-    "ClockDigital",                 // Page name
-    createPage,                     // Action
-    0,                              // Number of user parameters
-    {"GPST", "GPSD", "HDOP"},       // Bus values we need in the page
-    true                            // Show display header on/off
-);
-
-#endif
-

lib/obp60task/PageOneValue.cpp

@@ -162,9 +162,13 @@ public:
         constexpr int ZOOM_KEY = 1;
 #endif
 
-        if (dataHstryBuf) { // show "Mode" key only if chart supported boat data type is available
+        if (dataHstryBuf) { // show "Mode" key only if chart-supported boat data type is available
             commonData->keydata[0].label = "MODE";
+            if (pageMode != VALUE) { // show "ZOOM" key only if chart is visible
                 commonData->keydata[ZOOM_KEY].label = "ZOOM";
+            } else {
+                commonData->keydata[ZOOM_KEY].label = "";
+            }
         } else {
             commonData->keydata[0].label = "";
             commonData->keydata[ZOOM_KEY].label = "";
@@ -189,14 +193,15 @@ public:
                     pageMode = VALUE;
                     break;
                 }
+                setupKeys(); // Adjust key definition depending on <pageMode> and chart-supported boat data type
                 return 0; // Commit the key
             }
 
-            // Set time frame to show for history chart
+            // Set time frame to show for chart
 #if defined BOARD_OBP60S3
-            if (key == 5) {
+            if (key == 5  && pageMode != VALUE) {
 #elif defined BOARD_OBP40S3
-            if (key == 2) {
+            if (key == 2  && pageMode != VALUE) {
 #endif
                 if (dataIntv == 1) {
                     dataIntv = 2;
@@ -247,7 +252,7 @@ public:
             }
         }
 
-        setupKeys(); // adjust <mode> key depending on chart supported boat data type
+        setupKeys(); // Adjust key definition depending on <pageMode> and chart-supported boat data type
     }
 
     int displayPage(PageData& pageData)

lib/obp60task/PageTwoValues.cpp

@@ -149,7 +149,11 @@ public:
 
         if (dataHstryBuf[0] || dataHstryBuf[1]) { // show "Mode" key only if at least 1 chart supported boat data type is available
             commonData->keydata[0].label = "MODE";
+            if (pageMode != VALUES) { // show "ZOOM" key only if chart is visible
                 commonData->keydata[ZOOM_KEY].label = "ZOOM";
+            } else {
+                commonData->keydata[ZOOM_KEY].label = "";
+            }
         } else {
             commonData->keydata[0].label = "";
             commonData->keydata[ZOOM_KEY].label = "";
@@ -191,14 +195,15 @@ public:
                     pageMode = VALUES;
                     break;
                 }
+                setupKeys(); // Adjust key definition depending on <pageMode> and chart-supported boat data type
                 return 0; // Commit the key
             }
 
-            // Set time frame to show for history chart
+            // Set time frame to show for chart
 #if defined BOARD_OBP60S3
-            if (key == 5) {
+            if (key == 5 && pageMode != VALUES) {
 #elif defined BOARD_OBP40S3
-            if (key == 2) {
+            if (key == 2  && pageMode != VALUES) {
 #endif
                 if (dataIntv == 1) {
                     dataIntv = 2;
@@ -251,7 +256,7 @@ public:
             }
         }
 
-        setupKeys(); // adjust <mode> key depending on chart supported boat data type
+        setupKeys(); // Adjust key definition depending on <pageMode> and chart-supported boat data type
     }
 
     int displayPage(PageData& pageData)

lib/obp60task/PageWindPlot.cpp

@@ -196,7 +196,7 @@ public:
     int displayPage(PageData& pageData)
     {
         LOG_DEBUG(GwLog::LOG, "Display PageWindPlot");
-        ulong pageTime = millis();
+        // ulong pageTime = millis();
 
         if (showTruW != oldShowTruW) {
 
@@ -243,7 +243,7 @@ public:
             }
         }
 
-        LOG_DEBUG(GwLog::DEBUG, "PageWindPlot: page time %ldms", millis() - pageTime);
+        // LOG_DEBUG(GwLog::DEBUG, "PageWindPlot: page time %ldms", millis() - pageTime);
         return PAGE_UPDATE;
     }
 };

lib/obp60task/Pagedata.h

@@ -110,6 +110,7 @@ typedef struct{
     AlarmData alarm;
     GwApi::BoatValue *time = nullptr;
     GwApi::BoatValue *date = nullptr;
+    float tz = 0.0; // timezone from config
     uint16_t fgcolor;
     uint16_t bgcolor;
     bool keylock = false;

lib/obp60task/config_obp40.json

@@ -75,6 +75,20 @@
             "obp40": "true"
         }
     },
+    {
+        "name": "chainLength",
+        "label": "Anchor Chain Length [m]",
+        "type": "number",
+        "default": "0",
+        "check": "checkMinMax",
+        "min": 0,
+        "max": 255,
+        "description": "The length of the anchor chain [0...255m]",
+        "category": "OBP40 Settings",
+        "capabilities": {
+            "obp40": "true"
+        }
+    },
     {
         "name": "fuelTank",
         "label": "Fuel Tank [l]",
@@ -678,7 +692,7 @@
         "type": "string",
         "default": "text1",
         "description": "Button name",
-        "category": "OBP60 IO-Modul1",
+        "category": "OBP40 IO-Modul1",
         "capabilities": {
             "obp40":"true"
         }
@@ -689,7 +703,7 @@
         "type": "string",
         "default": "text2",
         "description": "Button name",
-        "category": "OBP60 IO-Modul1",
+        "category": "OBP40 IO-Modul1",
         "capabilities": {
             "obp40":"true"
         }
@@ -700,7 +714,7 @@
         "type": "string",
         "default": "text3",
         "description": "Button name",
-        "category": "OBP60 IO-Modul1",
+        "category": "OBP40 IO-Modul1",
         "capabilities": {
             "obp40":"true"
         }
@@ -711,7 +725,7 @@
         "type": "string",
         "default": "text4",
         "description": "Button name",
-        "category": "OBP60 IO-Modul1",
+        "category": "OBP40 IO-Modul1",
         "capabilities": {
             "obp40":"true"
         }
@@ -722,7 +736,7 @@
         "type": "string",
         "default": "text5",
         "description": "Button name",
-        "category": "OBP60 IO-Modul1",
+        "category": "OBP40 IO-Modul1",
         "capabilities": {
             "obp40":"true"
         }
@@ -1067,7 +1081,8 @@
         "description": "Type of map source, cloud service or local service",
         "list": [
             "OBP Service",
-            "Local Service"
+            "Local Service",
+            "Remote Service"
         ],
         "category": "OBP40 Navigation",
         "capabilities": {
@@ -1104,6 +1119,34 @@
             { "mapsource": ["Local Service"] }
         ]
     },
+    {
+        "name": "mapServer",
+        "label": "map server",
+        "type": "string",
+        "default": "",
+        "description": "Server for converting map tiles. Use only one hostname or IP address",
+        "category": "OBP40 Navigation",
+        "capabilities": {
+            "obp40": "true"
+        },
+        "condition": [
+            { "mapsource": ["Remote Service"] }
+        ]
+    },
+    {
+        "name": "mapTilePath",
+        "label": "map tile path",
+        "type": "string",
+        "default": "map.php",
+        "description": "Path to converter access e.g. index.php or map.php",
+        "category": "OBP40 Navigation",
+        "capabilities": {
+            "obp40": "true"
+        },
+        "condition": [
+            { "mapsource": ["Remote Service"] }
+        ]
+    },
     {
         "name": "maptype",
         "label": "Map Type",
@@ -1509,7 +1552,6 @@
             "obp40": "true"
         }
     },
-
     {
         "name": "page1type",
         "label": "Type",
@@ -1517,6 +1559,7 @@
         "default": "Voltage",
         "description": "Type of page for page 1",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -1818,7 +1861,7 @@
         "description": "Wind source for page 1: [true|apparent]",
         "list": [
             "True wind",
-            "apparent wind"
+            "Apparent wind"
         ],
         "category": "OBP40 Page 1",
         "capabilities": {
@@ -1847,6 +1890,7 @@
         "default": "WindRose",
         "description": "Type of page for page 2",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -2140,7 +2184,7 @@
         "description": "Wind source for page 2: [true|apparent]",
         "list": [
             "True wind",
-            "apparent wind"
+            "Apparent wind"
         ],
         "category": "OBP40 Page 2",
         "capabilities": {
@@ -2168,6 +2212,7 @@
         "default": "OneValue",
         "description": "Type of page for page 3",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -2453,7 +2498,7 @@
         "description": "Wind source for page 3: [true|apparent]",
         "list": [
             "True wind",
-            "apparent wind"
+            "Apparent wind"
         ],
         "category": "OBP40 Page 3",
         "capabilities": {
@@ -2480,6 +2525,7 @@
         "default": "TwoValues",
         "description": "Type of page for page 4",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -2757,7 +2803,7 @@
         "description": "Wind source for page 4: [true|apparent]",
         "list": [
             "True wind",
-            "apparent wind"
+            "Apparent wind"
         ],
         "category": "OBP40 Page 4",
         "capabilities": {
@@ -2783,6 +2829,7 @@
         "default": "ThreeValues",
         "description": "Type of page for page 5",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -3052,7 +3099,7 @@
         "description": "Wind source for page 5: [true|apparent]",
         "list": [
             "True wind",
-            "apparent wind"
+            "Apparent wind"
         ],
         "category": "OBP40 Page 5",
         "capabilities": {
@@ -3077,6 +3124,7 @@
         "default": "FourValues",
         "description": "Type of page for page 6",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -3338,7 +3386,7 @@
         "description": "Wind source for page 6: [true|apparent]",
         "list": [
             "True wind",
-            "apparent wind"
+            "Apparent wind"
         ],
         "category": "OBP40 Page 6",
         "capabilities": {
@@ -3362,6 +3410,7 @@
         "default": "FourValues2",
         "description": "Type of page for page 7",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -3615,7 +3664,7 @@
         "description": "Wind source for page 7: [true|apparent]",
         "list": [
             "True wind",
-            "apparent wind"
+            "Apparent wind"
         ],
         "category": "OBP40 Page 7",
         "capabilities": {
@@ -3638,6 +3687,7 @@
         "default": "Clock",
         "description": "Type of page for page 8",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -3883,7 +3933,7 @@
         "description": "Wind source for page 8: [true|apparent]",
         "list": [
             "True wind",
-            "apparent wind"
+            "Apparent wind"
         ],
         "category": "OBP40 Page 8",
         "capabilities": {
@@ -3905,6 +3955,7 @@
         "default": "RollPitch",
         "description": "Type of page for page 9",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -4142,7 +4193,7 @@
         "description": "Wind source for page 9: [true|apparent]",
         "list": [
             "True wind",
-            "apparent wind"
+            "Apparent wind"
         ],
         "category": "OBP40 Page 9",
         "capabilities": {
@@ -4163,6 +4214,7 @@
         "default": "Battery2",
         "description": "Type of page for page 10",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -4392,7 +4444,7 @@
         "description": "Wind source for page 10: [true|apparent]",
         "list": [
             "True wind",
-            "apparent wind"
+            "Apparent wind"
         ],
         "category": "OBP40 Page 10",
         "capabilities": {

lib/obp60task/config_obp60.json

@@ -75,6 +75,20 @@
             "obp60":"true"
         }
     },
+    {
+        "name": "chainLength",
+        "label": "Anchor Chain Length [m]",
+        "type": "number",
+        "default": "0",
+        "check": "checkMinMax",
+        "min": 0,
+        "max": 255,
+        "description": "The length of the anchor chain [0...255m]",
+        "category": "OBP60 Settings",
+        "capabilities": {
+            "obp60":"true"
+        }
+    },
     {
         "name": "fuelTank",
         "label": "Fuel Tank [l]",
@@ -1093,6 +1107,34 @@
             { "mapsource": ["Local Service"] }
         ]
     },
+    {
+        "name": "mapServer",
+        "label": "map server",
+        "type": "string",
+        "default": "",
+        "description": "Server for converting map tiles. Use only one hostname or IP address",
+        "category": "OBP60 Navigation",
+        "capabilities": {
+            "obp60": "true"
+        },
+        "condition": [
+            { "mapsource": ["Remote Service"] }
+        ]
+    },
+    {
+        "name": "mapTilePath",
+        "label": "map tile path",
+        "type": "string",
+        "default": "map.php",
+        "description": "Path to converter access e.g. index.php or map.php",
+        "category": "OBP40 Navigation",
+        "capabilities": {
+            "obp40": "true"
+        },
+        "condition": [
+            { "mapsource": ["Remote Service"] }
+        ]
+    },
     {
         "name": "maptype",
         "label": "Map Type",
@@ -1486,7 +1528,6 @@
             "obp60":"true"
         }
     },
-
     {
         "name": "page1type",
         "label": "Type",
@@ -1494,6 +1535,7 @@
         "default": "Voltage",
         "description": "Type of page for page 1",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -1794,6 +1836,7 @@
         "default": "WindRose",
         "description": "Type of page for page 2",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -2086,6 +2129,7 @@
         "default": "OneValue",
         "description": "Type of page for page 3",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -2370,6 +2414,7 @@
         "default": "TwoValues",
         "description": "Type of page for page 4",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -2646,6 +2691,7 @@
         "default": "ThreeValues",
         "description": "Type of page for page 5",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -2914,6 +2960,7 @@
         "default": "FourValues",
         "description": "Type of page for page 6",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -3174,6 +3221,7 @@
         "default": "FourValues2",
         "description": "Type of page for page 7",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -3426,6 +3474,7 @@
         "default": "Clock",
         "description": "Type of page for page 8",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -3670,6 +3719,7 @@
         "default": "RollPitch",
         "description": "Type of page for page 9",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",
@@ -3906,6 +3956,7 @@
         "default": "Battery2",
         "description": "Type of page for page 10",
         "list": [
+            "Anchor",
             "BME280",
             "Battery",
             "Battery2",

lib/obp60task/extra_task.py

@@ -1,12 +1,21 @@
 # PlatformIO extra script for obp60task
 
+import subprocess
+
+patching = False
+
 epdtype = "unknown"
 pcbvers = "unknown"
 for x in env["BUILD_FLAGS"]:
-    if x.startswith("-D HARDWARE_"):
+    if not x.startswith('-D'):
+        continue
+    opt = x[2:].strip()
+    if opt.startswith("HARDWARE_"):
         pcbvers = x.split('_')[1]
-    if x.startswith("-D DISPLAY_"):
+    elif opt.startswith("DISPLAY_"):
         epdtype = x.split('_')[1]
+    elif opt == 'ENABLE_PATCHES':
+        patching = True
 
 propfilename = os.path.join(env["PROJECT_LIBDEPS_DIR"], env["PIOENV"], "GxEPD2/library.properties")
 properties = {}
@@ -28,3 +37,20 @@ except:
 env["CPPDEFINES"].extend([("BOARD", env["BOARD"]), ("EPDTYPE", epdtype), ("PCBVERS", pcbvers), ("GXEPD2VERS", gxepd2vers)])
 
 print("added hardware info to CPPDEFINES")
+
+if patching:
+    # apply patches to gateway code
+    print("applying gateway patches")
+    patchdir = os.path.join(os.path.dirname(script), "patches")
+    if not os.path.isdir(patchdir):
+        print("patchdir not found, no patches applied")
+    else:
+        patchfiles = [f for f in os.listdir(patchdir)]
+        for p in patchfiles:
+            patch = os.path.join(patchdir, p)
+            print(f"applying {patch}")
+            res = subprocess.run(["git", "apply", patch], capture_output=True, text=True)
+            if res.returncode != 0:
+                print(res.stderr)
+        else:
+            print("no patches found")

lib/obp60task/obp60task.cpp

@@ -264,6 +264,8 @@ void registerAllPages(PageList &list){
     list.add(&registerPageDigitalOut);
     extern PageDescription registerPageAutopilot;
     list.add(&registerPageAutopilot);
+    extern PageDescription registerPageAnchor;
+    list.add(&registerPageAnchor);
 }
 
 // Undervoltage detection for shutdown display
@@ -332,7 +334,7 @@ void OBP60Task(GwApi *api){
 //    return;
     GwLog *logger=api->getLogger();
     GwConfigHandler *config=api->getConfig();
-#ifdef HARDWARE_V21
+#if defined HARDWARE_V20 || HARDWARE_V21
     startLedTask(api);
 #endif
     PageList allPages;
@@ -341,7 +343,7 @@ void OBP60Task(GwApi *api){
     commonData.logger=logger;
     commonData.config=config;
 
-#ifdef HARDWARE_V21
+#if defined HARDWARE_V20 || HARDWARE_V21
     // Keyboard coordinates for page footer
     initKeys(commonData);
 #endif
@@ -525,8 +527,8 @@ void OBP60Task(GwApi *api){
     // Configuration values for main loop
     String gpsFix = api->getConfig()->getConfigItem(api->getConfig()->flashLED,true)->asString();
     String gpsOn=api->getConfig()->getConfigItem(api->getConfig()->useGPS,true)->asString();
-    float tz = api->getConfig()->getConfigItem(api->getConfig()->timeZone,true)->asFloat();
 
+    commonData.tz = api->getConfig()->getConfigItem(api->getConfig()->timeZone,true)->asFloat();
     commonData.backlight.mode = backlightMapping(config->getConfigItem(config->backlight,true)->asString());
     commonData.backlight.color = colorMapping(config->getConfigItem(config->blColor,true)->asString());
     commonData.backlight.brightness = uint(config->getConfigItem(config->blBrightness,true)->asInt());
@@ -701,7 +703,7 @@ void OBP60Task(GwApi *api){
                 starttime5 = millis();
                 if(time->valid == true && date->valid == true && lat->valid == true && lon->valid == true){
                     // Provide sundata to all pages
-                    commonData.sundata = calcSunsetSunrise(time->value , date->value, lat->value, lon->value, tz);
+                    commonData.sundata = calcSunsetSunrise(time->value , date->value, lat->value, lon->value, commonData.tz);
                     // Backlight with sun control
                     if (commonData.backlight.mode == BacklightMode::SUN) {
                     // if(String(backlight) == "Control by Sun"){
@@ -714,7 +716,7 @@ void OBP60Task(GwApi *api){
                     }
                 } else if (homevalid and commonData.data.rtcValid) {
                     // No gps fix but valid home location and time configured
-                    commonData.sundata = calcSunsetSunriseRTC(&commonData.data.rtcTime, homelat, homelon, tz);
+                    commonData.sundata = calcSunsetSunriseRTC(&commonData.data.rtcTime, homelat, homelon, commonData.tz);
                 }
             }
             

lib/obp60task/platformio.ini

@@ -58,6 +58,7 @@ build_flags=
 #    -D DISPLAY_GYE042A87            #alternativ E-Ink display from Genyo Optical, R10 2.2 ohm - medium 
 #    -D DISPLAY_SE0420NQ04           #alternativ E-Ink display from SID Technology, R10 2.2 ohm - bad (burn in effects)
 #    -D DISPLAY_ZJY400300-042CAAMFGN #alternativ E-Ink display from ZZE Technology, R10 2.2 ohm - very good
+#    -D ENABLE_PATCHES               #enable patching of gateway code
     ${env.build_flags}
 #CONFIG_ESP_TASK_WDT_TIMEOUT_S = 10 #Task Watchdog timeout period (seconds) [1...60] 5 default
 upload_port = /dev/ttyACM0          #OBP60 download via USB-C direct
@@ -106,8 +107,9 @@ build_flags=
     -D HARDWARE_V10                 #OBP40 hardware revision V1.0 SKU:DIE07300S V1.1 (CrowPanel 4.2)
     -D DISPLAY_GDEY042T81           #new E-Ink display from Good Display (Waveshare), R10 2.2 ohm - good (contast lost by shunshine)
     #-D DISPLAY_ZJY400300-042CAAMFGN #alternativ E-Ink display from ZZE Technology, R10 2.2 ohm - very good   
-    -D LIPO_ACCU_1200               #Hardware extension, LiPo accu 3,7V 1200mAh
-    -D VOLTAGE_SENSOR               #Hardware extension, LiPo voltage sensor with two resistors
+    #-D LIPO_ACCU_1200               #Hardware extension, LiPo accu 3,7V 1200mAh
+    #-D VOLTAGE_SENSOR               #Hardware extension, LiPo voltage sensor with two resistors
+    #-D ENABLE_PATCHES               #enable patching of gateway code
     ${env.build_flags}
 upload_port = /dev/ttyUSB0          #OBP40 download via external USB/Serail converter
 upload_protocol = esptool           #firmware upload via USB OTG seriell, by first upload need to set the ESP32-S3 in the upload mode with shortcut GND to Pin27

lib/obp60task/run_install_tools

@@ -8,6 +8,6 @@
 
 # Install tools
 echo "Installing tools"
-cd /workspace/esp32-nmea2000
+cd /workspaces/esp32-nmea2000
 pip3 install -U esptool
 pip3 install  platformio