Fix for XTE page

PageWindPlot: add simulation data and AWD data option; COG validity check for true wind calculation

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, "stored calibration data: %s, offset: %f, slope: %f, smoothing: %f", instance.c_str(),
+        LOG_DEBUG(GwLog::LOG, "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 found in calibration data list", instance.c_str());
+        LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s not in calibration 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 data list", instance.c_str());
+        LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: smooth factor for %s not found in calibration list", instance.c_str());
         return;
     } else {
         smoothFactor = calibMap[instance].smooth;
@@ -184,8 +184,6 @@ 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/OBP60Extensions.cpp

@@ -64,6 +64,12 @@ 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
@@ -78,6 +84,9 @@ 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
@@ -87,7 +96,7 @@ void hardwareInit(GwApi *api)
     fram = Adafruit_FRAM_I2C();
     if (esp_reset_reason() ==  ESP_RST_POWERON) {
         // help initialize FRAM
-        api->getLogger()->logDebug(GwLog::LOG,"Delaying I2C init for 250ms due to cold boot");
+        logger->logDebug(GwLog::LOG, "Delaying I2C init for 250ms due to cold boot");
         delay(250);
     }
     // FRAM (e.g. MB85RC256V)
@@ -99,11 +108,88 @@ void hardwareInit(GwApi *api)
         // Boot counter
         uint8_t framcounter = fram.read(0x0000);
         fram.write(0x0000, framcounter+1);
-        api->getLogger()->logDebug(GwLog::LOG,"FRAM detected: 0x%04x/0x%04x (counter=%d)", manufacturerID, productID, framcounter);
+        logger->logDebug(GwLog::LOG, "FRAM detected: 0x%04x/0x%04x (counter=%d)", manufacturerID, productID, framcounter);
     }
     else {
         hasFRAM = false;
-        api->getLogger()->logDebug(GwLog::LOG,"NO FRAM detected");
+        logger->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) {
+    // Max Power | Only 5.0V | Min Power
+    if (powermode == "Max Power" || powermode == "Only 5.0V") {
+#ifdef HARDWARE_V21
+        setPortPin(OBP_POWER_50, true); // Power on 5.0V rail
+#endif
+#ifdef BOARD_OBP40S3
+        setPortPin(OBP_POWER_EPD, true);// Power on ePaper display
+        setPortPin(OBP_POWER_SD, true); // Power on SD card
+#endif
+    } else { // Min Power
+#ifdef HARDWARE_V21
+        setPortPin(OBP_POWER_50, false); // Power off 5.0V rail
+#endif
+#ifdef BOARD_OBP40S3
+        setPortPin(OBP_POWER_EPD, false);// Power off ePaper display
+        setPortPin(OBP_POWER_SD, false); // Power off SD card
+#endif
     }
 }
 

lib/obp60task/OBP60Extensions.h

@@ -7,6 +7,12 @@
 #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
@@ -15,6 +21,7 @@
 #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
@@ -24,6 +31,10 @@
 
 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;
@@ -75,6 +86,7 @@ void deepSleep(CommonData &common);
 uint8_t getLastPage();
 
 void hardwareInit(GwApi *api);
+void powerInit(String powermode);
 
 void setPortPin(uint pin, bool value);          // Set port pin for extension port
 

lib/obp60task/OBP60Formatter.cpp

@@ -65,13 +65,27 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
     String tempFormat = commondata.config->getString(commondata.config->tempFormat);            // [K|°C|°F]
     String dateFormat = commondata.config->getString(commondata.config->dateFormat);            // [DE|GB|US]
     bool usesimudata = commondata.config->getBool(commondata.config->useSimuData);              // [on|off]
+    String precision = commondata.config->getString(commondata.config->valueprecision);         // [1|2]
 
     // If boat value not valid
     if (! value->valid && !usesimudata){
         result.svalue = "---";
         return result;
     }
-    
+
+    const char* fmt_dec_1;
+    const char* fmt_dec_10;
+    const char* fmt_dec_100;
+    if (precision == "1") {
+        fmt_dec_1 = "%3.1f";
+        fmt_dec_10 = "%3.0f";
+        fmt_dec_100 = "%3.0f";
+    } else {
+        fmt_dec_1 = "%3.2f";
+        fmt_dec_10 = "%3.1f";
+        fmt_dec_100 = "%3.0f";
+    }
+
 //    LOG_DEBUG(GwLog::DEBUG,"formatValue init: getFormat: %s date->value: %f time->value: %f", value->getFormat(), commondata.date->value, commondata.time->value);
     static const int bsize = 30;
     char buffer[bsize+1];
@@ -91,25 +105,25 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
         tmElements_t parts;
         time_t tv=tNMEA0183Msg::daysToTime_t(value->value + dayoffset);
         tNMEA0183Msg::breakTime(tv,parts);
