Merge branch 'clock' into extended

extra_script.py

@@ -501,7 +501,7 @@ def prebuild(env):
     genereateUserTasks(os.path.join(outPath(), TASK_INCLUDE))
     generateFile(os.path.join(basePath(),XDR_FILE),os.path.join(outPath(),XDR_INCLUDE),generateXdrMappings)
     generateFile(os.path.join(basePath(),GROVE_CONFIG_IN),os.path.join(outPath(),GROVE_CONFIG),generateGroveDefs,inMode='r')
-    version="dev"+datetime.now().strftime("%Y%m%d")
+    version = "dev{}{}".format(datetime.now().strftime("%Y%m%d"), "-ext")
     env.Append(CPPDEFINES=[('GWDEVVERSION',version)])
 
 def cleangenerated(source, target, env):

lib/obp60task/BoatDataCalibration.cpp

@@ -101,7 +101,7 @@ void CalibrationDataList::readConfig(GwConfigHandler* config, GwLog* logger)
         calibMap[instance].slope = slope;
         calibMap[instance].smooth = smooth;
         calibMap[instance].isCalibrated = false;
-        LOG_DEBUG(GwLog::LOG, "calibration data: %s, offset: %f, slope: %f, smoothing: %f", instance.c_str(),
+        LOG_DEBUG(GwLog::LOG, "stored calibration data: %s, offset: %f, slope: %f, smoothing: %f", instance.c_str(),
             calibMap[instance].offset, calibMap[instance].slope, calibMap[instance].smooth);
     }
     LOG_DEBUG(GwLog::LOG, "all calibration data read");