-        if(usesimudata == false) { 
+        if (usesimudata == false) { 
-            if(String(dateFormat) == "DE"){
+            if (String(dateFormat) == "DE") {
-                snprintf(buffer,bsize,"%02d.%02d.%04d",parts.tm_mday,parts.tm_mon+1,parts.tm_year+1900);
+                snprintf(buffer,bsize, "%02d.%02d.%04d", parts.tm_mday, parts.tm_mon+1, parts.tm_year+1900);
             }
-            else if(String(dateFormat) == "GB"){
+            else if(String(dateFormat) == "GB") {
-                snprintf(buffer,bsize,"%02d/%02d/%04d",parts.tm_mday,parts.tm_mon+1,parts.tm_year+1900);
+                snprintf(buffer, bsize, "%02d/%02d/%04d", parts.tm_mday, parts.tm_mon+1, parts.tm_year+1900);
             }
-            else if(String(dateFormat) == "US"){
+            else if(String(dateFormat) == "US") {
-                snprintf(buffer,bsize,"%02d/%02d/%04d",parts.tm_mon+1,parts.tm_mday,parts.tm_year+1900);
+                snprintf(buffer, bsize, "%02d/%02d/%04d", parts.tm_mon+1, parts.tm_mday, parts.tm_year+1900);
             }
-            else if(String(dateFormat) == "ISO"){
+            else if(String(dateFormat) == "ISO") {
-                snprintf(buffer,bsize,"%04d-%02d-%02d",parts.tm_year+1900,parts.tm_mon+1,parts.tm_mday);
+                snprintf(buffer, bsize, "%04d-%02d-%02d", parts.tm_year+1900, parts.tm_mon+1, parts.tm_mday);
             }
-            else{
+            else {
-                snprintf(buffer,bsize,"%02d.%02d.%04d",parts.tm_mday,parts.tm_mon+1,parts.tm_year+1900);  
+                snprintf(buffer, bsize, "%02d.%02d.%04d", parts.tm_mday, parts.tm_mon+1, parts.tm_year+1900);  
             }
         }
         else{
-            snprintf(buffer,bsize,"01.01.2022"); 
+            snprintf(buffer, bsize, "01.01.2022"); 
         }
         if(timeZone == 0){
             result.unit = "UTC";
@@ -130,11 +144,11 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
         if (timeInSeconds > 86400) {timeInSeconds = timeInSeconds - 86400;}
         if (timeInSeconds <  0) {timeInSeconds = timeInSeconds + 86400;}
 //        LOG_DEBUG(GwLog::DEBUG,"... formatTime value: %f tz: %f corrected timeInSeconds: %f ", value->value, timeZone, timeInSeconds);
-        if(usesimudata == false) {
+        if (usesimudata == false) {
-            val=modf(timeInSeconds/3600.0,&inthr);
+            val = modf(timeInSeconds/3600.0, &inthr);
-            val=modf(val*3600.0/60.0,&intmin);
+            val = modf(val*3600.0/60.0, &intmin);
             modf(val*60.0,&intsec);
-            snprintf(buffer,bsize,"%02.0f:%02.0f:%02.0f",inthr,intmin,intsec);
+            snprintf(buffer, bsize, "%02.0f:%02.0f:%02.0f", inthr, intmin, intsec);
         }
         else{
             static long sec;
@@ -143,7 +157,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
                 sec ++;
             }
             sec = sec % 60;
-            snprintf(buffer,bsize,"11:36:%02i", int(sec));
+            snprintf(buffer, bsize, "11:36:%02i", int(sec));
             lasttime = millis();
         }
         if(timeZone == 0){
@@ -156,26 +170,26 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
     //########################################################
     else if (value->getFormat() == "formatFixed0"){
         if(usesimudata == false) {
-            snprintf(buffer,bsize,"%3.0f",value->value);
+            snprintf(buffer, bsize, "%3.0f", value->value);
             rawvalue = value->value;
         }
         else{
             rawvalue = 8.0 + float(random(0, 10)) / 10.0;
-            snprintf(buffer,bsize,"%3.0f", rawvalue);
+            snprintf(buffer, bsize, "%3.0f", rawvalue);
         }
         result.unit = "";
     }
     //########################################################
     else if (value->getFormat() == "formatCourse" || value->getFormat() == "formatWind"){
         double course = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             course = value->value;
             rawvalue = value->value;
         }
-        else{
+        else {
             course = 2.53 + float(random(0, 10) / 100.0);
             rawvalue = course;
-        }    
+        }
         course = course * 57.2958;      // Unit conversion form rad to deg
 
         // Format 3 numbers with prefix zero
@@ -185,7 +199,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
     //########################################################
     else if (value->getFormat() == "formatKnots" && (value->getName() == "SOG" || value->getName() == "STW")){
         double speed = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             speed = value->value;
             rawvalue = value->value;
         }
@@ -193,85 +207,85 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             rawvalue = 4.0 + float(random(0, 40));
             speed = rawvalue;
         }
-        if(String(speedFormat) == "km/h"){
+        if (String(speedFormat) == "km/h"){
         speed = speed * 3.6;            // Unit conversion form m/s to km/h
             result.unit = "km/h";
         }
-        else if(String(speedFormat) == "kn"){
+        else if (String(speedFormat) == "kn"){
             speed = speed * 1.94384;    // Unit conversion form m/s to kn
             result.unit = "kn";
         }
-        else{
+        else {
             speed = speed;              // Unit conversion form m/s to m/s
             result.unit = "m/s";
         }
-        if(speed < 10){
+        if(speed < 10) {
-            snprintf(buffer,bsize,"%3.2f",speed);
+            snprintf(buffer, bsize, fmt_dec_1, speed);
         }
-        if(speed >= 10 && speed < 100){
+        else if (speed < 100) {
-            snprintf(buffer,bsize,"%3.1f",speed);
+            snprintf(buffer, bsize, fmt_dec_10, speed);
         }
-        if(speed >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",speed);
+            snprintf(buffer, bsize, fmt_dec_100, speed);
         }
     }
     //########################################################
     else if (value->getFormat() == "formatKnots" && (value->getName() == "AWS" || value->getName() == "TWS" || value->getName() == "MaxAws" || value->getName() == "MaxTws")){
         double speed = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             speed = value->value;
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = 4.0 + float(random(0, 40));
             speed = rawvalue;
         }
-        if(String(windspeedFormat) == "km/h"){
+        if (String(windspeedFormat) == "km/h"){
-        speed = speed * 3.6;        // Unit conversion form m/s to km/h
+            speed = speed * 3.6;        // Unit conversion form m/s to km/h
             result.unit = "km/h";
         }
-        else if(String(windspeedFormat) == "kn"){
+        else if (String(windspeedFormat) == "kn"){
             speed = speed * 1.94384;      // Unit conversion form m/s to kn
             result.unit = "kn";
         }
         else if(String(windspeedFormat) == "bft"){
-            if(speed < 0.3){
+            if (speed < 0.3) {
                 speed = 0;
             }
-            if(speed >=0.3 && speed < 1.5){
+            else if (speed < 1.5) {
                 speed = 1;
             }
-            if(speed >=1.5 && speed < 3.3){
+            else if (speed < 3.3) {
                 speed = 2;
             }
-            if(speed >=3.3 && speed < 5.4){
+            else if (speed < 5.4) {
                 speed = 3;
             }
-            if(speed >=5.4 && speed < 7.9){
+            else if (speed < 7.9) {
                 speed = 4;
             }
-            if(speed >=7.9 && speed < 10.7){
+            else if (speed < 10.7) {
                 speed = 5;
             }
-            if(speed >=10.7 && speed < 13.8){
+            else if (speed < 13.8) {
                 speed = 6;
             }
-            if(speed >=13.8 && speed < 17.1){
+            else if (speed < 17.1) {
                 speed = 7;
             }
-            if(speed >=17.1 && speed < 20.7){
+            else if (speed < 20.7) {
                 speed = 8;
             }
-            if(speed >=20.7 && speed < 24.4){
+            else if (speed < 24.4) {
                 speed = 9;
             }
-            if(speed >=24.4 && speed < 28.4){
+            else if (speed < 28.4) {
                 speed = 10;
             }
-            if(speed >=28.4 && speed < 32.6){
+            else if (speed < 32.6) {
                 speed = 11;
             }
-            if(speed >=32.6){
+            else {
                 speed = 12;
             }
             result.unit = "bft";
@@ -280,82 +294,85 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             speed = speed;              // Unit conversion form m/s to m/s
             result.unit = "m/s";
         }
-        if(String(windspeedFormat) == "bft"){
+        if (String(windspeedFormat) == "bft"){
-            snprintf(buffer,bsize,"%2.0f",speed);
+            snprintf(buffer, bsize, "%2.0f", speed);
         }
         else{
-            if(speed < 10){
+            if (speed < 10){
-                snprintf(buffer,bsize,"%3.2f",speed);
+                snprintf(buffer, bsize, fmt_dec_1, speed);
             }
-            if(speed >= 10 && speed < 100){
+            else if (speed < 100){
-                snprintf(buffer,bsize,"%3.1f",speed);
+                snprintf(buffer, bsize, fmt_dec_10, speed);
             }
-            if(speed >= 100){
+            else {
-                snprintf(buffer,bsize,"%3.0f",speed);
+                snprintf(buffer, bsize, fmt_dec_100, speed);
             }
         }
     }
     //########################################################
     else if (value->getFormat() == "formatRot"){
         double rotation = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             rotation = value->value;
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = 0.04 + float(random(0, 10)) / 100.0;
             rotation = rawvalue;
         }
         rotation = rotation * 57.2958;      // Unit conversion form rad/s to deg/s
         result.unit = "Deg/s";
-        if(rotation < -100){
+        if (rotation < -100){
             rotation = -99;
         }
-        if(rotation > 100){
+        if (rotation > 100){
             rotation = 99;
         }
-        if(rotation > -10 && rotation < 10){
+        if (rotation > -10 && rotation < 10){
-            snprintf(buffer,bsize,"%3.2f",rotation);
+            snprintf(buffer, bsize, "%3.2f", rotation);
         }
-        if(rotation <= -10 || rotation >= 10){
+        if (rotation <= -10 || rotation >= 10){
-            snprintf(buffer,bsize,"%3.0f",rotation);
+            snprintf(buffer, bsize, "%3.0f", rotation);
         }
     }
     //########################################################
     else if (value->getFormat() == "formatDop"){
         double dop = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             dop = value->value;
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = 2.0 + float(random(0, 40)) / 10.0;
             dop = rawvalue;
         }
         result.unit = "m";
-        if(dop > 99.9){
+        if (dop > 99.9){
             dop = 99.9;
         }
-        if(dop < 10){
+        if (dop < 10){
-            snprintf(buffer,bsize,"%3.2f",dop);
+            snprintf(buffer, bsize, fmt_dec_1, dop);
         }
-        if(dop >= 10 && dop < 100){
+        else if(dop < 100){
-            snprintf(buffer,bsize,"%3.1f",dop);
+            snprintf(buffer, bsize, fmt_dec_10, dop);
+        }
+        else {
+            snprintf(buffer, bsize, fmt_dec_100, dop);
         }
     }
     //########################################################
     else if (value->getFormat() == "formatLatitude"){
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             double lat = value->value;
             rawvalue = value->value;
             String latitude = "";
             String latdir = "";
             float degree = abs(int(lat));
             float minute = abs((lat - int(lat)) * 60);
-            if(lat > 0){
+            if (lat > 0){
                 latdir = "N";
             }
-            else{
+            else {
                 latdir = "S";
             }
             latitude = String(degree,0) + "\x90 " + String(minute,4) + "' " + latdir;
@@ -364,41 +381,41 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
         }
         else{
             rawvalue = 35.0 + float(random(0, 10)) / 10000.0;
-            snprintf(buffer,bsize," 51\" %2.4f' N", rawvalue);
+            snprintf(buffer, bsize, " 51\" %2.4f' N", rawvalue);
         }
     }
     //########################################################
     else if (value->getFormat() == "formatLongitude"){
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             double lon = value->value;
             rawvalue = value->value;
             String longitude = "";
             String londir = "";
             float degree = abs(int(lon));
             float minute = abs((lon - int(lon)) * 60);
-            if(lon > 0){
+            if (lon > 0){
                 londir = "E";
             }
-            else{
+            else {
                 londir = "W";
             }
             longitude = String(degree,0) + "\x90 " + String(minute,4) + "' " + londir;
             result.unit = "";
             strcpy(buffer, longitude.c_str());
         }
-        else{
+        else {
             rawvalue = 6.0 + float(random(0, 10)) / 100000.0;
-            snprintf(buffer,bsize," 15\" %2.4f'", rawvalue);
+            snprintf(buffer, bsize, " 15\" %2.4f'", rawvalue);
         }
     }
     //########################################################
     else if (value->getFormat() == "formatDepth"){
         double depth = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             depth = value->value;
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = 18.0 + float(random(0, 100)) / 10.0;
             depth = rawvalue;
         }
@@ -409,71 +426,84 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
         else{
             result.unit = "m";
         }
-        if(depth < 10){
+        if (depth < 10) {
-            snprintf(buffer,bsize,"%3.2f",depth);
+            snprintf(buffer, bsize, fmt_dec_1, depth);
         }
-        if(depth >= 10 && depth < 100){
+        else if (depth < 100){
-            snprintf(buffer,bsize,"%3.1f",depth);
+            snprintf(buffer, bsize, fmt_dec_10, depth);
         }
-        if(depth >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",depth);
+            snprintf(buffer, bsize, fmt_dec_100, depth);
         }
     }
     //########################################################
     else if (value->getFormat() == "formatXte"){
         double xte = 0;
-        if (!usesimudata) {
+        if(usesimudata == false) {
-            xte = abs(value->value);
+            xte = value->value;
             rawvalue = value->value;
-        } else {
+        }
+        else{
             rawvalue = 6.0 + float(random(0, 4));
             xte = rawvalue;
         }
-        if (xte >= 100) {
+        if(String(distanceFormat) == "km"){
-            snprintf(buffer,bsize,"%3.0f",value->value);
+            xte = xte * 0.001;
-        } else if (xte >= 10) {
+            result.unit = "km";
-            snprintf(buffer,bsize,"%3.1f",value->value);
+        }
-        } else {
+        else if(String(distanceFormat) == "nm"){
-            snprintf(buffer,bsize,"%3.2f",value->value);
+            xte = xte * 0.000539957;
+            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"){
         double temp = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             temp = value->value;
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = 296.0 + float(random(0, 10)) / 10.0;
             temp = rawvalue;
         }
-        if(String(tempFormat) == "C"){
+        if (String(tempFormat) == "C") {
             temp = temp - 273.15;
             result.unit = "C";
         }
-        else if(String(tempFormat) == "F"){
+        else if (String(tempFormat) == "F") {
             temp = (temp - 273.15) * 9 / 5 + 32;
             result.unit = "F";
         }
         else{
             result.unit = "K";
         }
-        if(temp < 10){
+        if(temp < 10) {
-            snprintf(buffer,bsize,"%3.2f",temp);
+            snprintf(buffer, bsize, fmt_dec_1, temp);
         }
-        if(temp >= 10 && temp < 100){
+        else if (temp < 100) {
-            snprintf(buffer,bsize,"%3.1f",temp);
+            snprintf(buffer, bsize, fmt_dec_10, temp);
         }
-        if(temp >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",temp);
+            snprintf(buffer, bsize, fmt_dec_100, temp);
         }
     }
     //########################################################
     else if (value->getFormat() == "mtr2nm"){
         double distance = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             distance = value->value;
             rawvalue = value->value;
         }
@@ -481,25 +511,25 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             rawvalue = 2960.0 + float(random(0, 10));
             distance = rawvalue;
         }
-        if(String(distanceFormat) == "km"){
+        if (String(distanceFormat) == "km") {
             distance = distance * 0.001;
             result.unit = "km";
         }
-        else if(String(distanceFormat) == "nm"){
+        else if (String(distanceFormat) == "nm") {
             distance = distance * 0.000539957;
             result.unit = "nm";
         }
-        else{;
+        else {
             result.unit = "m";
         }
-        if(distance < 10){
+        if (distance < 10){
-            snprintf(buffer,bsize,"%3.2f",distance);
+            snprintf(buffer, bsize, fmt_dec_1, distance);
         }
-        if(distance >= 10 && distance < 100){
+        else if (distance < 100){
-            snprintf(buffer,bsize,"%3.1f",distance);
+            snprintf(buffer, bsize, fmt_dec_10, distance);
         }
-        if(distance >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",distance);
+            snprintf(buffer, bsize, fmt_dec_100, distance);
         }
     }
     //########################################################
@@ -508,122 +538,122 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
     //########################################################
      else if (value->getFormat() == "formatXdr:P:P"){
         double pressure = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             pressure = value->value;
             rawvalue = value->value;
             pressure = pressure / 100.0;        // Unit conversion form Pa to hPa
         }
-        else{
+        else {
             rawvalue = 968 + float(random(0, 10));
             pressure = rawvalue;
         }
-        snprintf(buffer,bsize,"%4.0f",pressure);
+        snprintf(buffer, bsize, "%4.0f", pressure);
         result.unit = "hPa";
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:P:B"){
         double pressure = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             pressure = value->value;
             rawvalue = value->value;
             pressure = pressure / 100.0;      // Unit conversion form Pa to mBar
         }
-        else{
+        else {
             rawvalue = value->value;
             pressure = 968 + float(random(0, 10));
         }
-        snprintf(buffer,bsize,"%4.0f",pressure);
+        snprintf(buffer, bsize, "%4.0f", pressure);
         result.unit = "mBar";
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:U:V"){
         double voltage = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             voltage = value->value;
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = 12 + float(random(0, 30)) / 10.0;
             voltage = rawvalue;
         }
-        if(voltage < 10){
+        if (voltage < 10) {
-            snprintf(buffer,bsize,"%3.2f",voltage);
+            snprintf(buffer, bsize, fmt_dec_1, voltage);
         }
-        else{
+        else {
-            snprintf(buffer,bsize,"%3.1f",voltage);
+            snprintf(buffer, bsize, fmt_dec_10, voltage);
         }
         result.unit = "V";
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:I:A"){
         double current = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             current = value->value;
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = 8.2 + float(random(0, 50)) / 10.0;
             current = rawvalue;
         }
-        if(current < 10){
+        if (current < 10) {
-            snprintf(buffer,bsize,"%3.2f",current);
+            snprintf(buffer, bsize, fmt_dec_1, current);
         }
-        if(current >= 10 && current < 100){
+        else if(current < 100) {
-            snprintf(buffer,bsize,"%3.1f",current);
+            snprintf(buffer, bsize, fmt_dec_10, current);
         }
-        if(current >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",current);
+            snprintf(buffer, bsize, fmt_dec_100, current);
         }
         result.unit = "A";
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:C:K"){
         double temperature = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             temperature = value->value - 273.15;    // Convert K to C
             rawvalue = value->value - 273.15;
         }
-        else{
+        else {
             rawvalue = 21.8 + float(random(0, 50)) / 10.0;
             temperature = rawvalue;
         }
-        if(temperature < 10){
+        if (temperature < 10) {
-            snprintf(buffer,bsize,"%3.2f",temperature);
+            snprintf(buffer, bsize, fmt_dec_1, temperature);
         }
-        if(temperature >= 10 && temperature < 100){
+        else if (temperature < 100) {
-            snprintf(buffer,bsize,"%3.1f",temperature);
+            snprintf(buffer, bsize, fmt_dec_10, temperature);
         }
-        if(temperature >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",temperature);
+            snprintf(buffer, bsize, fmt_dec_100, temperature);
         }
         result.unit = "Deg C";
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:C:C"){
         double temperature = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             temperature = value->value;    // Value in C
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = 21.8 + float(random(0, 50)) / 10.0;
             temperature = rawvalue;
         }
-        if(temperature < 10){
+        if (temperature < 10) {
-            snprintf(buffer,bsize,"%3.2f",temperature);
+            snprintf(buffer, bsize, fmt_dec_1, temperature);
         }
-        if(temperature >= 10 && temperature < 100){
+        else if(temperature < 100) {
-            snprintf(buffer,bsize,"%3.1f",temperature);
+            snprintf(buffer, bsize, fmt_dec_10, temperature);
         }
-        if(temperature >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",temperature);
+            snprintf(buffer, bsize, fmt_dec_100, temperature);
         }
         result.unit = "Deg C";
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:H:P"){
         double humidity = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             humidity = value->value;    // Value in %
             rawvalue = value->value;
         }
@@ -631,143 +661,143 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             rawvalue = 41.3 + float(random(0, 50)) / 10.0;
             humidity = rawvalue;
         }
-        if(humidity < 10){
+        if (humidity < 10) {
-            snprintf(buffer,bsize,"%3.2f",humidity);
+            snprintf(buffer, bsize, fmt_dec_1, humidity);
         }
-        if(humidity >= 10 && humidity < 100){
+        else if(humidity < 100) {
-            snprintf(buffer,bsize,"%3.1f",humidity);
+            snprintf(buffer, bsize, fmt_dec_10, humidity);
         }
-        if(humidity >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",humidity);
+            snprintf(buffer, bsize, fmt_dec_100, humidity);
         }
         result.unit = "%";
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:V:P"){
         double volume = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             volume = value->value;    // Value in %
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = 85.8 + float(random(0, 50)) / 10.0;
             volume = rawvalue;
         }
-        if(volume < 10){
+        if (volume < 10) {
-            snprintf(buffer,bsize,"%3.2f",volume);
+            snprintf(buffer, bsize, fmt_dec_1, volume);
         }
-        if(volume >= 10 && volume < 100){
+        else if (volume < 100) {
-            snprintf(buffer,bsize,"%3.1f",volume);
+            snprintf(buffer, bsize, fmt_dec_10, volume);
         }
-        if(volume >= 100){
+        else if (volume >= 100) {
-            snprintf(buffer,bsize,"%3.0f",volume);
+            snprintf(buffer, bsize, fmt_dec_100, volume);
         }
         result.unit = "%";
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:V:M"){
         double volume = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             volume = value->value;    // Value in l
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = 75.2 + float(random(0, 50)) / 10.0;
             volume = rawvalue;
         }
-        if(volume < 10){
+        if (volume < 10) {
-            snprintf(buffer,bsize,"%3.2f",volume);
+            snprintf(buffer, bsize, fmt_dec_1, volume);
         }
-        if(volume >= 10 && volume < 100){
+        else if (volume < 100) {
-            snprintf(buffer,bsize,"%3.1f",volume);
+            snprintf(buffer, bsize, fmt_dec_10, volume);
         }
-        if(volume >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",volume);
+            snprintf(buffer, bsize, fmt_dec_100, volume);
         }
         result.unit = "l";
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:R:I"){
         double flow = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             flow = value->value;    // Value in l/min
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = 7.5 + float(random(0, 20)) / 10.0;
             flow = rawvalue;
         }
-        if(flow < 10){
+        if (flow < 10) {
-            snprintf(buffer,bsize,"%3.2f",flow);
+            snprintf(buffer, bsize, fmt_dec_1, flow);
         }
-        if(flow >= 10 && flow < 100){
+        else if (flow < 100) {
-            snprintf(buffer,bsize,"%3.1f",flow);
+            snprintf(buffer, bsize, fmt_dec_10, flow);
         }
-        if(flow >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",flow);
+            snprintf(buffer, bsize, fmt_dec_100, flow);
         }
         result.unit = "l/min";
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:G:"){
         double generic = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
-            generic = value->value;    // Value in l/min
+            generic = value->value;
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = 18.5 + float(random(0, 20)) / 10.0;
             generic = rawvalue;
         }
-        if(generic < 10){
+        if (generic < 10) {
-            snprintf(buffer,bsize,"%3.2f",generic);
+            snprintf(buffer, bsize, fmt_dec_1, generic);
         }
-        if(generic >= 10 && generic < 100){
+        else if (generic < 100) {
-            snprintf(buffer,bsize,"%3.1f",generic);
+            snprintf(buffer, bsize, fmt_dec_10, generic);
         }
-        if(generic >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",generic);
+            snprintf(buffer, bsize, fmt_dec_100, generic);
         }
         result.unit = "";
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:A:P"){
         double dplace = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             dplace = value->value;    // Value in %
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = 55.3 + float(random(0, 20)) / 10.0;
             dplace = rawvalue;
         }
-        if(dplace < 10){
+        if (dplace < 10) {
-            snprintf(buffer,bsize,"%3.2f",dplace);
+            snprintf(buffer, bsize, fmt_dec_1, dplace);
         }
-        if(dplace >= 10 && dplace < 100){
+        else if (dplace < 100) {
-            snprintf(buffer,bsize,"%3.1f",dplace);
+            snprintf(buffer, bsize, fmt_dec_10, dplace);
         }
-        if(dplace >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",dplace);
+            snprintf(buffer, bsize, fmt_dec_100, dplace);
         }
         result.unit = "%";
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:A:D"){
         double angle = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             angle = value->value;
             angle = angle * 57.2958;      // Unit conversion form rad to deg
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = PI / 100 + (random(-5, 5) / 360 * 2* PI);
             angle = rawvalue * 57.2958;
         }
-        if(angle > -10 && angle < 10){
+        if (angle > -10 && angle < 10) {
             snprintf(buffer,bsize,"%3.1f",angle);
         }
-        else{
+        else {
             snprintf(buffer,bsize,"%3.0f",angle);
         }
         result.unit = "Deg";
@@ -775,41 +805,41 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
     //########################################################
     else if (value->getFormat() == "formatXdr:T:R"){
         double rpm = 0;
-        if(usesimudata == false) {
+        if (usesimudata == false) {
             rpm = value->value;    // Value in rpm
             rawvalue = value->value;
         }
-        else{
+        else {
             rawvalue = 2505 + random(0, 20);
             rpm = rawvalue;
         }
-        if(rpm < 10){
+        if (rpm < 10) {
-            snprintf(buffer,bsize,"%3.2f",rpm);
+            snprintf(buffer, bsize, fmt_dec_1, rpm);
         }
-        if(rpm >= 10 && rpm < 100){
+        else if (rpm < 100) {
-            snprintf(buffer,bsize,"%3.1f",rpm);
+            snprintf(buffer, bsize, fmt_dec_10, rpm);
         }
-        if(rpm >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",rpm);
+            snprintf(buffer, bsize, fmt_dec_100, rpm);
         }
         result.unit = "rpm";
     }
     //########################################################
     // Default format
     //########################################################
-    else{
+    else {
-        if(value->value < 10){
+        if (value->value < 10) {
-            snprintf(buffer,bsize,"%3.2f",value->value);
+            snprintf(buffer, bsize, fmt_dec_1, value->value);
         }
-        if(value->value >= 10 && value->value < 100){
+        else if (value->value < 100) {
-            snprintf(buffer,bsize,"%3.1f",value->value);
+            snprintf(buffer, bsize, fmt_dec_10, value->value);
         }
-        if(value->value >= 100){
+        else {
-            snprintf(buffer,bsize,"%3.0f",value->value);
+            snprintf(buffer, bsize, fmt_dec_100, value->value);
         }
         result.unit = "";
     }
-    buffer[bsize]=0;
+    buffer[bsize] = 0;
     result.value = rawvalue;        // Return value is only necessary in case of simulation of graphic pointer
     result.svalue = String(buffer);
     return result;

lib/obp60task/OBP60Hardware.h

@@ -82,7 +82,7 @@
     // Direction pin for RS485 NMEA0183
     #define OBP_DIRECTION_PIN 8
     // I2C
-    #define I2C_SPEED 10000UL       // 10kHz clock speed on I2C bus
+    #define I2C_SPEED 100000UL       // 100kHz 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 10
+    #define SD_SPI_CS GPIO_NUM_10
-    #define SD_SPI_MOSI 40
+    #define SD_SPI_MOSI GPIO_NUM_40
-    #define SD_SPI_CLK 39
+    #define SD_SPI_CLK GPIO_NUM_39
-    #define SD_SPI_MISO 13
+    #define SD_SPI_MISO GPIO_NUM_13
 
     // GPS (NEO-6M, NEO-M8N, ATGM336H)
     #define OBP_GPS_RX 19

lib/obp60task/OBPDataOperations.cpp

@@ -77,30 +77,56 @@ void WindUtils::calcTwdSA(const double* AWA, const double* AWS,
     //    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
+    static const double DBL_MIN = std::numeric_limits<double>::lowest();
+
+    // Serial.println("\ncalcTrueWind: HDT: " + String(*hdtVal) + ", HDM: " + String(*hdmVal) + ", VAR: " + String(*varVal) + ", SOG: " + String(*sogVal) + ", COG: " + String(*cogVal));
+    if (*hdmVal != DBL_MIN) {
+        hdt = *hdmVal + (*varVal != DBL_MIN ? *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_MIN && *sogVal >= minSogVal) {
+        hdt = *cogVal; // Use COG as fallback if HDT and HDM are not available, and SOG is not data noise
+    } else {
+        hdt = DBL_MIN; // Cannot calculate HDT without valid HDM or HDM+VAR or COG
+    }
+
+    return hdt;
+}
+
 bool WindUtils::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)
 {
     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_MIN) {
+    // Serial.println("\ncalcTrueWind: HDT: " + String(*hdtVal) + ", HDM: " + String(*hdmVal) + ", VAR: " + String(*varVal) + ", SOG: " + String(*sogVal) + ", COG: " + String(*cogVal));
+/*    if (*hdtVal != DBL_MIN) {
         hdt = *hdtVal; // Use HDT if available
     } else {
-        if (*hdmVal != DBL_MIN && *varVal != DBL_MIN) {
+        if (*hdmVal != DBL_MIN) {
-            hdt = *hdmVal + *varVal; // Use corrected HDM if HDT is not available
+            hdt = *hdmVal + (*varVal != DBL_MIN ? *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_MIN) {
+        } else if (*cogVal != DBL_MIN && *sogVal >= minSogVal) {
-            hdt = *cogVal; // Use COG as fallback if HDT and HDM are not available
+            hdt = *cogVal; // Use COG as fallback if HDT and HDM are not available, and SOG is not data noise
         } else {
             return false; // Cannot calculate without valid HDT or HDM+VAR or COG
         }
+    } */
+    if (*hdtVal != DBL_MIN) {
+        hdt = *hdtVal; // Use HDT if available
+    } else {
+        hdt = calcHDT(hdmVal, varVal, cogVal, sogVal);
     }
 
-    if (*cogVal != DBL_MIN) {
+    if (*cogVal != DBL_MIN && *sogVal >= minSogVal) { // if SOG is data noise, we don't trust COG
-        ctw = *cogVal; // Use COG as CTW if available
+
-        //    ctw = *cogVal + ((*cogVal - hdt) / 2); // Estimate CTW from COG
+        ctw = *cogVal; // Use COG for CTW if available
     } else {
         ctw = hdt; // 2nd approximation for CTW; hdt must exist if we reach this part of the code
     }
@@ -113,6 +139,7 @@ bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal,
         // 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_MIN) || (*awsVal == DBL_MIN)) {
         // Cannot calculate true wind without valid AWA, AWS; other checks are done earlier
@@ -125,33 +152,4 @@ bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal,
 
         return true;
     }
-}
+}
-
-void HstryBuf::fillWndBufSimData(tBoatHstryData& hstryBufs)
-// Fill most part of TWD and TWS history buffer with simulated data
-{
-    double value = 20.0;
-    int16_t value2 = 0;
-    for (int i = 0; i < 900; i++) {
-        value += random(-20, 20);
-        value = WindUtils::to360(value);
-        value2 = static_cast<int16_t>(value * DEG_TO_RAD * 1000);
-        hstryBufs.twdHstry->add(value2);
-    }
-}
-
-/* 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,18 +1,20 @@
 #pragma once
 #include "GwApi.h"
 #include "OBPRingBuffer.h"
-#include <Arduino.h>
+// #include <Arduino.h>
 #include <math.h>
 
 typedef struct {
     RingBuffer<int16_t>* twdHstry;
     RingBuffer<int16_t>* twsHstry;
+    RingBuffer<int16_t>* awdHstry;
+    RingBuffer<int16_t>* awsHstry;
 } tBoatHstryData; // Holds pointers to all history buffers for boat data
 
 class HstryBuf {
 
 public:
-    void fillWndBufSimData(tBoatHstryData& hstryBufs); // Fill most part of the TWD and TWS history buffer with simulated data
+
 };
 
 class WindUtils {
@@ -30,6 +32,7 @@ public:
     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,
         const double* cogVal, const double* stwVal, const double* sogVal, const double* hdtVal,
         const double* hdmVal, const double* varVal, double* twdVal, double* twsVal, double* twaVal);

lib/obp60task/OBPRingBuffer.h

@@ -32,6 +32,7 @@ public:
     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
     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

lib/obp60task/OBPRingBuffer.tpp

@@ -64,6 +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)

lib/obp60task/PageSystem.cpp

@@ -1,5 +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 "images/logo64.xbm"
@@ -7,8 +17,7 @@
 #include "qrcode.h"
 
 #ifdef BOARD_OBP40S3
-#include <SD.h>
+#include "dirent.h"
-#include <FS.h>
 #endif
 
 #define STRINGIZE_IMPL(x) #x
@@ -19,35 +28,27 @@
 #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. NMEA2000 device list
- */
-
 class PageSystem : public Page
 {
-uint64_t chipid;
+private:
-bool simulation;
+    uint64_t chipid;
-bool sdcard;
+    bool simulation;
-String buzzer_mode;
+    bool use_sdcard;
-uint8_t buzzer_power;
+    String buzzer_mode;
-String cpuspeed;
+    uint8_t buzzer_power;
-String rtc_module;
+    String cpuspeed;
-String gps_module;
+    String rtc_module;
-String env_module;
+    String gps_module;
+    String env_module;
 
-String batt_sensor;
+    String batt_sensor;
-String solar_sensor;
+    String solar_sensor;
-String gen_sensor;
+    String gen_sensor;
-String rot_sensor;
+    String rot_sensor;
-double homelat;
+    double homelat;
-double homelon;
+    double homelon;
 
-char mode = 'N'; // (N)ormal, (S)ettings, (D)evice list, (C)ard
+    char mode = 'N'; // (N)ormal, (S)ettings, (D)evice list, (C)ard
 
 public:
     PageSystem(CommonData &common){
@@ -55,11 +56,12 @@ public:
         common.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);
         }
         chipid = ESP.getEfuseMac();
         simulation = common.config->getBool(common.config->useSimuData);
 #ifdef BOARD_OBP40S3
-        sdcard = common.config->getBool(common.config->useSDCard);
+        use_sdcard = common.config->getBool(common.config->useSDCard);
 #endif
         buzzer_mode = common.config->getString(common.config->buzzerMode);
         buzzer_mode.toLowerCase();
@@ -76,7 +78,7 @@ public:
         homelon = common.config->getString(common.config->homeLON).toDouble();
     }
 
-    virtual void setupKeys(){
+    void setupKeys() {
         commonData->keydata[0].label = "EXIT";
         commonData->keydata[1].label = "MODE";
         commonData->keydata[2].label = "";
@@ -85,7 +87,7 @@ public:
         commonData->keydata[5].label = "ILUM";
     }
 
-    virtual int handleKey(int key){
+    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");
@@ -95,7 +97,7 @@ public:
             } else if (mode == 'S') {
                 mode = 'D';
             } else if (mode == 'D') {
-                if (sdcard) {
+                if (hasSDCard) {
                     mode = 'C';
                 } else {
                     mode = 'N';
@@ -117,7 +119,8 @@ public:
         }
         // standby / deep sleep
         if (key == 5) {
-           deepSleep(*commonData);
+            commonData->logger->logDebug(GwLog::LOG, "System going into deep sleep mode...");
+            deepSleep(*commonData);
         }
         // Code for keylock
         if (key == 11) {
@@ -132,6 +135,7 @@ public:
         }
         // standby / deep sleep
         if (key == 12) {
+            commonData->logger->logDebug(GwLog::LOG, "System going into deep sleep mode...");
             deepSleep(*commonData);
         }
 #endif
@@ -178,7 +182,7 @@ public:
         }
 
         // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageSystem");
+        logger->logDebug(GwLog::LOG, "Drawing at PageSystem, Mode=%c", mode);
 
         // Draw page
         //***********************************************************
@@ -257,14 +261,37 @@ public:
             getdisplay().setCursor(8, y0 + 48);
             getdisplay().print("SD-Card:");
             getdisplay().setCursor(90, y0 + 48);
-            if (sdcard) {
+            if (hasSDCard) {
-                uint64_t cardsize = SD.cardSize() / (1024 * 1024);
+                uint64_t cardsize = ((uint64_t) sdcard->csd.capacity) * sdcard->csd.sector_size / (1024 * 1024);
-                getdisplay().print(String(cardsize) + String(" MB"));
+                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:");
@@ -371,8 +398,61 @@ public:
             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

lib/obp60task/PageWindPlot.cpp

@@ -8,13 +8,40 @@
 
 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)
+{
+    int minVal = windDirHstry.getMinVal();
+    size_t count = windDirHstry.getCurrentSize();
+
+    if (windDirHstry.isEmpty() || amount <= 0) {
+        return 0;
+    }
+    if (amount > count)
+        amount = count;
+
+    int16_t midWndDir, minWndDir, maxWndDir = 0;
+    int wndCenter = 0;
+
+    midWndDir = windDirHstry.getMid(amount);
+    if (midWndDir != INT16_MIN) {
+        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();
     size_t count = windDirHstry.getCurrentSize();
-    //    size_t capacity = windDirHstry.getCapacity();
-    //    size_t last = windDirHstry.getLastIdx();
 
     if (windDirHstry.isEmpty() || amount <= 0) {
         return minVal;
@@ -27,7 +54,6 @@ 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 == minVal) {
@@ -51,23 +77,37 @@ 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
     int dataIntv = 1; // Update interval for wind history chart:
                       // (1)|(2)|(3)|(4) seconds for approx. 4, 8, 12, 16 min. history chart
-    bool showTWS = true; // Show TWS value in chart area
+    bool useSimuData;
+    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";
+#if defined BOARD_OBP60S3
+        commonData->keydata[1].label = "SRC";
+        commonData->keydata[4].label = "INTV";
+#elif defined BOARD_OBP40S3
         commonData->keydata[1].label = "INTV";
-        commonData->keydata[4].label = "TWS";
+#endif
     }
 
     // Key functions
@@ -85,8 +125,18 @@ public:
             return 0; // Commit the key
         }
 
-        // Set interval for wind history chart update time
+#if defined BOARD_OBP60S3
+        // 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) {
@@ -99,12 +149,6 @@ public:
             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;
@@ -113,19 +157,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
+    }
+
+
+
     int displayPage(PageData& pageData)
     {
         GwConfigHandler* config = commonData->config;
         GwLog* logger = commonData->logger;
 
-        float twsValue; // TWS value in chart area
+        static RingBuffer<int16_t>* wdHstry; // Wind direction data buffer
-        static String twdName, twdUnit; // TWD name and unit
+        static RingBuffer<int16_t>* wsHstry; // Wind speed data buffer
-        static int updFreq; // Update frequency for TWD
+        static String wdName, wdFormat; // Wind direction name and format
-        static int16_t twdLowest, twdHighest; // TWD range
+        static String wsName, wsFormat; // Wind speed name and format
-        // static int16_t twdBufMinVal; // lowest possible twd buffer value; used for non-set data
+        static int updFreq; // Update frequency for wind direction
+        static int16_t wdLowest, wdHighest; // Wind direction range
+        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 only for validation test, TWS for display of current value
+        // current boat data values; TWD/AWD only for validation test, TWS/AWS for display of current value
-        const int numBoatData = 2;
+        const int numBoatData = 4;
         GwApi::BoatValue* bvalue;
         String BDataName[numBoatData];
         double BDataValue[numBoatData];
@@ -137,8 +201,6 @@ public:
         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
@@ -155,16 +217,15 @@ public:
         static size_t lastIdx; // Last index of TWD history buffer
         static size_t lastAddedIdx = 0; // Last index of TWD history buffer when new data was added
         static int oldDataIntv; // remember recent user selection of data interval
+        static bool oldShowTruW; // remember recent user selection of wind data type
 
         static int wndCenter; // chart wind center value position
         static int wndLeft; // chart wind left value position
         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 = 40; // Default range for chart
+        static const int dfltRng = 60; // 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
@@ -172,29 +233,33 @@ 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 page WindPlot");
+        LOG_DEBUG(GwLog::LOG, "Display PageWindPlot");
 
-        // Get config data
+/*        // Get config data
-        simulation = config->getBool(config->useSimuData);
+        bool useSimuData = config->getBool(config->useSimuData);
-        holdValues = config->getBool(config->holdvalues);
+        // 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;
+            oldShowTruW = false; // we want to initialize wind buffers at 1st time routine runs
+            wdHstry = pageData.boatHstry.twdHstry;
+            bufSize = wdHstry->getCapacity();
+            wsHstry = pageData.boatHstry.twsHstry;
+            bufSize = wsHstry->getCapacity();
+            wdHstry->getMetaData(wdName, wdFormat, updFreq, wdLowest, wdHighest);
+            wsHstry->getMetaData(wsName, wsFormat, updFreq, wdLowest, wdHighest);
+            wsValue = 0;
+            wsBVal->setFormat(wsHstry->getFormat());
             numAddedBufVals, currIdx, lastIdx = 0;
-            lastAddedIdx = pageData.boatHstry.twdHstry->getLastIdx();
+            lastAddedIdx = wdHstry->getLastIdx();
-            pageData.boatHstry.twdHstry->getMetaData(twdName, twdUnit, updFreq, twdLowest, twdHighest);
             wndCenter = INT_MIN;
             midWndDir = 0;
             diffRng = dfltRng;
@@ -222,9 +287,25 @@ public:
             setFlashLED(false);
         }
 
+        if (showTruW != oldShowTruW) {
+            if (showTruW) {
+                wdHstry = pageData.boatHstry.twdHstry;
+                wsHstry = pageData.boatHstry.twsHstry;
+            } else {
+                wdHstry = pageData.boatHstry.awdHstry;
+                wsHstry = pageData.boatHstry.awsHstry;
+            }
+            wdHstry->getMetaData(wdName, wdFormat, updFreq, wdLowest, wdHighest);
+            wsHstry->getMetaData(wsName, wsFormat, updFreq, wdLowest, wdHighest);
+            bufSize = wdHstry->getCapacity();
+            wsBVal->setFormat(wsHstry->getFormat());
+
+            oldShowTruW = showTruW;
+        }
+
         // Identify buffer size and buffer start position for chart
-        count = pageData.boatHstry.twdHstry->getCurrentSize();
+        count = wdHstry->getCurrentSize();
-        currIdx = pageData.boatHstry.twdHstry->getLastIdx();
+        currIdx = wdHstry->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
@@ -240,29 +321,25 @@ public:
                 bufStart = max(0, bufStart - numAddedBufVals);
             }
         }
-        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: %.0f, xWS: %.1f, 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() / 10.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_MIN || (wndCenter == 0 && count == 1)) {
-            midWndDir = pageData.boatHstry.twdHstry->getMid(numWndVals);
+            wndCenter = getCntr(*wdHstry, numWndVals);
-            if (midWndDir != INT16_MIN) {
+            LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Range Init: count: %d, xWD: %.0f, wndCenter: %d, diffRng: %d, chrtRng: %d, Min: %.0f, Max: %.0f", count, wdHstry->getLast() / 1000.0 * radToDeg,
-                midWndDir = midWndDir / 1000.0 * radToDeg;
+                wndCenter, diffRng, chrtRng, wdHstry->getMin(numWndVals) / 1000.0 * radToDeg, wdHstry->getMax(numWndVals) / 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(*pageData.boatHstry.twdHstry, wndCenter, numWndVals);
+            diffRng = getRng(*wdHstry, wndCenter, numWndVals);
             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
@@ -288,7 +365,8 @@ public:
         char sWndLbl[4]; // char buffer for Wind angle label
         getdisplay().setFont(&Ubuntu_Bold12pt8b);
         getdisplay().setCursor(xCenter - 88, yOffset - 3);
-        getdisplay().print("TWD"); // Wind data name
+//        getdisplay().print("TWD"); // Wind data name
+        getdisplay().print(wdName); // 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
@@ -304,11 +382,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 (pageData.boatHstry.twdHstry->getMax() == pageData.boatHstry.twdHstry->getMinVal()) {
+        if (wdHstry->getMax() == wdHstry->getMinVal()) {
             // only <INT16_MIN> values in buffer -> no valid wind data available
             wndDataValid = false;
-        } else if (!BDataValid[0]) {
+        } else if (!BDataValid[0] && !useSimuData) {
-            // currently no valid TWD data available
+            // currently no valid TWD data available and no simulation mode
             numNoData++;
             wndDataValid = true;
             if (numNoData > 3) {
@@ -323,7 +401,7 @@ public:
         //***********************************************************************
         if (wndDataValid) {
             for (int i = 0; i < (numWndVals / dataIntv); i++) {
-                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
+                chrtVal = static_cast<int>(wdHstry->get(bufStart + (i * dataIntv))); // show the latest wind values in buffer; keep 1st value constant in a rolling buffer
                 if (chrtVal == INT16_MIN) {
                     chrtPrevVal = INT16_MIN;
                 } else {
@@ -331,8 +409,7 @@ public:
                     x = ((chrtVal - wndLeft + 360) % 360) * chrtScl;
                     y = yOffset + cHeight - i; // Position in chart area
 
-//                    if (i >= (numWndVals / dataIntv) - 10)
+                    if (i >= (numWndVals / dataIntv) - 1) // log chart data of 1 line (adjust for test purposes)
-                    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 == INT16_MIN)) {
@@ -364,41 +441,27 @@ public:
                 if (i >= (cHeight - 1)) {
                     oldDataIntv = 0; // force reset of buffer start and number of values to show in next display loop
 
-                    int minWndDir = pageData.boatHstry.twdHstry->getMin(numWndVals) / 1000.0 * radToDeg;
+                    int minWndDir = wdHstry->getMin(numWndVals) / 1000.0 * radToDeg;
-                    int maxWndDir = pageData.boatHstry.twdHstry->getMax(numWndVals) / 1000.0 * radToDeg;
+                    int maxWndDir = wdHstry->getMax(numWndVals) / 1000.0 * radToDeg;
                     LOG_DEBUG(GwLog::DEBUG, "PageWindPlot FreeTop: Minimum: %d, Maximum: %d, OldwndCenter: %d", minWndDir, maxWndDir, wndCenter);
-//                    if ((minWndDir + 540 >= wndCenter + 540) || (maxWndDir + 540 <= wndCenter + 540)) {
+                    // if (((minWndDir - wndCenter >= 0) && (minWndDir - wndCenter < 180)) || ((maxWndDir - wndCenter <= 0) && (maxWndDir - wndCenter >=180))) {
-                    if (((minWndDir - wndCenter >= 0) && (minWndDir - wndCenter < 180)) || ((maxWndDir - wndCenter <= 0) && (maxWndDir - wndCenter >=180))) {
+                    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))) {
-                        // Check if all wind value are left or right of center value -> optimize chart range
+                        // Check if all wind value are left or right of center value -> optimize chart center
-                        midWndDir = pageData.boatHstry.twdHstry->getMid(numWndVals) / 1000.0 * radToDeg;
+                        wndCenter = getCntr(*wdHstry, numWndVals);
-                        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;
                 }
             }
 
-        } else {
+            // Print wind speed value
-            // 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;
 
-            twsValue = pageData.boatHstry.twsHstry->getLast() / 10.0 * 1.94384; // TWS value in knots
+            xPosTws = flipTws ? 20 : width - 145;
-
-            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
@@ -409,28 +472,36 @@ public:
             }
             lastZone = currentZone;
 
+            wsValue = wsHstry->getLast();
+            wsBVal->value = wsValue; // temp variable to retreive data unit from OBP60Formater
+            wsBVal->valid = (static_cast<int16_t>(wsValue) != wsHstry->getMinVal());
+            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);
-            if (!BDataValid[1]) {
+            if (!wsBVal->valid) {
                 getdisplay().print("--.-");
             } else {
-                double dbl = BDataValue[1] * 3.6 / 1.852;
+                wsValue = wsValue / 10.0 * 1.94384; // Wind speed value in knots
-                if (dbl < 10.0) {
+                if (wsValue < 10.0) {
-                    getdisplay().printf("!%3.1f", dbl); // Value, round to 1 decimal
+                    getdisplay().printf("!%3.1f", wsValue); // Value, round to 1 decimal
                 } else {
-                    getdisplay().printf("%4.1f", dbl); // Value, round to 1 decimal
+                    getdisplay().printf("%4.1f", wsValue); // Value, round to 1 decimal
                 }
             }
             getdisplay().setFont(&Ubuntu_Bold12pt8b);
             getdisplay().setCursor(xPosTws + 82, yPosTws - 14);
-//            getdisplay().print("TWS"); // Name
+            getdisplay().print(wsName); // Name
-            getdisplay().print(BDataName[1]); // Name
             getdisplay().setFont(&Ubuntu_Bold8pt8b);
-//            getdisplay().setCursor(xPosTws + 78, yPosTws + 1);
             getdisplay().setCursor(xPosTws + 82, yPosTws + 1);
-//            getdisplay().printf(" kn"); // Unit
+            getdisplay().print(wsUnit); // 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
@@ -460,19 +531,17 @@ 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", "TWS" }, // Bus values we need in the page
+    { "TWD", "TWS", "AWD", "AWS" }, // 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,15 +7,33 @@
 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;
@@ -48,42 +66,57 @@ public:
         String flashLED = config->getString(config->flashLED);
         String backlightMode = config->getString(config->backlight);
 
-        // Get boat values #1
+	GwApi::BoatValue *bvalue1; // Value 1 for angle
-        GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
+        GwApi::BoatValue *bvalue2; // Value 2 for speed
-        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 values #2
+	// Get boat value for wind speed (AWS/TWS), shown in top left corner
-        GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list
+        if (source == 'A') {
-        String name2 = xdrDelete(bvalue2->getName());   // Value name
+            bvalue2 =pageData.values[5];
+        } 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
         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
+        bool valid3 = bvalue3->valid;                   // Valid information 
         String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
         String unit3 = formatValue(bvalue3, *commonData).unit;        // Unit of value
         if(valid3 == true){
@@ -91,13 +124,13 @@ public:
             unit3old = unit3;                           // Save old unit
         }
 
-        // Get boat values #4
+        // Get boat value  for top right corner
-        GwApi::BoatValue *bvalue4 = pageData.values[3]; // Fourth element in list
+        GwApi::BoatValue *bvalue4 = pageData.values[1]; 
-        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
         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
+        bool valid4 = bvalue4->valid;                   // Valid information 
         String svalue4 = formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
         String unit4 = formatValue(bvalue4, *commonData).unit;        // Unit of value
         if(valid4 == true){
@@ -105,13 +138,13 @@ public:
             unit4old = unit4;                           // Save old unit
         }
 
-        // Get boat values #5
+        // Get boat value bottom right corner
-        GwApi::BoatValue *bvalue5 = pageData.values[4]; // Fifth element in list
+        GwApi::BoatValue *bvalue5 = pageData.values[2]; 
-        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
         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
+        bool valid5 = bvalue5->valid;                   // Valid information 
         String svalue5 = formatValue(bvalue5, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
         String unit5 = formatValue(bvalue5, *commonData).unit;        // Unit of value
         if(valid5 == true){
@@ -119,13 +152,13 @@ public:
             unit5old = unit5;                           // Save old unit
         }
 
-        // Get boat values #5
+        // Get boat value for center
-        GwApi::BoatValue *bvalue6 = pageData.values[5]; // Sixth element in list
+        GwApi::BoatValue *bvalue6 = pageData.values[3]; 
-        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
         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
+        bool valid6 = bvalue6->valid;                   // Valid information 
         String svalue6 = formatValue(bvalue6, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
         String unit6 = formatValue(bvalue6, *commonData).unit;        // Unit of value
         if(valid6 == true){
@@ -133,6 +166,7 @@ public:
             unit6old = unit6;                           // Save old unit
         }
 
+
         // Optical warning by limit violation (unused)
         if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
@@ -151,7 +185,7 @@ public:
 
         getdisplay().setTextColor(commonData->fgcolor);
 
-        // Show value 2 at position of value 1 (top left)
+        // Show AWS or TWS top left
         getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
         getdisplay().setCursor(10, 65);
         getdisplay().print(svalue2);                     // Value
@@ -171,7 +205,7 @@ public:
         // Horizintal separator left
         getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
 
-        // Show value 3 at bottom left
+        // Show value 3 (=first user-configured parameter) at bottom left
         getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
         getdisplay().setCursor(10, 270);
         getdisplay().print(svalue3);                     // Value
@@ -188,11 +222,10 @@ public:
             getdisplay().print(unit3old);                // Unit
         }
 
-        // Show value 4 at top right
+        // Show value 4 (=second user-configured parameter) at top right
         getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
         getdisplay().setCursor(295, 65);
         if(valid3 == true){
-           // getdisplay().print(abs(value3 * 180 / M_PI), 0); // Value
             getdisplay().print(svalue4);     // Value
         }
         else{
@@ -214,7 +247,7 @@ public:
         // Horizintal separator right
         getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
 
-        // Show value 5 at bottom right
+        // Show value 5 (=third user-configured parameter) at bottom right
         getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
         getdisplay().setCursor(295, 270);
         getdisplay().print(svalue5);                     // Value
@@ -329,26 +362,49 @@ public:
 
 //*******************************************************************************************
 
-        // Show value6, so that it does not collide with the wind pointer
+	// Show value6 (=fourth user-configured parameter) and ssource, so that they do not collide with the wind pointer
-        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+if ( cos(value1) > 0){ 
-        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{ 
+    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, 130);
+    }
+    else{
+	    getdisplay().setCursor(220, 130);
+    }
+    getdisplay().print(ssource);		//true or app. 
+}
 
         return PAGE_UPDATE;
     };
@@ -361,13 +417,14 @@ 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 (0 here)
+ * and we provide the number of user parameters we expect (4 here)
  * and will will provide the names of the fixed values we need
  */
 PageDescription registerPageWindRoseFlex(
     "WindRoseFlex", // Page name
     createPage,     // Action
-    6,              // Number of bus values depends on selection in Web configuration; was zero
+    4,              // Number of bus values depends on selection in Web configuration
+    {"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

@@ -123,6 +123,7 @@ class Page{
     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 = "";

lib/obp60task/config.json

@@ -1117,6 +1117,21 @@
             "obp60":"true"
         }
     },
+    {
+        "name": "valueprecision",
+        "label": "Display value precision",
+        "type": "list",
+        "default": "2",
+        "description": "Maximum number of decimal places to display [1|2]",
+        "list": [
+            "1",
+            "2"
+        ],
+        "category": "OBP60 Display",
+        "capabilities": {
+            "obp60":"true"
+        }
+    },
     {
         "name": "backlight",
         "label": "Backlight Mode",
@@ -1506,9 +1521,6 @@
         "condition": [
             {
                 "page1type": "SixValues"
-            },
-            {
-                "page1type": "WindRoseFlex"
             }
         ]
     },
@@ -1525,9 +1537,6 @@
         "condition": [
             {
                 "page1type": "SixValues"
-            },
-            {
-                "page1type": "WindRoseFlex"
             }
         ]
     },
@@ -1784,9 +1793,6 @@
         "condition": [
             {
                 "page2type": "SixValues"
-            },
-            {
-                "page2type": "WindRoseFlex"
             }
         ]
     },
@@ -1803,9 +1809,6 @@
         "condition": [
             {
                 "page2type": "SixValues"
-            },
-            {
-                "page2type": "WindRoseFlex"
             }
         ]
     },
@@ -2059,9 +2062,6 @@
         "condition": [
             {
                 "page3type": "SixValues"
-            },
-            {
-                "page3type": "WindRoseFlex"
             }
         ]
     },
@@ -2078,9 +2078,6 @@
         "condition": [
             {
                 "page3type": "SixValues"
-            },
-            {
-                "page3type": "WindRoseFlex"
             }
         ]
     },
@@ -2331,9 +2328,6 @@
         "condition": [
             {
                 "page4type": "SixValues"
-            },
-            {
-                "page4type": "WindRoseFlex"
             }
         ]
     },
@@ -2350,9 +2344,6 @@
         "condition": [
             {
                 "page4type": "SixValues"
-            },
-            {
-                "page4type": "WindRoseFlex"
             }
         ]
     },
@@ -2600,9 +2591,6 @@
         "condition": [
             {
                 "page5type": "SixValues"
-            },
-            {
-                "page5type": "WindRoseFlex"
             }
         ]
     },
@@ -2619,9 +2607,6 @@
         "condition": [
             {
                 "page5type": "SixValues"
-            },
-            {
-                "page5type": "WindRoseFlex"
             }
         ]
     },
@@ -2866,9 +2851,6 @@
         "condition": [
             {
                 "page6type": "SixValues"
-            },
-            {
-                "page6type": "WindRoseFlex"
             }
         ]
     },
@@ -2885,9 +2867,6 @@
         "condition": [
             {
                 "page6type": "SixValues"
-            },
-            {
-                "page6type": "WindRoseFlex"
             }
         ]
     },
@@ -3129,9 +3108,6 @@
         "condition": [
             {
                 "page7type": "SixValues"
-            },
-            {
-                "page7type": "WindRoseFlex"
             }
         ]
     },
@@ -3148,9 +3124,6 @@
         "condition": [
             {
                 "page7type": "SixValues"
-            },
-            {
-                "page7type": "WindRoseFlex"
             }
         ]
     },
@@ -3389,9 +3362,6 @@
         "condition": [
             {
                 "page8type": "SixValues"
-            },
-            {
-                "page8type": "WindRoseFlex"
             }
         ]
     },
@@ -3408,9 +3378,6 @@
         "condition": [
             {
                 "page8type": "SixValues"
-            },
-            {
-                "page8type": "WindRoseFlex"
             }
         ]
     },
@@ -3646,9 +3613,6 @@
         "condition": [
             {
                 "page9type": "SixValues"
-            },
-            {
-                "page9type": "WindRoseFlex"
             }
         ]
     },
@@ -3665,9 +3629,6 @@
         "condition": [
             {
                 "page9type": "SixValues"
-            },
-            {
-                "page9type": "WindRoseFlex"
             }
         ]
     },
@@ -3900,9 +3861,6 @@
         "condition": [
             {
                 "page10type": "SixValues"
-            },
-            {
-                "page10type": "WindRoseFlex"
             }
         ]
     },
@@ -3919,9 +3877,6 @@
         "condition": [
             {
                 "page10type": "SixValues"
-            },
-            {
-                "page10type": "WindRoseFlex"
             }
         ]
     },
@@ -3972,4 +3927,3 @@
         ]
     }
 ]
-

lib/obp60task/config_obp40.json

@@ -1129,6 +1129,21 @@
             "obp40": "true"
         }
     },
+    {
+        "name": "valueprecision",
+        "label": "Display value precision",
+        "type": "list",
+        "default": "2",
+        "description": "Maximum number of decimal places to display [1|2]",
+        "list": [
+            "1",
+            "2"
+        ],
+        "category": "OBP40 Display",
+        "capabilities": {
+            "obp40":"true"
+        }
+    },
     {
         "name": "backlight",
         "label": "Backlight Mode",
@@ -1600,6 +1615,26 @@
             }
         ]
     },
+    {
+        "name": "page1wndsrc",
+        "label": "Wind source",
+        "type": "list",
+        "default": "True wind",
+        "description": "Wind source for page 1: [true|apparant]",
+        "list": [
+            "True wind",
+            "Apparant wind"
+        ],
+        "category": "OBP40 Page 1",
+        "capabilities": {
+            "obp40": "true"
+        },
+        "condition": [
+            {
+                "page1type": "WindPlot"
+            }
+        ]
+    },
     {
         "name": "page2type",
         "label": "Type",
@@ -1878,6 +1913,26 @@
             }
         ]
     },
+    {
+        "name": "page2wndsrc",
+        "label": "Wind source",
+        "type": "list",
+        "default": "True wind",
+        "description": "Wind source for page 2: [true|apparant]",
+        "list": [
+            "True wind",
+            "Apparant wind"
+        ],
+        "category": "OBP40 Page 2",
+        "capabilities": {
+            "obp40": "true"
+        },
+        "condition": [
+            {
+                "page2type": "WindPlot"
+            }
+        ]
+    },
     {
         "name": "page3type",
         "label": "Type",
@@ -2153,6 +2208,26 @@
             }
         ]
     },
+    {
+        "name": "page3wndsrc",
+        "label": "Wind source",
+        "type": "list",
+        "default": "True wind",
+        "description": "Wind source for page 3: [true|apparant]",
+        "list": [
+            "True wind",
+            "Apparant wind"
+        ],
+        "category": "OBP40 Page 3",
+        "capabilities": {
+            "obp40": "true"
+        },
+        "condition": [
+            {
+                "page3type": "WindPlot"
+            }
+        ]
+    },
     {
         "name": "page4type",
         "label": "Type",
@@ -2425,6 +2500,26 @@
             }
         ]
     },
+    {
+        "name": "page4wndsrc",
+        "label": "Wind source",
+        "type": "list",
+        "default": "True wind",
+        "description": "Wind source for page 4: [true|apparant]",
+        "list": [
+            "True wind",
+            "Apparant wind"
+        ],
+        "category": "OBP40 Page 4",
+        "capabilities": {
+            "obp40": "true"
+        },
+        "condition": [
+            {
+                "page4type": "WindPlot"
+            }
+        ]
+    },
     {
         "name": "page5type",
         "label": "Type",
@@ -2694,6 +2789,26 @@
             }
         ]
     },
+    {
+        "name": "page5wndsrc",
+        "label": "Wind source",
+        "type": "list",
+        "default": "True wind",
+        "description": "Wind source for page 5: [true|apparant]",
+        "list": [
+            "True wind",
+            "Apparant wind"
+        ],
+        "category": "OBP40 Page 5",
+        "capabilities": {
+            "obp40": "true"
+        },
+        "condition": [
+            {
+                "page5type": "WindPlot"
+            }
+        ]
+    },
     {
         "name": "page6type",
         "label": "Type",
@@ -2960,6 +3075,26 @@
             }
         ]
     },
+    {
+        "name": "page6wndsrc",
+        "label": "Wind source",
+        "type": "list",
+        "default": "True wind",
+        "description": "Wind source for page 6: [true|apparant]",
+        "list": [
+            "True wind",
+            "Apparant wind"
+        ],
+        "category": "OBP40 Page 6",
+        "capabilities": {
+            "obp40": "true"
+        },
+        "condition": [
+            {
+                "page6type": "WindPlot"
+            }
+        ]
+    },
     {
         "name": "page7type",
         "label": "Type",
@@ -3223,6 +3358,26 @@
             }
         ]
     },
+    {
+        "name": "page7wndsrc",
+        "label": "Wind source",
+        "type": "list",
+        "default": "True wind",
+        "description": "Wind source for page 7: [true|apparant]",
+        "list": [
+            "True wind",
+            "Apparant wind"
+        ],
+        "category": "OBP40 Page 7",
+        "capabilities": {
+            "obp40": "true"
+        },
+        "condition": [
+            {
+                "page7type": "WindPlot"
+            }
+        ]
+    },
     {
         "name": "page8type",
         "label": "Type",
@@ -3483,6 +3638,26 @@
             }
         ]
     },
+    {
+        "name": "page8wndsrc",
+        "label": "Wind source",
+        "type": "list",
+        "default": "True wind",
+        "description": "Wind source for page 8: [true|apparant]",
+        "list": [
+            "True wind",
+            "Apparant wind"
+        ],
+        "category": "OBP40 Page 8",
+        "capabilities": {
+            "obp40": "true"
+        },
+        "condition": [
+            {
+                "page8type": "WindPlot"
+            }
+        ]
+    },
     {
         "name": "page9type",
         "label": "Type",
@@ -3740,6 +3915,26 @@
             }
         ]
     },
+    {
+        "name": "page9wndsrc",
+        "label": "Wind source",
+        "type": "list",
+        "default": "True wind",
+        "description": "Wind source for page 9: [true|apparant]",
+        "list": [
+            "True wind",
+            "Apparant wind"
+        ],
+        "category": "OBP40 Page 9",
+        "capabilities": {
+            "obp40": "true"
+        },
+        "condition": [
+            {
+                "page9type": "WindPlot"
+            }
+        ]
+    },
     {
         "name": "page10type",
         "label": "Type",
@@ -3993,6 +4188,25 @@
                 "page10type": "Fluid"
             }
         ]
+    },
+    {
+        "name": "page10wndsrc",
+        "label": "Wind source",
+        "type": "list",
+        "default": "True wind",
+        "description": "Wind source for page 10: [true|apparant]",
+        "list": [
+            "True wind",
+            "Apparant wind"
+        ],
+        "category": "OBP40 Page 10",
+        "capabilities": {
+            "obp40": "true"
+        },
+        "condition": [
+            {
+                "page10type": "WindPlot"
+            }
+        ]
     }
 ]
-

lib/obp60task/gen_set.py

@@ -1,132 +1,179 @@
 #!/usr/bin/env python3
-# A tool to generate that part of config.json  that deals with pages and fields.
-#
-#Usage: 1. modify this script (e.g.add a page, change number of fields, etc.)
-#       2. Delete all lines from config.json from the curly backet before "name": "page1type"  to o the end of the file (as of today, delete from line 917 to the end of the File)
-#       3. run ./gen_set.py >> config.json
 
+"""
+A tool to generate that part of config.json that deals with pages and fields.
+
+Usage example:
+
+ 1. Delete all lines from config.json from the curly backet before
+    "name": "page1type"  to the end of the file
+
+ 2. run ./gen_set.py -d obp60 -p 10 >> config.json
+
+TODO Better handling of default pages
+
+"""
+
+import os
+import sys
+import getopt
+import re
 import json
 
-# List of all pages and the number of parameters they expect.
+__version__ = "0.2"
-no_of_fields_per_page = {
-    "Wind": 0,
-    "XTETrack": 0,
-    "Battery2": 0,
-    "Battery": 0,
-    "BME280": 0,
-    "Clock": 0,
-    "Compass" : 0,
-    "DST810": 0,
-    "Fluid": 1,
-    "FourValues2": 4,
-    "FourValues": 4,
-    "Generator": 0,
-    "KeelPosition": 0,
-    "OneValue": 1,
-    "RollPitch": 2,
-    "RudderPosition": 0,
-    "SixValues" : 6,
-    "Solar": 0,
-    "ThreeValues": 3,
-    "TwoValues": 2,
-    "Voltage": 0,
-    "WhitePage": 0,
-    "WindPlot": 0,
-    "WindRose": 0,
-    "WindRoseFlex": 6,
-}
 
-# No changes needed beyond this point
+def detect_pages(filename):
-# max number of pages supported by OBP60
+    # returns a dictionary with page name and the number of gui fields
-no_of_pages = 10
+    pagefiles = []
-# Default selection for each page
+    with open(filename, 'r') as fh:
-default_pages = [
+        pattern = r'extern PageDescription\s*register(Page[^;\s]*)'
-    "Voltage",
+        for line in fh:
-    "WindRose",
+            if "extern PageDescription" in line:
-    "OneValue",
+                match = re.search(pattern, line)
-    "TwoValues",
+                if match:
-    "ThreeValues",
+                    pagefiles.append(match.group(1))
-    "FourValues",
+    try:
-    "FourValues2",
+        pagefiles.remove('PageSystem')
-    "Clock",
+    except ValueError:
-    "RollPitch",
+        pass
-    "Battery2",
+    pagedata = {}
-]
+    for pf in pagefiles:
-numbers = [
+        filename = pf + ".cpp"
-    "one",
+        with open(filename, 'r') as fh:
-    "two",
+            content = fh.read()
-    "three",
+        pattern =  r'PageDescription\s*?register' + pf + r'\s*\(\s*"([^"]+)".*?\n\s*(\d+)'
-    "four",
+        match = re.search(pattern, content, re.DOTALL)
-    "five",
+        if match:
-    "six",
+            pagedata[match.group(1)] = int(match.group(2))
-    "seven",
+    return pagedata
-    "eight",
-    "nine",
-    "ten",
-]
-pages = sorted(no_of_fields_per_page.keys())
-max_no_of_fields_per_page = max(no_of_fields_per_page.values())
 
-output = []
+def get_default_page(pageno):
+    # Default selection for each page
+    default_pages = (
+        "Voltage",
+        "WindRose",
+        "OneValue",
+        "TwoValues",
+        "ThreeValues",
+        "FourValues",
+        "FourValues2",
+        "Clock",
+        "RollPitch",
+        "Battery2"
+    )
+    if pageno > len(default_pages):
+        return "OneValue"
+    return default_pages[pageno - 1]
 
-for page_no in range(1, no_of_pages + 1):
+def number_to_text(number):
-    page_data = {
+    if number < 0 or number > 99:
-        "name": f"page{page_no}type",
+        raise ValueError("Only numbers from 0 to 99 are allowed.")
-        "label": "Type",
+    numbers = ("zero", "one", "two", "three", "four", "five", "six", "seven",
-        "type": "list",
+        "eight", "nine", "ten", "eleven", "twelve", "thirteen", "fourteen",
-        "default": default_pages[page_no - 1],
+        "fifteen", "sixteen", "seventeen", "eighteen", "nineteen")
-        "description": f"Type of page for page {page_no}",
+    tens = ("", "", "twenty", "thirty", "forty", "fifty", "sixty", "seventy",
-        "list": pages,
+        "eighty", "ninety")
-        "category": f"OBP60 Page {page_no}",
+    if number < 20:
-        "capabilities": {"obp60": "true"},
+        return numbers[number]
-        "condition": [{"visiblePages": vp} for vp in range(page_no, no_of_pages + 1)],
+    else:
-        #"fields": [],
+        q, r = divmod(number, 10)
-    }
+        return tens[q] + numbers[r]
-    output.append(page_data)
 
-    for field_no in range(1, max_no_of_fields_per_page + 1):
+def create_json(device, no_of_pages, pagedata):
-        field_data = {
+
-            "name": f"page{page_no}value{field_no}",
+    pages = sorted(pagedata.keys())
-            "label": f"Field {field_no}",
+    max_no_of_fields_per_page = max(pagedata.values())
-            "type": "boatData",
+
-            "default": "",
+    output = []
-            "description": f"The display for field {numbers[field_no - 1]}",
+
-            "category": f"OBP60 Page {page_no}",
+    for page_no in range(1, no_of_pages + 1):
-            "capabilities": {"obp60": "true"},
+        page_data = {
-            "condition": [
+            "name": f"page{page_no}type",
-                {f"page{page_no}type": page}
+            "label": "Type",
-                for page in pages
+            "type": "list",
-                if no_of_fields_per_page[page] >= field_no
+            "default": get_default_page(page_no),
-            ],
+            "description": f"Type of page for page {page_no}",
+            "list": pages,
+            "category": f"{device.upper()} Page {page_no}",
+            "capabilities": {device.lower(): "true"},
+            "condition": [{"visiblePages": vp} for vp in range(page_no, no_of_pages + 1)],
+            #"fields": [],
         }
-        output.append(field_data)
+        output.append(page_data)
 
-    fluid_data ={
+        for field_no in range(1, max_no_of_fields_per_page + 1):
-        "name": f"page{page_no}fluid",
+            field_data = {
-        "label": "Fluid type",
+                "name": f"page{page_no}value{field_no}",
-        "type": "list",
+                "label": f"Field {field_no}",
-        "default": "0",
+                "type": "boatData",
-        "list": [
+                "default": "",
-        {"l":"Fuel (0)","v":"0"},
+                "description": "The display for field {}".format(number_to_text(field_no)),
-        {"l":"Water (1)","v":"1"},
+                "category": f"{device.upper()} Page {page_no}",
-        {"l":"Gray Water (2)","v":"2"},
+                "capabilities": {device.lower(): "true"},
-        {"l":"Live Well (3)","v":"3"},
+                "condition": [
-        {"l":"Oil (4)","v":"4"},
+                    {f"page{page_no}type": page}
-        {"l":"Black Water (5)","v":"5"},
+                    for page in pages
-        {"l":"Fuel Gasoline (6)","v":"6"}
+                    if pagedata[page] >= field_no
-        ],
+                ],
-        "description": "Fluid type in tank",
+            }
-        "category": f"OBP60 Page {page_no}",
+            output.append(field_data)
-        "capabilities": {
-        "obp60":"true"
-        },
-        "condition":[{f"page{page_no}type":"Fluid"}]
-        } 
-    output.append(fluid_data)
 
-json_output = json.dumps(output, indent=4)
+        fluid_data ={
-# print omitting first and last line containing [ ] of JSON array
+            "name": f"page{page_no}fluid",
-#print(json_output[1:-1])
+            "label": "Fluid type",
-# print omitting first line containing [  of JSON array
+            "type": "list",
-print(json_output[1:])
+            "default": "0",
-# print(",")
+            "list": [
+            {"l":"Fuel (0)","v":"0"},
+            {"l":"Water (1)","v":"1"},
+            {"l":"Gray Water (2)","v":"2"},
+            {"l":"Live Well (3)","v":"3"},
+            {"l":"Oil (4)","v":"4"},
+            {"l":"Black Water (5)","v":"5"},
+            {"l":"Fuel Gasoline (6)","v":"6"}
+            ],
+            "description": "Fluid type in tank",
+            "category": f"{device.upper()} Page {page_no}",
+            "capabilities": {
+                device.lower(): "true"
+            },
+            "condition":[{f"page{page_no}type":"Fluid"}]
+            }
+        output.append(fluid_data)
+
+    return json.dumps(output, indent=4)
+
+def usage():
+    print("{} v{}".format(os.path.basename(__file__), __version__))
+    print()
+    print("Command line options")
+    print(" -d --device     device name to use e.g. obp60")
+    print(" -p --pages      number of pages to create")
+    print(" -h              show this help")
+    print()
+
+if __name__ == '__main__':
+    try:
+        options, remainder = getopt.getopt(sys.argv[1:], 'd:p:', ['device=','--pages='])
+    except getopt.GetoptError as err:
+        print(err)
+        usage()
+        sys.exit(2)
+
+    device = "obp60"
+    no_of_pages = 10
+    for opt, arg in options:
+        if opt in ('-d', '--device'):
+            device = arg
+        elif opt in ('-p', '--pages'):
+            no_of_pages = int(arg)
+        elif opt == '-h':
+            usage()
+            sys.exit(0)
+
+    # automatic detect pages and number of fields from sourcecode
+    pagedata = detect_pages("obp60task.cpp")
+
+    json_output = create_json(device, no_of_pages, pagedata)
+    # print omitting first line containing [  of JSON array
+    print(json_output[1:])

lib/obp60task/index.js

@@ -0,0 +1,12 @@
+(function(){
+    const api=window.esp32nmea2k;
+    if (! api) return;
+    const tabName="OBP60";
+    api.registerListener((id, data) => {
+    //    if (!data.testboard) return; //do nothing if we are not active
+        let page = api.addTabPage(tabName, "OBP60");
+        api.addEl('button', '', page, 'Screenshot').addEventListener('click', function (ev) {
+	window.open('/api/user/OBP60Task/screenshot', 'screenshot');
+        })
+    }, api.EVENTS.init);
+})();

lib/obp60task/obp60task.cpp

@@ -18,8 +18,6 @@
 
 #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
 
@@ -34,7 +32,6 @@
 #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
@@ -47,63 +44,23 @@ void OBP60Init(GwApi *api){
     GwConfigHandler *config = api->getConfig();
 
     // Set a new device name and hidden the original name in the main config
-    String devicename = api->getConfig()->getConfigItem(api->getConfig()->deviceName,true)->asString();
+    String devicename = config->getConfigItem(config->deviceName, true)->asString();
-    api->getConfig()->setValue(GwConfigDefinitions::systemName, devicename, GwConfigInterface::ConfigType::HIDDEN);
+    config->setValue(GwConfigDefinitions::systemName, devicename, GwConfigInterface::ConfigType::HIDDEN);
+
+    logger->prefix = devicename + ":";
+    logger->logDebug(GwLog::LOG,"obp60init running");
 
-    api->getLogger()->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);
 
-    // Init power rail 5.0V
+#ifdef BOARD_OBP40S3
-    String powermode = api->getConfig()->getConfigItem(api->getConfig()->powerMode,true)->asString();
-    api->getLogger()->logDebug(GwLog::DEBUG,"Power Mode is: %s", powermode.c_str());
-    if(powermode == "Max Power" || powermode == "Only 5.0V"){
-        #ifdef HARDWARE_V21
-        setPortPin(OBP_POWER_50, true); // Power on 5.0V rail
-        #endif
-        #ifdef BOARD_OBP40S3
-        setPortPin(OBP_POWER_EPD, true);// Power on ePaper display
-        setPortPin(OBP_POWER_SD, true); // Power on SD card
-        #endif
-    }
-    else{
-        #ifdef HARDWARE_V21
-        setPortPin(OBP_POWER_50, false); // Power off 5.0V rail
-        #endif
-        #ifdef BOARD_OBP40S3
-        setPortPin(OBP_POWER_EPD, false);// Power off ePaper display
-        setPortPin(OBP_POWER_SD, false); // Power off SD card
-        #endif
-    }
-
-    #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
@@ -112,7 +69,7 @@ void OBP60Init(GwApi *api){
 
     // Settings for e-paper display
     String fastrefresh = api->getConfig()->getConfigItem(api->getConfig()->fastRefresh,true)->asString();
-    api->getLogger()->logDebug(GwLog::DEBUG,"Fast Refresh Mode is: %s", fastrefresh.c_str());
+    logger->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
@@ -131,11 +88,11 @@ void OBP60Init(GwApi *api){
 
     // Get CPU speed
     int freq = getCpuFrequencyMhz();
-    api->getLogger()->logDebug(GwLog::LOG,"CPU speed at boot: %i MHz", freq);
+    logger->logDebug(GwLog::LOG,"CPU speed at boot: %i MHz", freq);
     
     // Settings for backlight
     String backlightMode = api->getConfig()->getConfigItem(api->getConfig()->backlight,true)->asString();
-    api->getLogger()->logDebug(GwLog::DEBUG,"Backlight Mode is: %s", backlightMode.c_str());
+    logger->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"){
@@ -150,7 +107,7 @@ void OBP60Init(GwApi *api){
 
     // Settings flash LED mode
     String ledMode = api->getConfig()->getConfigItem(api->getConfig()->flashLED,true)->asString();
-    api->getLogger()->logDebug(GwLog::DEBUG,"LED Mode is: %s", ledMode.c_str());
+    logger->logDebug(GwLog::DEBUG,"LED Mode is: %s", ledMode.c_str());
     if(String(ledMode) == "Off"){
         setBlinkingLED(false);
     }
@@ -282,7 +239,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;
@@ -376,9 +333,8 @@ void underVoltageDetection(GwApi *api, CommonData &common){
     }
 }
 
-//bool addTrueWind(GwApi* api, BoatValueList* boatValues, double *twd, double *tws, double *twa) {
+// Calculate true wind data and add to obp60task boat data list
 bool addTrueWind(GwApi* api, BoatValueList* boatValues) {
-    // Calculate true wind data and add to obp60task boat data list
 
     double awaVal, awsVal, cogVal, stwVal, sogVal, hdtVal, hdmVal, varVal;
     double twd, tws, twa;
@@ -404,7 +360,7 @@ bool addTrueWind(GwApi* api, BoatValueList* boatValues) {
     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,
+    api->getLogger()->logDebug(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 = WindUtils::calcTrueWind(&awaVal, &awsVal, &cogVal, &stwVal, &sogVal, &hdtVal, &hdmVal, &varVal, &twd, &tws, &twa);
@@ -423,31 +379,42 @@ bool addTrueWind(GwApi* api, BoatValueList* boatValues) {
             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,
+    api->getLogger()->logDebug(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;
 }
 
+// Init history buffers for selected boat data
 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
+    const double DBL_MIN = std::numeric_limits<double>::lowest();
 
     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 twdHstryMax = 6283; // Max value for wind direction (TWD, AWD) 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
+    int twsHstryMax = 1000; // Max value for wind speed (TWS, AWS) 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);
+    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
     GwApi::BoatValue *twdBVal = boatValues->findValueOrCreate(hstryBufList.twdHstry->getName());
     GwApi::BoatValue *twsBVal = boatValues->findValueOrCreate(hstryBufList.twsHstry->getName());
     GwApi::BoatValue *twaBVal = boatValues->findValueOrCreate("TWA");
+    GwApi::BoatValue *awdBVal = boatValues->findValueOrCreate(hstryBufList.awdHstry->getName());
+    GwApi::BoatValue *awsBVal = boatValues->findValueOrCreate(hstryBufList.awsHstry->getName());
+
+    if (!awdBVal->valid) { // AWD usually does not exist
+        awdBVal->setFormat(hstryBufList.awdHstry->getFormat());
+        awdBVal->value = DBL_MIN;
+    }
 }
 
-void handleHstryBuf(GwApi* api, BoatValueList* boatValues, tBoatHstryData hstryBufList) {
+void handleHstryBuf(GwApi* api, BoatValueList* boatValues, tBoatHstryData hstryBufList, bool useSimuData) {
     // Handle history buffers for TWD, TWS
 
     GwLog *logger = api->getLogger();
@@ -456,42 +423,110 @@ void handleHstryBuf(GwApi* api, BoatValueList* boatValues, tBoatHstryData hstryB
     int16_t twdHstryMax = hstryBufList.twdHstry->getMaxVal();
     int16_t twsHstryMin = hstryBufList.twsHstry->getMinVal();
     int16_t twsHstryMax = hstryBufList.twsHstry->getMaxVal();
-    int16_t twdBuf, twsBuf;
+    int16_t awdHstryMin = hstryBufList.awdHstry->getMinVal();
+    int16_t awdHstryMax = hstryBufList.awdHstry->getMaxVal();
+    int16_t awsHstryMin = hstryBufList.awsHstry->getMinVal();
+    int16_t awsHstryMax = hstryBufList.awsHstry->getMaxVal();
+    static int16_t twd, 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
 
     GwApi::BoatValue *twdBVal = boatValues->findValueOrCreate(hstryBufList.twdHstry->getName());
     GwApi::BoatValue *twsBVal = boatValues->findValueOrCreate(hstryBufList.twsHstry->getName());
     GwApi::BoatValue *twaBVal = boatValues->findValueOrCreate("TWA");
+    GwApi::BoatValue *awdBVal = boatValues->findValueOrCreate(hstryBufList.awdHstry->getName());
+    GwApi::BoatValue *awsBVal = boatValues->findValueOrCreate(hstryBufList.awsHstry->getName());
+    GwApi::BoatValue *awaBVal = boatValues->findValueOrCreate("AWA");
+    GwApi::BoatValue *hdtBVal = boatValues->findValueOrCreate("HDT");
+    GwApi::BoatValue *hdmBVal = boatValues->findValueOrCreate("HDM");
+    GwApi::BoatValue *varBVal = boatValues->findValueOrCreate("VAR");
+    GwApi::BoatValue *cogBVal = boatValues->findValueOrCreate("COG");
+    GwApi::BoatValue *sogBVal = boatValues->findValueOrCreate("SOG");
+
+    api->getLogger()->logDebug(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);
 
-    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 = 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
-        twdBuf = static_cast<int16_t>(std::round(calBVal->value * 1000));
+        twd = static_cast<int16_t>(std::round(calBVal->value * 1000));
-        if (twdBuf >= twdHstryMin && twdBuf <= twdHstryMax) {
+        if (twd >= twdHstryMin && twd <= twdHstryMax) {
-            hstryBufList.twdHstry->add(twdBuf);
+            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));
     }
-    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 = 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
-        twsBuf = static_cast<int16_t>(std::round(calBVal->value * 10));
+        tws = static_cast<int16_t>(std::round(calBVal->value * 10));
-        if (twsBuf >= twsHstryMin && twsBuf <= twsHstryMax) {
+        if (tws >= twsHstryMin && tws <= twsHstryMax) {
-            hstryBufList.twsHstry->add(twsBuf);
+            hstryBufList.twsHstry->add(tws);
         }
+        delete calBVal;
+        calBVal = nullptr;
+    } else if (useSimuData) {
+        tws += random(-50, 50); // TWS value in m/s; expands to 1 decimal
+        tws = constrain(tws, 0, 250); // 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);
+        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 * 10);
+        if (aws >= awsHstryMin && aws <= awsHstryMax) {
+            hstryBufList.awsHstry->add(static_cast<int16_t>(aws));
+        }
+        delete calBVal;
+        calBVal = nullptr;
+    } else if (useSimuData) {
+        aws += random(-50, 50); // TWS value in m/s; expands to 1 decimal
+        aws = constrain(aws, 0, 250); // Limit TWS to [0..25] m/s
+        hstryBufList.awsHstry->add(aws);
     }
-    delete calBVal;
-    calBVal = nullptr;
 }
 
 // OBP60 Task
@@ -608,9 +643,11 @@ void OBP60Task(GwApi *api){
     //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> twdHstry(960); // Circular buffer to store true wind direction values; store 960 TWD values for 16 minutes history
-    RingBuffer<int16_t> twsHstry(960); // Circular buffer to store wind speed values (TWS)
+    RingBuffer<int16_t> twsHstry(960); // Circular buffer to store true wind speed values (TWS)
-    tBoatHstryData hstryBufList = {&twdHstry, &twsHstry};
+    RingBuffer<int16_t> awdHstry(960); // Circular buffer to store appearant wind direction values; store 960 AWD values for 16 minutes history
+    RingBuffer<int16_t> awsHstry(960); // Circular buffer to store appearant xwind speed values (AWS)
+    tBoatHstryData hstryBufList = {&twdHstry, &twsHstry, &awdHstry, &awsHstry};
 
     //fill the page data from config
     numPages=config->getInt(config->visiblePages,1);
@@ -663,7 +700,7 @@ void OBP60Task(GwApi *api){
 
     // Check user setting for true wind calculation
     bool calcTrueWnds = api->getConfig()->getBool(api->getConfig()->calcTrueWnds, false);
-    // bool simulation = api->getConfig()->getBool(api->getConfig()->useSimuData, false);
+    bool useSimuData = api->getConfig()->getBool(api->getConfig()->useSimuData, false);
 
     // Initialize history buffer for certain boat data
     initHstryBuf(api, &boatValues, hstryBufList);
@@ -709,7 +746,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 %f : %f", homelat, homelon);
+        LOG_DEBUG(GwLog::LOG, "Home location set to lat=%f, lon=%f", homelat, homelon);
     } else {
         LOG_DEBUG(GwLog::LOG, "No valid home location found");
     }
@@ -743,6 +780,7 @@ void OBP60Task(GwApi *api){
     //####################################################################################
 
     bool systemPage = false;
+    bool systemPageNew = false;
     Page *currentPage;
     while (true){
         delay(100);     // Delay 100ms (loop time)
@@ -795,6 +833,7 @@ void OBP60Task(GwApi *api){
                     systemPage = true; // System page is out of band
                     syspage->setupKeys();
                     keyboardMessage = 0;
+                    systemPageNew = true;
                 }
                 else {
                     currentPage = pages[pageNumber].page;
@@ -891,6 +930,7 @@ 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
@@ -918,6 +958,7 @@ 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
@@ -942,6 +983,7 @@ 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
@@ -974,7 +1016,7 @@ void OBP60Task(GwApi *api){
                     addTrueWind(api, &boatValues);
                 }
                 // Handle history buffers for TWD, TWS for wind plot page and other usage
-                 handleHstryBuf(api, &boatValues, hstryBufList);
+                 handleHstryBuf(api, &boatValues, hstryBufList, useSimuData);
 
                 // Clear display
                 // getdisplay().fillRect(0, 0, getdisplay().width(), getdisplay().height(), commonData.bgcolor);
@@ -990,6 +1032,10 @@ void OBP60Task(GwApi *api){
                 if (systemPage) {
                     displayFooter(commonData);
                     PageData sysparams; // empty
+                    if (systemPageNew) {
+                        syspage->displayNew(sysparams);
+                        systemPageNew = false;
+                    }
                     syspage->displayPage(sysparams);
                 }
                 else {
@@ -1006,10 +1052,11 @@ void OBP60Task(GwApi *api){
                     }
                     else{
                         if (lastPage != pageNumber){
-                            if (hasFRAM) fram.write(FRAM_PAGE_NO, pageNumber); // remember page for device restart
+                            pages[lastPage].page->leavePage(pages[lastPage].parameters); // call page cleanup code
+                            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);