@@ -117,7 +117,7 @@ void CalibrationDataList::calibrateInstance(GwApi::BoatValue* boatDataValue, GwL
     std::string format = "";
 
     if (calibMap.find(instance) == calibMap.end()) {
-        LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s not in calibration list", instance.c_str());
+        LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s not found in calibration data list", instance.c_str());
         return;
     } else if (!boatDataValue->valid) { // no valid boat data value, so we don't want to apply calibration data
         calibMap[instance].isCalibrated = false;
@@ -173,7 +173,7 @@ void CalibrationDataList::smoothInstance(GwApi::BoatValue* boatDataValue, GwLog*
     if (!boatDataValue->valid) { // no valid boat data value, so we don't want to smoothen value
         return;
     } else if (calibMap.find(instance) == calibMap.end()) {
-        LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: smooth factor for %s not found in calibration list", instance.c_str());
+        LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: smooth factor for %s not found in calibration data list", instance.c_str());
         return;
     } else {
         smoothFactor = calibMap[instance].smooth;
@@ -184,6 +184,8 @@ void CalibrationDataList::smoothInstance(GwApi::BoatValue* boatDataValue, GwLog*
         }
         lastValue[instance] = dataValue; // store the new value for next cycle; first time, store only the current value and return
         boatDataValue->value = dataValue; // set the smoothed value to the boat data value
+
+        LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: Smoothing factor: %f, Smoothed value: %f", instance.c_str(), smoothFactor, dataValue);
     }
 }
 

lib/obp60task/BoatDataCalibration.h

@@ -3,8 +3,7 @@
 #ifndef _BOATDATACALIBRATION_H
 #define _BOATDATACALIBRATION_H
 
-// #include "Pagedata.h"
+#include "Pagedata.h"
-#include "GwApi.h"
 #include <string>
 #include <unordered_map>
 

lib/obp60task/ConfigMenu.cpp

@@ -0,0 +1,204 @@
+/*
+  Menu system for online configuration
+*/
+#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;
+}
+
+void ConfigMenuItem::setRange(uint16_t valmin, uint16_t valmax, std::vector<uint16_t> valsteps) {
+    min = valmin;
+    max = valmax;
+    steps = valsteps;
+};
+
+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,66 @@
+#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 valtype; // "int" | "bool"
+    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/LedSpiTask.cpp

@@ -14,6 +14,30 @@ https://controllerstech.com/ws2812-leds-using-spi/
 
 */
 
+String Color::toHex() {
+    char hexColor[8];
+    sprintf(hexColor, "#%02X%02X%02X", r, g, b);
+    return String(hexColor);
+}
+
+String Color::toName() {
+    static std::map<int, String> const names = {
+        {0xff0000, "Red"},
+        {0x00ff00, "Green"},
+        {0x0000ff, "Blue",},
+        {0xff9900, "Orange"},
+        {0xffff00, "Yellow"},
+        {0x3366ff, "Aqua"},
+        {0xff0066, "Violet"},
+        {0xffffff, "White"}
+    };
+    int color = (r << 16) + (g << 8) + b;
+    auto it = names.find(color);
+    if (it == names.end()) {
+        return toHex();
+    }
+    return it->second;
+}
 
 static uint8_t mulcolor(uint8_t f1, uint8_t f2){
     uint16_t rt=f1;

lib/obp60task/LedSpiTask.h

@@ -10,7 +10,7 @@ class Color{
     uint8_t g;
     uint8_t b;
     Color():r(0),g(0),b(0){}
-    Color(uint8_t cr, uint8_t cg,uint8_t cb):
+    Color(uint8_t cr, uint8_t cg, uint8_t cb):
         b(cb),g(cg),r(cr){}
     Color(const Color &o):b(o.b),g(o.g),r(o.r){}
     bool equal(const Color &o) const{
@@ -22,6 +22,8 @@ class Color{
     bool operator != (const Color &other) const{
         return ! equal(other);
     }
+    String toHex();
+    String toName();
 };
 
 static Color COLOR_GREEN=Color(0,255,0);

lib/obp60task/OBP60Extensions.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include <Arduino.h>
@@ -24,7 +25,6 @@
 #include "fonts/Ubuntu_Bold20pt8b.h"
 #include "fonts/Ubuntu_Bold32pt8b.h"
 #include "fonts/Atari16px8b.h" // Key label font
-#include "fonts/IBM8x8px.h"
 
 // E-Ink Display
 #define GxEPD_WIDTH 400     // Display width
@@ -41,7 +41,8 @@ GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> & getdisplay(){return display;}
 // Set display type and SPI pins for display
 GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> display(GxEPD2_420_GDEY042T81(OBP_SPI_CS, OBP_SPI_DC, OBP_SPI_RST, OBP_SPI_BUSY)); // GDEW042T2 400x300, UC8176 (IL0398)
 // Export display in new funktion
-GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> & getdisplay(){return display;}
+GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> & getdisplay(){return display;} // DEPRECATED
+gxepd2display *epd = &display;
 #endif
 
 #ifdef DISPLAY_GYE042A87
@@ -65,12 +66,6 @@ PCF8574 pcf8574_Out(PCF8574_I2C_ADDR1); // First digital output modul PCF8574 fr
 Adafruit_FRAM_I2C fram;
 bool hasFRAM = false;
 
-// SD Card
-#ifdef BOARD_OBP40S3
-sdmmc_card_t *sdcard;
-#endif
-bool hasSDCard = false;
-
 // Global vars
 bool blinkingLED = false;       // Enable / disable blinking flash LED
 bool statusLED = false;         // Actual status of flash LED on/off
@@ -85,9 +80,6 @@ LedTaskData *ledTaskData=nullptr;
 
 void hardwareInit(GwApi *api)
 {
-    GwLog *logger = api->getLogger();
-    GwConfigHandler *config = api->getConfig();
-
     Wire.begin();
     // Init PCF8574 digital outputs
     Wire.setClock(I2C_SPEED);       // Set I2C clock on 10 kHz
@@ -97,7 +89,7 @@ void hardwareInit(GwApi *api)
     fram = Adafruit_FRAM_I2C();
     if (esp_reset_reason() ==  ESP_RST_POWERON) {
         // help initialize FRAM
-        logger->logDebug(GwLog::LOG, "Delaying I2C init for 250ms due to cold boot");
+        api->getLogger()->logDebug(GwLog::LOG,"Delaying I2C init for 250ms due to cold boot");
         delay(250);
     }
     // FRAM (e.g. MB85RC256V)
@@ -109,68 +101,12 @@ void hardwareInit(GwApi *api)
         // Boot counter
         uint8_t framcounter = fram.read(0x0000);
         fram.write(0x0000, framcounter+1);
-        logger->logDebug(GwLog::LOG, "FRAM detected: 0x%04x/0x%04x (counter=%d)", manufacturerID, productID, framcounter);
+        api->getLogger()->logDebug(GwLog::LOG,"FRAM detected: 0x%04x/0x%04x (counter=%d)", manufacturerID, productID, framcounter);
     }
     else {
         hasFRAM = false;
-        logger->logDebug(GwLog::LOG, "NO FRAM detected");
+        api->getLogger()->logDebug(GwLog::LOG,"NO FRAM detected");
     }
-    // SD Card
-    hasSDCard = false;
-#ifdef BOARD_OBP40S3
-    if (config->getBool(config->useSDCard)) {
-        esp_err_t ret;
-        sdmmc_host_t host = SDSPI_HOST_DEFAULT();
-        host.slot = SPI3_HOST;
-        logger->logDebug(GwLog::DEBUG, "SDSPI_HOST: max_freq_khz=%d" , host.max_freq_khz);
-        spi_bus_config_t bus_cfg = {
-            .mosi_io_num = SD_SPI_MOSI,
-            .miso_io_num = SD_SPI_MISO,
-            .sclk_io_num = SD_SPI_CLK,
-            .quadwp_io_num = -1,
-            .quadhd_io_num = -1,
-            .max_transfer_sz = 4000,
-        };
-        ret = spi_bus_initialize((spi_host_device_t) host.slot, &bus_cfg, SDSPI_DEFAULT_DMA);
-        if (ret != ESP_OK) {
-            logger->logDebug(GwLog::ERROR, "Failed to initialize SPI bus for SD card");
-        } else {
-            sdspi_device_config_t slot_config = SDSPI_DEVICE_CONFIG_DEFAULT();
-            slot_config.gpio_cs = SD_SPI_CS;
-            slot_config.host_id = (spi_host_device_t) host.slot;
-            esp_vfs_fat_sdmmc_mount_config_t mount_config = {
-                .format_if_mount_failed = false,
-                .max_files = 5,
-                .allocation_unit_size = 16 * 1024
-            };
-            ret = esp_vfs_fat_sdspi_mount(MOUNT_POINT, &host, &slot_config, &mount_config, &sdcard);
-            if (ret != ESP_OK) {
-                if (ret == ESP_FAIL) {
-                    logger->logDebug(GwLog::ERROR, "Failed to mount SD card filesystem");
-                } else {
-                    // ret == 263 could be not powered up yet
-                    logger->logDebug(GwLog::ERROR, "Failed to initialize SD card (error #%d)", ret);
-                }
-            } else {
-                logger->logDebug(GwLog::LOG, "SD card filesystem mounted at '%s'", MOUNT_POINT);
-                hasSDCard = true;
-            }
-        }
-        if (hasSDCard) {
-            // read some stats
-            String features = "";
-            if (sdcard->is_mem) features += "MEM "; // Memory card
-            if (sdcard->is_sdio) features += "IO "; // IO Card
-            if (sdcard->is_mmc) features += "MMC "; // MMC Card
-            if (sdcard->is_ddr) features += "DDR ";
-            // if (sdcard->is_uhs1) features += "UHS-1 ";
-            // ext_csd. Extended information
-            // uint8_t rev, uint8_t power_class
-            logger->logDebug(GwLog::LOG, "SD card features: %s", features);
-            logger->logDebug(GwLog::LOG, "SD card size: %lluMB", ((uint64_t) sdcard->csd.capacity) * sdcard->csd.sector_size / (1024 * 1024));
-        }
-    }
-#endif
 }
 
 void powerInit(String powermode) {
@@ -467,7 +403,7 @@ void displayTrendLow(int16_t x, int16_t y, uint16_t size, uint16_t color){
 }
 
 // Show header informations
-void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop){
+void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop){
 
     static bool heartbeat = false;
     static unsigned long usbRxOld = 0;
@@ -481,31 +417,70 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
     static unsigned long n2kRxOld = 0;
     static unsigned long n2kTxOld = 0;
 
+    uint16_t symbol_x = 2;
+    static const uint16_t symbol_offset = 20;
+
     if(commonData.config->getBool(commonData.config->statusLine) == true){
 
+       if (symbolmode) {
+           commonData.logger->logDebug(GwLog::LOG,"Header: Symbolmode");
+       } else {
+           commonData.logger->logDebug(GwLog::LOG,"Header: Textmode");
+        }
+
         // Show status info
         getdisplay().setTextColor(commonData.fgcolor);
         getdisplay().setFont(&Ubuntu_Bold8pt8b);
         getdisplay().setCursor(0, 15);
-        if(commonData.status.wifiApOn){
+        if (commonData.status.wifiApOn) {
-        getdisplay().print(" AP ");
+            if (symbolmode) {
+                getdisplay().drawXBitmap(symbol_x, 1, iconmap["AP"], icon_width, icon_height, commonData.fgcolor);
+                symbol_x += symbol_offset;
+            } else {
+                getdisplay().print(" AP ");
+            }
         }
         // If receive new telegram data then display bus name
         if(commonData.status.tcpClRx != tcpClRxOld || commonData.status.tcpClTx != tcpClTxOld || commonData.status.tcpSerRx != tcpSerRxOld || commonData.status.tcpSerTx != tcpSerTxOld){
-        getdisplay().print("TCP ");
+            if (symbolmode) {
+                getdisplay().drawXBitmap(symbol_x, 1, iconmap["TCP"], icon_width, icon_height, commonData.fgcolor);
+                symbol_x += symbol_offset;
+            } else {
+                getdisplay().print("TCP ");
+            }
         }
         if(commonData.status.n2kRx != n2kRxOld || commonData.status.n2kTx != n2kTxOld){
-        getdisplay().print("N2K ");
+            if (symbolmode) {
+                getdisplay().drawXBitmap(symbol_x, 1, iconmap["N2K"], icon_width, icon_height, commonData.fgcolor);
+                symbol_x += symbol_offset;
+            } else {
+                getdisplay().print("N2K ");
+            }
         }
         if(commonData.status.serRx != serRxOld || commonData.status.serTx != serTxOld){
-        getdisplay().print("183 ");
+            if (symbolmode) {
+                getdisplay().drawXBitmap(symbol_x, 1, iconmap["0183"], icon_width, icon_height, commonData.fgcolor);
+                symbol_x += symbol_offset;
+            } else {
+                getdisplay().print("183 ");
+            }
         }
         if(commonData.status.usbRx != usbRxOld || commonData.status.usbTx != usbTxOld){
-        getdisplay().print("USB ");
+            if (symbolmode) {
+                getdisplay().drawXBitmap(symbol_x, 1, iconmap["USB"], icon_width, icon_height, commonData.fgcolor);
+                symbol_x += symbol_offset;
+            } else {
+                getdisplay().print("USB ");
+            }
         }
         double gpshdop = formatValue(hdop, commonData).value;
         if(commonData.config->getString(commonData.config->useGPS) != "off" &&  gpshdop <= commonData.config->getInt(commonData.config->hdopAccuracy) && hdop->valid == true){
-        getdisplay().print("GPS");
+            if (symbolmode) {
+                getdisplay().drawXBitmap(symbol_x, 1, iconmap["GPS"], icon_width, icon_height, commonData.fgcolor);
+                symbol_x += symbol_offset;
+            } else {
+                getdisplay().print("GPS");
+            }
         }
         // Save old telegram counter
         tcpClRxOld = commonData.status.tcpClRx;

lib/obp60task/OBP60Extensions.h

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #ifndef _OBP60EXTENSIONPORT_H
 #define _OBP60EXTENSIONPORT_H
 
@@ -8,12 +9,6 @@
 #include <GxEPD2_BW.h>                  // E-paper lib V2
 #include <Adafruit_FRAM_I2C.h>          // I2C FRAM
 
-#ifdef BOARD_OBP40S3
-#include "esp_vfs_fat.h"
-#include "sdmmc_cmd.h"
-#define MOUNT_POINT "/sdcard"
-#endif
-
 // FRAM address reservations 32kB: 0x0000 - 0x7FFF
 // 0x0000 - 0x03ff: single variables
 #define FRAM_PAGE_NO 0x0002
@@ -22,7 +17,6 @@
 #define FRAM_VOLTAGE_AVG 0x000A
 #define FRAM_VOLTAGE_TREND 0x000B
 #define FRAM_VOLTAGE_MODE 0x000C
-// Wind page
 #define FRAM_WIND_SIZE 0x000D
 #define FRAM_WIND_SRC 0x000E
 #define FRAM_WIND_MODE 0x000F
@@ -32,10 +26,6 @@
 
 extern Adafruit_FRAM_I2C fram;
 extern bool hasFRAM;
-extern bool hasSDCard;
-#ifdef BOARD_OBP40S3
-extern sdmmc_card_t *sdcard;
-#endif
 
 // Fonts declarations for display (#includes see OBP60Extensions.cpp)
 extern const GFXfont DSEG7Classic_BoldItalic16pt7b;
@@ -51,7 +41,6 @@ extern const GFXfont Ubuntu_Bold16pt8b;
 extern const GFXfont Ubuntu_Bold20pt8b;
 extern const GFXfont Ubuntu_Bold32pt8b;
 extern const GFXfont Atari16px;
-extern const GFXfont IBM8x8px;
 
 // Global functions
 #ifdef DISPLAY_GDEW042T2
@@ -59,7 +48,9 @@ GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> & getdisplay();
 #endif
 
 #ifdef DISPLAY_GDEY042T81
-GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> & getdisplay();
+GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> & getdisplay(); // DEPRECATED
+typedef GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> gxepd2display;
+extern gxepd2display *epd;
 #endif
 
 #ifdef DISPLAY_GYE042A87
@@ -110,7 +101,7 @@ void drawTextBoxed(Rect box, String text, uint16_t fg, uint16_t bg, bool inverte
 void displayTrendHigh(int16_t x, int16_t y, uint16_t size, uint16_t color);
 void displayTrendLow(int16_t x, int16_t y, uint16_t size, uint16_t color);
 
-void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop); // Draw display header
+void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop); // Draw display header
 void displayFooter(CommonData &commonData);
 void displayAlarm(CommonData &commonData);
 
@@ -158,24 +149,62 @@ static unsigned char fram_bits[] PROGMEM = {
    0xff, 0xff, 0xf8, 0x1f, 0xf8, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x1f,
    0xf8, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x1f };
 
-static unsigned char ap_bits[] PROGMEM = {
+// Header symbols
+
+static unsigned char ap_bits[] PROGMEM= {
    0xe0, 0x03, 0x18, 0x0c, 0x04, 0x10, 0xc2, 0x21, 0x30, 0x06, 0x08, 0x08,
    0xc0, 0x01, 0x20, 0x02, 0x00, 0x00, 0x80, 0x00, 0xc0, 0x01, 0xc0, 0x01,
    0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00 };
 
-static unsigned char dish_bits[] PROGMEM = {
+static unsigned char gps_bits[] PROGMEM = {
    0x3c, 0x00, 0x42, 0x18, 0xfa, 0x1b, 0x02, 0x04, 0x02, 0x0a, 0x02, 0x09,
    0x82, 0x08, 0x06, 0x0a, 0x0e, 0x1b, 0x9c, 0x2b, 0x38, 0x2b, 0x74, 0x20,
    0xec, 0x1f, 0x1c, 0x00, 0xf4, 0x00, 0xfe, 0x03 };
 
+static unsigned char nmea_bits[] PROGMEM = {
+   0x00, 0x00, 0x22, 0x21, 0x26, 0x33, 0x26, 0x33, 0x2a, 0x2d, 0x32, 0x2d,
+   0x32, 0x21, 0x22, 0x21, 0x00, 0x00, 0x3c, 0x0c, 0x04, 0x0c, 0x04, 0x12,
+   0x3c, 0x12, 0x04, 0x1e, 0x04, 0x21, 0x3c, 0x21 };
+
+static unsigned char n2k_bits[] PROGMEM = {
+   0xe0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x02, 0x40, 0x32, 0x4c, 0x31, 0x8c,
+   0x01, 0x80, 0x81, 0x81, 0x81, 0x81, 0x01, 0x80, 0x31, 0x8c, 0x32, 0x4c,
+   0x02, 0x40, 0x04, 0x20, 0x98, 0x19, 0xe0, 0x07 };
+
+static unsigned char tcp_bits[] PROGMEM = {
+   0x00, 0x00, 0xe0, 0x03, 0x20, 0x02, 0x20, 0x02, 0x20, 0x02, 0xe0, 0x03,
+   0x80, 0x00, 0x80, 0x00, 0xff, 0xff, 0x08, 0x10, 0x08, 0x10, 0x3e, 0x7c,
+   0x22, 0x44, 0x22, 0x44, 0x22, 0x44, 0x3e, 0x7c };
+
+static unsigned char usb_bits[] PROGMEM = {
+   0x00, 0x00, 0x92, 0x39, 0x52, 0x4a, 0x52, 0x48, 0x92, 0x39, 0x12, 0x4a,
+   0x52, 0x4a, 0x8c, 0x39, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0x04, 0x20,
+   0xf4, 0x2f, 0x04, 0x20, 0xf8, 0x1f, 0x00, 0x00 };
+
+static unsigned char sdcard_bits[] PROGMEM = {
+   0xf8, 0x07, 0x0c, 0x08, 0x04, 0x08, 0xc4, 0x09, 0x24, 0x1a, 0xe4, 0x13,
+   0x04, 0x20, 0x24, 0x21, 0xa4, 0x12, 0x44, 0x12, 0x04, 0x20, 0x04, 0x20,
+   0xc4, 0x23, 0x34, 0x2c, 0xd8, 0x1b, 0x00, 0x00 };
+
+static unsigned char bluetooth_bits[] PROGMEM = {
+   0x00, 0x00, 0x22, 0x21, 0x26, 0x33, 0x26, 0x33, 0x2a, 0x2d, 0x32, 0x2d,
+   0x32, 0x21, 0x22, 0x21, 0x00, 0x00, 0x3c, 0x0c, 0x04, 0x0c, 0x04, 0x12,
+   0x3c, 0x12, 0x04, 0x1e, 0x04, 0x21, 0x3c, 0x21 };
+
 static std::map<String, unsigned char *> iconmap = {
     {"LEFT", left_bits},
     {"RIGHT", right_bits},
     {"LOCK", lock_bits},
     {"PLUS", plus_bits},
     {"MINUS", minus_bits},
-    {"DISH", dish_bits},
+    {"GPS", gps_bits},
-    {"AP", ap_bits}
+    {"AP", ap_bits},
+    {"0183", nmea_bits},
+    {"N2K", n2k_bits},
+    {"TCP", tcp_bits},
+    {"USB", usb_bits},
+    {"SDCARD", sdcard_bits},
+    {"BLUE", bluetooth_bits}
 };
 
 // Battery

lib/obp60task/OBP60Formatter.cpp

@@ -439,34 +439,21 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
     //########################################################
     else if (value->getFormat() == "formatXte"){
         double xte = 0;
-        if(usesimudata == false) {
+        if (!usesimudata) {
-            xte = value->value;
+            xte = abs(value->value);
             rawvalue = value->value;
-        }
+        } else {
-        else{
             rawvalue = 6.0 + float(random(0, 4));
             xte = rawvalue;
         }
-        if(String(distanceFormat) == "km"){
+        if (xte >= 100) {
-            xte = xte * 0.001;
+            snprintf(buffer, bsize, fmt_dec_100, value->value);
-            result.unit = "km";
+        } else if (xte >= 10) {
-        }
+            snprintf(buffer, bsize, fmt_dec_10, value->value);
-        else if(String(distanceFormat) == "nm"){
+        } else {
-            xte = xte * 0.000539957;
+            snprintf(buffer, bsize, fmt_dec_1, value->value);
-            result.unit = "nm";
-        }
-        else{;
-            result.unit = "m";
-        }
-        if(xte < 10){
-            snprintf(buffer,bsize,"%3.2f",xte);
-        }
-        if(xte >= 10 && xte < 100){
-            snprintf(buffer,bsize,"%3.1f",xte);
-        }
-        if(xte >= 100){
-            snprintf(buffer,bsize,"%3.0f",xte);
         }
+        result.unit = "nm";
     }
     //########################################################
     else if (value->getFormat() == "kelvinToC"){

lib/obp60task/OBP60Hardware.h

@@ -82,7 +82,7 @@
     // Direction pin for RS485 NMEA0183
     #define OBP_DIRECTION_PIN 8
     // I2C
-    #define I2C_SPEED 100000UL       // 100kHz clock speed on I2C bus
+    #define I2C_SPEED 10000UL       // 10kHz clock speed on I2C bus
     #define OBP_I2C_SDA 21
     #define OBP_I2C_SCL 38
     // DS1388 RTC
@@ -120,10 +120,10 @@
     #define SHOW_TIME 6000        // Show time in [ms] for logo and WiFi QR code
     #define FULL_REFRESH_TIME 600 // Refresh cycle time in [s][600...3600] for full display update (very important healcy function)
     // SPI SD-Card
-    #define SD_SPI_CS GPIO_NUM_10
+    #define SD_SPI_CS 10
-    #define SD_SPI_MOSI GPIO_NUM_40
+    #define SD_SPI_MOSI 40
-    #define SD_SPI_CLK GPIO_NUM_39
+    #define SD_SPI_CLK 39
-    #define SD_SPI_MISO GPIO_NUM_13
+    #define SD_SPI_MISO 13
 
     // GPS (NEO-6M, NEO-M8N, ATGM336H)
     #define OBP_GPS_RX 19

lib/obp60task/OBPDataOperations.cpp

@@ -1,147 +1,5 @@
 #include "OBPDataOperations.h"
 
-// --- Class HstryBuf ---------------
-// Init history buffers for selected boat data
-void HstryBuf::init(BoatValueList* boatValues, GwLog *log) {
-
-    logger = log;
-
-    int hstryUpdFreq = 1000; // Update frequency for history buffers in ms
-    int hstryMinVal = 0; // Minimum value for these history buffers
-    twdHstryMax = 6283; // Max value for wind direction (TWD, AWD) in rad [0...2*PI], shifted by 1000 for 3 decimals
-    twsHstryMax = 65000; // Max value for wind speed (TWS, AWS) in m/s [0..65], shifted by 1000 for 3 decimals
-    awdHstryMax = twdHstryMax;
-    awsHstryMax = twsHstryMax;
-    twdHstryMin = hstryMinVal;
-    twsHstryMin = hstryMinVal;
-    awdHstryMin = hstryMinVal;
-    awsHstryMin = hstryMinVal;
-    const double DBL_MAX = std::numeric_limits<double>::max();
-
-    // Initialize history buffers with meta data
-    hstryBufList.twdHstry->setMetaData("TWD", "formatCourse", hstryUpdFreq, hstryMinVal, twdHstryMax);
-    hstryBufList.twsHstry->setMetaData("TWS", "formatKnots", hstryUpdFreq, hstryMinVal, twsHstryMax);
-    hstryBufList.awdHstry->setMetaData("AWD", "formatCourse", hstryUpdFreq, hstryMinVal, twdHstryMax);
-    hstryBufList.awsHstry->setMetaData("AWS", "formatKnots", hstryUpdFreq, hstryMinVal, twsHstryMax);
-
-    // create boat values for history data types, if they don't exist yet
-    twdBVal = boatValues->findValueOrCreate(hstryBufList.twdHstry->getName());
-    twsBVal = boatValues->findValueOrCreate(hstryBufList.twsHstry->getName());
-    twaBVal = boatValues->findValueOrCreate("TWA");
-    awdBVal = boatValues->findValueOrCreate(hstryBufList.awdHstry->getName());
-    awsBVal = boatValues->findValueOrCreate(hstryBufList.awsHstry->getName());
-
-    if (!awdBVal->valid) { // AWD usually does not exist
-        awdBVal->setFormat(hstryBufList.awdHstry->getFormat());
-        awdBVal->value = DBL_MAX;
-    }
-
-    // collect boat values for true wind calculation
-    awaBVal = boatValues->findValueOrCreate("AWA");
-    hdtBVal = boatValues->findValueOrCreate("HDT");
-    hdmBVal = boatValues->findValueOrCreate("HDM");
-    varBVal = boatValues->findValueOrCreate("VAR");
-    cogBVal = boatValues->findValueOrCreate("COG");
-    sogBVal = boatValues->findValueOrCreate("SOG");
-}
-
-// Handle history buffers for TWD, TWS, AWD, AWS
-//void HstryBuf::handleHstryBuf(GwApi* api, BoatValueList* boatValues, bool useSimuData) {
-void HstryBuf::handleHstryBuf(bool useSimuData) {
-
-    static int16_t twd = 20; //initial value only relevant if we use simulation data
-    static uint16_t tws = 20; //initial value only relevant if we use simulation data
-    static double awd, aws, hdt = 20; //initial value only relevant if we use simulation data
-    GwApi::BoatValue *calBVal; // temp variable just for data calibration -> we don't want to calibrate the original data here
-
-    LOG_DEBUG(GwLog::DEBUG,"obp60task handleHstryBuf: TWD_isValid? %d, twdBVal: %.1f, twaBVal: %.1f, twsBVal: %.1f", twdBVal->valid, twdBVal->value * RAD_TO_DEG,
-        twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852);
-
-    if (twdBVal->valid) {
-        calBVal = new GwApi::BoatValue("TWD"); // temporary solution for calibration of history buffer values
-        calBVal->setFormat(twdBVal->getFormat());
-        calBVal->value = twdBVal->value;
-        calBVal->valid = twdBVal->valid;
-        calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated
-        twd = static_cast<int16_t>(std::round(calBVal->value * 1000.0));
-        if (twd >= twdHstryMin && twd <= twdHstryMax) {
-            hstryBufList.twdHstry->add(twd);
-        }
-        delete calBVal;
-        calBVal = nullptr;
-    } else if (useSimuData) {
-        twd += random(-20, 20);
-        twd = WindUtils::to360(twd);
-        hstryBufList.twdHstry->add(static_cast<int16_t>(DegToRad(twd) * 1000.0));
-    }
-
-    if (twsBVal->valid) {
-        calBVal = new GwApi::BoatValue("TWS"); // temporary solution for calibration of history buffer values
-        calBVal->setFormat(twsBVal->getFormat());
-        calBVal->value = twsBVal->value;
-        calBVal->valid = twsBVal->valid;
-        calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated
-        tws = static_cast<uint16_t>(std::round(calBVal->value * 1000));
-        if (tws >= twsHstryMin && tws <= twsHstryMax) {
-            hstryBufList.twsHstry->add(tws);
-        }
-        delete calBVal;
-        calBVal = nullptr;
-    } else if (useSimuData) {
-        tws += random(-5000, 5000); // TWS value in m/s; expands to 3 decimals
-        tws = constrain(tws, 0, 25000); // Limit TWS to [0..25] m/s
-        hstryBufList.twsHstry->add(tws);
-    }
-
-    if (awaBVal->valid) {
-        if (hdtBVal->valid) {
-            hdt = hdtBVal->value; // Use HDT if available
-        } else {
-            hdt = WindUtils::calcHDT(&hdmBVal->value, &varBVal->value, &cogBVal->value, &sogBVal->value);
-        }
-
-        awd = awaBVal->value + hdt;
-        awd = WindUtils::to2PI(awd);
-        calBVal = new GwApi::BoatValue("AWD"); // temporary solution for calibration of history buffer values
-        calBVal->value = awd;
-        calBVal->setFormat(awdBVal->getFormat());
-        calBVal->valid = true;
-        calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated
-        awdBVal->value = calBVal->value;
-        awdBVal->valid = true;
-        awd = std::round(calBVal->value * 1000.0);
-        if (awd >= awdHstryMin && awd <= awdHstryMax) {
-            hstryBufList.awdHstry->add(static_cast<int16_t>(awd));
-        }
-        delete calBVal;
-        calBVal = nullptr;
-    } else if (useSimuData) {
-        awd += random(-20, 20);
-        awd = WindUtils::to360(awd);
-        hstryBufList.awdHstry->add(static_cast<int16_t>(DegToRad(awd) * 1000.0));
-    }
-    
-    if (awsBVal->valid) {
-        calBVal = new GwApi::BoatValue("AWS"); // temporary solution for calibration of history buffer values
-        calBVal->setFormat(awsBVal->getFormat());
-        calBVal->value = awsBVal->value;
-        calBVal->valid = awsBVal->valid;
-        calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated
-        aws = std::round(calBVal->value * 1000);
-        if (aws >= awsHstryMin && aws <= awsHstryMax) {
-            hstryBufList.awsHstry->add(static_cast<uint16_t>(aws));
-        }
-        delete calBVal;
-        calBVal = nullptr;
-    } else if (useSimuData) {
-        aws += random(-5000, 5000); // TWS value in m/s; expands to 1 decimal
-        aws = constrain(aws, 0, 25000); // Limit TWS to [0..25] m/s
-        hstryBufList.awsHstry->add(aws);
-    }
-}
-// --- Class HstryBuf ---------------
-
-// --- Class WindUtils --------------
 double WindUtils::to2PI(double a)
 {
     a = fmod(a, 2 * M_PI);
@@ -210,28 +68,13 @@ void WindUtils::calcTwdSA(const double* AWA, const double* AWS,
     double awd = *AWA + *HDT;
     awd = to2PI(awd);
     double stw = -*STW;
+    //    Serial.println("\ncalcTwdSA: AWA: " + String(*AWA) + ", AWS: " + String(*AWS) + ", CTW: " + String(*CTW) + ", STW: " + String(*STW) + ", HDT: " + String(*HDT));
     addPolar(&awd, AWS, CTW, &stw, TWD, TWS);
 
     // Normalize TWD and TWA to 0-360°
     *TWD = to2PI(*TWD);
     *TWA = toPI(*TWD - *HDT);
-}
+    //    Serial.println("calcTwdSA: TWD: " + String(*TWD) + ", TWS: " + String(*TWS));
-
-double WindUtils::calcHDT(const double* hdmVal, const double* varVal, const double* cogVal, const double* sogVal)
-{
-    double hdt;
-    double minSogVal = 0.1; // SOG below this value (m/s) is assumed to be  data noise from GPS sensor
-
-    if (*hdmVal != DBL_MAX) {
-        hdt = *hdmVal + (*varVal != DBL_MAX ? *varVal : 0.0); // Use corrected HDM if HDT is not available (or just HDM if VAR is not available)
-        hdt = to2PI(hdt);
-    } else if (*cogVal != DBL_MAX && *sogVal >= minSogVal) {
-        hdt = *cogVal; // Use COG as fallback if HDT and HDM are not available, and SOG is not data noise
-    } else {
-        hdt = DBL_MAX; // Cannot calculate HDT without valid HDM or HDM+VAR or COG
-    }
-
-    return hdt;
 }
 
 bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal,
@@ -240,32 +83,38 @@ bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal,
 {
     double stw, hdt, ctw;
     double twd, tws, twa;
-    double minSogVal = 0.1; // SOG below this value (m/s) is assumed to be  data noise from GPS sensor
+    static const double DBL_MIN = std::numeric_limits<double>::lowest();
 
-    if (*hdtVal != DBL_MAX) {
+    if (*hdtVal != DBL_MIN) {
         hdt = *hdtVal; // Use HDT if available
     } else {
-        hdt = calcHDT(hdmVal, varVal, cogVal, sogVal);
+        if (*hdmVal != DBL_MIN && *varVal != DBL_MIN) {
+            hdt = *hdmVal + *varVal; // Use corrected HDM if HDT is not available
+            hdt = to2PI(hdt);
+        } else if (*cogVal != DBL_MIN) {
+            hdt = *cogVal; // Use COG as fallback if HDT and HDM are not available
+        } else {
+            return false; // Cannot calculate without valid HDT or HDM+VAR or COG
+        }
     }
 
-    if (*cogVal != DBL_MAX && *sogVal >= minSogVal) { // if SOG is data noise, we don't trust COG
+    if (*cogVal != DBL_MIN) {
-
+        ctw = *cogVal; // Use COG as CTW if available
-        ctw = *cogVal; // Use COG for CTW if available
+        //    ctw = *cogVal + ((*cogVal - hdt) / 2); // Estimate CTW from COG
     } else {
         ctw = hdt; // 2nd approximation for CTW; hdt must exist if we reach this part of the code
     }
 
-    if (*stwVal != DBL_MAX) {
+    if (*stwVal != DBL_MIN) {
         stw = *stwVal; // Use STW if available
-    } else if (*sogVal != DBL_MAX) {
+    } else if (*sogVal != DBL_MIN) {
         stw = *sogVal;
     } else {
         // If STW and SOG are not available, we cannot calculate true wind
         return false;
     }
-    // Serial.println("\ncalcTrueWind: HDT: " + String(hdt) + ", CTW: " + String(ctw) + ", STW: " + String(stw));
 
-    if ((*awaVal == DBL_MAX) || (*awsVal == DBL_MAX)) {
+    if ((*awaVal == DBL_MIN) || (*awsVal == DBL_MIN)) {
         // Cannot calculate true wind without valid AWA, AWS; other checks are done earlier
         return false;
     } else {
@@ -278,45 +127,31 @@ bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal,
     }
 }
 
-// Calculate true wind data and add to obp60task boat data list
+void HstryBuf::fillWndBufSimData(tBoatHstryData& hstryBufs)
-bool WindUtils::addTrueWind(GwApi* api, BoatValueList* boatValues, GwLog* log) {
+// Fill most part of TWD and TWS history buffer with simulated data
-
+{
-    GwLog* logger = log;
+    double value = 20.0;
-
+    int16_t value2 = 0;
-    double awaVal, awsVal, cogVal, stwVal, sogVal, hdtVal, hdmVal, varVal;
+    for (int i = 0; i < 900; i++) {
-    double twd, tws, twa;
+        value += random(-20, 20);
-    bool isCalculated = false;
+        value = WindUtils::to360(value);
-
+        value2 = static_cast<int16_t>(value * DEG_TO_RAD * 1000);
-    awaVal = awaBVal->valid ? awaBVal->value : DBL_MAX;
+        hstryBufs.twdHstry->add(value2);
-    awsVal = awsBVal->valid ? awsBVal->value : DBL_MAX;
-    cogVal = cogBVal->valid ? cogBVal->value : DBL_MAX;
-    stwVal = stwBVal->valid ? stwBVal->value : DBL_MAX;
-    sogVal = sogBVal->valid ? sogBVal->value : DBL_MAX;
-    hdtVal = hdtBVal->valid ? hdtBVal->value : DBL_MAX;
-    hdmVal = hdmBVal->valid ? hdmBVal->value : DBL_MAX;
-    varVal = varBVal->valid ? varBVal->value : DBL_MAX;
-    LOG_DEBUG(GwLog::DEBUG,"obp60task addTrueWind: 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);
-
-    isCalculated = calcTrueWind(&awaVal, &awsVal, &cogVal, &stwVal, &sogVal, &hdtVal, &hdmVal, &varVal, &twd, &tws, &twa);
-
-    if (isCalculated) { // Replace values only, if successfully calculated and not already available
-        if (!twdBVal->valid) {
-            twdBVal->value = twd;
-            twdBVal->valid = true;
-        }
-        if (!twsBVal->valid) {
-            twsBVal->value = tws;
-            twsBVal->valid = true;
-        }
-        if (!twaBVal->valid) {
-            twaBVal->value = twa;
-            twaBVal->valid = true;
-        }
     }
-    LOG_DEBUG(GwLog::DEBUG,"obp60task addTrueWind: isCalculated %d, TWD %.1f, TWA %.1f, TWS %.1f", isCalculated, twdBVal->value * RAD_TO_DEG,
-        twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852);
-
-    return isCalculated;
 }
-// --- Class WindUtils --------------
+
+/* double genTwdSimDat()
+{
+    simTwd += random(-20, 20);
+    if (simTwd < 0.0)
+        simTwd += 360.0;
+    if (simTwd >= 360.0)
+        simTwd -= 360.0;
+
+    int16_t z = static_cast<int16_t>(DegToRad(simTwd) * 1000.0);
+    pageData.boatHstry.twdHstry->add(z); // Fill the buffer with some test data
+
+    simTws += random(-200, 150) / 10.0; // TWS value in knots
+    simTws = constrain(simTws, 0.0f, 50.0f); // Ensure TWS is between 0 and 50 knots
+    twsValue = simTws;
+}*/

lib/obp60task/OBPDataOperations.h

@@ -1,91 +1,36 @@
 #pragma once
-#include <N2kMessages.h>
+#include "GwApi.h"
 #include "OBPRingBuffer.h"
-#include "BoatDataCalibration.h"        // Functions lib for data instance calibration
+#include <Arduino.h>
-#include "obp60task.h"
 #include <math.h>
 
 typedef struct {
     RingBuffer<int16_t>* twdHstry;
-    RingBuffer<uint16_t>* twsHstry;
+    RingBuffer<int16_t>* twsHstry;
-    RingBuffer<int16_t>* awdHstry;
-    RingBuffer<uint16_t>* awsHstry;
 } tBoatHstryData; // Holds pointers to all history buffers for boat data
 
 class HstryBuf {
-private:
-    GwLog *logger;
-
-    RingBuffer<int16_t> twdHstry; // Circular buffer to store true wind direction values
-    RingBuffer<uint16_t> twsHstry; // Circular buffer to store true wind speed values (TWS)
-    RingBuffer<int16_t> awdHstry; // Circular buffer to store apparant wind direction values
-    RingBuffer<uint16_t> awsHstry; // Circular buffer to store apparant xwind speed values (AWS)
-    int16_t twdHstryMin; // Min value for wind direction (TWD) in history buffer
-    int16_t twdHstryMax; // Max value for wind direction (TWD) in history buffer
-    uint16_t twsHstryMin;
-    uint16_t twsHstryMax;
-    int16_t awdHstryMin;
-    int16_t awdHstryMax;
-    uint16_t awsHstryMin;
-    uint16_t awsHstryMax;
-
-    // boat values for buffers and for true wind calculation
-    GwApi::BoatValue *twdBVal, *twsBVal, *twaBVal, *awdBVal, *awsBVal;
-    GwApi::BoatValue *awaBVal, *hdtBVal, *hdmBVal, *varBVal, *cogBVal, *sogBVal;
 
 public:
-    tBoatHstryData hstryBufList;
+    void fillWndBufSimData(tBoatHstryData& hstryBufs); // Fill most part of the TWD and TWS history buffer with simulated data
-
-    HstryBuf(){
-        hstryBufList = {&twdHstry, &twsHstry, &awdHstry, &awsHstry}; // Generate history buffers of zero size
-    };
-    
-    HstryBuf(int size) {
-        hstryBufList = {&twdHstry, &twsHstry, &awdHstry, &awsHstry}; 
-        hstryBufList.twdHstry->resize(size); // store <size> xWD values for <size>/60 minutes history
-        hstryBufList.twsHstry->resize(size);
-        hstryBufList.awdHstry->resize(size);
-        hstryBufList.awsHstry->resize(size);
-    };
-    void init(BoatValueList* boatValues, GwLog *log);
-    void handleHstryBuf(bool useSimuData);
 };
 
 class WindUtils {
-private:
-    GwApi::BoatValue *twdBVal, *twsBVal, *twaBVal;
-    GwApi::BoatValue *awaBVal, *awsBVal, *cogBVal, *stwBVal, *sogBVal, *hdtBVal, *hdmBVal, *varBVal;
-    static constexpr double DBL_MAX = std::numeric_limits<double>::max();
 
 public:
-    WindUtils(BoatValueList* boatValues){
-        twdBVal = boatValues->findValueOrCreate("TWD");
-        twsBVal = boatValues->findValueOrCreate("TWS");
-        twaBVal = boatValues->findValueOrCreate("TWA");
-        awaBVal = boatValues->findValueOrCreate("AWA");
-        awsBVal = boatValues->findValueOrCreate("AWS");
-        cogBVal = boatValues->findValueOrCreate("COG");
-        stwBVal = boatValues->findValueOrCreate("STW");
-        sogBVal = boatValues->findValueOrCreate("SOG");
-        hdtBVal = boatValues->findValueOrCreate("HDT");
-        hdmBVal = boatValues->findValueOrCreate("HDM");
-        varBVal = boatValues->findValueOrCreate("VAR");
-    };
     static double to2PI(double a);
     static double toPI(double a);
     static double to360(double a);
     static double to180(double a);
-    void toCart(const double* phi, const double* r, double* x, double* y);
+    static void toCart(const double* phi, const double* r, double* x, double* y);
-    void toPol(const double* x, const double* y, double* phi, double* r);
+    static void toPol(const double* x, const double* y, double* phi, double* r);
-    void addPolar(const double* phi1, const double* r1,
+    static void addPolar(const double* phi1, const double* r1,
         const double* phi2, const double* r2,
         double* phi, double* r);
-    void calcTwdSA(const double* AWA, const double* AWS,
+    static void calcTwdSA(const double* AWA, const double* AWS,
         const double* CTW, const double* STW, const double* HDT,
         double* TWD, double* TWS, double* TWA);
-    static double calcHDT(const double* hdmVal, const double* varVal, const double* cogVal, const double* sogVal);
+    static bool calcTrueWind(const double* awaVal, const double* awsVal,
-    bool calcTrueWind(const double* awaVal, const double* awsVal,
         const double* cogVal, const double* stwVal, const double* sogVal, const double* hdtVal,
         const double* hdmVal, const double* varVal, double* twdVal, double* twsVal, double* twaVal);
-    bool addTrueWind(GwApi* api, BoatValueList* boatValues, GwLog *log);
 };

lib/obp60task/OBPRingBuffer.h

@@ -1,75 +1,37 @@
 #pragma once
 #include "GwSynchronized.h"
-#include "WString.h"
-#include "esp_heap_caps.h"
 #include <algorithm>
 #include <limits>
 #include <stdexcept>
 #include <vector>
-
+#include "WString.h"
-template <typename T>
-struct PSRAMAllocator {
-    using value_type = T;
-
-    PSRAMAllocator() = default;
-
-    template <class U>
-    constexpr PSRAMAllocator(const PSRAMAllocator<U>&) noexcept { }
-
-    T* allocate(std::size_t n)
-    {
-        void* ptr = heap_caps_malloc(n * sizeof(T), MALLOC_CAP_SPIRAM);
-        if (!ptr) {
-            return nullptr;
-        } else {
-            return static_cast<T*>(ptr);
-        }
-    }
-
-    void deallocate(T* p, std::size_t) noexcept
-    {
-        heap_caps_free(p);
-    }
-};
-
-template <class T, class U>
-bool operator==(const PSRAMAllocator<T>&, const PSRAMAllocator<U>&) { return true; }
-
-template <class T, class U>
-bool operator!=(const PSRAMAllocator<T>&, const PSRAMAllocator<U>&) { return false; }
 
 template <typename T>
 class RingBuffer {
 private:
-    //    std::vector<T> buffer; // THE buffer vector
+    mutable SemaphoreHandle_t bufLocker;
-    std::vector<T, PSRAMAllocator<T>> buffer; // THE buffer vector, allocated in PSRAM
+    std::vector<T> buffer;
     size_t capacity;
     size_t head; // Points to the next insertion position
     size_t first; // Points to the first (oldest) valid element
     size_t last; // Points to the last (newest) valid element
     size_t count; // Number of valid elements currently in buffer
     bool is_Full; // Indicates that all buffer elements are used and ringing is in use
-    T MIN_VAL; // lowest possible value of buffer of type <T>
+    T MIN_VAL; // lowest possible value of buffer
-    T MAX_VAL; // highest possible value of buffer of type <T> -> indicates invalid value in buffer
+    T MAX_VAL; // highest possible value of buffer of type <T>
-    mutable SemaphoreHandle_t bufLocker;
 
     // metadata for buffer
     String dataName; // Name of boat data in buffer
     String dataFmt; // Format of boat data in buffer
     int updFreq; // Update frequency in milliseconds
-    T smallest; // Value range of buffer: smallest value; needs to be => MIN_VAL
+    T smallest; // Value range of buffer: smallest value
-    T largest; // Value range of buffer: biggest value; needs to be < MAX_VAL, since MAX_VAL indicates invalid entries
+    T largest; // Value range of buffer: biggest value
-
-    void initCommon();
 
 public:
-    RingBuffer();
     RingBuffer(size_t size);
     void setMetaData(String name, String format, int updateFrequency, T minValue, T maxValue); // Set meta data for buffer
     bool getMetaData(String& name, String& format, int& updateFrequency, T& minValue, T& maxValue); // Get meta data of buffer
-    bool getMetaData(String& name, String& format);
     String getName() const; // Get buffer name
-    String getFormat() const; // Get buffer data format
     void add(const T& value); // Add a new value to  buffer
     T get(size_t index) const; // Get value at specific position (0-based index from oldest to newest)
     T getFirst() const; // Get the first (oldest) value in buffer
@@ -88,10 +50,9 @@ public:
     size_t getLastIdx() const; // Get the index of newest value in buffer
     bool isEmpty() const; // Check if buffer is empty
     bool isFull() const; // Check if buffer is full
-    T getMinVal() const; // Get lowest possible value for buffer
+    T getMinVal() const; // Get lowest possible value for buffer; used for initialized buffer data
-    T getMaxVal() const; // Get highest possible value for buffer; used for unset/invalid buffer data
+    T getMaxVal() const; // Get highest possible value for buffer
     void clear(); // Clear buffer
-    void resize(size_t size); // Delete buffer and set new size
     T operator[](size_t index) const; // Operator[] for convenient access (same as get())
     std::vector<T> getAllValues() const; // Get all current values as a vector
 };

lib/obp60task/OBPRingBuffer.tpp

@@ -1,30 +1,5 @@
 #include "OBPRingBuffer.h"
 
-template <typename T>
-void RingBuffer<T>::initCommon() {
-    MIN_VAL = std::numeric_limits<T>::lowest();
-    MAX_VAL = std::numeric_limits<T>::max();
-    dataName = "";
-    dataFmt = "";
-    updFreq = -1;
-    smallest = MIN_VAL;
-    largest = MAX_VAL;
-    bufLocker = xSemaphoreCreateMutex();
-}
-
-template <typename T>
-RingBuffer<T>::RingBuffer()
-    : capacity(0)
-    , head(0)
-    , first(0)
-    , last(0)
-    , count(0)
-    , is_Full(false)
-{
-    initCommon();
-    // <buffer> stays empty
-}
-
 template <typename T>
 RingBuffer<T>::RingBuffer(size_t size)
     : capacity(size)
@@ -34,10 +9,23 @@ RingBuffer<T>::RingBuffer(size_t size)
     , count(0)
     , is_Full(false)
 {
-    initCommon();
+    bufLocker = xSemaphoreCreateMutex();
 
-    buffer.reserve(size);
+    if (size == 0) {
-    buffer.resize(size, MAX_VAL); // MAX_VAL indicate invalid values
+        // return false;
+    }
+
+    MIN_VAL = std::numeric_limits<T>::lowest();
+    MAX_VAL = std::numeric_limits<T>::max();
+    dataName = "";
+    dataFmt = "";
+    updFreq = -1;
+    smallest = MIN_VAL;
+    largest = MAX_VAL;
+
+    buffer.resize(size, MIN_VAL);
+
+    // return true;
 }
 
 // Specify meta data of buffer content
@@ -69,20 +57,6 @@ bool RingBuffer<T>::getMetaData(String& name, String& format, int& updateFrequen
     return true;
 }
 
-// Get meta data of buffer content
-template <typename T>
-bool RingBuffer<T>::getMetaData(String& name, String& format)
-{
-    if (dataName == "" || dataFmt == "") {
-        return false; // Meta data not set
-    }
-
-    GWSYNCHRONIZED(&bufLocker);
-    name = dataName;
-    format = dataFmt;
-    return true;
-}
-
 // Get buffer name
 template <typename T>
 String RingBuffer<T>::getName() const
@@ -90,20 +64,13 @@ String RingBuffer<T>::getName() const
     return dataName;
 }
 
-// Get buffer data format
-template <typename T>
-String RingBuffer<T>::getFormat() const
-{
-    return dataFmt;
-}
-
 // Add a new value to buffer
 template <typename T>
 void RingBuffer<T>::add(const T& value)
 {
     GWSYNCHRONIZED(&bufLocker);
     if (value < smallest || value > largest) {
-        buffer[head] = MAX_VAL; // Store MAX_VAL if value is out of range
+        buffer[head] = MIN_VAL; // Store MIN_VAL if value is out of range
     } else {
         buffer[head] = value;
     }
@@ -127,7 +94,7 @@ T RingBuffer<T>::get(size_t index) const
 {
     GWSYNCHRONIZED(&bufLocker);
     if (isEmpty() || index < 0 || index >= count) {
-        return MAX_VAL;
+        return MIN_VAL;
     }
 
     size_t realIndex = (first + index) % capacity;
@@ -146,7 +113,7 @@ template <typename T>
 T RingBuffer<T>::getFirst() const
 {
     if (isEmpty()) {
-        return MAX_VAL;
+        return MIN_VAL;
     }
     return get(0);
 }
@@ -156,7 +123,7 @@ template <typename T>
 T RingBuffer<T>::getLast() const
 {
     if (isEmpty()) {
-        return MAX_VAL;
+        return MIN_VAL;
     }
     return get(count - 1);
 }
@@ -166,14 +133,14 @@ template <typename T>
 T RingBuffer<T>::getMin() const
 {
     if (isEmpty()) {
-        return MAX_VAL;
+        return MIN_VAL;
     }
 
     T minVal = MAX_VAL;
     T value;
     for (size_t i = 0; i < count; i++) {
         value = get(i);
-        if (value < minVal && value != MAX_VAL) {
+        if (value < minVal && value != MIN_VAL) {
             minVal = value;
         }
     }
@@ -185,7 +152,7 @@ template <typename T>
 T RingBuffer<T>::getMin(size_t amount) const
 {
     if (isEmpty() || amount <= 0) {
-        return MAX_VAL;
+        return MIN_VAL;
     }
     if (amount > count)
         amount = count;
@@ -194,7 +161,7 @@ T RingBuffer<T>::getMin(size_t amount) const
     T value;
     for (size_t i = 0; i < amount; i++) {
         value = get(count - 1 - i);
-        if (value < minVal && value != MAX_VAL) {
+        if (value < minVal && value != MIN_VAL) {
             minVal = value;
         }
     }
@@ -206,14 +173,14 @@ template <typename T>
 T RingBuffer<T>::getMax() const
 {
     if (isEmpty()) {
-        return MAX_VAL;
+        return MIN_VAL;
     }
 
     T maxVal = MIN_VAL;
     T value;
     for (size_t i = 0; i < count; i++) {
         value = get(i);
-        if (value > maxVal && value != MAX_VAL) {
+        if (value > maxVal && value != MIN_VAL) {
             maxVal = value;
         }
     }
@@ -225,7 +192,7 @@ template <typename T>
 T RingBuffer<T>::getMax(size_t amount) const
 {
     if (isEmpty() || amount <= 0) {
-        return MAX_VAL;
+        return MIN_VAL;
     }
     if (amount > count)
         amount = count;
@@ -234,7 +201,7 @@ T RingBuffer<T>::getMax(size_t amount) const
     T value;
     for (size_t i = 0; i < amount; i++) {
         value = get(count - 1 - i);
-        if (value > maxVal && value != MAX_VAL) {
+        if (value > maxVal && value != MIN_VAL) {
             maxVal = value;
         }
     }
@@ -246,7 +213,7 @@ template <typename T>
 T RingBuffer<T>::getMid() const
 {
     if (isEmpty()) {
-        return MAX_VAL;
+        return MIN_VAL;
     }
 
     return (getMin() + getMax()) / static_cast<T>(2);
@@ -257,7 +224,7 @@ template <typename T>
 T RingBuffer<T>::getMid(size_t amount) const
 {
     if (isEmpty() || amount <= 0) {
-        return MAX_VAL;
+        return MIN_VAL;
     }
 
     if (amount > count)
@@ -271,7 +238,7 @@ template <typename T>
 T RingBuffer<T>::getMedian() const
 {
     if (isEmpty()) {
-        return MAX_VAL;
+        return MIN_VAL;
     }
 
     // Create a temporary vector with current valid elements
@@ -300,7 +267,7 @@ template <typename T>
 T RingBuffer<T>::getMedian(size_t amount) const
 {
     if (isEmpty() || amount <= 0) {
-        return MAX_VAL;
+        return MIN_VAL;
     }
     if (amount > count)
         amount = count;
@@ -368,14 +335,14 @@ bool RingBuffer<T>::isFull() const
     return is_Full;
 }
 
-// Get lowest possible value for buffer
+// Get lowest possible value for buffer; used for non-set buffer data
 template <typename T>
 T RingBuffer<T>::getMinVal() const
 {
     return MIN_VAL;
 }
 
-// Get highest possible value for buffer; used for unset/invalid buffer data
+// Get highest possible value for buffer
 template <typename T>
 T RingBuffer<T>::getMaxVal() const
 {
@@ -394,23 +361,6 @@ void RingBuffer<T>::clear()
     is_Full = false;
 }
 
-// Delete buffer and set new size
-template <typename T>
-void RingBuffer<T>::resize(size_t newSize)
-{
-    GWSYNCHRONIZED(&bufLocker);
-    capacity = newSize;
-    head = 0;
-    first = 0;
-    last = 0;
-    count = 0;
-    is_Full = false;
-
-    buffer.clear();
-    buffer.reserve(newSize);
-    buffer.resize(newSize, MAX_VAL);
-}
-
 // Get all current values as a vector
 template <typename T>
 std::vector<T> RingBuffer<T>::getAllValues() const

lib/obp60task/PageAnchor.cpp

@@ -1,10 +1,13 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+#include "ConfigMenu.h"
+
 /*
+  Anchor overview with additional associated data
   This page is in experimental stage so be warned!
   North is up.
-  Anchor page with background map from mapservice
 
   Boatdata used
     DBS - Water depth
@@ -14,28 +17,32 @@
     LAT/LON - Boat position, current
     HDOP - Position error
 
+  This is the fist page to contain a configuration page with 
+  data entry option.
+  Also it will make use of the new alarm function.
+
+  Data
+    Anchor position lat/lon
+    Depth at anchor position
+    Chain length used
+    Boat position current
+    Depth at boat position
+    Boat heading
+    Wind direction
+    Wind strength
+    Alarm j/n
+    Alarm radius
+    GPS position error
+    Timestamp while dropping anchor
+
    Drop / raise function in device OBP40 has to be done inside 
    config mode because of limited number of buttons.
 
-  TODO 
-    gzip for data transfer,
-       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)
-
 */
 
-#include <WiFi.h>
-#include <HTTPClient.h>
-#include "Pagedata.h"
-#include "OBP60Extensions.h"
-
 #define anchor_width 16
 #define anchor_height 16
-static unsigned char anchor_bits[] PROGMEM = {
+static unsigned char anchor_bits[] = {
    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 };
@@ -43,32 +50,22 @@ static unsigned char anchor_bits[] PROGMEM = {
 class PageAnchor : public Page
 {
 private:
-    char mode = 'N'; // (N)ormal, (C)onfig
+    GwConfigHandler *config;
-    int8_t editmode = -1; // marker for menu/edit/set function
+    GwLog *logger;
-
+    bool simulation = false;
-    //uint8_t *mapbuf = new uint8_t[10000]; // 8450 Byte without header
+    bool holdvalues = false;
-    //int mapbuf_size = 10000;
+    String flashLED;
-    //uint8_t *mapbuf = (uint8_t*) heap_caps_malloc(mapbuf_size, MALLOC_CAP_SPIRAM);
+    String backlightMode;
-    GFXcanvas1 *canvas;
-    const uint16_t map_width = 264;
-    const uint16_t map_height = 260;
-    bool map_valid = false;
-    double map_lat = 0; // current center of valid map
-    double map_lon = 0;
-    String server_name; // server with map service
-    String tile_path;
-
     String lengthformat;
 
-    double scale = 50;    // Radius of display circle in meter, depends on lat
+    int scale = 50; // Radius of display circle in meter
-    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;
+    uint8_t chain;
 
     bool anchor_set = false;
     double anchor_lat;
@@ -76,6 +73,11 @@ private:
     double anchor_depth;
     int anchor_ts; // time stamp anchor dropped
 
+    char mode = 'N'; // (N)ormal, (C)onfig
+    int8_t editmode = -1; // marker for menu/edit/set function
+
+    ConfigMenu *menu;
+
     void displayModeNormal(PageData &pageData) {
 
         // Boatvalues: DBS, HDT, AWS, AWD, LAT, LON, HDOP
@@ -97,35 +99,11 @@ private:
         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);
+        LOG_DEBUG(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;
-                    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
@@ -137,19 +115,8 @@ private:
         };
         //rotatePoints und dann Linien zeichnen
         // TODO rotate boat according to current heading
-        if (bv_hdt->valid) {
+        //drawPoly(rotatePoints(c, pts, RadToDeg(value2)), commonData->fgcolor);
-            if (map_valid) {
+        drawPoly(pts_boat, commonData->fgcolor);
-                Point b1 = rotatePoint(c, {b.x, b.y - 8}, RadToDeg(bv_hdt->value));
-                getdisplay().fillCircle(b1.x, b1.y, 10, commonData->bgcolor);
-            }
-            drawPoly(rotatePoints(c, pts_boat, RadToDeg(bv_hdt->value)), 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 = {
@@ -164,70 +131,53 @@ private:
 
         // Title and corner value headings
         getdisplay().setTextColor(commonData->fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold10pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        // Left
+        getdisplay().setCursor(8, 48);
-        getdisplay().setCursor(8, 36);
         getdisplay().print("Anchor");
-        getdisplay().setCursor(8, 210);
+
+        getdisplay().setFont(&Ubuntu_Bold10pt8b);
+        getdisplay().setCursor(8, 200);
         getdisplay().print("Depth");
-        // Right
+        drawTextRalign(392, 38, "Chain");
-        drawTextRalign(392, 80, "Chain");
+        drawTextRalign(392, 200, "Wind");
-        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
+        drawTextRalign(392, 100, lengthformat); // chain unit not implemented
 
         // Corner values
         getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(8, 54);
+        getdisplay().setCursor(8, 70);
-        getdisplay().print(anchor_set ? "Dropped" : "Ready"); // Anchor state
+        getdisplay().print("Alarm: ");
-        getdisplay().setCursor(8, 72);
+        getdisplay().print(alarm_enabled ? "On" : "Off");
-        getdisplay().print("Alarm: "); // Alarm state
-        getdisplay().print(alarm_enabled ? "on" : "off");
 
-        getdisplay().setCursor(8, 120);
+        getdisplay().setCursor(8, 90);
-        getdisplay().print("Zoom");
+        getdisplay().print("HDOP");
-        getdisplay().setCursor(8, 136);
+        getdisplay().setCursor(8, 106);
-        getdisplay().print(zoom);
+        if (bv_hdop->valid) {
-
+            getdisplay().print(round(bv_hdop->value), 0);
-        getdisplay().setCursor(8, 160);
+            getdisplay().print(sunit_hdop);
-        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
+        // Values
-        drawTextRalign(392, 96, String(chain) + " m");
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        drawTextRalign(392, 96+16, "of " + String(chain_length) + " m");
+        // Current chain used
-
+        getdisplay().setCursor(328, 85);
-        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+        getdisplay().print("27");
 
         // Depth
         getdisplay().setCursor(8, 250);
         getdisplay().print(sval_dbs);
-
         // Wind
-        getdisplay().setCursor(320, 250);
+        getdisplay().setCursor(328, 250);
         getdisplay().print(sval_aws);
 
-        // Position of boat in center of map
+        getdisplay().drawCircle(c.x, c.y, r, commonData->fgcolor);
-        getdisplay().setFont(&IBM8x8px);
+        getdisplay().drawCircle(c.x, c.y, r + 1, commonData->fgcolor);
-        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);
@@ -238,11 +188,20 @@ private:
         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");
+        drawTextCenter(c.x + r / 2, c.y + 8, String(scale) + "m");
+ 
+        // alarm range circle
+        if (alarm_enabled) {
+            // alarm range in meter has to be smaller than the scale in meter
+            // r and r_range are pixel values
+            uint16_t r_range = int(alarm_range * r / scale);
+            LOG_DEBUG(GwLog::LOG,"Drawing at PageAnchor; Alarm range = %d", r_range);
+            getdisplay().drawCircle(c.x, c.y, r_range, commonData->fgcolor);
+        }
  
         // 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);
+                                 anchor_bits, anchor_width, anchor_height, commonData->fgcolor);
 
     }
 
@@ -253,160 +212,191 @@ private:
         getdisplay().setCursor(8, 48);
         getdisplay().print("Anchor configuration");
         
+        // TODO
+        // show lat/lon for anchor pos
+        // show lat/lon for boat pos
+        // show distance anchor <-> boat
+
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        for (int i = 0 ; i < menu->getItemCount(); i++) {
+            ConfigMenuItem *itm = menu->getItemByIndex(i);
+            if (!itm) {
+                LOG_DEBUG(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");
+        config = commonData->config;
+        logger = commonData->logger;
+        logger->logDebug(GwLog::LOG,"Instantiate PageAnchor");
 
-        server_name = common.config->getString(common.config->mapServer);
+        // preload configuration data
-        tile_path = common.config->getString(common.config->mapTilePath);
+        simulation = config->getBool(config->useSimuData);
+        holdvalues = config->getBool(config->holdvalues);
+        flashLED = config->getString(config->flashLED);
+        backlightMode = config->getString(config->backlight);
+        lengthformat = config->getString(config->lengthFormat);
+        chain_length = config->getInt(config->chainLength);
 
-        lengthformat = common.config->getString(common.config->lengthFormat);
+        chain = 0;
-        chain_length = common.config->getInt(common.config->chainLength);
+        anchor_set = false;
+        alarm_range = 30;
 
-        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");
+        if (! newitem) {
+            // Demo: in case of failure exit here, should never be happen
+            logger->logDebug(GwLog::ERROR,"Menu item creation failed");
+            return;
+        }
+        newitem->setRange(0, 200, {1, 5, 10});
+        newitem = menu->addItem("chainmax", "Chain max", "int", chain_length, "m");
+        newitem->setRange(0, 200, {1, 5, 10});
+        newitem = menu->addItem("zoom", "Zoom", "int", 50, "m");
+        newitem->setRange(0, 200, {1, });
+        newitem = menu->addItem("range", "Alarm range", "int", 40, "m");
+        newitem->setRange(0, 200, {1, 5, 10});
+        newitem = menu->addItem("alat", "Adjust anchor lat.", "int", 0, "m");
+        newitem->setRange(0, 200, {1, 5, 10});
+        newitem = menu->addItem("alon", "Adjust anchor lon.", "int", 0, "m");
+        newitem->setRange(0, 200, {1, 5, 10});
+#ifdef BOARD_OBP40S3
+        // Intodruced here because of missing keys for OBP40
+        newitem = menu->addItem("anchor", "Anchor down", "bool", 0, "");
+#endif
+        menu->setItemActive("zoom");
+     }
 
     void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "MODE";
-#ifdef BOARD_OBP40S3
+        commonData->keydata[1].label = "ALARM";
-        commonData->keydata[1].label = "DROP";
-#endif
-#ifdef BOARD_OBP60S3
-        commonData->keydata[4].label = "DROP";
-#endif
     }
 
-    // TODO OBP40 / OBP60 different handling
+#ifdef BOARD_OBP60S3
-    int handleKey(int key) {
+    int handleKey(int key){
+        if (key == 1) { // Switch between normal and config mode
+            if (mode == 'N') {
+                mode = 'C';
+            } else {
+                mode = 'N';
+            }
+            return 0;
+        }
+        if (mode == 'N') {
+            if (key == 2) { // Toggle alarm
+                alarm_enabled = !alarm_enabled;
+                return 0;
+            }
+        } else { // Config mode
+            if (key == 3) {
+                // menu down
+                menu->goNext();
+                return 0;
+            }
+            if (key == 4) {
+                // menu up
+                menu->goPrev();
+                return 0;
+            }
+        }
+        if (key == 11) { // Code for keylock
+            commonData->keylock = !commonData->keylock;
+            return 0;
+        }
+        return key;
+    }
+#endif
+#ifdef BOARD_OBP40S3
+    int handleKey(int key){
         if (key == 1) { // Switch between normal and config mode
             if (mode == 'N') {
                 mode = 'C';
                 commonData->keydata[1].label = "EDIT";
             } else {
                 mode = 'N';
-#ifdef BOARD_OBP40S3
+                commonData->keydata[1].label = "ALARM";
-                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;
+            if (key == 2) { // Toggle alarm
-            commonData->keydata[1].label = anchor_set ? "RAISE": "DROP";
+                alarm_enabled = !alarm_enabled;
-            return 0;
+                return 0;
+            }
+        } else { // Config mode
+            // TODO different code for OBP40 / OBP60 
+            if (key == 9) {
+                // menu down
+                if (editmode > 0) {
+                    // decrease item value
+                    menu->getActiveItem()->decValue();
+                } else {
+                    menu->goNext();
+                }
+                return 0;
+            }
+            if (key == 10) {
+                // menu up or value up
+                if (editmode > 0) {
+                    // increase item value
+                    menu->getActiveItem()->incValue();
+                } else {
+                    menu->goPrev();
+                }
+                return 0;
+            }
+            if (key == 2) {
+                // enter / leave edit mode for current menu item
+                if (editmode > 0) {
+                    commonData->keydata[1].label = "EDIT";
+                    editmode = 0;
+                } else {
+                    commonData->keydata[1].label = "SET";
+                    editmode = 1;
+                }
+                return 0;
+            }
         }
-        // Code for keylock
+        if (key == 11) { // Code for keylock
-        if (key == 11){
             commonData->keylock = !commonData->keylock;
             return 0;
         }
         return key;
     }
-
+#endif
-    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;
-        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.SetAcceptEncoding("gzip");
-        // TODO miniz.c from ROM
-        int httpCode = http.GET();
-        if (httpCode > 0) {
-            if (httpCode == HTTP_CODE_OK) {
-                WiFiClient* stream = http.getStreamPtr();
-                int size = http.getSize();
-                commonData->logger->logDebug(GwLog::LOG, "HTTP get size: %d", size);
-                // header: P4<LF><width> <height><LF> (e.g. 11 byte)
-                uint8_t header[14]; // max: P4<LF>wwww wwww<LF>
-                bool header_read = false;
-                int header_size = 0;
-                uint8_t* buf = canvas->getBuffer();
-                int n = 0;
-                int ix = 0;
-                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;
-        }
-
-        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);
-        }
     };
 
-    int displayPage(PageData &pageData) {
+    int displayPage(PageData &pageData){
-        GwLog *logger = commonData->logger;
 
         // Logging boat values
-        logger->logDebug(GwLog::LOG, "Drawing at PageAnchor; Mode=%c", mode);
+        LOG_DEBUG(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

lib/obp60task/PageClock.cpp

@@ -31,6 +31,15 @@ bool homevalid = false; // homelat and homelon are valid
     PageClock(CommonData &common){
         commonData = &common;
         common.logger->logDebug(GwLog::LOG,"Instantiate PageClock");
+
+        // WIP time source
+#ifdef BOARD_OBP60S3
+        String use_rtc = common.config->getString(common.config->useRTC);
+        if (use_rtc == "off") {
+            source = 'G';
+        }
+#endif
+
         simulation = common.config->getBool(common.config->useSimuData);
         timezone = common.config->getString(common.config->timeZone).toDouble();
         homelat = common.config->getString(common.config->homeLAT).toDouble();
@@ -100,9 +109,10 @@ bool homevalid = false; // homelat and homelon are valid
         static String svalue5old = "";
         static String svalue6old = "";
 
-        double value1 = 0;
+        double value1 = 0; // GPS time
-        double value2 = 0;
+        double value2 = 0; // GPS date FIXME date defined as uint32_t!
-        double value3 = 0;
+        double value3 = 0; // HDOP
+        bool gpsvalid = false;
 
         // Get config data
         String lengthformat = config->getString(config->lengthFormat);
@@ -155,6 +165,9 @@ bool homevalid = false; // homelat and homelon are valid
             unit3old = unit3;                           // Save old unit
         }
 
+        // GPS date and time are valid and can be used
+        gpsvalid = (valid1 && valid2 && valid3);
+
         // Optical warning by limit violation (unused)
         if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
@@ -163,7 +176,7 @@ bool homevalid = false; // homelat and homelon are valid
 
         // 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);
+        LOG_DEBUG(GwLog::LOG,"Drawing at PageClock, %s:%f,  %s:%f, %s:%f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3);
 
         // Draw page
         //***********************************************************
@@ -231,7 +244,7 @@ bool homevalid = false; // homelat and homelon are valid
 
         // Show values sunrise
         String sunrise = "---";
-        if ((valid1 and valid2 and valid3 == true) or (homevalid and commonData->data.rtcValid)) {
+        if (((source == 'G') and gpsvalid) or (homevalid and commonData->data.rtcValid)) {
             sunrise = String(commonData->sundata.sunriseHour) + ":" + String(commonData->sundata.sunriseMinute + 100).substring(1);
             svalue5old = sunrise;
         } else if (simulation) {
@@ -251,7 +264,7 @@ bool homevalid = false; // homelat and homelon are valid
 
         // Show values sunset
         String sunset = "---";
-        if ((valid1 and valid2 and valid3 == true) or (homevalid and commonData->data.rtcValid)) {
+        if (((source == 'G') and gpsvalid) or (homevalid and commonData->data.rtcValid)) {
             sunset = String(commonData->sundata.sunsetHour) + ":" +  String(commonData->sundata.sunsetMinute + 100).substring(1);
             svalue6old = sunset;
         } else if (simulation) {

lib/obp60task/PageSkyView.cpp

@@ -1,73 +1,46 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 
-#include <vector>
-#include <algorithm> // for vector sorting
-
 /*
  * SkyView / Satellites
  */
 
 class PageSkyView : public Page
 {
-private:
-    String flashLED;
-    GwBoatData *bd;
-
 public:
-    PageSkyView(CommonData &common)
+    PageSkyView(CommonData &common){
-    {
         commonData = &common;
-
+        common.logger->logDebug(GwLog::LOG,"Show PageSkyView");
-        // task name access is for example purpose only
-        TaskHandle_t currentTaskHandle = xTaskGetCurrentTaskHandle();
-        const char* taskName = pcTaskGetName(currentTaskHandle);
-        common.logger->logDebug(GwLog::LOG, "Instantiate PageSkyView in task '%s'", taskName);
-
-        flashLED = common.config->getString(common.config->flashLED);
     }
 
-    int handleKey(int key) {
+    int handleKey(int key){
-        // return 0 to mark the key handled completely
+        // Code for keylock
-        // return the key to allow further action
+        if(key == 11){
-        if (key == 11) {
             commonData->keylock = !commonData->keylock;
-            return 0;
+            return 0;                   // Commit the key
         }
         return key;
     }
 
-    void displayNew(PageData &pageData) {
+    int displayPage(PageData &pageData) {
-#ifdef BOARD_OBP60S3
+        GwConfigHandler *config = commonData->config;
-        // Clear optical warning
+        GwLog *logger = commonData->logger;
-        if (flashLED == "Limit Violation") {
+
+        // Get config data
+        String flashLED = config->getString(config->flashLED);
+        String displaycolor = config->getString(config->displaycolor);
+        String backlightMode = config->getString(config->backlight);
+        
+        // Optical warning by limit violation (unused)
+        if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
             setFlashLED(false); 
         }
-#endif
-        bd = pageData.api->getBoatData();
-    };
 
-    // Comparator function to sort by SNR
+        // Logging boat values
-    static bool compareBySNR(const GwSatInfo& a, const GwSatInfo& b) {
+        LOG_DEBUG(GwLog::LOG,"Drawing at PageSkyView");
-       return a.SNR > b.SNR; // Sort in descending order
-    }
-
-    int displayPage(PageData &pageData) {
-        GwLog *logger = commonData->logger;
-
-        std::vector<GwSatInfo> sats;
-        int nSat = bd->SatInfo->getNumSats();
-
-        logger->logDebug(GwLog::LOG, "Drawing at PageSkyView, %d satellites", nSat);
-
-        for (int i = 0; i < nSat; i++) {
-            sats.push_back(*bd->SatInfo->getAt(i));
-        }
-        std::sort(sats.begin(), sats.end(), compareBySNR);
 
         // Draw page
         //***********************************************************
@@ -78,13 +51,29 @@ public:
         // current position
         getdisplay().setFont(&Ubuntu_Bold8pt8b);
 
+        GwApi::BoatValue *bv_lat = pageData.values[0];
+        String sv_lat = formatValue(bv_lat, *commonData).svalue;
+        //getdisplay().setCursor(300, 40);
+        //getdisplay().print(sv_lat);
+
+        GwApi::BoatValue *bv_lon = pageData.values[1];
+        String sv_lon = formatValue(bv_lon, *commonData).svalue;
+        //getdisplay().setCursor(300, 60);
+        //getdisplay().print(sv_lon);
+
+        GwApi::BoatValue *bv_hdop = pageData.values[2];
+        String sv_hdop = formatValue(bv_hdop, *commonData).svalue;
+        //getdisplay().setCursor(300, 80);
+        //getdisplay().print(sv_hdop);
+
         // sky view
         Point c = {130, 148};
-        uint16_t r = 120;
+        uint16_t r = 125;
         uint16_t r1 = r / 2;
 
-        getdisplay().fillCircle(c.x, c.y, r + 2, commonData->fgcolor);
+        getdisplay().fillCircle(c.x, c.y, r, commonData->bgcolor);
-        getdisplay().fillCircle(c.x, c.y, r - 1, commonData->bgcolor);
+        getdisplay().drawCircle(c.x, c.y, r + 1, commonData->fgcolor);
+        getdisplay().drawCircle(c.x, c.y, r + 2, commonData->fgcolor);
         getdisplay().drawCircle(c.x, c.y, r1, commonData->fgcolor);
 
         // separation lines
@@ -101,83 +90,43 @@ public:
 
         // directions 
 
-        int16_t x1, y1;
+        int16_t  x1, y1;
         uint16_t w, h;
         getdisplay().setFont(&Ubuntu_Bold12pt8b);
 
 		getdisplay().getTextBounds("N", 0, 150, &x1, &y1, &w, &h);
-        getdisplay().setCursor(c.x - w / 2, c.y - r + h + 3);
+        getdisplay().setCursor(c.x - w / 2, c.y - r + h + 2);
         getdisplay().print("N");
 
 		getdisplay().getTextBounds("S", 0, 150, &x1, &y1, &w, &h);
-        getdisplay().setCursor(c.x - w / 2, c.y + r - 3);
+        getdisplay().setCursor(c.x - w / 2, c.y + r - 2);
         getdisplay().print("S");
 
 		getdisplay().getTextBounds("E", 0, 150, &x1, &y1, &w, &h);
-        getdisplay().setCursor(c.x + r - w - 3, c.y + h / 2);
+        getdisplay().setCursor(c.x + r - w - 2, c.y + h / 2);
         getdisplay().print("E");
         
 		getdisplay().getTextBounds("W", 0, 150, &x1, &y1, &w, &h);
-        getdisplay().setCursor(c.x - r + 3 , c.y + h / 2);
+        getdisplay().setCursor(c.x - r + 2 , c.y + h / 2);
         getdisplay().print("W");
 
-        // show satellites in "map"
+        // satellites
-        getdisplay().setFont(&IBM8x8px);
+
-        for (int i = 0; i < nSat; i++) {
-            float arad = (sats[i].Azimut * M_PI / 180.0) + M_PI;
-            float erad = sats[i].Elevation * M_PI / 180.0;
-            uint16_t x = c.x + sin(arad) * erad * r1;
-            uint16_t y = c.y + cos(arad) * erad * r1;
-            getdisplay().fillRect(x-4, y-4, 8, 8, commonData->fgcolor);
-            getdisplay().setCursor(x-7, y+12);
-            getdisplay().printf("%02d", static_cast<int>(sats[i].PRN));
-        }
 
         // Signal / Noise bars
         getdisplay().setFont(&Ubuntu_Bold8pt8b);
         getdisplay().setCursor(325, 34);
         getdisplay().print("SNR");
-//        getdisplay().drawRect(270, 20, 125, 257, commonData->fgcolor);
+        getdisplay().drawRect(270, 20, 125, 257, commonData->fgcolor);
-        int maxsat = std::min(nSat, 12);
+        for (int i = 0; i < 12; i++) {
-        for (int i = 0; i < maxsat; i++) {
             uint16_t y = 29 + (i + 1) * 20;
             getdisplay().setCursor(276, y);
             char buffer[3];
-            snprintf(buffer, 3, "%02d", static_cast<int>(sats[i].PRN));
+            snprintf(buffer, 3, "%02d", i+1);
             getdisplay().print(String(buffer));
             getdisplay().drawRect(305, y-12, 85, 14, commonData->fgcolor);
-            getdisplay().setCursor(315, y);
-            // TODO SNR as number or as bar via mode key?
-            if (sats[i].SNR <= 100) {
-                // getdisplay().print(sats[i].SNR);
-                getdisplay().fillRect(307, y-10, int(81 * sats[i].SNR / 100.0), 10, commonData->fgcolor);
-            } else {
-                getdisplay().print("n/a");
-            }
         }
 
-        // Show SatInfo and HDOP
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-
-        getdisplay().setCursor(220, 34);
-        getdisplay().print("Sat:");
-
-        GwApi::BoatValue *bv_satinfo = pageData.values[0]; // SatInfo
-        String sval_satinfo = formatValue(bv_satinfo, *commonData).svalue;
-        getdisplay().setCursor(220, 49);
-        getdisplay().print(sval_satinfo);
-        
-        getdisplay().setCursor(220, 254);
-        getdisplay().print("HDOP:");
-
-        GwApi::BoatValue *bv_hdop = pageData.values[1]; // HDOP
-        double hdop = formatValue(bv_hdop, *commonData).value * 4; // 4 is factor for UERE (translation in meter)
-        char sval_hdop[20];
-        dtostrf(hdop, 0, 1, sval_hdop);  // Only one prefix
-        strcat(sval_hdop, "m");
-        getdisplay().setCursor(220, 269);
-        getdisplay().print(sval_hdop);
-
         return PAGE_UPDATE;
     };
 };
@@ -197,7 +146,7 @@ PageDescription registerPageSkyView(
     "SkyView",              // Page name
     createPage,             // Action
     0,                      // Number of bus values depends on selection in Web configuration
-    {"SatInfo", "HDOP"},    // Bus values we need in the page
+    {"LAT", "LON", "HDOP"}, // Bus values we need in the page
     true                    // Show display header on/off
 );
 

lib/obp60task/PageSystem.cpp

@@ -1,23 +1,15 @@
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
-/*
- * Special system page, called directly with fast key sequence 5,4
- * Out of normal page order.
- * Consists of some sub-pages with following content:
- *   1. Hard and software information
- *   2. System settings
- *   3. NMEA2000 device list
- *   4. SD Card information if available
- */
-
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
+#include "ConfigMenu.h"
 #include "images/logo64.xbm"
 #include <esp32/clk.h>
 #include "qrcode.h"
 
 #ifdef BOARD_OBP40S3
-#include "dirent.h"
+#include <SD.h>
+#include <FS.h>
 #endif
 
 #define STRINGIZE_IMPL(x) #x
@@ -28,12 +20,42 @@
 #define DISPLAYINFO STRINGIZE(EPDTYPE)
 #define GXEPD2INFO STRINGIZE(GXEPD2VERS)
 
+/*
+ * Special system page, called directly with fast key sequence 5,4
+ * Out of normal page order.
+ * Consists of some sub-pages with following content:
+ *   1. Hard and software information
+ *   2. System settings
+ *   3. System configuration: running and NVRAM
+ *   4. NMEA2000 device list
+ *   5. SD Card information if available
+ *
+ * TODO
+ *    - setCpuFrequencyMhz(80|160|240);
+ *    - Accesspoint / ! Änderung im Gatewaycode erforderlich?
+ *         if (! isApActive()) {
+ *           wifiSSID = config->getString(config->wifiSSID);
+ *           wifiPass = config->getString(config->wifiPass);
+ *           wifiSoftAP(wifiSSID, wifiPass);
+ *         }
+ *     - Power mode
+ *         powerInit(powermode);
+ */
+
 class PageSystem : public Page
 {
 private:
+    GwConfigHandler *config;
+    GwLog *logger;
+
+    // NVRAM config options
+    String flashLED;
+
+    // Generic data access
+
     uint64_t chipid;
     bool simulation;
-    bool use_sdcard;
+    bool sdcard;
     String buzzer_mode;
     uint8_t buzzer_power;
     String cpuspeed;
@@ -48,20 +70,337 @@ private:
     double homelat;
     double homelon;
 
-    char mode = 'N'; // (N)ormal, (S)ettings, (D)evice list, (C)ard
+    char mode = 'N'; // (N)ormal, (S)ettings, (C)onfiguration, (D)evice list, c(A)rd
+    int8_t editmode = -1; // marker for menu/edit/set function
+
+    ConfigMenu *menu;
+
+    void incMode() {
+        if (mode == 'N') {        // Normal
+            mode = 'S';
+        } else if (mode == 'S') { // Settings
+            mode = 'C';
+        } else if (mode == 'C') { // Config
+            mode = 'D';
+        } else if (mode == 'D') { // Device list
+            if (sdcard) {
+                mode = 'A';       // SD-Card
+            } else {
+                mode = 'N';
+            }
+        } else {
+            mode = 'N';
+        }
+    }
+
+    void decMode() {
+        if (mode == 'N') {
+            if (sdcard) {
+                mode = 'A';
+            } else {
+                mode = 'D';
+            }
+        } else if (mode == 'S') { // Settings
+            mode = 'N';
+        } else if (mode == 'C') { // Config
+            mode = 'S';
+        } else if (mode == 'D') { // Device list
+            mode = 'C';
+        } else {
+            mode = 'D';
+        }
+    }
+
+    void displayModeNormal() {
+        // Default system page view
+
+        uint16_t y0 = 155;
+
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setCursor(8, 48);
+        getdisplay().print("System information");
+
+        getdisplay().drawXBitmap(320, 25, logo64_bits, logo64_width, logo64_height, commonData->fgcolor);
+
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+
+        char ssid[13];
+        snprintf(ssid, 13, "%04X%08X", (uint16_t)(chipid >> 32), (uint32_t)chipid);
+        displayBarcode(String(ssid), 320, 200, 2);
+        getdisplay().setCursor(8, 70);
+        getdisplay().print(String("MCUDEVICE-") + String(ssid));
+
+        getdisplay().setCursor(8, 95);
+        getdisplay().print("Firmware version: ");
+        getdisplay().setCursor(150, 95);
+        getdisplay().print(VERSINFO);
+
+        getdisplay().setCursor(8, 113);
+        getdisplay().print("Board version: ");
+        getdisplay().setCursor(150, 113);
+        getdisplay().print(BOARDINFO);
+        getdisplay().print(String(" HW ") + String(PCBINFO));
+
+        getdisplay().setCursor(8, 131);
+        getdisplay().print("Display version: ");
+        getdisplay().setCursor(150, 131);
+        getdisplay().print(DISPLAYINFO);
+        getdisplay().print("; GxEPD2 v");
+        getdisplay().print(GXEPD2INFO);
+
+        getdisplay().setCursor(8, 265);
+#ifdef BOARD_OBP60S3
+        getdisplay().print("Press STBY to enter deep sleep mode");
+#endif
+#ifdef BOARD_OBP40S3
+        getdisplay().print("Press wheel to enter deep sleep mode");
+#endif
+
+        // Flash memory size
+        uint32_t flash_size = ESP.getFlashChipSize();
+        getdisplay().setCursor(8, y0);
+        getdisplay().print("FLASH:");
+        getdisplay().setCursor(90, y0);
+        getdisplay().print(String(flash_size / 1024) + String(" kB"));
+
+        // PSRAM memory size
+        uint32_t psram_size = ESP.getPsramSize();
+        getdisplay().setCursor(8, y0 + 16);
+        getdisplay().print("PSRAM:");
+        getdisplay().setCursor(90, y0 + 16);
+        getdisplay().print(String(psram_size / 1024) + String(" kB"));
+
+        // FRAM available / status
+        getdisplay().setCursor(8, y0 + 32);
+        getdisplay().print("FRAM:");
+        getdisplay().setCursor(90, y0 + 32);
+        getdisplay().print(hasFRAM ? "available" : "not found");
+
+#ifdef BOARD_OBP40S3
+        // SD-Card
+        getdisplay().setCursor(8, y0 + 48);
+        getdisplay().print("SD-Card:");
+        getdisplay().setCursor(90, y0 + 48);
+        if (sdcard) {
+            uint64_t cardsize = SD.cardSize() / (1024 * 1024);
+            getdisplay().print(String(cardsize) + String(" MB"));
+        } else {
+            getdisplay().print("off");
+        }
+#endif
+
+        // CPU speed config / active
+        getdisplay().setCursor(202, y0);
+        getdisplay().print("CPU speed:");
+        getdisplay().setCursor(300, y0);
+        getdisplay().print(cpuspeed);
+        getdisplay().print(" / ");
+        int cpu_freq = esp_clk_cpu_freq() / 1000000;
+        getdisplay().print(String(cpu_freq));
+
+        // total RAM free
+        int Heap_free = esp_get_free_heap_size();
+        getdisplay().setCursor(202, y0 + 16);
+        getdisplay().print("Total free:");
+        getdisplay().setCursor(300, y0 + 16);
+        getdisplay().print(String(Heap_free));
+
+        // RAM free for task
+        int RAM_free = uxTaskGetStackHighWaterMark(NULL);
+        getdisplay().setCursor(202, y0 + 32);
+        getdisplay().print("Task free:");
+        getdisplay().setCursor(300, y0 + 32);
+        getdisplay().print(String(RAM_free));
+    }
+
+    void displayModeConfig() {
+        // Configuration interface
+
+        uint16_t x0 = 16;
+        uint16_t y0 = 80;
+        uint16_t dy = 20;
+
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setCursor(8, 48);
+        getdisplay().print("System configuration");
+
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+
+        /*getdisplay().setCursor(x0, y0);
+        getdisplay().print("CPU speed: 80 | 160 | 240");
+        getdisplay().setCursor(x0, y0 + 1 * dy);
+        getdisplay().print("Power mode: Max | 5V | Min");
+        getdisplay().setCursor(x0, y0 + 2 * dy);
+        getdisplay().print("Accesspoint: On | Off");
+
+        // TODO Change NVRAM-preferences settings here
+        getdisplay().setCursor(x0, y0 + 4 * dy);
+        getdisplay().print("Simulation: On | Off"); */
+
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        for (int i = 0 ; i < menu->getItemCount(); i++) {
+            ConfigMenuItem *itm = menu->getItemByIndex(i);
+            if (!itm) {
+                LOG_DEBUG(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");
+                }
+            }
+        }
+    }
+
+    void displayModeSettings() {
+        // View some of the current settings
+
+        const uint16_t x0 = 8;
+        const uint16_t y0 = 72;
+
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setCursor(x0, 48);
+        getdisplay().print("System settings");
+
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+
+        // left column
+        getdisplay().setCursor(x0, y0);
+        getdisplay().print("Simulation:");
+        getdisplay().setCursor(120, y0);
+        getdisplay().print(simulation ? "on" : "off");
+
+        getdisplay().setCursor(x0, y0 + 16);
+        getdisplay().print("Environment:");
+        getdisplay().setCursor(120, y0 + 16);
+        getdisplay().print(env_module);
+
+        getdisplay().setCursor(x0, y0 + 32);
+        getdisplay().print("Buzzer:");
+        getdisplay().setCursor(120, y0 + 32);
+        getdisplay().print(buzzer_mode);
+
+        getdisplay().setCursor(x0, y0 + 64);
+        getdisplay().print("GPS:");
+        getdisplay().setCursor(120, y0 + 64);
+        getdisplay().print(gps_module);
+
+        getdisplay().setCursor(x0, y0 + 80);
+        getdisplay().print("RTC:");
+        getdisplay().setCursor(120, y0 + 80);
+        getdisplay().print(rtc_module);
+
+        getdisplay().setCursor(x0, y0 + 96);
+        getdisplay().print("Wifi:");
+        getdisplay().setCursor(120, y0 + 96);
+        getdisplay().print(commonData->status.wifiApOn ? "on" : "off");
+
+        // Home location
+        getdisplay().setCursor(x0, y0 + 128);
+        getdisplay().print("Home Lat.:");
+        drawTextRalign(230, y0 + 128, formatLatitude(homelat));
+        getdisplay().setCursor(x0, y0 + 144);
+        getdisplay().print("Home Lon.:");
+        drawTextRalign(230, y0 + 144, formatLongitude(homelon));
+
+        // right column
+        getdisplay().setCursor(202, y0);
+        getdisplay().print("Batt. sensor:");
+        getdisplay().setCursor(320, y0);
+        getdisplay().print(batt_sensor);
+
+        // Solar sensor
+        getdisplay().setCursor(202, y0 + 16);
+        getdisplay().print("Solar sensor:");
+        getdisplay().setCursor(320, y0 + 16);
+        getdisplay().print(solar_sensor);
+
+        // Generator sensor
+        getdisplay().setCursor(202, y0 + 32);
+        getdisplay().print("Gen. sensor:");
+        getdisplay().setCursor(320, y0 + 32);
+        getdisplay().print(gen_sensor);
+
+#ifdef BOARD_OBP60S3
+        // Backlight infos
+        getdisplay().setCursor(202, y0 + 64);
+        getdisplay().print("Backlight:");
+        getdisplay().setCursor(320, y0 + 64);
+        getdisplay().printf("%d%%", commonData->backlight.brightness);
+        // TODO test function with OBP60 device
+        getdisplay().setCursor(202, y0 + 80);
+        getdisplay().print("Bl color:");
+        getdisplay().setCursor(320, y0 + 80);
+        getdisplay().print(commonData->backlight.color.toName());
+        getdisplay().setCursor(202, y0 + 96);
+        getdisplay().print("Bl mode:");
+        getdisplay().setCursor(320, y0 + 96);
+        getdisplay().print(commonData->backlight.mode);
+        // TODO Buzzer mode and power
+#endif
+
+        // Gyro sensor
+        // WIP / FEATURE
+    }
+
+    void displayModeSDCard() {
+        // SD card info
+        uint16_t x0 = 20;
+        uint16_t y0 = 72;
+
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setCursor(8, 48);
+        getdisplay().print("SD Card info");
+
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setCursor(x0, y0);
+        getdisplay().print("Work in progress...");
+    }
+
+    void displayModeDevicelist() {
+        // NMEA2000 device list
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setCursor(8, 48);
+        getdisplay().print("NMEA2000 device list");
+
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setCursor(20, 80);
+        getdisplay().print("RxD: ");
+        getdisplay().print(String(commonData->status.n2kRx));
+        getdisplay().setCursor(20, 100);
+        getdisplay().print("TxD: ");
+        getdisplay().print(String(commonData->status.n2kTx));
+    }
+
+   void storeConfig() {
+       menu->storeValues();
+   }
 
 public:
     PageSystem(CommonData &common){
         commonData = &common;
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageSystem");
+        config = commonData->config;
+        logger = commonData->logger;
+
+        logger->logDebug(GwLog::LOG,"Instantiate PageSystem");
         if (hasFRAM) {
             mode = fram.read(FRAM_SYSTEM_MODE);
-            common.logger->logDebug(GwLog::DEBUG, "Loaded mode '%c' from FRAM", mode);
         }
+        flashLED = common.config->getString(common.config->flashLED);
+
         chipid = ESP.getEfuseMac();
         simulation = common.config->getBool(common.config->useSimuData);
 #ifdef BOARD_OBP40S3
-        use_sdcard = common.config->getBool(common.config->useSDCard);
+        sdcard = common.config->getBool(common.config->useSDCard);
 #endif
         buzzer_mode = common.config->getString(common.config->buzzerMode);
         buzzer_mode.toLowerCase();
@@ -76,9 +415,27 @@ public:
         rot_sensor = common.config->getString(common.config->useRotSensor);
         homelat = common.config->getString(common.config->homeLAT).toDouble();
         homelon = common.config->getString(common.config->homeLON).toDouble();
+
+        // CPU speed: 80 | 160 | 240
+        // Power mode: Max | 5V | Min
+        // Accesspoint: On | Off
+
+        // TODO Change NVRAM-preferences settings here
+        // getdisplay().setCursor(x0, y0 + 4 * dy);
+        // getdisplay().print("Simulation: On | Off");
+
+        // Initialize config menu
+        menu = new ConfigMenu("Options", 40, 80);
+        menu->setItemDimension(150, 20);
+
+        ConfigMenuItem *newitem;
+        newitem = menu->addItem("accesspoint", "Accesspoint", "bool", 0, "");
+        newitem = menu->addItem("simulation", "Simulation", "on/off", 0, "");
+        menu->setItemActive("accesspoint");
+
     }
 
-    void setupKeys() {
+    virtual void setupKeys(){
         commonData->keydata[0].label = "EXIT";
         commonData->keydata[1].label = "MODE";
         commonData->keydata[2].label = "";
@@ -87,24 +444,12 @@ public:
         commonData->keydata[5].label = "ILUM";
     }
 
-    int handleKey(int key) {
+    virtual int handleKey(int key){
         // do *NOT* handle key #1 this handled by obp60task as exit
         // Switch display mode
         commonData->logger->logDebug(GwLog::LOG, "System keyboard handler");
         if (key == 2) {
-            if (mode == 'N') {
+            incMode();
-                mode = 'S';
-            } else if (mode == 'S') {
-                mode = 'D';
-            } else if (mode == 'D') {
-                if (hasSDCard) {
-                    mode = 'C';
-                } else {
-                    mode = 'N';
-                }
-            } else {
-                mode = 'N';
-            }
             if (hasFRAM) fram.write(FRAM_SYSTEM_MODE, mode);
             return 0;
         }
@@ -119,8 +464,7 @@ public:
         }
         // standby / deep sleep
         if (key == 5) {
-            commonData->logger->logDebug(GwLog::LOG, "System going into deep sleep mode...");
+           deepSleep(*commonData);
-            deepSleep(*commonData);
         }
         // Code for keylock
         if (key == 11) {
@@ -129,13 +473,17 @@ public:
         }
 #endif
 #ifdef BOARD_OBP40S3
-        // grab cursor keys to disable page navigation
+        // use cursor keys for local mode navigation
-        if (key == 9 or key == 10) {
+        if (key == 9) {
+            incMode();
+            return 0;
+        }
+        if (key == 10) {
+            decMode();
             return 0;
         }
         // standby / deep sleep
         if (key == 12) {
-            commonData->logger->logDebug(GwLog::LOG, "System going into deep sleep mode...");
             deepSleep(*commonData);
         }
 #endif
@@ -172,301 +520,35 @@ public:
         GwConfigHandler *config = commonData->config;
         GwLog *logger = commonData->logger;
 
-        // Get config data
-        String flashLED = config->getString(config->flashLED);
-
         // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
+        if(flashLED == "Limit Violation"){
             setBlinkingLED(false);
             setFlashLED(false); 
         }
 
-        // Logging boat values
+        // Logging page information
-        logger->logDebug(GwLog::LOG, "Drawing at PageSystem, Mode=%c", mode);
+        LOG_DEBUG(GwLog::LOG,"Drawing at PageSystem, Mode=%c", mode);
-
-        // Draw page
-        //***********************************************************
-
-        uint16_t x0 = 8;  // left column
-        uint16_t y0 = 48; // data table starts here
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height());
 
-        if (mode == 'N') {
+        // call current system page
-
+        switch (mode) {
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            case 'N':
-            getdisplay().setCursor(8, 48);
+                displayModeNormal();
-            getdisplay().print("System Information");
+                break;
-
+            case 'S':
-            getdisplay().drawXBitmap(320, 25, logo64_bits, logo64_width, logo64_height, commonData->fgcolor);
+                displayModeSettings();
-
+                break;
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            case 'C':
-            y0 = 155;
+                displayModeConfig();
-
+                break;
-            char ssid[13];
+            case 'A':
-            snprintf(ssid, 13, "%04X%08X", (uint16_t)(chipid >> 32), (uint32_t)chipid);
+                displayModeSDCard();
-            displayBarcode(String(ssid), 320, 200, 2);
+                break;
-            getdisplay().setCursor(8, 70);
+            case 'D':
-            getdisplay().print(String("MCUDEVICE-") + String(ssid));
+                displayModeDevicelist();
-
+                break;
-            getdisplay().setCursor(8, 95);
-            getdisplay().print("Firmware version: ");
-            getdisplay().setCursor(150, 95);
-            getdisplay().print(VERSINFO);
-
-            getdisplay().setCursor(8, 113);
-            getdisplay().print("Board version: ");
-            getdisplay().setCursor(150, 113);
-            getdisplay().print(BOARDINFO);
-            getdisplay().print(String(" HW ") + String(PCBINFO));
-
-            getdisplay().setCursor(8, 131);
-            getdisplay().print("Display version: ");
-            getdisplay().setCursor(150, 131);
-            getdisplay().print(DISPLAYINFO);
-            getdisplay().print("; GxEPD2 v");
-            getdisplay().print(GXEPD2INFO);
-
-            getdisplay().setCursor(8, 265);
-#ifdef BOARD_OBP60S3
-            getdisplay().print("Press STBY to enter deep sleep mode");
-#endif
-#ifdef BOARD_OBP40S3
-            getdisplay().print("Press wheel to enter deep sleep mode");
-#endif
-
-            // Flash memory size
-            uint32_t flash_size = ESP.getFlashChipSize();
-            getdisplay().setCursor(8, y0);
-            getdisplay().print("FLASH:");
-            getdisplay().setCursor(90, y0);
-            getdisplay().print(String(flash_size / 1024) + String(" kB"));
-
-            // PSRAM memory size
-            uint32_t psram_size = ESP.getPsramSize();
-            getdisplay().setCursor(8, y0 + 16);
-            getdisplay().print("PSRAM:");
-            getdisplay().setCursor(90, y0 + 16);
-            getdisplay().print(String(psram_size / 1024) + String(" kB"));
-
-            // FRAM available / status
-            getdisplay().setCursor(8, y0 + 32);
-            getdisplay().print("FRAM:");
-            getdisplay().setCursor(90, y0 + 32);
-            getdisplay().print(hasFRAM ? "available" : "not found");
-
-#ifdef BOARD_OBP40S3
-            // SD-Card
-            getdisplay().setCursor(8, y0 + 48);
-            getdisplay().print("SD-Card:");
-            getdisplay().setCursor(90, y0 + 48);
-            if (hasSDCard) {
-                uint64_t cardsize = ((uint64_t) sdcard->csd.capacity) * sdcard->csd.sector_size / (1024 * 1024);
-                getdisplay().printf("%llu MB", cardsize);
-            } else {
-                getdisplay().print("off");
-            }
-#endif
-
-            // Uptime
-            int64_t uptime = esp_timer_get_time() / 1000000;
-            String uptime_unit;
-            if (uptime < 120) {
-                uptime_unit = " seconds";
-            } else {
-                if (uptime < 2 * 3600) {
-                    uptime /= 60;
-                    uptime_unit = " minutes";
-                } else if (uptime < 2 * 3600 * 24) {
-                    uptime /= 3600;
-                    uptime_unit = " hours";
-                } else {
-                    uptime /= 86400;
-                    uptime_unit = " days";
-                }
-            }
-            getdisplay().setCursor(8, y0 + 80);
-            getdisplay().print("Uptime:");
-            getdisplay().setCursor(90, y0 + 80);
-            getdisplay().print(uptime);
-            getdisplay().print(uptime_unit);
-
-            // CPU speed config / active
-            getdisplay().setCursor(202, y0);
-            getdisplay().print("CPU speed:");
-            getdisplay().setCursor(300, y0);
-            getdisplay().print(cpuspeed);
-            getdisplay().print(" / ");
-            int cpu_freq = esp_clk_cpu_freq() / 1000000;
-            getdisplay().print(String(cpu_freq));
-
-            // total RAM free
-            int Heap_free = esp_get_free_heap_size();
-            getdisplay().setCursor(202, y0 + 16);
-            getdisplay().print("Total free:");
-            getdisplay().setCursor(300, y0 + 16);
-            getdisplay().print(String(Heap_free));
-
-            // RAM free for task
-            int RAM_free = uxTaskGetStackHighWaterMark(NULL);
-            getdisplay().setCursor(202, y0 + 32);
-            getdisplay().print("Task free:");
-            getdisplay().setCursor(300, y0 + 32);
-            getdisplay().print(String(RAM_free));
-
-        } else if (mode == 'S') {
-            // Settings
-            
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(x0, 48);
-            getdisplay().print("System settings");
-
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            x0 = 8;
-            y0 = 72;
-
-            // left column
-            getdisplay().setCursor(x0, y0);
-            getdisplay().print("Simulation:");
-            getdisplay().setCursor(120, y0);
-            getdisplay().print(simulation ? "on" : "off");
-
-            getdisplay().setCursor(x0, y0 + 16);
-            getdisplay().print("Environment:");
-            getdisplay().setCursor(120, y0 + 16);
-            getdisplay().print(env_module);
-
-            getdisplay().setCursor(x0, y0 + 32);
-            getdisplay().print("Buzzer:");
-            getdisplay().setCursor(120, y0 + 32);
-            getdisplay().print(buzzer_mode);
-
-            getdisplay().setCursor(x0, y0 + 64);
-            getdisplay().print("GPS:");
-            getdisplay().setCursor(120, y0 + 64);
-            getdisplay().print(gps_module);
-
-            getdisplay().setCursor(x0, y0 + 80);
-            getdisplay().print("RTC:");
-            getdisplay().setCursor(120, y0 + 80);
-            getdisplay().print(rtc_module);
-
-            getdisplay().setCursor(x0, y0 + 96);
-            getdisplay().print("Wifi:");
-            getdisplay().setCursor(120, y0 + 96);
-            getdisplay().print(commonData->status.wifiApOn ? "on" : "off");
-
-            // Home location
-            getdisplay().setCursor(x0, y0 + 128);
-            getdisplay().print("Home Lat.:");
-            getdisplay().setCursor(120, y0 + 128);
-            getdisplay().print(formatLatitude(homelat));
-            getdisplay().setCursor(x0, y0 + 144);
-            getdisplay().print("Home Lon.:");
-            getdisplay().setCursor(120, y0 + 144);
-            getdisplay().print(formatLongitude(homelon));
-
-            // right column
-            getdisplay().setCursor(202, y0);
-            getdisplay().print("Batt. sensor:");
-            getdisplay().setCursor(320, y0);
-            getdisplay().print(batt_sensor);
-
-            // Solar sensor
-            getdisplay().setCursor(202, y0 + 16);
-            getdisplay().print("Solar sensor:");
-            getdisplay().setCursor(320, y0 + 16);
-            getdisplay().print(solar_sensor);
-
-            // Generator sensor
-            getdisplay().setCursor(202, y0 + 32);
-            getdisplay().print("Gen. sensor:");
-            getdisplay().setCursor(320, y0 + 32);
-            getdisplay().print(gen_sensor);
-
-            // Gyro sensor
-
-        } else if (mode == 'C') {
-            // Card info
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(8, 48);
-            getdisplay().print("SD Card info");
-
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-
-            x0 = 20;
-            y0 = 72;
-            getdisplay().setCursor(x0, y0);
-#ifdef BOARD_OBP60S3
-            // This mode should not be callable by devices without card hardware
-            // In case of accidential reaching this, display a friendly message
-            getdisplay().print("This mode is not indended to be reached!\n");
-            getdisplay().print("There's nothing to see here. Move on.");
-#endif
-#ifdef BOARD_OBP40S3
-            getdisplay().print("Work in progress...");
-
-            /* TODO
-               this code should go somewhere else. only for testing purposes here
-               identify card as OBP-Card:
-                 magic.dat
-                 version.dat
-                 readme.txt
-                 IMAGES/
-                 CHARTS/
-                 LOGS/
-                 DATA/
-                hint: file access with fopen, fgets, fread, fclose
-            */
-
-            // Simple test for magic file in root
-            getdisplay().setCursor(x0, y0 + 32);
-            String file_magic = MOUNT_POINT "/magic.dat";
-            logger->logDebug(GwLog::LOG, "Test magicfile: %s", file_magic.c_str());
-            struct stat st;
-            if (stat(file_magic.c_str(), &st) == 0) {
-                getdisplay().printf("File %s exists", file_magic.c_str());
-            } else {
-                getdisplay().printf("File %s not found", file_magic.c_str());
-            }
-
-            // Root directory check
-            DIR* dir = opendir(MOUNT_POINT);
-            int dy = 0;
-            if (dir != NULL) {
-                logger->logDebug(GwLog::LOG, "Root directory: %s", MOUNT_POINT);
-                struct dirent* entry;
-                while (((entry = readdir(dir)) != NULL) and (dy < 140)) {
-                    getdisplay().setCursor(x0, y0 + 64 + dy);
-                    getdisplay().print(entry->d_name);
-                    // type 1 is file, type 2 is dir
-                    if (entry->d_type == 2) {
-                        getdisplay().print("/");
-                    }
-                    dy += 20;
-                    logger->logDebug(GwLog::DEBUG, "    %s type %d", entry->d_name, entry->d_type);
-                }
-                closedir(dir);
-            } else {
-                logger->logDebug(GwLog::LOG, "Failed to open root directory");
-            }
-
-#endif
-
-        } else {
-            // NMEA2000 device list
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(8, 48);
-            getdisplay().print("NMEA2000 device list");
-
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(20, 80);
-            getdisplay().print("RxD: ");
-            getdisplay().print(String(commonData->status.n2kRx));
-            getdisplay().setCursor(20, 100);
-            getdisplay().print("TxD: ");
-            getdisplay().print(String(commonData->status.n2kTx));
         }
 
         // Update display

lib/obp60task/PageVoltage.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,16 +7,20 @@
 
 class PageVoltage : public Page
 {
-bool init = false;                  // Marker for init done
+private:
-uint8_t average = 0;                // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s
+    bool init = false;                  // Marker for init done
-bool trend = true;                  // Trend indicator [0|1], 0=off, 1=on
+    uint8_t average = 0;                // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s
-double raw = 0;
+    bool trend = true;                  // Trend indicator [0|1], 0=off, 1=on
-char mode = 'D';                    // display mode (A)nalog | (D)igital
+    double raw = 0;
+    char mode = 'D';                    // display mode (A)nalog | (D)igital
 
 public:
     PageVoltage(CommonData &common){
         commonData = &common;
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageVoltage");
+        config = commonData->config;
+        logger = commonData->logger;
+
+        logger->logDebug(GwLog::LOG,"Instantiate PageVoltage");
         if (hasFRAM) {
             average = fram.read(FRAM_VOLTAGE_AVG);
             trend = fram.read(FRAM_VOLTAGE_TREND);
@@ -23,6 +28,10 @@ public:
         }
     }
 
+    ~PageVoltage(){
+	    logger->logDebug(GwLog::LOG,"Destroy PageVoltage");
+	}
+
     virtual void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "AVG";

lib/obp60task/PageWind.cpp

@@ -247,8 +247,8 @@ public:
         if(key == 1){               // Mode switch
             if(mode == 'N'){
                 mode = 'L';
-        //    } else if (mode == 'L') {
+            } else if (mode == 'L') {
-        //        mode = 'X';
+                mode = 'X';
             } else {
                 mode = 'N';
             }

lib/obp60task/PageWindPlot.cpp

@@ -1,52 +1,23 @@
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
-#include "Pagedata.h"
+#include "BoatDataCalibration.h"
 #include "OBP60Extensions.h"
 #include "OBPRingBuffer.h"
-#include "OBPDataOperations.h"
+#include "Pagedata.h"
-#include "BoatDataCalibration.h"
 #include <vector>
 
 static const double radToDeg = 180.0 / M_PI; // Conversion factor from radians to degrees
 
-// Get maximum difference of last <amount> of TWD ringbuffer values to center chart; returns "0" if data is not valid
-int getCntr(const RingBuffer<int16_t>& windDirHstry, size_t amount)
-{
-    const int MAX_VAL = windDirHstry.getMaxVal();
-    size_t count = windDirHstry.getCurrentSize();
-
-    if (windDirHstry.isEmpty() || amount <= 0) {
-        return 0;
-    }
-    if (amount > count)
-        amount = count;
-
-    uint16_t midWndDir, minWndDir, maxWndDir = 0;
-    int wndCenter = 0;
-
-    midWndDir = windDirHstry.getMid(amount);
-    if (midWndDir != MAX_VAL) {
-        midWndDir = midWndDir / 1000.0 * radToDeg;
-        wndCenter = int((midWndDir + (midWndDir >= 0 ? 5 : -5)) / 10) * 10; // Set new center value; round to nearest 10 degree value
-        minWndDir = windDirHstry.getMin(amount) / 1000.0 * radToDeg;
-        maxWndDir = windDirHstry.getMax(amount) / 1000.0 * radToDeg;
-        if ((maxWndDir - minWndDir) > 180 && !(minWndDir > maxWndDir)) { // if wind range is > 180 and no 0° crossover, adjust wndCenter to smaller wind range end
-            wndCenter = WindUtils::to360(wndCenter + 180);
-        }
-    }
-
-    return wndCenter;
-}
-
 // Get maximum difference of last <amount> of TWD ringbuffer values to center chart
 int getRng(const RingBuffer<int16_t>& windDirHstry, int center, size_t amount)
 {
     int minVal = windDirHstry.getMinVal();
-    const int MAX_VAL = windDirHstry.getMaxVal();
     size_t count = windDirHstry.getCurrentSize();
+    //    size_t capacity = windDirHstry.getCapacity();
+    //    size_t last = windDirHstry.getLastIdx();
 
     if (windDirHstry.isEmpty() || amount <= 0) {
-        return MAX_VAL;
+        return minVal;
     }
     if (amount > count)
         amount = count;
@@ -56,10 +27,11 @@ int getRng(const RingBuffer<int16_t>& windDirHstry, int center, size_t amount)
     int maxRng = minVal;
     // Start from the newest value (last) and go backwards x times
     for (size_t i = 0; i < amount; i++) {
+        //        value = windDirHstry.get(((last - i) % capacity + capacity) % capacity);
         value = windDirHstry.get(count - 1 - i);
 
-        if (value == MAX_VAL) {
+        if (value == minVal) {
-            continue;  // ignore invalid values
+            continue;
         }
 
         value = value / 1000.0 * radToDeg;
@@ -71,7 +43,7 @@ int getRng(const RingBuffer<int16_t>& windDirHstry, int center, size_t amount)
         maxRng = 180;
     }
 
-    return (maxRng != minVal ? maxRng : MAX_VAL);
+    return maxRng;
 }
 
 // ****************************************************************
@@ -79,39 +51,23 @@ class PageWindPlot : public Page {
 
     bool keylock = false; // Keylock
     char chrtMode = 'D'; // Chart mode: 'D' for TWD, 'S' for TWS, 'B' for both
-    bool showTruW = true; // Show true wind or apparant wind in chart area
-    bool oldShowTruW = false; // remember recent user selection of wind data type
-
     int dataIntv = 1; // Update interval for wind history chart:
-                      // (1)|(2)|(3)|(4)|(8) x 240 seconds for 4, 8, 12, 16, 32 min. history chart
+                      // (1)|(2)|(3)|(4) seconds for approx. 4, 8, 12, 16 min. history chart
-    bool useSimuData;
+    bool showTWS = true; // Show TWS value in chart area
-    String flashLED;
-    String backlightMode;
 
 public:
     PageWindPlot(CommonData& common)
     {
         commonData = &common;
         common.logger->logDebug(GwLog::LOG, "Instantiate PageWindPlot");
-
-        // Get config data
-        useSimuData = common.config->getBool(common.config->useSimuData);
-        // holdValues = common.config->getBool(common.config->holdvalues);
-        flashLED = common.config->getString(common.config->flashLED);
-        backlightMode = common.config->getString(common.config->backlight);
-
     }
 
     virtual void setupKeys()
     {
         Page::setupKeys();
-        // commonData->keydata[0].label = "MODE";
+        //        commonData->keydata[0].label = "MODE";
-#if defined BOARD_OBP60S3
-        commonData->keydata[1].label = "SRC";
-        commonData->keydata[4].label = "INTV";
-#elif defined BOARD_OBP40S3
         commonData->keydata[1].label = "INTV";
-#endif
+        commonData->keydata[4].label = "TWS";
     }
 
     // Key functions
@@ -129,32 +85,26 @@ public:
             return 0; // Commit the key
         }
 
-#if defined BOARD_OBP60S3
+        // Set interval for wind history chart update time
-        // Set data source TRUE | APP
         if (key == 2) {
-            showTruW = !showTruW;
-            return 0; // Commit the key
-        }
-
-        // Set interval for wind history chart update time (interval)
-        if (key == 5) {
-#elif defined BOARD_OBP40S3
-        if (key == 2) {
-#endif
             if (dataIntv == 1) {
                 dataIntv = 2;
             } else if (dataIntv == 2) {
                 dataIntv = 3;
             } else if (dataIntv == 3) {
                 dataIntv = 4;
-            } else if (dataIntv == 4) {
-                dataIntv = 8;
             } else {
                 dataIntv = 1;
             }
             return 0; // Commit the key
         }
 
+        // Switch TWS on/off
+        if (key == 5) {
+            showTWS = !showTWS;
+            return 0; // Commit the key
+        }
+
         // Keylock function
         if (key == 11) { // Code for keylock
             commonData->keylock = !commonData->keylock;
@@ -163,50 +113,39 @@ public:
         return key;
     }
 
-    virtual void displayNew(PageData &pageData){
-#ifdef BOARD_OBP40S3
-        String wndSrc; // Wind source true/apparant wind - preselection for OBP40
-
-        wndSrc = commonData->config->getString("page" + String(pageData.pageNumber) + "wndsrc");
-        if (wndSrc =="True wind") {
-            showTruW = true;
-        } else {
-            showTruW = false; // Wind source is apparant wind
-        }
-        commonData->logger->logDebug(GwLog::LOG,"New PageWindPlot: wind source=%s", wndSrc);
-#endif
-        oldShowTruW = !showTruW; // makes wind source being initialized at initial page call
-    }
-
     int displayPage(PageData& pageData)
     {
         GwConfigHandler* config = commonData->config;
         GwLog* logger = commonData->logger;
 
-        static RingBuffer<int16_t>* wdHstry; // Wind direction data buffer
+        float twsValue; // TWS value in chart area
-        static RingBuffer<uint16_t>* wsHstry; // Wind speed data buffer
+        static String twdName, twdUnit; // TWD name and unit
-        static String wdName, wdFormat; // Wind direction name and format
+        static int updFreq; // Update frequency for TWD
-        static String wsName, wsFormat; // Wind speed name and format
+        static int16_t twdLowest, twdHighest; // TWD range
-        static int16_t wdMAX_VAL; // Max. value of wd history buffer, indicating invalid values
+        // static int16_t twdBufMinVal; // lowest possible twd buffer value; used for non-set data
-        float wsValue; // Wind speed value in chart area
-        String wsUnit; // Wind speed unit in chart area
-        static GwApi::BoatValue* wsBVal = new GwApi::BoatValue("TWS"); // temp BoatValue for wind speed unit identification; required by OBP60Formater
 
-        // current boat data values; TWD/AWD only for validation test
+        // current boat data values; TWD only for validation test, TWS for display of current value
         const int numBoatData = 2;
         GwApi::BoatValue* bvalue;
+        String BDataName[numBoatData];
+        double BDataValue[numBoatData];
         bool BDataValid[numBoatData];
+        String BDataText[numBoatData];
+        String BDataUnit[numBoatData];
+        String BDataFormat[numBoatData];
 
         static bool isInitialized = false; // Flag to indicate that page is initialized
         static bool wndDataValid = false; // Flag to indicate if wind data is valid
         static int numNoData; // Counter for multiple invalid data values in a row
+        static bool simulation = false;
+        static bool holdValues = false;
 
         static int width; // Screen width
         static int height; // Screen height
         static int xCenter; // Center of screen in x direction
         static const int yOffset = 48; // Offset for y coordinates of chart area
         static int cHeight; // height of chart area
-        static int bufSize; // History buffer size: 1.920 values for 32 min. history chart
+        static int bufSize; // History buffer size: 960 values for appox. 16 min. history chart
         static int intvBufSize; // Buffer size used for currently selected time interval
         int count; // current size of buffer
         static int numWndVals; // number of wind values available for current interval selection
@@ -222,8 +161,10 @@ public:
         static int wndRight; // chart wind right value position
         static int chrtRng; // Range of wind values from mid wind value to min/max wind value in degrees
         int diffRng; // Difference between mid and current wind value
-        static const int dfltRng = 60; // Default range for chart
+        static const int dfltRng = 40; // Default range for chart
         int midWndDir; // New value for wndCenter after chart start / shift
+        static int simTwd; // Simulation value for TWD
+        static float simTws; // Simulation value for TWS
 
         int x, y; // x and y coordinates for drawing
         static int prevX, prevY; // Last x and y coordinates for drawing
@@ -231,20 +172,30 @@ public:
         int chrtVal; // Current wind value
         static int chrtPrevVal; // Last wind value in chart area for check if value crosses 180 degree line
 
-        LOG_DEBUG(GwLog::LOG, "Display PageWindPlot");
+        LOG_DEBUG(GwLog::LOG, "Display page WindPlot");
-        ulong timer = millis();
+
+        // Get config data
+        simulation = config->getBool(config->useSimuData);
+        holdValues = config->getBool(config->holdvalues);
+        String flashLED = config->getString(config->flashLED);
+        String backlightMode = config->getString(config->backlight);
 
         if (!isInitialized) {
             width = getdisplay().width();
             height = getdisplay().height();
             xCenter = width / 2;
             cHeight = height - yOffset - 22;
+            bufSize = pageData.boatHstry.twdHstry->getCapacity();
             numNoData = 0;
+            simTwd = pageData.boatHstry.twdHstry->getLast() / 1000.0 * radToDeg;
+            simTws = 0;
+            twsValue = 0;
             bufStart = 0;
             oldDataIntv = 0;
-            wsValue = 0;
             numAddedBufVals, currIdx, lastIdx = 0;
-            wndCenter = INT_MAX;
+            lastAddedIdx = pageData.boatHstry.twdHstry->getLastIdx();
+            pageData.boatHstry.twdHstry->getMetaData(twdName, twdUnit, updFreq, twdLowest, twdHighest);
+            wndCenter = INT_MIN;
             midWndDir = 0;
             diffRng = dfltRng;
             chrtRng = dfltRng;
@@ -255,7 +206,14 @@ public:
         // read boat data values; TWD only for validation test, TWS for display of current value
         for (int i = 0; i < numBoatData; i++) {
             bvalue = pageData.values[i];
+            BDataName[i] = xdrDelete(bvalue->getName());
+            BDataName[i] = BDataName[i].substring(0, 6); // String length limit for value name
+            calibrationData.calibrateInstance(bvalue, logger); // Check if boat data value is to be calibrated
+            BDataValue[i] = bvalue->value; // Value as double in SI unit
             BDataValid[i] = bvalue->valid;
+            BDataText[i] = formatValue(bvalue, *commonData).svalue; // Formatted value as string including unit conversion and switching decimal places
+            BDataUnit[i] = formatValue(bvalue, *commonData).unit;
+            BDataFormat[i] = bvalue->getFormat(); // Unit of value
         }
 
         // Optical warning by limit violation (unused)
@@ -264,30 +222,12 @@ public:
             setFlashLED(false);
         }
 
-        if (showTruW != oldShowTruW) {
-            if (showTruW) {
-                wdHstry = pageData.boatHstry->hstryBufList.twdHstry;
-                wsHstry = pageData.boatHstry->hstryBufList.twsHstry;
-            } else {
-                wdHstry = pageData.boatHstry->hstryBufList.awdHstry;
-                wsHstry = pageData.boatHstry->hstryBufList.awsHstry;
-            }
-            wdHstry->getMetaData(wdName, wdFormat);
-            wsHstry->getMetaData(wsName, wsFormat);
-            wdMAX_VAL = wdHstry->getMaxVal();
-            bufSize = wdHstry->getCapacity();
-            wsBVal->setFormat(wsHstry->getFormat());
-            lastAddedIdx = wdHstry->getLastIdx();
-
-            oldShowTruW = showTruW;
-        }
-
         // Identify buffer size and buffer start position for chart
-        count = wdHstry->getCurrentSize();
+        count = pageData.boatHstry.twdHstry->getCurrentSize();
-        currIdx = wdHstry->getLastIdx();
+        currIdx = pageData.boatHstry.twdHstry->getLastIdx();
         numAddedBufVals = (currIdx - lastAddedIdx + bufSize) % bufSize; // Number of values added to buffer since last display
         if (dataIntv != oldDataIntv || count == 1) {
-            // new data interval selected by user; this is only x * 230 values instead of 240 seconds (4 minutes) per interval step
+            // new data interval selected by user
             intvBufSize = cHeight * dataIntv;
             numWndVals = min(count, (cHeight - 60) * dataIntv);
             bufStart = max(0, count - numWndVals);
@@ -300,26 +240,29 @@ public:
                 bufStart = max(0, bufStart - numAddedBufVals);
             }
         }
-        // LOG_DEBUG(GwLog::DEBUG,"PSRAM Size: %d kByte; free: %d Byte", ESP.getPsramSize()/1024, ESP.getFreePsram());
+        LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Dataset: count: %d, TWD: %.0f, TWS: %.1f, TWD_valid? %d, intvBufSize: %d, numWndVals: %d, bufStart: %d, numAddedBufVals: %d, lastIdx: %d, old: %d, act: %d",
-        LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Dataset: count: %d, xWD: %.1f, xWS: %.2f, xWD_valid? %d, intvBufSize: %d, numWndVals: %d, bufStart: %d, numAddedBufVals: %d, lastIdx: %d, wind source: %s",
+            count, pageData.boatHstry.twdHstry->getLast() / 1000.0 * radToDeg, pageData.boatHstry.twsHstry->getLast() / 10.0 * 1.94384, BDataValid[0],
-            count, wdHstry->getLast() / 1000.0 * radToDeg, wsHstry->getLast() / 1000.0 * 1.94384, BDataValid[0], intvBufSize, numWndVals, bufStart, numAddedBufVals, wdHstry->getLastIdx(),
+            intvBufSize, numWndVals, bufStart, numAddedBufVals, pageData.boatHstry.twdHstry->getLastIdx(), oldDataIntv, dataIntv);
-            showTruW ? "True" : "App");
 
         // Set wndCenter from 1st real buffer value
-        if (wndCenter == INT_MAX || (wndCenter == 0 && count == 1)) {
+        if (wndCenter == INT_MIN || (wndCenter == 0 && count == 1)) {
-            wndCenter = getCntr(*wdHstry, numWndVals);
+            midWndDir = pageData.boatHstry.twdHstry->getMid(numWndVals);
-            LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Range Init: count: %d, xWD: %.1f, wndCenter: %d, diffRng: %d, chrtRng: %d, Min: %.0f, Max: %.0f", count, wdHstry->getLast() / 1000.0 * radToDeg,
+            if (midWndDir != INT16_MIN) {
-                wndCenter, diffRng, chrtRng, wdHstry->getMin(numWndVals) / 1000.0 * radToDeg, wdHstry->getMax(numWndVals) / 1000.0 * radToDeg);
+                midWndDir = midWndDir / 1000.0 * radToDeg;
+                wndCenter = int((midWndDir + (midWndDir >= 0 ? 5 : -5)) / 10) * 10; // Set new center value; round to nearest 10 degree value
+            } else {
+                wndCenter = 0;
+            }
+            LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Range Init: count: %d, TWD: %.0f, wndCenter: %d, diffRng: %d, chrtRng: %d", count, pageData.boatHstry.twdHstry->getLast() / 1000.0 * radToDeg,
+                wndCenter, diffRng, chrtRng);
         } else {
             // check and adjust range between left, center, and right chart limit
-            diffRng = getRng(*wdHstry, wndCenter, numWndVals);
+            diffRng = getRng(*pageData.boatHstry.twdHstry, wndCenter, numWndVals);
-            diffRng = (diffRng == wdMAX_VAL ? 0 : diffRng);
+            diffRng = (diffRng == INT16_MIN ? 0 : diffRng);
             if (diffRng > chrtRng) {
                 chrtRng = int((diffRng + (diffRng >= 0 ? 9 : -1)) / 10) * 10; // Round up to next 10 degree value
             } else if (diffRng + 10 < chrtRng) { // Reduce chart range for higher resolution if possible
                 chrtRng = max(dfltRng, int((diffRng + (diffRng >= 0 ? 9 : -1)) / 10) * 10);
-                LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Range adjust: wndCenter: %d, diffRng: %d, chrtRng: %d, Min: %.0f, Max: %.0f", wndCenter, diffRng, chrtRng,
-                    wdHstry->getMin(numWndVals) / 1000.0 * radToDeg, wdHstry->getMax(numWndVals) / 1000.0 * radToDeg);
             }
         }
         chrtScl = float(width) / float(chrtRng) / 2.0; // Chart scale: pixels per degree
@@ -345,7 +288,7 @@ public:
         char sWndLbl[4]; // char buffer for Wind angle label
         getdisplay().setFont(&Ubuntu_Bold12pt8b);
         getdisplay().setCursor(xCenter - 88, yOffset - 3);
-        getdisplay().print(wdName); // Wind data name
+        getdisplay().print("TWD"); // Wind data name
         snprintf(sWndLbl, 4, "%03d", (wndCenter < 0) ? (wndCenter + 360) : wndCenter);
         drawTextCenter(xCenter, yOffset - 11, sWndLbl);
         getdisplay().drawCircle(xCenter + 25, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
@@ -361,11 +304,11 @@ public:
         getdisplay().drawCircle(width - 5, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
         getdisplay().drawCircle(width - 5, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
 
-        if (wdHstry->getMax() == wdMAX_VAL) {
+        if (pageData.boatHstry.twdHstry->getMax() == pageData.boatHstry.twdHstry->getMinVal()) {
-            // only <MAX_VAL> values in buffer -> no valid wind data available
+            // only <INT16_MIN> values in buffer -> no valid wind data available
             wndDataValid = false;
-        } else if (!BDataValid[0] && !useSimuData) {
+        } else if (!BDataValid[0]) {
-            // currently no valid xWD data available and no simulation mode
+            // currently no valid TWD data available
             numNoData++;
             wndDataValid = true;
             if (numNoData > 3) {
@@ -380,18 +323,19 @@ public:
         //***********************************************************************
         if (wndDataValid) {
             for (int i = 0; i < (numWndVals / dataIntv); i++) {
-                chrtVal = static_cast<int>(wdHstry->get(bufStart + (i * dataIntv))); // show the latest wind values in buffer; keep 1st value constant in a rolling buffer
+                chrtVal = static_cast<int>(pageData.boatHstry.twdHstry->get(bufStart + (i * dataIntv))); // show the latest wind values in buffer; keep 1st value constant in a rolling buffer
-                if (chrtVal == wdMAX_VAL) {
+                if (chrtVal == INT16_MIN) {
-                    chrtPrevVal = wdMAX_VAL;
+                    chrtPrevVal = INT16_MIN;
                 } else {
                     chrtVal = static_cast<int>((chrtVal / 1000.0 * radToDeg) + 0.5); // Convert to degrees and round
                     x = ((chrtVal - wndLeft + 360) % 360) * chrtScl;
                     y = yOffset + cHeight - i; // Position in chart area
 
-                    if (i >= (numWndVals / dataIntv) - 1) // log chart data of 1 line (adjust for test purposes)
+//                    if (i >= (numWndVals / dataIntv) - 10)
+                    if (i >= (numWndVals / dataIntv) - 1)
                         LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Chart: i: %d, chrtVal: %d, bufStart: %d, count: %d, linesToShow: %d", i, chrtVal, bufStart, count, (numWndVals / dataIntv));
 
-                    if ((i == 0) || (chrtPrevVal == wdMAX_VAL)) {
+                    if ((i == 0) || (chrtPrevVal == INT16_MIN)) {
                         // just a dot for 1st chart point or after some invalid values
                         prevX = x;
                         prevY = y;
@@ -420,27 +364,41 @@ public:
                 if (i >= (cHeight - 1)) {
                     oldDataIntv = 0; // force reset of buffer start and number of values to show in next display loop
 
-                    int minWndDir = wdHstry->getMin(numWndVals) / 1000.0 * radToDeg;
+                    int minWndDir = pageData.boatHstry.twdHstry->getMin(numWndVals) / 1000.0 * radToDeg;
-                    int maxWndDir = wdHstry->getMax(numWndVals) / 1000.0 * radToDeg;
+                    int maxWndDir = pageData.boatHstry.twdHstry->getMax(numWndVals) / 1000.0 * radToDeg;
                     LOG_DEBUG(GwLog::DEBUG, "PageWindPlot FreeTop: Minimum: %d, Maximum: %d, OldwndCenter: %d", minWndDir, maxWndDir, wndCenter);
-                    // if (((minWndDir - wndCenter >= 0) && (minWndDir - wndCenter < 180)) || ((maxWndDir - wndCenter <= 0) && (maxWndDir - wndCenter >=180))) {
+//                    if ((minWndDir + 540 >= wndCenter + 540) || (maxWndDir + 540 <= wndCenter + 540)) {
-                    if ((wndRight > wndCenter && (minWndDir >= wndCenter && minWndDir <= wndRight)) || (wndRight <= wndCenter && (minWndDir >= wndCenter || minWndDir <= wndRight)) || (wndLeft < wndCenter && (maxWndDir <= wndCenter && maxWndDir >= wndLeft)) || (wndLeft >= wndCenter && (maxWndDir <= wndCenter || maxWndDir >= wndLeft))) {
+                    if (((minWndDir - wndCenter >= 0) && (minWndDir - wndCenter < 180)) || ((maxWndDir - wndCenter <= 0) && (maxWndDir - wndCenter >=180))) {
-                        // Check if all wind value are left or right of center value -> optimize chart center
+                        // Check if all wind value are left or right of center value -> optimize chart range
-                        wndCenter = getCntr(*wdHstry, numWndVals);
+                        midWndDir = pageData.boatHstry.twdHstry->getMid(numWndVals) / 1000.0 * radToDeg;
+                        if (midWndDir != INT16_MIN) {
+                            wndCenter = int((midWndDir + (midWndDir >= 0 ? 5 : -5)) / 10) * 10; // Set new center value; round to nearest 10 degree value
+                        }
                     }
                     LOG_DEBUG(GwLog::DEBUG, "PageWindPlot FreeTop: cHeight: %d, bufStart: %d, numWndVals: %d, wndCenter: %d", cHeight, bufStart, numWndVals, wndCenter);
                     break;
                 }
             }
 
-            // Print wind speed value
+        } else {
+            // No valid data available
+            LOG_DEBUG(GwLog::LOG, "PageWindPlot: No valid data available");
+            getdisplay().setFont(&Ubuntu_Bold10pt8b);
+            getdisplay().fillRect(xCenter - 33, height / 2 - 20, 66, 24, commonData->bgcolor); // Clear area for message
+            drawTextCenter(xCenter, height / 2 - 10, "No data");
+        }
+
+        // Print TWS value
+        if (showTWS) {
             int currentZone;
             static int lastZone = 0;
             static bool flipTws = false;
             int xPosTws;
             static const int yPosTws = yOffset + 40;
 
-            xPosTws = flipTws ? 20 : width - 145;
+            twsValue = pageData.boatHstry.twsHstry->getLast() / 10.0 * 1.94384; // TWS value in knots
+
+            xPosTws = flipTws ? 20 : width - 138;
             currentZone = (y >= yPosTws - 38) && (y <= yPosTws + 6) && (x >= xPosTws - 4) && (x <= xPosTws + 146) ? 1 : 0; // Define current zone for TWS value
             if (currentZone != lastZone) {
                 // Only flip when x moves to a different zone
@@ -451,38 +409,28 @@ public:
             }
             lastZone = currentZone;
 
-            wsValue = wsHstry->getLast();
-            wsBVal->value = wsValue / 1000.0; // temp variable to retreive data unit from OBP60Formater
-            wsBVal->valid = (static_cast<uint16_t>(wsValue) != wsHstry->getMinVal());
-            String swsValue = formatValue(wsBVal, *commonData).svalue; // value (string)
-            wsUnit = formatValue(wsBVal, *commonData).unit; // Unit of value
             getdisplay().fillRect(xPosTws - 4, yPosTws - 38, 142, 44, commonData->bgcolor); // Clear area for TWS value
             getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
             getdisplay().setCursor(xPosTws, yPosTws);
-            getdisplay().print(swsValue); // Value
+            if (!BDataValid[1]) {
-/*            if (!wsBVal->valid) {
                 getdisplay().print("--.-");
             } else {
-                wsValue = wsValue / 1000.0 * 1.94384; // Wind speed value in knots
+                double dbl = BDataValue[1] * 3.6 / 1.852;
-                if (wsValue < 10.0) {
+                if (dbl < 10.0) {
-                    getdisplay().printf("!%3.1f", wsValue); // Value, round to 1 decimal
+                    getdisplay().printf("!%3.1f", dbl); // Value, round to 1 decimal
                 } else {
-                    getdisplay().printf("%4.1f", wsValue); // Value, round to 1 decimal
+                    getdisplay().printf("%4.1f", dbl); // Value, round to 1 decimal
                 }
-            } */
+            }
             getdisplay().setFont(&Ubuntu_Bold12pt8b);
             getdisplay().setCursor(xPosTws + 82, yPosTws - 14);
-            getdisplay().print(wsName); // Name
+//            getdisplay().print("TWS"); // Name
+            getdisplay().print(BDataName[1]); // Name
             getdisplay().setFont(&Ubuntu_Bold8pt8b);
+//            getdisplay().setCursor(xPosTws + 78, yPosTws + 1);
             getdisplay().setCursor(xPosTws + 82, yPosTws + 1);
-            getdisplay().print(wsUnit); // Unit
+//            getdisplay().printf(" kn"); // Unit
-
+            getdisplay().print(BDataUnit[1]); // Unit
-        } else {
-            // No valid data available
-            LOG_DEBUG(GwLog::LOG, "PageWindPlot: No valid data available");
-            getdisplay().setFont(&Ubuntu_Bold10pt8b);
-            getdisplay().fillRect(xCenter - 33, height / 2 - 20, 66, 24, commonData->bgcolor); // Clear area for message
-            drawTextCenter(xCenter, height / 2 - 10, "No data");
         }
 
         // chart Y axis labels; print at last to overwrite potential chart lines in label area
@@ -504,7 +452,6 @@ public:
             getdisplay().printf("%3d", chrtLbl); // Wind value label
         }
 
-        LOG_DEBUG(GwLog::DEBUG, "PageWindPlot time: %ld", millis() - timer);
         return PAGE_UPDATE;
     };
 };
@@ -513,17 +460,19 @@ static Page* createPage(CommonData& common)
 {
     return new PageWindPlot(common);
 }
-
+/**
-/* with the code below we make this page known to the PageTask
+ * 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 */
+ * and will will provide the names of the fixed values we need
+ */
 PageDescription registerPageWindPlot(
     "WindPlot", // Page name
     createPage, // Action
     0, // Number of bus values depends on selection in Web configuration
-    { "TWD", "AWD" }, // Bus values we need in the page
+    { "TWD", "TWS" }, // Bus values we need in the page
+//    {}, // Bus values we need in the page
     true // Show display header on/off
 );
 

lib/obp60task/PageWindRoseFlex.cpp

@@ -7,33 +7,15 @@
 class PageWindRoseFlex : public Page
 {
 int16_t lp = 80;                    // Pointer length
-char source = 'A';		    // data source (A)pparent | (T)rue
-String 	ssource="App.";		    // String for Data Source 
 
 public:
     PageWindRoseFlex(CommonData &common){
         commonData = &common;
         common.logger->logDebug(GwLog::LOG,"Instantiate PageWindRoseFlex");
     }
-    virtual void setupKeys(){
-        Page::setupKeys();
-        commonData->keydata[1].label = "SRC";
-    }
 
     // Key functions
     virtual int handleKey(int key){
-	if(key == 2){ 
-	 // Code for set source 
-	    if(source == 'A'){ 
-		    source = 'T'; 
-		    ssource = "True"; // String to display
-	    } else { 
-		    source = 'A'; 
-		    ssource = "App."; // String to display
-	    } 
-	   } 
-	return key;               // Commit the key
-
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -58,11 +40,6 @@ public:
         static String unit5old = "";
         static String svalue6old = "";
         static String unit6old = "";
-        static GFXfont name3font;
-        static GFXfont name4font;
-        static GFXfont name5font;
-        static GFXfont name6font;
-
 
         // Get config data
         String lengthformat = config->getString(config->lengthFormat);
@@ -71,60 +48,39 @@ public:
         String flashLED = config->getString(config->flashLED);
         String backlightMode = config->getString(config->backlight);
 
-	GwApi::BoatValue *bvalue1; // Value 1 for angle
+        // Get boat values #1
-        GwApi::BoatValue *bvalue2; // Value 2 for speed
+        GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
-
+        String name1 = xdrDelete(bvalue1->getName());   // Value name
-	// Get boat value for wind angle (AWA/TWA), shown by pointer
-        if (source == 'A') {
-            bvalue1 = pageData.values[4];
-        } else {
-            bvalue1 = pageData.values[6];
-        }
-        String name1 = bvalue1->getName().c_str();      // Value name
         name1 = name1.substring(0, 6);                  // String length limit for value name
         calibrationData.calibrateInstance(bvalue1, logger); // Check if boat data value is to be calibrated
         double value1 = bvalue1->value;                 // Value as double in SI unit
         bool valid1 = bvalue1->valid;                   // Valid information
+        value1 = formatValue(bvalue1, *commonData).value;// Format only nesaccery for simulation data for pointer
         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){
+        if(valid1 == true){
             svalue1old = svalue1;   	                // Save old value
             unit1old = unit1;                           // Save old unit
         }
 
-	// Get boat value for wind speed (AWS/TWS), shown in top left corner
+        // Get boat values #2
-        if (source == 'A') {
+        GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list
-            bvalue2 =pageData.values[5];
+        String name2 = xdrDelete(bvalue2->getName());   // Value name
-        } else {
-            bvalue2 = pageData.values[7];
-        }
-        String name2 = bvalue2->getName().c_str();      // Value name
         name2 = name2.substring(0, 6);                  // String length limit for value name
         calibrationData.calibrateInstance(bvalue2, logger); // Check if boat data value is to be calibrated
         double value2 = bvalue2->value;                 // Value as double in SI unit
         bool valid2 = bvalue2->valid;                   // Valid information
-        if (simulation) {
-            value2 = 0.62731; // some random value
-        }
         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){
+        if(valid2 == true){
             svalue2old = svalue2;   	                // Save old value
             unit2old = unit2;                           // Save old unit
         }
 
-
+        // Get boat values #3
-
+        GwApi::BoatValue *bvalue3 = pageData.values[2]; // Third element in list
-        // Get boat value for bottom left  corner
-        GwApi::BoatValue *bvalue3 = pageData.values[0]; 
         String name3 = xdrDelete(bvalue3->getName());   // Value name
         name3 = name3.substring(0, 6);                  // String length limit for value name
-        if (name3.length()>3){
-            name3font=Ubuntu_Bold8pt8b;
-        }
-        else{
-            name3font=Ubuntu_Bold12pt8b;
-        }
         calibrationData.calibrateInstance(bvalue3, logger); // Check if boat data value is to be calibrated
         double value3 = bvalue3->value;                 // Value as double in SI unit
         bool valid3 = bvalue3->valid;                   // Valid information
@@ -135,16 +91,10 @@ public:
             unit3old = unit3;                           // Save old unit
         }
 
-        // Get boat value  for top right corner
+        // Get boat values #4
-        GwApi::BoatValue *bvalue4 = pageData.values[1]; 
+        GwApi::BoatValue *bvalue4 = pageData.values[3]; // Fourth element in list
-        String name4 = xdrDelete(bvalue4->getName());      // Value name
+        String name4 = xdrDelete(bvalue4->getName());   // Value name
         name4 = name4.substring(0, 6);                  // String length limit for value name
-        if (name4.length()>3){
-            name4font=Ubuntu_Bold8pt8b;
-        }
-        else{
-            name4font=Ubuntu_Bold12pt8b;
-        }
         calibrationData.calibrateInstance(bvalue4, logger); // Check if boat data value is to be calibrated
         double value4 = bvalue4->value;                 // Value as double in SI unit
         bool valid4 = bvalue4->valid;                   // Valid information
@@ -155,16 +105,10 @@ public:
             unit4old = unit4;                           // Save old unit
         }
 
-        // Get boat value bottom right corner
+        // Get boat values #5
-        GwApi::BoatValue *bvalue5 = pageData.values[2]; 
+        GwApi::BoatValue *bvalue5 = pageData.values[4]; // Fifth element in list
-        String name5 = xdrDelete(bvalue5->getName());      // Value name
+        String name5 = xdrDelete(bvalue5->getName());   // Value name
         name5 = name5.substring(0, 6);                  // String length limit for value name
-        if (name5.length()>3){
-            name5font=Ubuntu_Bold8pt8b;
-        }
-        else{
-            name5font=Ubuntu_Bold12pt8b;
-        }
         calibrationData.calibrateInstance(bvalue5, logger); // Check if boat data value is to be calibrated
         double value5 = bvalue5->value;                 // Value as double in SI unit
         bool valid5 = bvalue5->valid;                   // Valid information
@@ -175,16 +119,10 @@ public:
             unit5old = unit5;                           // Save old unit
         }
 
-        // Get boat value for center (name is not displayed)
+        // Get boat values #5
-        GwApi::BoatValue *bvalue6 = pageData.values[3]; 
+        GwApi::BoatValue *bvalue6 = pageData.values[5]; // Sixth element in list
-        String name6 = xdrDelete(bvalue6->getName());      // Value name
+        String name6 = xdrDelete(bvalue6->getName());   // Value name
         name6 = name6.substring(0, 6);                  // String length limit for value name
-        if (name6.length()>3){
-            name6font=Ubuntu_Bold8pt8b;
-        }
-        else{
-            name6font=Ubuntu_Bold8pt8b;
-        }
         calibrationData.calibrateInstance(bvalue6, logger); // Check if boat data value is to be calibrated
         double value6 = bvalue6->value;                 // Value as double in SI unit
         bool valid6 = bvalue6->valid;                   // Valid information
@@ -195,7 +133,6 @@ public:
             unit6old = unit6;                           // Save old unit
         }
 
-
         // Optical warning by limit violation (unused)
         if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
@@ -214,7 +151,7 @@ public:
 
         getdisplay().setTextColor(commonData->fgcolor);
 
-        // Show AWS or TWS top left
+        // Show value 2 at position of value 1 (top left)
         getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
         getdisplay().setCursor(10, 65);
         getdisplay().print(svalue2);                     // Value
@@ -234,11 +171,11 @@ public:
         // Horizintal separator left
         getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
 
-        // Show value 3 (=first user-configured parameter) at bottom left
+        // Show value 3 at bottom left
         getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
         getdisplay().setCursor(10, 270);
         getdisplay().print(svalue3);                     // Value
-        getdisplay().setFont(&name3font);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
         getdisplay().setCursor(10, 220);
         getdisplay().print(name3);                       // Name
         getdisplay().setFont(&Ubuntu_Bold8pt8b);
@@ -251,15 +188,21 @@ public:
             getdisplay().print(unit3old);                // Unit
         }
 
-        // Show value 4 (=second user-configured parameter) at top right
+        // Show value 4 at top right
         getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
         getdisplay().setCursor(295, 65);
-        getdisplay().print(svalue4);     // Value
+        if(valid3 == true){
-        getdisplay().setFont(&name4font);
+           // getdisplay().print(abs(value3 * 180 / M_PI), 0); // Value
-        getdisplay().setCursor(325, 95);
+            getdisplay().print(svalue4);     // Value
+        }
+        else{
+            getdisplay().print("---");                   // Value
+        }
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setCursor(335, 95);
         getdisplay().print(name4);                       // Name
         getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(325, 115);
+        getdisplay().setCursor(335, 115);
         getdisplay().print(" ");
         if(holdvalues == false){
             getdisplay().print(unit4);                   // Unit
@@ -271,15 +214,15 @@ public:
         // Horizintal separator right
         getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
 
-        // Show value 5 (=third user-configured parameter) at bottom right
+        // Show value 5 at bottom right
         getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
         getdisplay().setCursor(295, 270);
         getdisplay().print(svalue5);                     // Value
-        getdisplay().setFont(&name5font);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(325, 220);
+        getdisplay().setCursor(335, 220);
         getdisplay().print(name5);                       // Name
         getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(325, 190);
+        getdisplay().setCursor(335, 190);
         getdisplay().print(" ");
         if(holdvalues == false){
             getdisplay().print(unit5);                   // Unit
@@ -386,51 +329,26 @@ public:
 
 //*******************************************************************************************
 
-	// Show value6 (=fourth user-configured parameter) and ssource, so that they do not collide with the wind pointer
+        // Show value6, so that it does not collide with the wind pointer
-if ( cos(value1) > 0){ 
+        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-    //pointer points upwards 
+        if (cos(value1) > 0){
-    getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+            getdisplay().setCursor(160, 200);
-    getdisplay().setCursor(160, 200);
+            getdisplay().print(svalue6);                     // Value
-    getdisplay().print(svalue6);                     // Value
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setCursor(190, 215);
-    getdisplay().setCursor(190, 215);
+        } else{
-    getdisplay().print(" ");
+            getdisplay().setCursor(160, 130);
-    if(holdvalues == false){
+            getdisplay().print(svalue6);                     // Value
-        getdisplay().print(unit6);                   // Unit
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-    }
+            getdisplay().setCursor(190, 90);
-    else{  
+        }
-        getdisplay().print(unit6old);                // Unit
+        getdisplay().print(" ");
-    }
+        if(holdvalues == false){
-    if (sin(value1)>0){
+            getdisplay().print(unit6);                   // Unit
-	    getdisplay().setCursor(160, 130);
+        }
-    }
+        else{
-    else{
+            getdisplay().print(unit6old);                // Unit
-	    getdisplay().setCursor(220, 130);
+        }
-    }
-    getdisplay().print(ssource);		// true or app.
-}
-else{ 
-    // pointer points downwards
-    getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-    getdisplay().setCursor(160, 130);
-    getdisplay().print(svalue6);                     // Value
-    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-    getdisplay().setCursor(190, 90);
-    getdisplay().print(" ");
-    if(holdvalues == false){
-        getdisplay().print(unit6);                   // Unit
-    }
-    else{  
-        getdisplay().print(unit6old);                // Unit
-    }
-    if (sin(value1)>0){
-	    getdisplay().setCursor(160, 200);
-    }
-    else{
-	    getdisplay().setCursor(220, 200);
-    }
-    getdisplay().print(ssource);		//true or app. 
-}
 
         return PAGE_UPDATE;
     };
@@ -443,14 +361,13 @@ static Page *createPage(CommonData &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 (4 here)
+ * 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 registerPageWindRoseFlex(
     "WindRoseFlex", // Page name
     createPage,     // Action
-    4,              // Number of bus values depends on selection in Web configuration
+    6,              // Number of bus values depends on selection in Web configuration; was zero
-    {"AWA", "AWS", "TWA", "TWS"},    // fixed  values we need in the page. They are inserted AFTER the web-configured values.	
     true            // Show display header on/off
 );
 

lib/obp60task/Pagedata.h

@@ -1,9 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 #include <Arduino.h>
 #include "GwApi.h"
 #include <functional>
 #include <vector>
 #include "LedSpiTask.h"
+#include "OBPRingBuffer.h"
 #include "OBPDataOperations.h"
 
 #define MAX_PAGE_NUMBER 10    // Max number of pages for show data
@@ -11,12 +14,11 @@
 typedef std::vector<GwApi::BoatValue *> ValueList;
 
 typedef struct{
-  GwApi *api;
   String pageName;
   uint8_t pageNumber; // page number in sequence of visible pages
   //the values will always contain the user defined values first
   ValueList values;
-  HstryBuf* boatHstry;
+  tBoatHstryData boatHstry;
 } PageData;
 
 // Sensor data structure (only for extended sensors, not for NMEA bus sensors)
@@ -99,31 +101,37 @@ typedef struct{
 } AlarmData;
 
 typedef struct{
-    GwApi::Status status;
+    int voltage = 0;
-    GwLog *logger = nullptr;
+} AvgData;
-    GwConfigHandler *config = nullptr;
+
-    SensorData data;
+typedef struct{
-    SunData sundata;
+  GwApi::Status status;
-    TouchKeyData keydata[6];
+  GwLog *logger=NULL;
-    BacklightData backlight;
+  GwConfigHandler *config=NULL;
-    AlarmData alarm;
+  SensorData data;
-    GwApi::BoatValue *time = nullptr;
+  SunData sundata;
-    GwApi::BoatValue *date = nullptr;
+  TouchKeyData keydata[6];
-    uint16_t fgcolor;
+  BacklightData backlight;
-    uint16_t bgcolor;
+  AlarmData alarm;
-    bool keylock = false;
+  AvgData avgdata;
-    String powermode;
+  GwApi::BoatValue *time=NULL;
+  GwApi::BoatValue *date=NULL;
+  uint16_t fgcolor;
+  uint16_t bgcolor;
+  bool keylock = false;
+  String powermode;
 } CommonData;
 
 //a base class that all pages must inherit from
 class Page{
-  protected:
+protected:
     CommonData *commonData;
-  public:
+    GwConfigHandler *config;
+    GwLog *logger;
+public:
     int refreshtime = 1000;
     virtual int displayPage(PageData &pageData)=0;
     virtual void displayNew(PageData &pageData){}
-    virtual void leavePage(PageData &pageData){}
     virtual void setupKeys() {
 #ifdef HARDWARE_V21
         commonData->keydata[0].label = "";
@@ -182,9 +190,9 @@ class PageDescription{
 
 class PageStruct{
     public:
-        Page *page = nullptr;
+        Page *page=NULL;
         PageData parameters;
-        PageDescription *description = nullptr;
+        PageDescription *description=NULL;
 };
 
 // Standard format functions without overhead

lib/obp60task/fonts/IBM8x8px.h

@@ -1,202 +0,0 @@
-const uint8_t IBM8x8pxBitmaps[] PROGMEM = {
-	0x00,				/* 0x20 space */
-	0x6F, 0xF6, 0x60, 0x60,	/* 0x21 exclam */
-	0xDE, 0xF6,			/* 0x22 quotedbl */
-	0x6C, 0xDB, 0xFB, 0x6F, 0xED, 0x9B, 0x00,	/* 0x23 numbersign */
-	0x31, 0xFC, 0x1E, 0x0F, 0xE3, 0x00,	/* 0x24 dollar */
-	0xC7, 0x98, 0x61, 0x86, 0x78, 0xC0,	/* 0x25 percent */
-	0x38, 0xD8, 0xE3, 0xBD, 0xD9, 0x9D, 0x80,	/* 0x26 ampersand */
-	0x6F, 0x00,			/* 0x27 quotesingle */
-	0x36, 0xCC, 0xC6, 0x30,	/* 0x28 parenleft */
-	0xC6, 0x33, 0x36, 0xC0,	/* 0x29 parenright */
-	0x66, 0x3C, 0xFF, 0x3C, 0x66,	/* 0x2A asterisk */
-	0x30, 0xCF, 0xCC, 0x30,	/* 0x2B plus */
-	0x6F, 0x00,			/* 0x2C comma */
-	0xFC,				/* 0x2D hyphen */
-	0xF0,				/* 0x2E period */
-	0x06, 0x18, 0x61, 0x86, 0x18, 0x20, 0x00,	/* 0x2F slash */
-	0x7D, 0x8F, 0x3E, 0xFF, 0x7C, 0xDF, 0x00,	/* 0x30 zero */
-	0x31, 0xC3, 0x0C, 0x30, 0xCF, 0xC0,	/* 0x31 one */
-	0x7B, 0x30, 0xCE, 0x63, 0x1F, 0xC0,	/* 0x32 two */
-	0x7B, 0x30, 0xCE, 0x0F, 0x37, 0x80,	/* 0x33 three */
-	0x1C, 0x79, 0xB6, 0x6F, 0xE1, 0x87, 0x80,	/* 0x34 four */
-	0xFF, 0x0F, 0x83, 0x0F, 0x37, 0x80,	/* 0x35 five */
-	0x39, 0x8C, 0x3E, 0xCF, 0x37, 0x80,	/* 0x36 six */
-	0xFF, 0x30, 0xC6, 0x30, 0xC3, 0x00,	/* 0x37 seven */
-	0x7B, 0x3C, 0xDE, 0xCF, 0x37, 0x80,	/* 0x38 eight */
-	0x7B, 0x3C, 0xDF, 0x0C, 0x67, 0x00,	/* 0x39 nine */
-	0xF0, 0xF0,			/* 0x3A colon */
-	0x6C, 0x37, 0x80,	/* 0x3B semicolon */
-	0x19, 0x99, 0x86, 0x18, 0x60,	/* 0x3C less */
-	0xFC, 0x00, 0x3F,	/* 0x3D equal */
-	0xC3, 0x0C, 0x33, 0x33, 0x00,	/* 0x3E greater */
-	0x7B, 0x30, 0xC6, 0x30, 0x03, 0x00,	/* 0x3F question */
-	0x7D, 0x8F, 0x7E, 0xFD, 0xF8, 0x1E, 0x00,	/* 0x40 at */
-	0x31, 0xEC, 0xF3, 0xFF, 0x3C, 0xC0,	/* 0x41 A */
-	0xFC, 0xCD, 0x9B, 0xE6, 0x6C, 0xFF, 0x00,	/* 0x42 B */
-	0x3C, 0xCF, 0x06, 0x0C, 0x0C, 0xCF, 0x00,	/* 0x43 C */
-	0xF8, 0xD9, 0x9B, 0x36, 0x6D, 0xBE, 0x00,	/* 0x44 D */
-	0xFE, 0xC5, 0xA3, 0xC6, 0x8C, 0x7F, 0x80,	/* 0x45 E */
-	0xFE, 0xC5, 0xA3, 0xC6, 0x8C, 0x3C, 0x00,	/* 0x46 F */
-	0x3C, 0xCF, 0x06, 0x0C, 0xEC, 0xCF, 0x80,	/* 0x47 G */
-	0xCF, 0x3C, 0xFF, 0xCF, 0x3C, 0xC0,	/* 0x48 H */
-	0xF6, 0x66, 0x66, 0xF0,	/* 0x49 I */
-	0x1E, 0x18, 0x30, 0x6C, 0xD9, 0x9E, 0x00,	/* 0x4A J */
-	0xE6, 0xCD, 0xB3, 0xC6, 0xCC, 0xF9, 0x80,	/* 0x4B K */
-	0xF0, 0xC1, 0x83, 0x06, 0x2C, 0xFF, 0x80,	/* 0x4C L */
-	0xC7, 0xDF, 0xFF, 0xFD, 0x78, 0xF1, 0x80,	/* 0x4D M */
-	0xC7, 0xCF, 0xDE, 0xFC, 0xF8, 0xF1, 0x80,	/* 0x4E N */
-	0x38, 0xDB, 0x1E, 0x3C, 0x6D, 0x8E, 0x00,	/* 0x4F O */
-	0xFC, 0xCD, 0x9B, 0xE6, 0x0C, 0x3C, 0x00,	/* 0x50 P */
-	0x7B, 0x3C, 0xF3, 0xDD, 0xE1, 0xC0,	/* 0x51 Q */
-	0xFC, 0xCD, 0x9B, 0xE6, 0xCC, 0xF9, 0x80,	/* 0x52 R */
-	0x7B, 0x3E, 0x1C, 0x1F, 0x37, 0x80,	/* 0x53 S */
-	0xFE, 0xD3, 0x0C, 0x30, 0xC7, 0x80,	/* 0x54 T */
-	0xCF, 0x3C, 0xF3, 0xCF, 0x3F, 0xC0,	/* 0x55 U */
-	0xCF, 0x3C, 0xF3, 0xCD, 0xE3, 0x00,	/* 0x56 V */
-	0xC7, 0x8F, 0x1E, 0xBF, 0xFD, 0xF1, 0x80,	/* 0x57 W */
-	0xC7, 0x8D, 0xB1, 0xC3, 0x8D, 0xB1, 0x80,	/* 0x58 X */
-	0xCF, 0x3C, 0xDE, 0x30, 0xC7, 0x80,	/* 0x59 Y */
-	0xFF, 0x8E, 0x30, 0xC3, 0x2C, 0xFF, 0x80,	/* 0x5A Z */
-	0xFC, 0xCC, 0xCC, 0xF0,	/* 0x5B bracketleft */
-	0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0xC0, 0x80,	/* 0x5C backslash */
-	0xF3, 0x33, 0x33, 0xF0,	/* 0x5D bracketright */
-	0x10, 0x71, 0xB6, 0x30,	/* 0x5E asciicircum */
-	0xFF,				/* 0x5F underscore */
-	0xD9, 0x80,			/* 0x60 grave */
-	0x78, 0x19, 0xF6, 0x67, 0x60,	/* 0x61 a */
-	0xE0, 0xC1, 0x83, 0xE6, 0x6C, 0xF7, 0x00,	/* 0x62 b */
-	0x7B, 0x3C, 0x33, 0x78,	/* 0x63 c */
-	0x1C, 0x18, 0x33, 0xEC, 0xD9, 0x9D, 0x80,	/* 0x64 d */
-	0x7B, 0x3F, 0xF0, 0x78,	/* 0x65 e */
-	0x39, 0xB6, 0x3C, 0x61, 0x8F, 0x00,	/* 0x66 f */
-	0x77, 0x9B, 0x33, 0xE0, 0xDF, 0x00,	/* 0x67 g */
-	0xE0, 0xC1, 0xB3, 0xB6, 0x6C, 0xF9, 0x80,	/* 0x68 h */
-	0x60, 0xE6, 0x66, 0xF0,	/* 0x69 i */
-	0x0C, 0x00, 0xC3, 0x0F, 0x3C, 0xDE,	/* 0x6A j */
-	0xE0, 0xC1, 0x9B, 0x67, 0x8D, 0xB9, 0x80,	/* 0x6B k */
-	0xE6, 0x66, 0x66, 0xF0,	/* 0x6C l */
-	0xCD, 0xFF, 0xFE, 0xBC, 0x60,	/* 0x6D m */
-	0xFB, 0x3C, 0xF3, 0xCC,	/* 0x6E n */
-	0x7B, 0x3C, 0xF3, 0x78,	/* 0x6F o */
-	0xDC, 0xCD, 0x9B, 0xE6, 0x1E, 0x00,	/* 0x70 p */
-	0x77, 0x9B, 0x33, 0xE0, 0xC3, 0xC0,	/* 0x71 q */
-	0xDC, 0xED, 0x9B, 0x0F, 0x00,	/* 0x72 r */
-	0x7F, 0x07, 0x83, 0xF8,	/* 0x73 s */
-	0x23, 0x3E, 0xC6, 0x34, 0xC0,	/* 0x74 t */
-	0xCD, 0x9B, 0x36, 0x67, 0x60,	/* 0x75 u */
-	0xCF, 0x3C, 0xDE, 0x30,	/* 0x76 v */
-	0xC7, 0xAF, 0xFF, 0xF6, 0xC0,	/* 0x77 w */
-	0xC6, 0xD8, 0xE3, 0x6C, 0x60,	/* 0x78 x */
-	0xCF, 0x3C, 0xDF, 0x0F, 0xE0,	/* 0x79 y */
-	0xFE, 0x63, 0x19, 0xFC,	/* 0x7A z */
-	0x1C, 0xC3, 0x38, 0x30, 0xC1, 0xC0,	/* 0x7B braceleft */
-	0xFC, 0xFC,			/* 0x7C bar */
-	0xE0, 0xC3, 0x07, 0x30, 0xCE, 0x00,	/* 0x7D braceright */
-	0x77, 0xB8,			/* 0x7E asciitilde */
-	0x10, 0x71, 0xB6, 0x3C, 0x7F, 0xC0	/* 0x7F uni007F */
-};
-
-const GFXglyph IBM8x8pxGlyphs[] PROGMEM = {
-	{ 0, 1, 1, 2, 0, -1 }, /* 0x20 space */
-	{ 1, 4, 7, 5, 0, -7 }, /* 0x21 exclam */
-	{ 5, 5, 3, 6, 0, -7 }, /* 0x22 quotedbl */
-	{ 7, 7, 7, 8, 0, -7 }, /* 0x23 numbersign */
-	{ 14, 6, 7, 7, 0, -7 }, /* 0x24 dollar */
-	{ 20, 7, 6, 8, 0, -6 }, /* 0x25 percent */
-	{ 26, 7, 7, 8, 0, -7 }, /* 0x26 ampersand */
-	{ 33, 3, 3, 4, 0, -7 }, /* 0x27 quotesingle */
-	{ 35, 4, 7, 5, 0, -7 }, /* 0x28 parenleft */
-	{ 39, 4, 7, 5, 0, -7 }, /* 0x29 parenright */
-	{ 43, 8, 5, 9, 0, -6 }, /* 0x2A asterisk */
-	{ 48, 6, 5, 7, 0, -6 }, /* 0x2B plus */
-	{ 52, 3, 3, 4, 0, -2 }, /* 0x2C comma */
-	{ 54, 6, 1, 7, 0, -4 }, /* 0x2D hyphen */
-	{ 55, 2, 2, 3, 0, -2 }, /* 0x2E period */
-	{ 56, 7, 7, 8, 0, -7 }, /* 0x2F slash */
-	{ 63, 7, 7, 8, 0, -7 }, /* 0x30 zero */
-	{ 70, 6, 7, 7, 0, -7 }, /* 0x31 one */
-	{ 76, 6, 7, 7, 0, -7 }, /* 0x32 two */
-	{ 82, 6, 7, 7, 0, -7 }, /* 0x33 three */
-	{ 88, 7, 7, 8, 0, -7 }, /* 0x34 four */
-	{ 95, 6, 7, 7, 0, -7 }, /* 0x35 five */
-	{ 101, 6, 7, 7, 0, -7 }, /* 0x36 six */
-	{ 107, 6, 7, 7, 0, -7 }, /* 0x37 seven */
-	{ 113, 6, 7, 7, 0, -7 }, /* 0x38 eight */
-	{ 119, 6, 7, 7, 0, -7 }, /* 0x39 nine */
-	{ 125, 2, 6, 3, 0, -6 }, /* 0x3A colon */
-	{ 127, 3, 6, 4, 0, -6 }, /* 0x3B semicolon */
-	{ 130, 5, 7, 6, 0, -7 }, /* 0x3C less */
-	{ 135, 6, 4, 7, 0, -5 }, /* 0x3D equal */
-	{ 138, 5, 7, 6, 0, -7 }, /* 0x3E greater */
-	{ 143, 6, 7, 7, 0, -7 }, /* 0x3F question */
-	{ 149, 7, 7, 8, 0, -7 }, /* 0x40 at */
-	{ 156, 6, 7, 7, 0, -7 }, /* 0x41 A */
-	{ 162, 7, 7, 8, 0, -7 }, /* 0x42 B */
-	{ 169, 7, 7, 8, 0, -7 }, /* 0x43 C */
-	{ 176, 7, 7, 8, 0, -7 }, /* 0x44 D */
-	{ 183, 7, 7, 8, 0, -7 }, /* 0x45 E */
-	{ 190, 7, 7, 8, 0, -7 }, /* 0x46 F */
-	{ 197, 7, 7, 8, 0, -7 }, /* 0x47 G */
-	{ 204, 6, 7, 7, 0, -7 }, /* 0x48 H */
-	{ 210, 4, 7, 5, 0, -7 }, /* 0x49 I */
-	{ 214, 7, 7, 8, 0, -7 }, /* 0x4A J */
-	{ 221, 7, 7, 8, 0, -7 }, /* 0x4B K */
-	{ 228, 7, 7, 8, 0, -7 }, /* 0x4C L */
-	{ 235, 7, 7, 8, 0, -7 }, /* 0x4D M */
-	{ 242, 7, 7, 8, 0, -7 }, /* 0x4E N */
-	{ 249, 7, 7, 8, 0, -7 }, /* 0x4F O */
-	{ 256, 7, 7, 8, 0, -7 }, /* 0x50 P */
-	{ 263, 6, 7, 7, 0, -7 }, /* 0x51 Q */
-	{ 269, 7, 7, 8, 0, -7 }, /* 0x52 R */
-	{ 276, 6, 7, 7, 0, -7 }, /* 0x53 S */
-	{ 282, 6, 7, 7, 0, -7 }, /* 0x54 T */
-	{ 288, 6, 7, 7, 0, -7 }, /* 0x55 U */
-	{ 294, 6, 7, 7, 0, -7 }, /* 0x56 V */
-	{ 300, 7, 7, 8, 0, -7 }, /* 0x57 W */
-	{ 307, 7, 7, 8, 0, -7 }, /* 0x58 X */
-	{ 314, 6, 7, 7, 0, -7 }, /* 0x59 Y */
-	{ 320, 7, 7, 8, 0, -7 }, /* 0x5A Z */
-	{ 327, 4, 7, 5, 0, -7 }, /* 0x5B bracketleft */
-	{ 331, 7, 7, 8, 0, -7 }, /* 0x5C backslash */
-	{ 338, 4, 7, 5, 0, -7 }, /* 0x5D bracketright */
-	{ 342, 7, 4, 8, 0, -7 }, /* 0x5E asciicircum */
-	{ 346, 8, 1, 9, 0, 0 }, /* 0x5F underscore */
-	{ 347, 3, 3, 4, 0, -7 }, /* 0x60 grave */
-	{ 349, 7, 5, 8, 0, -5 }, /* 0x61 a */
-	{ 354, 7, 7, 8, 0, -7 }, /* 0x62 b */
-	{ 361, 6, 5, 7, 0, -5 }, /* 0x63 c */
-	{ 365, 7, 7, 8, 0, -7 }, /* 0x64 d */
-	{ 372, 6, 5, 7, 0, -5 }, /* 0x65 e */
-	{ 376, 6, 7, 7, 0, -7 }, /* 0x66 f */
-	{ 382, 7, 6, 8, 0, -5 }, /* 0x67 g */
-	{ 388, 7, 7, 8, 0, -7 }, /* 0x68 h */
-	{ 395, 4, 7, 5, 0, -7 }, /* 0x69 i */
-	{ 399, 6, 8, 7, 0, -7 }, /* 0x6A j */
-	{ 405, 7, 7, 8, 0, -7 }, /* 0x6B k */
-	{ 412, 4, 7, 5, 0, -7 }, /* 0x6C l */
-	{ 416, 7, 5, 8, 0, -5 }, /* 0x6D m */
-	{ 421, 6, 5, 7, 0, -5 }, /* 0x6E n */
-	{ 425, 6, 5, 7, 0, -5 }, /* 0x6F o */
-	{ 429, 7, 6, 8, 0, -5 }, /* 0x70 p */
-	{ 435, 7, 6, 8, 0, -5 }, /* 0x71 q */
-	{ 441, 7, 5, 8, 0, -5 }, /* 0x72 r */
-	{ 446, 6, 5, 7, 0, -5 }, /* 0x73 s */
-	{ 450, 5, 7, 6, 0, -7 }, /* 0x74 t */
-	{ 455, 7, 5, 8, 0, -5 }, /* 0x75 u */
-	{ 460, 6, 5, 7, 0, -5 }, /* 0x76 v */
-	{ 464, 7, 5, 8, 0, -5 }, /* 0x77 w */
-	{ 469, 7, 5, 8, 0, -5 }, /* 0x78 x */
-	{ 474, 6, 6, 7, 0, -5 }, /* 0x79 y */
-	{ 479, 6, 5, 7, 0, -5 }, /* 0x7A z */
-	{ 483, 6, 7, 7, 0, -7 }, /* 0x7B braceleft */
-	{ 489, 2, 7, 3, 0, -7 }, /* 0x7C bar */
-	{ 491, 6, 7, 7, 0, -7 }, /* 0x7D braceright */
-	{ 497, 7, 2, 8, 0, -7 }, /* 0x7E asciitilde */
-	{ 499, 7, 6, 8, 0, -6 } /* 0x7F uni007F */
-};
-
-const GFXfont IBM8x8px PROGMEM = {
-  (uint8_t  *)IBM8x8pxBitmaps,
-  (GFXglyph *)IBM8x8pxGlyphs,
-  0x20, 0x7F, 8 };

lib/obp60task/gen_set.py

@@ -20,7 +20,7 @@ import getopt
 import re
 import json
 
-__version__ = "0.3"
+__version__ = "0.2"
 
 def detect_pages(filename):
     # returns a dictionary with page name and the number of gui fields
@@ -87,11 +87,6 @@ def create_json(device, no_of_pages, pagedata):
     output = []
 
     for page_no in range(1, no_of_pages + 1):
-
-        category = f"{device.upper()} Page {page_no}"
-        capabilities = {device.lower(): "true"}
-        visiblepages = [str(vp) for vp in range(page_no, no_of_pages + 1)]
-
         page_data = {
             "name": f"page{page_no}type",
             "label": "Type",
@@ -99,11 +94,9 @@ def create_json(device, no_of_pages, pagedata):
             "default": get_default_page(page_no),
             "description": f"Type of page for page {page_no}",
             "list": pages,
-            "category": category,
+            "category": f"{device.upper()} Page {page_no}",
             "capabilities": {device.lower(): "true"},
-            "condition": {
+            "condition": [{"visiblePages": vp} for vp in range(page_no, no_of_pages + 1)],
-                "visiblePages": visiblepages
-            },
             #"fields": [],
         }
         output.append(page_data)
@@ -115,59 +108,39 @@ def create_json(device, no_of_pages, pagedata):
                 "type": "boatData",
                 "default": "",
                 "description": "The display for field {}".format(number_to_text(field_no)),
-                "category": category,
+                "category": f"{device.upper()} Page {page_no}",
-                "capabilities": capabilities,
+                "capabilities": {device.lower(): "true"},
-                "condition": { 
+                "condition": [
-                    f"page{page_no}type": [ p for p in pages if pagedata[p] >= field_no ]
+                    {f"page{page_no}type": page}
-                    ,"visiblePages": visiblepages
+                    for page in pages
-                }
+                    if pagedata[page] >= field_no
+                ],
             }
             output.append(field_data)
 
-        fluid_data = {
+        fluid_data ={
             "name": f"page{page_no}fluid",
             "label": "Fluid type",
             "type": "list",
             "default": "0",
             "list": [
-                {"l":"Fuel (0)","v":"0"},
+            {"l":"Fuel (0)","v":"0"},
-                {"l":"Water (1)","v":"1"},
+            {"l":"Water (1)","v":"1"},
-                {"l":"Gray Water (2)","v":"2"},
+            {"l":"Gray Water (2)","v":"2"},
-                {"l":"Live Well (3)","v":"3"},
+            {"l":"Live Well (3)","v":"3"},
-                {"l":"Oil (4)","v":"4"},
+            {"l":"Oil (4)","v":"4"},
-                {"l":"Black Water (5)","v":"5"},
+            {"l":"Black Water (5)","v":"5"},
-                {"l":"Fuel Gasoline (6)","v":"6"}
+            {"l":"Fuel Gasoline (6)","v":"6"}
             ],
             "description": "Fluid type in tank",
-            "category": category,
+            "category": f"{device.upper()} Page {page_no}",
-            "capabilities": capabilities,
+            "capabilities": {
-            "condition": {
+                device.lower(): "true"
-                f"page{page_no}type": "Fluid",
+            },
-                "visiblePages": visiblepages
+            "condition":[{f"page{page_no}type":"Fluid"}]
             }
-        }
         output.append(fluid_data)
 
-        if device.upper() == 'OBP40':
-            windsource = {
-                "name": f"page{page_no}wndsrc",
-                "label": "Wind source",
-                "type": "list",
-                "default": "True wind",
-                "description": f"Wind source for page {page_no}: [true|apparent]",
-                "list": [
-                    "True wind",
-                    "Apparant wind"
-                ],
-                "category": category,
-                "capabilities": capabilities,
-                "condition": {
-                    f"page{page_no}type": "WindPlot",
-                    "visiblePages": visiblepages
-                }
-            }
-            output.append(windsource)
-
     return json.dumps(output, indent=4)
 
 def usage():

lib/obp60task/index.js

@@ -1,14 +0,0 @@
-// Add a new register card in web configuration interface
-// This is a Java Script! 
-(function(){
-    const api=window.esp32nmea2k;
-    if (! api) return;
-    const tabName="Screen";
-    api.registerListener((id, data) => {
-    //    if (!data.testboard) return; //do nothing if we are not active
-        let page = api.addTabPage(tabName, "Screen");
-        api.addEl('button', '', page, 'Screenshot').addEventListener('click', function (ev) {
-	window.open('/api/user/OBP60Task/screenshot', 'screenshot');
-        })
-    }, api.EVENTS.init);
-})();

lib/obp60task/obp60task.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include "obp60task.h"
 #include "Pagedata.h"                   // Data exchange for pages
@@ -13,13 +14,19 @@
 #include "OBP60Extensions.h"            // Functions lib for extension board
 #include "OBP60Keypad.h"                // Functions for keypad
 #include "BoatDataCalibration.h"        // Functions lib for data instance calibration
+#include "OBPRingBuffer.h"              // Functions lib with ring buffer for history storage of some boat data
 #include "OBPDataOperations.h"          // Functions lib for data operations such as true wind calculation
 
 #ifdef BOARD_OBP40S3
 #include "driver/rtc_io.h"              // Needs for weakup from deep sleep
+#include <FS.h>                         // SD-Card access
+#include <SD.h>
 #include <SPI.h>
 #endif
 
+// True type character sets includes
+// See OBP60ExtensionPort.cpp
+
 // Pictures
 //#include GxEPD_BitmapExamples         // Example picture
 #include "MFD_OBP60_400x300_sw.h"       // MFD with logo
@@ -28,6 +35,7 @@
 #include "OBP60QRWiFi.h"                // Functions lib for WiFi QR code
 #include "OBPSensorTask.h"              // Functions lib for sensor data
 
+
 // Global vars
 bool initComplete = false;      // Initialization complete
 int taskRunCounter = 0;         // Task couter for loop section
@@ -40,23 +48,45 @@ void OBP60Init(GwApi *api){
     GwConfigHandler *config = api->getConfig();
 
     // Set a new device name and hidden the original name in the main config
-    String devicename = config->getConfigItem(config->deviceName, true)->asString();
+    String devicename = api->getConfig()->getConfigItem(api->getConfig()->deviceName,true)->asString();
-    config->setValue(GwConfigDefinitions::systemName, devicename, GwConfigInterface::ConfigType::HIDDEN);
+    api->getConfig()->setValue(GwConfigDefinitions::systemName, devicename, GwConfigInterface::ConfigType::HIDDEN);
 
-    logger->prefix = devicename + ":";
+    api->getLogger()->logDebug(GwLog::LOG,"obp60init running");
-    logger->logDebug(GwLog::LOG,"obp60init running");
     
     // Check I2C devices
     
-    // Init power
-    String powermode = config->getConfigItem(config->powerMode,true)->asString();
-    logger->logDebug(GwLog::DEBUG, "Power Mode is: %s", powermode.c_str());
-    powerInit(powermode);
-
     // Init hardware
     hardwareInit(api);
 
-#ifdef BOARD_OBP40S3
+    // Init power
+    String powermode = api->getConfig()->getConfigItem(api->getConfig()->powerMode,true)->asString();
+    api->getLogger()->logDebug(GwLog::DEBUG,"Power Mode is: %s", powermode.c_str());
+    powerInit(powermode);
+
+    #ifdef BOARD_OBP40S3
+    bool sdcard = config->getBool(config->useSDCard);
+    if (sdcard) {
+        SPIClass SD_SPI = SPIClass(HSPI);
+        SD_SPI.begin(SD_SPI_CLK, SD_SPI_MISO, SD_SPI_MOSI);
+        if (SD.begin(SD_SPI_CS, SD_SPI, 80000000)) {
+            String sdtype = "unknown";
+            uint8_t cardType = SD.cardType();
+            switch (cardType) {
+                case CARD_MMC:
+                   sdtype = "MMC";
+                   break;
+                case CARD_SD:
+                   sdtype = "SDSC";
+                   break;
+                case CARD_SDHC:
+                   sdtype = "SDHC";
+                   break;
+            }
+            uint64_t cardSize = SD.cardSize() / (1024 * 1024);
+            LOG_DEBUG(GwLog::LOG,"SD card type %s of size %d MB detected", sdtype, cardSize);
+        }
+    }
+
     // Deep sleep wakeup configuration
     esp_sleep_enable_ext0_wakeup(OBP_WAKEWUP_PIN, 0);   // 1 = High, 0 = Low
     rtc_gpio_pullup_en(OBP_WAKEWUP_PIN);                // Activate pullup resistor
@@ -65,7 +95,7 @@ void OBP60Init(GwApi *api){
 
     // Settings for e-paper display
     String fastrefresh = api->getConfig()->getConfigItem(api->getConfig()->fastRefresh,true)->asString();
-    logger->logDebug(GwLog::DEBUG, "Fast Refresh Mode is: %s", fastrefresh.c_str());
+    api->getLogger()->logDebug(GwLog::DEBUG,"Fast Refresh Mode is: %s", fastrefresh.c_str());
     #ifdef DISPLAY_GDEY042T81
     if(fastrefresh == "true"){
         static const bool useFastFullUpdate = true;   // Enable fast full display update only for GDEY042T81
@@ -84,11 +114,11 @@ void OBP60Init(GwApi *api){
 
     // Get CPU speed
     int freq = getCpuFrequencyMhz();
-    logger->logDebug(GwLog::LOG,"CPU speed at boot: %i MHz", freq);
+    api->getLogger()->logDebug(GwLog::LOG,"CPU speed at boot: %i MHz", freq);
     
     // Settings for backlight
     String backlightMode = api->getConfig()->getConfigItem(api->getConfig()->backlight,true)->asString();
-    logger->logDebug(GwLog::DEBUG,"Backlight Mode is: %s", backlightMode.c_str());
+    api->getLogger()->logDebug(GwLog::DEBUG,"Backlight Mode is: %s", backlightMode.c_str());
     uint brightness = uint(api->getConfig()->getConfigItem(api->getConfig()->blBrightness,true)->asInt());
     String backlightColor = api->getConfig()->getConfigItem(api->getConfig()->blColor,true)->asString();
     if(String(backlightMode) == "On"){
@@ -103,7 +133,7 @@ void OBP60Init(GwApi *api){
 
     // Settings flash LED mode
     String ledMode = api->getConfig()->getConfigItem(api->getConfig()->flashLED,true)->asString();
-    logger->logDebug(GwLog::DEBUG,"LED Mode is: %s", ledMode.c_str());
+    api->getLogger()->logDebug(GwLog::DEBUG,"LED Mode is: %s", ledMode.c_str());
     if(String(ledMode) == "Off"){
         setBlinkingLED(false);
     }
@@ -121,8 +151,8 @@ void OBP60Init(GwApi *api){
 typedef struct {
         int page0=0;
         QueueHandle_t queue;
-        GwLog* logger = nullptr;
+        GwLog* logger = NULL;
-//        GwApi* api = nullptr;
+//        GwApi* api = NULL;
         uint sensitivity = 100;
         bool use_syspage = true;
     } MyData;
@@ -147,37 +177,45 @@ void keyboardTask(void *param){
     vTaskDelete(NULL);
 }
 
-// Scorgan: moved class declaration to header file <obp60task.h> to make class available to other functions
+class BoatValueList{
-// --- Class BoatValueList --------------
+    public:
-bool BoatValueList::addValueToList(GwApi::BoatValue *v){
+    static const int MAXVALUES=100;
-    for (int i=0;i<numValues;i++){
+    //we create a list containing all our BoatValues
-        if (allBoatValues[i] == v){
+    //this is the list we later use to let the api fill all the values
-            //already in list...
+    //additionally we put the necessary values into the paga data - see below
-            return true;
+    GwApi::BoatValue *allBoatValues[MAXVALUES];
+    int numValues=0;
+    
+    bool addValueToList(GwApi::BoatValue *v){
+        for (int i=0;i<numValues;i++){
+            if (allBoatValues[i] == v){
+                //already in list...
+                return true;
+            }
         }
+        if (numValues >= MAXVALUES) return false;
+        allBoatValues[numValues]=v;
+        numValues++;
+        return true;
     }
-    if (numValues >= MAXVALUES) return false;
+    //helper to ensure that each BoatValue is only queried once
-    allBoatValues[numValues]=v;
+    GwApi::BoatValue *findValueOrCreate(String name){
-    numValues++;
+        for (int i=0;i<numValues;i++){
-    return true;
+            if (allBoatValues[i]->getName() == name) {
-}
+                return allBoatValues[i];
-//helper to ensure that each BoatValue is only queried once
+            }
-GwApi::BoatValue *BoatValueList::findValueOrCreate(String name){
-    for (int i=0;i<numValues;i++){
-        if (allBoatValues[i]->getName() == name) {
-            return allBoatValues[i];
         }
+        GwApi::BoatValue *rt=new GwApi::BoatValue(name);
+        addValueToList(rt);
+        return rt;
     }
-    GwApi::BoatValue *rt=new GwApi::BoatValue(name);
+};
-    addValueToList(rt);
-    return rt;
-}
-// --- Class BoatValueList --------------
 
 //we want to have a list that has all our page definitions
 //this way each page can easily be added here
 //needs some minor tricks for the safe static initialization
 typedef std::vector<PageDescription*> Pages;
+//the page list class
 class PageList{
     public:
         Pages pages;
@@ -227,7 +265,7 @@ void registerAllPages(PageList &list){
     extern PageDescription registerPageWindRose;
     list.add(&registerPageWindRose);
     extern PageDescription registerPageWindRoseFlex;
-    list.add(&registerPageWindRoseFlex);
+    list.add(&registerPageWindRoseFlex); // 
     extern PageDescription registerPageVoltage;
     list.add(&registerPageVoltage);
     extern PageDescription registerPageDST810;
@@ -265,62 +303,182 @@ void registerAllPages(PageList &list){
 }
 
 // Undervoltage detection for shutdown display
-void underVoltageError(CommonData &common) {
+void underVoltageDetection(GwApi *api, CommonData &common){
-#if defined VOLTAGE_SENSOR && defined LIPO_ACCU_1200
+    // Read settings
-    // Switch off all power lines
+    double voffset = (api->getConfig()->getConfigItem(api->getConfig()->vOffset,true)->asString()).toFloat();
-    setPortPin(OBP_BACKLIGHT_LED, false);   // Backlight Off
+    double vslope = (api->getConfig()->getConfigItem(api->getConfig()->vSlope,true)->asString()).toFloat();
-    setFlashLED(false);                     // Flash LED Off
+    // Read supply voltage
-    buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
+    #if defined VOLTAGE_SENSOR && defined LIPO_ACCU_1200
-    // Shutdown EInk display
+    float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.53) * 2;   // Vin = 1/2 for OBP40
-    getdisplay().setFullWindow();           // Set full Refresh
+    float minVoltage = 3.65;  // Absolut minimum volatge for 3,7V LiPo accu
-    //getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+    #else
-    getdisplay().fillScreen(common.bgcolor);// Clear screen
+    float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.17) * 20;   // Vin = 1/20 for OBP60
-    getdisplay().setTextColor(common.fgcolor);
+    float minVoltage = MIN_VOLTAGE;
-    getdisplay().setFont(&Ubuntu_Bold20pt8b);
+    #endif
-    getdisplay().setCursor(65, 150);
+    double calVoltage = actVoltage * vslope + voffset;  // Calibration
-    getdisplay().print("Undervoltage");
+    if(calVoltage < minVoltage){
-    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        #if defined VOLTAGE_SENSOR && defined LIPO_ACCU_1200
-    getdisplay().setCursor(65, 175);
+        // Switch off all power lines
-    getdisplay().print("Charge battery and restart system");
+        setPortPin(OBP_BACKLIGHT_LED, false);   // Backlight Off
-    getdisplay().nextPage();                // Partial update
+        setFlashLED(false);                     // Flash LED Off            
-    getdisplay().powerOff();                // Display power off
+        buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
-    setPortPin(OBP_POWER_EPD, false);       // Power off ePaper display
+        // Shutdown EInk display
-    setPortPin(OBP_POWER_SD, false);        // Power off SD card
+        getdisplay().setFullWindow();           // Set full Refresh
-#else
+        //getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-    // Switch off all power lines
+        getdisplay().fillScreen(common.bgcolor);// Clear screen
-    setPortPin(OBP_BACKLIGHT_LED, false);   // Backlight Off
+        getdisplay().setTextColor(common.fgcolor);
-    setFlashLED(false);                     // Flash LED Off
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-    buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
+        getdisplay().setCursor(65, 150);
-    setPortPin(OBP_POWER_50, false);        // Power rail 5.0V Off
+        getdisplay().print("Undervoltage");
-    // Shutdown EInk display
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        getdisplay().setCursor(65, 175);
-    getdisplay().fillScreen(common.bgcolor);// Clear screen
+        getdisplay().print("Charge battery and restart system");
-    getdisplay().setTextColor(common.fgcolor);
+        getdisplay().nextPage();                // Partial update
-    getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().powerOff();                // Display power off
-    getdisplay().setCursor(65, 150);
+        setPortPin(OBP_POWER_EPD, false);       // Power off ePaper display
-    getdisplay().print("Undervoltage");
+        setPortPin(OBP_POWER_SD, false);        // Power off SD card
-    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        #else
-    getdisplay().setCursor(65, 175);
+        // Switch off all power lines
-    getdisplay().print("To wake up repower system");
+        setPortPin(OBP_BACKLIGHT_LED, false);   // Backlight Off
-    getdisplay().nextPage();                // Partial update
+        setFlashLED(false);                     // Flash LED Off            
-    getdisplay().powerOff();                // Display power off
+        buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
-#endif
+        setPortPin(OBP_POWER_50, false);        // Power rail 5.0V Off
-    while (true) {
+        // Shutdown EInk display
-        esp_deep_sleep_start(); // Deep Sleep without wakeup. Wakeup only after power cycle (restart).
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        getdisplay().fillScreen(common.bgcolor);// Clear screen
+        getdisplay().setTextColor(common.fgcolor);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setCursor(65, 150);
+        getdisplay().print("Undervoltage");
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setCursor(65, 175);
+        getdisplay().print("To wake up repower system");
+        getdisplay().nextPage();                // Partial update
+        getdisplay().powerOff();                // Display power off
+        #endif
+        // Stop system
+        while(true){
+            esp_deep_sleep_start();             // Deep Sleep without weakup. Weakup only after power cycle (restart).
+        }
     }
 }
 
-inline bool underVoltageDetection(float voffset, float vslope) {
+//bool addTrueWind(GwApi* api, BoatValueList* boatValues, double *twd, double *tws, double *twa) {
-    // Read supply voltage
+bool addTrueWind(GwApi* api, BoatValueList* boatValues) {
-#if defined VOLTAGE_SENSOR && defined LIPO_ACCU_1200
+    // Calculate true wind data and add to obp60task boat data list
-    float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.53) * 2;   // Vin = 1/2 for OBP40
+
-    float minVoltage = 3.65;  // Absolut minimum volatge for 3,7V LiPo accu
+    double awaVal, awsVal, cogVal, stwVal, sogVal, hdtVal, hdmVal, varVal;
-#else
+    double twd, tws, twa;
-    float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.17) * 20;   // Vin = 1/20 for OBP60
+    bool isCalculated = false;
-    float minVoltage = MIN_VOLTAGE;
+    const double DBL_MIN = std::numeric_limits<double>::lowest();
-#endif
+
-    float calVoltage = actVoltage * vslope + voffset;  // Calibration
+    GwApi::BoatValue *twdBVal = boatValues->findValueOrCreate("TWD");
-    return (calVoltage < minVoltage);
+    GwApi::BoatValue *twsBVal = boatValues->findValueOrCreate("TWS");
+    GwApi::BoatValue *twaBVal = boatValues->findValueOrCreate("TWA");
+    GwApi::BoatValue *awaBVal = boatValues->findValueOrCreate("AWA");
+    GwApi::BoatValue *awsBVal = boatValues->findValueOrCreate("AWS");
+    GwApi::BoatValue *cogBVal = boatValues->findValueOrCreate("COG");
+    GwApi::BoatValue *stwBVal = boatValues->findValueOrCreate("STW");
+    GwApi::BoatValue *sogBVal = boatValues->findValueOrCreate("SOG");
+    GwApi::BoatValue *hdtBVal = boatValues->findValueOrCreate("HDT");
+    GwApi::BoatValue *hdmBVal = boatValues->findValueOrCreate("HDM");
+    GwApi::BoatValue *varBVal = boatValues->findValueOrCreate("VAR");
+    awaVal = awaBVal->valid ? awaBVal->value : DBL_MIN;
+    awsVal = awsBVal->valid ? awsBVal->value : DBL_MIN;
+    cogVal = cogBVal->valid ? cogBVal->value : DBL_MIN;
+    stwVal = stwBVal->valid ? stwBVal->value : DBL_MIN;
+    sogVal = sogBVal->valid ? sogBVal->value : DBL_MIN;
+    hdtVal = hdtBVal->valid ? hdtBVal->value : DBL_MIN;
+    hdmVal = hdmBVal->valid ? hdmBVal->value : DBL_MIN;
+    varVal = varBVal->valid ? varBVal->value : DBL_MIN;
+    api->getLogger()->logDebug(GwLog::DEBUG,"obp60task addTrueWind: AWA %.1f, AWS %.1f, COG %.1f, STW %.1f, SOG %.1f, 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);
+
+    isCalculated = WindUtils::calcTrueWind(&awaVal, &awsVal, &cogVal, &stwVal, &sogVal, &hdtVal, &hdmVal, &varVal, &twd, &tws, &twa);
+
+    if (isCalculated) { // Replace values only, if successfully calculated and not already available
+        if (!twdBVal->valid) {
+            twdBVal->value = twd;
+            twdBVal->valid = true;
+        }
+        if (!twsBVal->valid) {
+            twsBVal->value = tws;
+            twsBVal->valid = true;
+        }
+        if (!twaBVal->valid) {
+            twaBVal->value = twa;
+            twaBVal->valid = true;
+        }
+    }
+    api->getLogger()->logDebug(GwLog::DEBUG,"obp60task addTrueWind: TWD_Valid %d, isCalculated %d, TWD %.1f, TWA %.1f, TWS %.1f", twdBVal->valid, isCalculated, twdBVal->value * RAD_TO_DEG,
+        twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852);
+
+    return isCalculated;
+}
+
+void initHstryBuf(GwApi* api, BoatValueList* boatValues, tBoatHstryData hstryBufList) {
+    // Init history buffers for TWD, TWS
+
+    GwApi::BoatValue *calBVal; // temp variable just for data calibration -> we don't want to calibrate the original data here
+
+    int hstryUpdFreq = 1000; // Update frequency for history buffers in ms
+    int hstryMinVal = 0; // Minimum value for these history buffers
+    int twdHstryMax = 6283; // Max value for wind direction (TWD) in rad (0...2*PI), shifted by 1000 for 3 decimals
+    int twsHstryMax = 1000; // Max value for wind speed (TWS) in m/s, shifted by 10 for 1 decimal
+    // Initialize history buffers with meta data
+    hstryBufList.twdHstry->setMetaData("TWD", "formatCourse", hstryUpdFreq, hstryMinVal, twdHstryMax);
+    hstryBufList.twsHstry->setMetaData("TWS", "formatKnots", hstryUpdFreq, hstryMinVal, twsHstryMax);
+
+    GwApi::BoatValue *twdBVal = boatValues->findValueOrCreate(hstryBufList.twdHstry->getName());
+    GwApi::BoatValue *twsBVal = boatValues->findValueOrCreate(hstryBufList.twsHstry->getName());
+    GwApi::BoatValue *twaBVal = boatValues->findValueOrCreate("TWA");
+}
+
+void handleHstryBuf(GwApi* api, BoatValueList* boatValues, tBoatHstryData hstryBufList) {
+    // Handle history buffers for TWD, TWS
+
+    GwLog *logger = api->getLogger();
+
+    int16_t twdHstryMin = hstryBufList.twdHstry->getMinVal();
+    int16_t twdHstryMax = hstryBufList.twdHstry->getMaxVal();
+    int16_t twsHstryMin = hstryBufList.twsHstry->getMinVal();
+    int16_t twsHstryMax = hstryBufList.twsHstry->getMaxVal();
+    int16_t twdBuf, twsBuf;
+    GwApi::BoatValue *calBVal; // temp variable just for data calibration -> we don't want to calibrate the original data here
+
+    GwApi::BoatValue *twdBVal = boatValues->findValueOrCreate(hstryBufList.twdHstry->getName());
+    GwApi::BoatValue *twsBVal = boatValues->findValueOrCreate(hstryBufList.twsHstry->getName());
+    GwApi::BoatValue *twaBVal = boatValues->findValueOrCreate("TWA");
+
+    api->getLogger()->logDebug(GwLog::DEBUG,"obp60task handleHstryBuf: twdBVal: %.1f, twaBVal: %.1f, twsBVal: %.1f, TWD_isValid? %d", twdBVal->value * RAD_TO_DEG,
+        twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852, twdBVal->valid);
+    calBVal = new GwApi::BoatValue("TWD"); // temporary solution for calibration of history buffer values
+    calBVal->setFormat(twdBVal->getFormat());
+    if (twdBVal->valid) {
+        calBVal->value = twdBVal->value;
+        calBVal->valid = twdBVal->valid;
+        calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated
+        twdBuf = static_cast<int16_t>(std::round(calBVal->value * 1000));
+        if (twdBuf >= twdHstryMin && twdBuf <= twdHstryMax) {
+            hstryBufList.twdHstry->add(twdBuf);
+        }
+    }
+    delete calBVal;
+    calBVal = nullptr;
+
+    calBVal = new GwApi::BoatValue("TWS"); // temporary solution for calibration of history buffer values
+    calBVal->setFormat(twsBVal->getFormat());
+    if (twsBVal->valid) {
+        calBVal->value = twsBVal->value;
+        calBVal->valid = twsBVal->valid;
+        calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated
+        twsBuf = static_cast<int16_t>(std::round(calBVal->value * 10));
+        if (twsBuf >= twsHstryMin && twsBuf <= twsHstryMax) {
+            hstryBufList.twsHstry->add(twsBuf);
+        }
+    }
+    delete calBVal;
+    calBVal = nullptr;
 }
 
 // OBP60 Task
@@ -365,6 +523,7 @@ void OBP60Task(GwApi *api){
     String systemname = api->getConfig()->getConfigItem(api->getConfig()->systemName,true)->asString();
     String wifipass = api->getConfig()->getConfigItem(api->getConfig()->apPassword,true)->asString();
     bool refreshmode = api->getConfig()->getConfigItem(api->getConfig()->refresh,true)->asBoolean();
+    bool symbolmode = (config->getString(config->headerFormat) == "ICON");
     String fastrefresh = api->getConfig()->getConfigItem(api->getConfig()->fastRefresh,true)->asString();
     uint fullrefreshtime = uint(api->getConfig()->getConfigItem(api->getConfig()->fullRefreshTime,true)->asInt());
     #ifdef BOARD_OBP40S3
@@ -433,11 +592,14 @@ void OBP60Task(GwApi *api){
     int lastPage=pageNumber;
 
     BoatValueList boatValues; //all the boat values for the api query
-    HstryBuf hstryBufList(1920);  // Create ring buffers for history storage of some boat data (1920 seconds = 32 minutes)
-    WindUtils trueWind(&boatValues);  // Create helper object for true wind calculation
     //commonData.distanceformat=config->getString(xxx);
     //add all necessary data to common data
 
+    // Create ring buffers for history storage of some boat data
+    RingBuffer<int16_t> twdHstry(960); // Circular buffer to store wind direction values; store 960 TWD values for 16 minutes history
+    RingBuffer<int16_t> twsHstry(960); // Circular buffer to store wind speed values (TWS)
+    tBoatHstryData hstryBufList = {&twdHstry, &twsHstry};
+
     //fill the page data from config
     numPages=config->getInt(config->visiblePages,1);
     if (numPages < 1) numPages=1;
@@ -458,7 +620,6 @@ void OBP60Task(GwApi *api){
        pages[i].page=description->creator(commonData);
        pages[i].parameters.pageName=pageType;
        pages[i].parameters.pageNumber = i + 1;
-       pages[i].parameters.api = api;
        LOG_DEBUG(GwLog::DEBUG,"found page %s for number %d",pageType.c_str(),i);
        //fill in all the user defined parameters
        for (int uid=0;uid<description->userParam;uid++){
@@ -477,8 +638,10 @@ void OBP60Task(GwApi *api){
             LOG_DEBUG(GwLog::DEBUG,"added fixed value %s to page %d",value->getName().c_str(),i);
             pages[i].parameters.values.push_back(value); 
        }
-       // Add boat history data to page parameters
+        if (pages[i].description->pageName == "WindPlot") {
-       pages[i].parameters.boatHstry = &hstryBufList;
+            // Add boat history data to page parameters
+            pages[i].parameters.boatHstry = hstryBufList;
+        }
     }
     // add out of band system page (always available)
     Page *syspage = allPages.pages[0]->creator(commonData);
@@ -486,12 +649,12 @@ void OBP60Task(GwApi *api){
     // Read all calibration data settings from config
     calibrationData.readConfig(config, logger);
 
-    // Check user settings for true wind calculation
+    // Check user setting for true wind calculation
     bool calcTrueWnds = api->getConfig()->getBool(api->getConfig()->calcTrueWnds, false);
-    bool useSimuData = api->getConfig()->getBool(api->getConfig()->useSimuData, false);
+    // bool simulation = api->getConfig()->getBool(api->getConfig()->useSimuData, false);
 
     // Initialize history buffer for certain boat data
-    hstryBufList.init(&boatValues, logger);
+    initHstryBuf(api, &boatValues, hstryBufList);
 
     // Display screenshot handler for HTTP request
     // http://192.168.15.1/api/user/OBP60Task/screenshot
@@ -526,9 +689,7 @@ void OBP60Task(GwApi *api){
     commonData.backlight.brightness = 2.55 * uint(config->getConfigItem(config->blBrightness,true)->asInt());
     commonData.powermode = api->getConfig()->getConfigItem(api->getConfig()->powerMode,true)->asString();
 
-    bool uvoltage = config->getConfigItem(config->underVoltage, true)->asBoolean();
+    bool uvoltage = api->getConfig()->getConfigItem(api->getConfig()->underVoltage,true)->asBoolean();
-    float voffset = (config->getConfigItem(config->vOffset,true)->asString()).toFloat();
-    float vslope = (config->getConfigItem(config->vSlope,true)->asString()).toFloat();
     String cpuspeed = api->getConfig()->getConfigItem(api->getConfig()->cpuSpeed,true)->asString();
     uint hdopAccuracy = uint(api->getConfig()->getConfigItem(api->getConfig()->hdopAccuracy,true)->asInt());
 
@@ -536,7 +697,7 @@ void OBP60Task(GwApi *api){
     double homelon = commonData.config->getString(commonData.config->homeLON).toDouble();
     bool homevalid = homelat >= -180.0 and homelat <= 180 and homelon >= -90.0 and homelon <= 90.0;
     if (homevalid) {
-        LOG_DEBUG(GwLog::LOG, "Home location set to lat=%f, lon=%f", homelat, homelon);
+        LOG_DEBUG(GwLog::LOG, "Home location set to %f : %f", homelat, homelon);
     } else {
         LOG_DEBUG(GwLog::LOG, "No valid home location found");
     }
@@ -570,18 +731,14 @@ void OBP60Task(GwApi *api){
     //####################################################################################
 
     bool systemPage = false;
-    bool systemPageNew = false;
     Page *currentPage;
     while (true){
         delay(100);     // Delay 100ms (loop time)
         bool keypressed = false;
 
         // Undervoltage detection
-        if (uvoltage == true) {
+        if(uvoltage == true){
-            if (underVoltageDetection(voffset, vslope)) {
+            underVoltageDetection(api, commonData);
-                LOG_DEBUG(GwLog::ERROR, "Undervoltage detected, shutting down!");
-                underVoltageError(commonData);
-            }
         }
 
         // Set CPU speed after boot after 1min 
@@ -626,7 +783,6 @@ void OBP60Task(GwApi *api){
                     systemPage = true; // System page is out of band
                     syspage->setupKeys();
                     keyboardMessage = 0;
-                    systemPageNew = true;
                 }
                 else {
                     currentPage = pages[pageNumber].page;
@@ -712,8 +868,8 @@ void OBP60Task(GwApi *api){
                 }
             }
             
-            // Full display update afer a new selected page and 8s wait time
+            // Full display update afer a new selected page and 4s wait time
-            if(millis() > starttime4 + 8000 && delayedDisplayUpdate == true){
+            if(millis() > starttime4 + 4000 && delayedDisplayUpdate == true){
                 starttime1 = millis();
                 starttime2 = millis();
                 getdisplay().setFullWindow();    // Set full update
@@ -723,7 +879,6 @@ void OBP60Task(GwApi *api){
                 else{
                     getdisplay().fillScreen(commonData.fgcolor); // Clear display
                     #ifdef DISPLAY_GDEY042T81
-                        getdisplay().hibernate();                  // Set display in hybenate mode
                         getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
                     #else
                         getdisplay().init(115200);               // Init for normal displays
@@ -751,7 +906,6 @@ void OBP60Task(GwApi *api){
                 else{
                     getdisplay().fillScreen(commonData.fgcolor); // Clear display
                     #ifdef DISPLAY_GDEY042T81
-                        getdisplay().hibernate();                  // Set display in hybenate mode
                         getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
                     #else
                         getdisplay().init(115200);               // Init for normal displays
@@ -776,7 +930,6 @@ void OBP60Task(GwApi *api){
                 else{
                     getdisplay().fillScreen(commonData.fgcolor); // Clear display
                     #ifdef DISPLAY_GDEY042T81
-                        getdisplay().hibernate();                  // Set display in hybenate mode
                         getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
                     #else
                         getdisplay().init(115200);               // Init for normal displays
@@ -806,10 +959,10 @@ void OBP60Task(GwApi *api){
                 api->getStatus(commonData.status);
 
                 if (calcTrueWnds) {
-                    trueWind.addTrueWind(api, &boatValues, logger);
+                    addTrueWind(api, &boatValues);
                 }
                 // Handle history buffers for TWD, TWS for wind plot page and other usage
-                 hstryBufList.handleHstryBuf(useSimuData);
+                 handleHstryBuf(api, &boatValues, hstryBufList);
 
                 // Clear display
                 // getdisplay().fillRect(0, 0, getdisplay().width(), getdisplay().height(), commonData.bgcolor);
@@ -818,18 +971,13 @@ void OBP60Task(GwApi *api){
                 // Show header if enabled
                 if (pages[pageNumber].description && pages[pageNumber].description->header or systemPage){
                     // build header using commonData
-                    displayHeader(commonData, date, time, hdop);  // Show page header
+                    displayHeader(commonData, symbolmode, date, time, hdop);  // Show page header
                 }
 
                 // Call the particular page
                 if (systemPage) {
                     displayFooter(commonData);
                     PageData sysparams; // empty
-                    sysparams.api = api;
-                    if (systemPageNew) {
-                        syspage->displayNew(sysparams);
-                        systemPageNew = false;
-                    }
                     syspage->displayPage(sysparams);
                 }
                 else {
@@ -846,11 +994,10 @@ void OBP60Task(GwApi *api){
                     }
                     else{
                         if (lastPage != pageNumber){
-                            pages[lastPage].page->leavePage(pages[lastPage].parameters); // call page cleanup code
+                            if (hasFRAM) fram.write(FRAM_PAGE_NO, pageNumber); // remember page for device restart
-                            if (hasFRAM) fram.write(FRAM_PAGE_NO, pageNumber); // remember new page for device restart
                             currentPage->setupKeys();
                             currentPage->displayNew(pages[pageNumber].parameters);
-                            lastPage = pageNumber;
+                            lastPage=pageNumber;
                         }
                         //call the page code
                         LOG_DEBUG(GwLog::DEBUG,"calling page %d",pageNumber);

lib/obp60task/obp60task.h

@@ -41,24 +41,5 @@
     #ifdef BOARD_OBP40S3
     DECLARE_CAPABILITY(obp40,true)
     #endif
-    #ifdef BOARD_OBP60S3
+    DECLARE_STRING_CAPABILITY(HELP_URL, "https://obp60-v2-docu.readthedocs.io/de/latest/"); // Link to help pages
-    DECLARE_STRING_CAPABILITY(HELP_URL, "https://obp60-v2-docu.readthedocs.io/en/latest/"); // Link to help pages
-    #endif
-    #ifdef BOARD_OBP40S3
-    DECLARE_STRING_CAPABILITY(HELP_URL, "https://obp40-v1-docu.readthedocs.io/en/latest/"); // Link to help pages
-    #endif
-
-    class BoatValueList{
-        public:
-        static const int MAXVALUES=100;
-        //we create a list containing all our BoatValues
-        //this is the list we later use to let the api fill all the values
-        //additionally we put the necessary values into the paga data - see below
-        GwApi::BoatValue *allBoatValues[MAXVALUES];
-        int numValues=0;
-        
-        bool addValueToList(GwApi::BoatValue *v);
-        //helper to ensure that each BoatValue is only queried once
-        GwApi::BoatValue *findValueOrCreate(String name);
-    };
 #endif

lib/obp60task/platformio.ini

@@ -41,8 +41,6 @@ lib_deps =
     milesburton/DallasTemperature@3.11.0
     signetica/SunRise@2.0.2
     adafruit/Adafruit FRAM I2C@2.0.3
-    WifiClientSecure
-    HTTPClient
 build_flags=
     #https://thingpulse.com/usb-settings-for-logging-with-the-esp32-s3-in-platformio/?srsltid=AfmBOopGskbkr4GoeVkNlFaZXe_zXkLceKF6Rn-tmoXABCeAR2vWsdHL
 #    -D CORE_DEBUG_LEVEL=1           #Debug level for CPU core via CDC (serial device)
@@ -95,8 +93,6 @@ lib_deps =
     milesburton/DallasTemperature@3.11.0
     signetica/SunRise@2.0.2
     adafruit/Adafruit FRAM I2C@2.0.3
-    WifiClientSecure
-    HTTPClient
 build_flags=
     -D DISABLE_DIAGNOSTIC_OUTPUT    #Disable diagnostic output for GxEPD2 lib
     -D BOARD_OBP40S3                #Board OBP40 with ESP32S3