PGN 127502 remote keyboard support

Merge pull request #208 from thooge/fonts
Added small 8x8px font mainly for use with graphs
2025-12-28 05:03:06 +01:00 · 2025-12-27 17:07:01 +01:00 · 2025-10-06 18:25:44 +02:00 · 2025-10-06 18:23:56 +02:00 · 2025-10-06 13:19:42 +02:00 · 2025-10-06 10:44:58 +02:00
28 changed files with 3743 additions and 3258 deletions
--- a/lib/api/GwApi.h
+++ b/lib/api/GwApi.h
@@ -137,6 +137,7 @@ class GwApi{
         * thread safe methods - can directly be called from a user task
         */
        virtual GwRequestQueue *getQueue()=0;
+        virtual QueueHandle_t getKbQueue()=0;
        virtual void sendN2kMessage(const tN2kMsg &msg, bool convert=true)=0;
        /**
         * deprecated - sourceId will be ignored
--- a/lib/config/GwConverterConfig.h
+++ b/lib/config/GwConverterConfig.h
@@ -71,6 +71,7 @@ class GwConverterConfig{
      int rmcInterval=1000;
      int rmcCheckTime=4000;
      int winst312=256;
+      int swBankInstance=0;
      bool unmappedXdr=false;
      unsigned long xdrTimeout=60000;
      std::vector<WindMapping> windMappings;
@@ -97,6 +98,7 @@ class GwConverterConfig{
            windMappings.push_back(mapping);
          }
        }
+        swBankInstance=config->getInt(GwConfigDefinitions::swBankInstance,0);
      }
      const WindMapping findWindMapping(const tN2kWindReference &n2k) const{
        for (const auto & it:windMappings){
@@ -113,4 +115,4 @@ class GwConverterConfig{


  };
-#endif
+#endif
--- a/lib/nmea2kto0183/N2kDataToNMEA0183.cpp
+++ b/lib/nmea2kto0183/N2kDataToNMEA0183.cpp
@@ -1572,6 +1572,36 @@ private:
        finalizeXdr();
    }

+    void Handle127502(const tN2kMsg &msg){
+        // switch bank control / receive remote key strokes
+        unsigned char instance=-1;
+        tN2kBinaryStatus bankstatus;
+        LOG_DEBUG(GwLog::LOG,"received switch bank control");
+        // check if we are addressed and our configured instance is used
+        if (! ParseN2kPGN127502(msg,instance,bankstatus)) {
+            LOG_DEBUG(GwLog::DEBUG,"unable to parse PGN %d",msg.PGN);
+            return;
+        }
+        if (! (instance == config.swBankInstance)) {
+            LOG_DEBUG(GwLog::DEBUG,"switch bank instance #%d ignored",instance);
+            return;
+        }
+        // TODO (?) multiple keys together
+
+        // only process configured key count (default 6)
+        for (uint8_t i=1; i<=6; i++) {
+            tN2kOnOff keystatus = N2kGetStatusOnBinaryStatus(bankstatus, i);
+            if (keystatus == 1) {
+                // key pressed: send key to queue
+                xQueueSend(keyboardQueue, &i, 0);
+            } else if (keystatus == 2) {
+                // long key pressed: send long key to queue
+                xQueueSend(keyboardQueue, &i, 0);
+            }
+        }
+
+    }
+
    void registerConverters()
    {
      //register all converter functions
@@ -1607,6 +1637,7 @@ private:
      converters.registerConverter(127488UL, &N2kToNMEA0183Functions::Handle127488);
      converters.registerConverter(130316UL, &N2kToNMEA0183Functions::Handle130316);
      converters.registerConverter(127257UL, &N2kToNMEA0183Functions::Handle127257);
+      converters.registerConverter(127502UL, &N2kToNMEA0183Functions::Handle127502);
 #define HANDLE_AIS
 #ifdef HANDLE_AIS
      converters.registerConverter(129038UL, &N2kToNMEA0183Functions::HandleAISClassAPosReport);  // AIS Class A Position Report, Message Type 1
@@ -1620,13 +1651,15 @@ private:
  public:
    N2kToNMEA0183Functions(GwLog *logger, GwBoatData *boatData, 
        SendNMEA0183MessageCallback callback,
-        String talkerId, GwXDRMappings *xdrMappings, const GwConverterConfig &cfg) 
+        String talkerId, GwXDRMappings *xdrMappings, const GwConverterConfig &cfg,
+        QueueHandle_t kbQueue)
    : N2kDataToNMEA0183(logger, boatData, callback,talkerId)
    {
        this->logger = logger;
        this->boatData = boatData;
        this->xdrMappings=xdrMappings;
        this->config=cfg;
+        this->keyboardQueue=kbQueue;
        registerConverters();
    }
    virtual void loop(unsigned long lastExtRmc) override
@@ -1642,8 +1675,8 @@ private:

 N2kDataToNMEA0183* N2kDataToNMEA0183::create(GwLog *logger, GwBoatData *boatData, 
    SendNMEA0183MessageCallback callback, String talkerId, GwXDRMappings *xdrMappings,
-    const GwConverterConfig &cfg){
-  LOG_DEBUG(GwLog::LOG,"creating N2kToNMEA0183");    
-  return new N2kToNMEA0183Functions(logger,boatData,callback, talkerId,xdrMappings,cfg);
+    const GwConverterConfig &cfg, QueueHandle_t kbQueue){
+  LOG_DEBUG(GwLog::LOG,"creating N2kToNMEA0183");
+  return new N2kToNMEA0183Functions(logger,boatData,callback, talkerId,xdrMappings,cfg,kbQueue);
 }
 //*****************************************************************************
--- a/lib/nmea2kto0183/N2kDataToNMEA0183.h
+++ b/lib/nmea2kto0183/N2kDataToNMEA0183.h
@@ -43,6 +43,7 @@ protected:
  GwBoatData *boatData;
  int sourceId=0;
  char talkerId[3];
+  QueueHandle_t keyboardQueue;
  SendNMEA0183MessageCallback sendNMEA0183MessageCallback;
  void SendMessage(const tNMEA0183Msg &NMEA0183Msg);
  N2kDataToNMEA0183(GwLog *logger, GwBoatData *boatData,  
@@ -50,7 +51,8 @@ protected:

 public:
  static N2kDataToNMEA0183* create(GwLog *logger, GwBoatData *boatData,  SendNMEA0183MessageCallback callback, 
-    String talkerId, GwXDRMappings *xdrMappings,const GwConverterConfig &cfg);
+    String talkerId, GwXDRMappings *xdrMappings,const GwConverterConfig &cfg,
+    QueueHandle_t kbQueue);
  virtual void HandleMsg(const tN2kMsg &N2kMsg, int sourceId) = 0;
  virtual void loop(unsigned long lastRmc);
  virtual ~N2kDataToNMEA0183(){}
@@ -59,4 +61,4 @@ public:
  virtual void toJson(GwJsonDocument *json)=0;
  virtual String handledKeys()=0;
 };
-#endif
+#endif
--- a/lib/obp60task/BoatDataCalibration.h
+++ b/lib/obp60task/BoatDataCalibration.h
@@ -3,7 +3,8 @@
 #ifndef _BOATDATACALIBRATION_H
 #define _BOATDATACALIBRATION_H

-#include "Pagedata.h"
+// #include "Pagedata.h"
+#include "GwApi.h"
 #include <string>
 #include <unordered_map>

--- a/lib/obp60task/Graphics.cpp
+++ b/lib/obp60task/Graphics.cpp
@@ -0,0 +1,25 @@
+/*
+Generic graphics functions
+
+*/
+#include <math.h>
+#include "Graphics.h"
+
+Point rotatePoint(const Point& origin, const Point& p, double angle) {
+    // rotate poind around origin by degrees
+    Point rotated;
+    double phi = angle * M_PI / 180.0;
+    double dx = p.x - origin.x;
+    double dy = p.y - origin.y;
+    rotated.x = origin.x + cos(phi) * dx - sin(phi) * dy;
+    rotated.y = origin.y + sin(phi) * dx + cos(phi) * dy;
+    return rotated;
+}
+
+std::vector<Point> rotatePoints(const Point& origin, const std::vector<Point>& pts, double angle) {
+    std::vector<Point> rotatedPoints;
+    for (const auto& p : pts) {
+         rotatedPoints.push_back(rotatePoint(origin, p, angle));
+    }
+     return rotatedPoints;
+}
--- a/lib/obp60task/Graphics.h
+++ b/lib/obp60task/Graphics.h
@@ -0,0 +1,17 @@
+#pragma once
+#include <vector>
+
+struct Point {
+    double x;
+    double y;
+};
+
+struct Rect {
+    double x;
+    double y;
+    double w;
+    double h;
+};
+
+Point rotatePoint(const Point& origin, const Point& p, double angle);
+std::vector<Point> rotatePoints(const Point& origin, const std::vector<Point>& pts, double angle);
--- a/lib/obp60task/OBP60Extensions.cpp
+++ b/lib/obp60task/OBP60Extensions.cpp
@@ -24,6 +24,7 @@
 #include "fonts/Ubuntu_Bold20pt8b.h"
 #include "fonts/Ubuntu_Bold32pt8b.h"
 #include "fonts/Atari16px8b.h" // Key label font
+#include "fonts/IBM8x8px.h"

 // E-Ink Display
 #define GxEPD_WIDTH 400     // Display width
@@ -362,30 +363,20 @@ String xdrDelete(String input){
    return input;
 }

-Point rotatePoint(const Point& origin, const Point& p, double angle) {
-    // rotate poind around origin by degrees
-    Point rotated;
-    double phi = angle * M_PI / 180.0;
-    double dx = p.x - origin.x;
-    double dy = p.y - origin.y;
-    rotated.x = origin.x + cos(phi) * dx - sin(phi) * dy;
-    rotated.y = origin.y + sin(phi) * dx + cos(phi) * dy;
-    return rotated;
-}
-
-std::vector<Point> rotatePoints(const Point& origin, const std::vector<Point>& pts, double angle) {
-    std::vector<Point> rotatedPoints;
-    for (const auto& p : pts) {
-         rotatedPoints.push_back(rotatePoint(origin, p, angle));
-    }
-     return rotatedPoints;
-}
-
 void fillPoly4(const std::vector<Point>& p4, uint16_t color) {
    getdisplay().fillTriangle(p4[0].x, p4[0].y, p4[1].x, p4[1].y, p4[2].x, p4[2].y, color);
    getdisplay().fillTriangle(p4[0].x, p4[0].y, p4[2].x, p4[2].y, p4[3].x, p4[3].y, color);
 }

+void drawPoly(const std::vector<Point>& points, uint16_t color) {
+    size_t polysize = points.size();
+    for (size_t i = 0; i < polysize - 1; i++) {
+        getdisplay().drawLine(points[i].x, points[i].y, points[i+1].x, points[i+1].y, color);
+    }
+    // close path
+    getdisplay().drawLine(points[polysize-1].x, points[polysize-1].y, points[0].x, points[0].y, color);
+}
+
 // Split string into words, whitespace separated
 std::vector<String> split(const String &s) {
    std::vector<String> words;
@@ -447,6 +438,24 @@ void drawTextRalign(int16_t x, int16_t y, String text) {
    getdisplay().print(text);
 }

+// Draw text inside box, normal or inverted
+void drawTextBoxed(Rect box, String text, uint16_t fg, uint16_t bg, bool inverted, bool border) {
+    if (inverted) {
+        getdisplay().fillRect(box.x, box.y, box.w, box.h, fg);
+        getdisplay().setTextColor(bg);
+    } else {
+        if (border) {
+            getdisplay().fillRect(box.x + 1, box.y + 1, box.w - 2, box.h - 2, bg);
+            getdisplay().drawRect(box.x, box.y, box.w, box.h, fg);
+        }
+        getdisplay().setTextColor(fg);
+    }
+    uint16_t border_offset = box.h / 4; // 25% of box height
+    getdisplay().setCursor(box.x + border_offset, box.y + box.h - border_offset);
+    getdisplay().print(text);
+    getdisplay().setTextColor(fg);
+}
+
 // Show a triangle for trend direction high (x, y is the left edge)
 void displayTrendHigh(int16_t x, int16_t y, uint16_t size, uint16_t color){
    getdisplay().fillTriangle(x, y, x+size*2, y, x+size, y-size*2, color);
--- a/lib/obp60task/OBP60Extensions.h
+++ b/lib/obp60task/OBP60Extensions.h
@@ -4,6 +4,7 @@
 #include <Arduino.h>
 #include "OBP60Hardware.h"
 #include "LedSpiTask.h"
+#include "Graphics.h"
 #include <GxEPD2_BW.h>                  // E-paper lib V2
 #include <Adafruit_FRAM_I2C.h>          // I2C FRAM

@@ -50,6 +51,7 @@ extern const GFXfont Ubuntu_Bold16pt8b;
 extern const GFXfont Ubuntu_Bold20pt8b;
 extern const GFXfont Ubuntu_Bold32pt8b;
 extern const GFXfont Atari16px;
+extern const GFXfont IBM8x8px;

 // Global functions
 #ifdef DISPLAY_GDEW042T2
@@ -73,13 +75,8 @@ GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> & getdisplay();
 #define PAGE_UPDATE 1      // page wants display to update
 #define PAGE_HIBERNATE 2   // page wants displey to hibernate

-struct Point {
-    double x;
-    double y;
-};
-Point rotatePoint(const Point& origin, const Point& p, double angle);
-std::vector<Point> rotatePoints(const Point& origin, const std::vector<Point>& pts, double angle);
 void fillPoly4(const std::vector<Point>& p4, uint16_t color);
+void drawPoly(const std::vector<Point>& points, uint16_t color);

 void deepSleep(CommonData &common);

@@ -108,6 +105,7 @@ String xdrDelete(String input);                 // Delete xdr prefix from string

 void drawTextCenter(int16_t cx, int16_t cy, String text);
 void drawTextRalign(int16_t x, int16_t y, String text);
+void drawTextBoxed(Rect box, String text, uint16_t fg, uint16_t bg, bool inverted, bool border);

 void displayTrendHigh(int16_t x, int16_t y, uint16_t size, uint16_t color);
 void displayTrendLow(int16_t x, int16_t y, uint16_t size, uint16_t color);
--- a/lib/obp60task/OBPDataOperations.cpp
+++ b/lib/obp60task/OBPDataOperations.cpp
@@ -1,5 +1,147 @@
 #include "OBPDataOperations.h"

+// --- Class HstryBuf ---------------
+// Init history buffers for selected boat data
+void HstryBuf::init(BoatValueList* boatValues, GwLog *log) {
+
+    logger = log;
+
+    int hstryUpdFreq = 1000; // Update frequency for history buffers in ms
+    int hstryMinVal = 0; // Minimum value for these history buffers
+    twdHstryMax = 6283; // Max value for wind direction (TWD, AWD) in rad [0...2*PI], shifted by 1000 for 3 decimals
+    twsHstryMax = 65000; // Max value for wind speed (TWS, AWS) in m/s [0..65], shifted by 1000 for 3 decimals
+    awdHstryMax = twdHstryMax;
+    awsHstryMax = twsHstryMax;
+    twdHstryMin = hstryMinVal;
+    twsHstryMin = hstryMinVal;
+    awdHstryMin = hstryMinVal;
+    awsHstryMin = hstryMinVal;
+    const double DBL_MAX = std::numeric_limits<double>::max();
+
+    // Initialize history buffers with meta data
+    hstryBufList.twdHstry->setMetaData("TWD", "formatCourse", hstryUpdFreq, hstryMinVal, twdHstryMax);
+    hstryBufList.twsHstry->setMetaData("TWS", "formatKnots", hstryUpdFreq, hstryMinVal, twsHstryMax);
+    hstryBufList.awdHstry->setMetaData("AWD", "formatCourse", hstryUpdFreq, hstryMinVal, twdHstryMax);
+    hstryBufList.awsHstry->setMetaData("AWS", "formatKnots", hstryUpdFreq, hstryMinVal, twsHstryMax);
+
+    // create boat values for history data types, if they don't exist yet
+    twdBVal = boatValues->findValueOrCreate(hstryBufList.twdHstry->getName());
+    twsBVal = boatValues->findValueOrCreate(hstryBufList.twsHstry->getName());
+    twaBVal = boatValues->findValueOrCreate("TWA");
+    awdBVal = boatValues->findValueOrCreate(hstryBufList.awdHstry->getName());
+    awsBVal = boatValues->findValueOrCreate(hstryBufList.awsHstry->getName());
+
+    if (!awdBVal->valid) { // AWD usually does not exist
+        awdBVal->setFormat(hstryBufList.awdHstry->getFormat());
+        awdBVal->value = DBL_MAX;
+    }
+
+    // collect boat values for true wind calculation
+    awaBVal = boatValues->findValueOrCreate("AWA");
+    hdtBVal = boatValues->findValueOrCreate("HDT");
+    hdmBVal = boatValues->findValueOrCreate("HDM");
+    varBVal = boatValues->findValueOrCreate("VAR");
+    cogBVal = boatValues->findValueOrCreate("COG");
+    sogBVal = boatValues->findValueOrCreate("SOG");
+}
+
+// Handle history buffers for TWD, TWS, AWD, AWS
+//void HstryBuf::handleHstryBuf(GwApi* api, BoatValueList* boatValues, bool useSimuData) {
+void HstryBuf::handleHstryBuf(bool useSimuData) {
+
+    static int16_t twd = 20; //initial value only relevant if we use simulation data
+    static uint16_t tws = 20; //initial value only relevant if we use simulation data
+    static double awd, aws, hdt = 20; //initial value only relevant if we use simulation data
+    GwApi::BoatValue *calBVal; // temp variable just for data calibration -> we don't want to calibrate the original data here
+
+    LOG_DEBUG(GwLog::DEBUG,"obp60task handleHstryBuf: TWD_isValid? %d, twdBVal: %.1f, twaBVal: %.1f, twsBVal: %.1f", twdBVal->valid, twdBVal->value * RAD_TO_DEG,
+        twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852);
+
+    if (twdBVal->valid) {
+        calBVal = new GwApi::BoatValue("TWD"); // temporary solution for calibration of history buffer values
+        calBVal->setFormat(twdBVal->getFormat());
+        calBVal->value = twdBVal->value;
+        calBVal->valid = twdBVal->valid;
+        calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated
+        twd = static_cast<int16_t>(std::round(calBVal->value * 1000.0));
+        if (twd >= twdHstryMin && twd <= twdHstryMax) {
+            hstryBufList.twdHstry->add(twd);
+        }
+        delete calBVal;
+        calBVal = nullptr;
+    } else if (useSimuData) {
+        twd += random(-20, 20);
+        twd = WindUtils::to360(twd);
+        hstryBufList.twdHstry->add(static_cast<int16_t>(DegToRad(twd) * 1000.0));
+    }
+
+    if (twsBVal->valid) {
+        calBVal = new GwApi::BoatValue("TWS"); // temporary solution for calibration of history buffer values
+        calBVal->setFormat(twsBVal->getFormat());
+        calBVal->value = twsBVal->value;
+        calBVal->valid = twsBVal->valid;
+        calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated
+        tws = static_cast<uint16_t>(std::round(calBVal->value * 1000));
+        if (tws >= twsHstryMin && tws <= twsHstryMax) {
+            hstryBufList.twsHstry->add(tws);
+        }
+        delete calBVal;
+        calBVal = nullptr;
+    } else if (useSimuData) {
+        tws += random(-5000, 5000); // TWS value in m/s; expands to 3 decimals
+        tws = constrain(tws, 0, 25000); // Limit TWS to [0..25] m/s
+        hstryBufList.twsHstry->add(tws);
+    }
+
+    if (awaBVal->valid) {
+        if (hdtBVal->valid) {
+            hdt = hdtBVal->value; // Use HDT if available
+        } else {
+            hdt = WindUtils::calcHDT(&hdmBVal->value, &varBVal->value, &cogBVal->value, &sogBVal->value);
+        }
+
+        awd = awaBVal->value + hdt;
+        awd = WindUtils::to2PI(awd);
+        calBVal = new GwApi::BoatValue("AWD"); // temporary solution for calibration of history buffer values
+        calBVal->value = awd;
+        calBVal->setFormat(awdBVal->getFormat());
+        calBVal->valid = true;
+        calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated
+        awdBVal->value = calBVal->value;
+        awdBVal->valid = true;
+        awd = std::round(calBVal->value * 1000.0);
+        if (awd >= awdHstryMin && awd <= awdHstryMax) {
+            hstryBufList.awdHstry->add(static_cast<int16_t>(awd));
+        }
+        delete calBVal;
+        calBVal = nullptr;
+    } else if (useSimuData) {
+        awd += random(-20, 20);
+        awd = WindUtils::to360(awd);
+        hstryBufList.awdHstry->add(static_cast<int16_t>(DegToRad(awd) * 1000.0));
+    }
+    
+    if (awsBVal->valid) {
+        calBVal = new GwApi::BoatValue("AWS"); // temporary solution for calibration of history buffer values
+        calBVal->setFormat(awsBVal->getFormat());
+        calBVal->value = awsBVal->value;
+        calBVal->valid = awsBVal->valid;
+        calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated
+        aws = std::round(calBVal->value * 1000);
+        if (aws >= awsHstryMin && aws <= awsHstryMax) {
+            hstryBufList.awsHstry->add(static_cast<uint16_t>(aws));
+        }
+        delete calBVal;
+        calBVal = nullptr;
+    } else if (useSimuData) {
+        aws += random(-5000, 5000); // TWS value in m/s; expands to 1 decimal
+        aws = constrain(aws, 0, 25000); // Limit TWS to [0..25] m/s
+        hstryBufList.awsHstry->add(aws);
+    }
+}
+// --- Class HstryBuf ---------------
+
+// --- Class WindUtils --------------
 double WindUtils::to2PI(double a)
 {
    a = fmod(a, 2 * M_PI);
@@ -68,29 +210,25 @@ void WindUtils::calcTwdSA(const double* AWA, const double* AWS,
    double awd = *AWA + *HDT;
    awd = to2PI(awd);
    double stw = -*STW;
-    //    Serial.println("\ncalcTwdSA: AWA: " + String(*AWA) + ", AWS: " + String(*AWS) + ", CTW: " + String(*CTW) + ", STW: " + String(*STW) + ", HDT: " + String(*HDT));
    addPolar(&awd, AWS, CTW, &stw, TWD, TWS);

    // Normalize TWD and TWA to 0-360°
    *TWD = to2PI(*TWD);
    *TWA = toPI(*TWD - *HDT);
-    //    Serial.println("calcTwdSA: TWD: " + String(*TWD) + ", TWS: " + String(*TWS));
 }

 double WindUtils::calcHDT(const double* hdmVal, const double* varVal, const double* cogVal, const double* sogVal)
 {
    double hdt;
    double minSogVal = 0.1; // SOG below this value (m/s) is assumed to be  data noise from GPS sensor
-    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)
+    if (*hdmVal != DBL_MAX) {
+        hdt = *hdmVal + (*varVal != DBL_MAX ? *varVal : 0.0); // Use corrected HDM if HDT is not available (or just HDM if VAR is not available)
        hdt = to2PI(hdt);
-    } else if (*cogVal != DBL_MIN && *sogVal >= minSogVal) {
+    } else if (*cogVal != DBL_MAX && *sogVal >= minSogVal) {
        hdt = *cogVal; // Use COG as fallback if HDT and HDM are not available, and SOG is not data noise
    } else {
-        hdt = DBL_MIN; // Cannot calculate HDT without valid HDM or HDM+VAR or COG
+        hdt = DBL_MAX; // Cannot calculate HDT without valid HDM or HDM+VAR or COG
    }

    return hdt;
@@ -103,37 +241,23 @@ bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal,
    double stw, hdt, ctw;
    double twd, tws, twa;
    double minSogVal = 0.1; // SOG below this value (m/s) is assumed to be  data noise from GPS sensor
-    static const double DBL_MIN = std::numeric_limits<double>::lowest();

-    // 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) {
-            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 {
-            return false; // Cannot calculate without valid HDT or HDM+VAR or COG
-        }
-    } */
-    if (*hdtVal != DBL_MIN) {
+    if (*hdtVal != DBL_MAX) {
        hdt = *hdtVal; // Use HDT if available
    } else {
        hdt = calcHDT(hdmVal, varVal, cogVal, sogVal);
    }

-    if (*cogVal != DBL_MIN && *sogVal >= minSogVal) { // if SOG is data noise, we don't trust COG
+    if (*cogVal != DBL_MAX && *sogVal >= minSogVal) { // if SOG is data noise, we don't trust 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
    }

-    if (*stwVal != DBL_MIN) {
+    if (*stwVal != DBL_MAX) {
        stw = *stwVal; // Use STW if available
-    } else if (*sogVal != DBL_MIN) {
+    } else if (*sogVal != DBL_MAX) {
        stw = *sogVal;
    } else {
        // If STW and SOG are not available, we cannot calculate true wind
@@ -141,7 +265,7 @@ bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal,
    }
    // Serial.println("\ncalcTrueWind: HDT: " + String(hdt) + ", CTW: " + String(ctw) + ", STW: " + String(stw));

-    if ((*awaVal == DBL_MIN) || (*awsVal == DBL_MIN)) {
+    if ((*awaVal == DBL_MAX) || (*awsVal == DBL_MAX)) {
        // Cannot calculate true wind without valid AWA, AWS; other checks are done earlier
        return false;
    } else {
@@ -152,4 +276,47 @@ bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal,

        return true;
    }
-}
+}
+
+// Calculate true wind data and add to obp60task boat data list
+bool WindUtils::addTrueWind(GwApi* api, BoatValueList* boatValues, GwLog* log) {
+
+    GwLog* logger = log;
+
+    double awaVal, awsVal, cogVal, stwVal, sogVal, hdtVal, hdmVal, varVal;
+    double twd, tws, twa;
+    bool isCalculated = false;
+
+    awaVal = awaBVal->valid ? awaBVal->value : DBL_MAX;
+    awsVal = awsBVal->valid ? awsBVal->value : DBL_MAX;
+    cogVal = cogBVal->valid ? cogBVal->value : DBL_MAX;
+    stwVal = stwBVal->valid ? stwBVal->value : DBL_MAX;
+    sogVal = sogBVal->valid ? sogBVal->value : DBL_MAX;
+    hdtVal = hdtBVal->valid ? hdtBVal->value : DBL_MAX;
+    hdmVal = hdmBVal->valid ? hdmBVal->value : DBL_MAX;
+    varVal = varBVal->valid ? varBVal->value : DBL_MAX;
+    LOG_DEBUG(GwLog::DEBUG,"obp60task addTrueWind: AWA %.1f, AWS %.1f, COG %.1f, STW %.1f, SOG %.2f, HDT %.1f, HDM %.1f, VAR %.1f", awaBVal->value * RAD_TO_DEG, awsBVal->value * 3.6 / 1.852,
+            cogBVal->value * RAD_TO_DEG, stwBVal->value * 3.6 / 1.852, sogBVal->value * 3.6 / 1.852, hdtBVal->value * RAD_TO_DEG, hdmBVal->value * RAD_TO_DEG, varBVal->value * RAD_TO_DEG);
+
+    isCalculated = calcTrueWind(&awaVal, &awsVal, &cogVal, &stwVal, &sogVal, &hdtVal, &hdmVal, &varVal, &twd, &tws, &twa);
+
+    if (isCalculated) { // Replace values only, if successfully calculated and not already available
+        if (!twdBVal->valid) {
+            twdBVal->value = twd;
+            twdBVal->valid = true;
+        }
+        if (!twsBVal->valid) {
+            twsBVal->value = tws;
+            twsBVal->valid = true;
+        }
+        if (!twaBVal->valid) {
+            twaBVal->value = twa;
+            twaBVal->valid = true;
+        }
+    }
+    LOG_DEBUG(GwLog::DEBUG,"obp60task addTrueWind: isCalculated %d, TWD %.1f, TWA %.1f, TWS %.1f", isCalculated, twdBVal->value * RAD_TO_DEG,
+        twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852);
+
+    return isCalculated;
+}
+// --- Class WindUtils --------------
--- a/lib/obp60task/OBPDataOperations.h
+++ b/lib/obp60task/OBPDataOperations.h
@@ -1,39 +1,91 @@
 #pragma once
-#include "GwApi.h"
+#include <N2kMessages.h>
 #include "OBPRingBuffer.h"
-// #include <Arduino.h>
+#include "BoatDataCalibration.h"        // Functions lib for data instance calibration
+#include "obp60task.h"
 #include <math.h>

 typedef struct {
    RingBuffer<int16_t>* twdHstry;
-    RingBuffer<int16_t>* twsHstry;
+    RingBuffer<uint16_t>* twsHstry;
    RingBuffer<int16_t>* awdHstry;
-    RingBuffer<int16_t>* awsHstry;
+    RingBuffer<uint16_t>* awsHstry;
 } tBoatHstryData; // Holds pointers to all history buffers for boat data

 class HstryBuf {
+private:
+    GwLog *logger;
+
+    RingBuffer<int16_t> twdHstry; // Circular buffer to store true wind direction values
+    RingBuffer<uint16_t> twsHstry; // Circular buffer to store true wind speed values (TWS)
+    RingBuffer<int16_t> awdHstry; // Circular buffer to store apparant wind direction values
+    RingBuffer<uint16_t> awsHstry; // Circular buffer to store apparant xwind speed values (AWS)
+    int16_t twdHstryMin; // Min value for wind direction (TWD) in history buffer
+    int16_t twdHstryMax; // Max value for wind direction (TWD) in history buffer
+    uint16_t twsHstryMin;
+    uint16_t twsHstryMax;
+    int16_t awdHstryMin;
+    int16_t awdHstryMax;
+    uint16_t awsHstryMin;
+    uint16_t awsHstryMax;
+
+    // boat values for buffers and for true wind calculation
+    GwApi::BoatValue *twdBVal, *twsBVal, *twaBVal, *awdBVal, *awsBVal;
+    GwApi::BoatValue *awaBVal, *hdtBVal, *hdmBVal, *varBVal, *cogBVal, *sogBVal;

 public:
+    tBoatHstryData hstryBufList;

+    HstryBuf(){
+        hstryBufList = {&twdHstry, &twsHstry, &awdHstry, &awsHstry}; // Generate history buffers of zero size
+    };
+    
+    HstryBuf(int size) {
+        hstryBufList = {&twdHstry, &twsHstry, &awdHstry, &awsHstry}; 
+        hstryBufList.twdHstry->resize(size); // store <size> xWD values for <size>/60 minutes history
+        hstryBufList.twsHstry->resize(size);
+        hstryBufList.awdHstry->resize(size);
+        hstryBufList.awsHstry->resize(size);
+    };
+    void init(BoatValueList* boatValues, GwLog *log);
+    void handleHstryBuf(bool useSimuData);
 };

 class WindUtils {
+private:
+    GwApi::BoatValue *twdBVal, *twsBVal, *twaBVal;
+    GwApi::BoatValue *awaBVal, *awsBVal, *cogBVal, *stwBVal, *sogBVal, *hdtBVal, *hdmBVal, *varBVal;
+    static constexpr double DBL_MAX = std::numeric_limits<double>::max();

 public:
+    WindUtils(BoatValueList* boatValues){
+        twdBVal = boatValues->findValueOrCreate("TWD");
+        twsBVal = boatValues->findValueOrCreate("TWS");
+        twaBVal = boatValues->findValueOrCreate("TWA");
+        awaBVal = boatValues->findValueOrCreate("AWA");
+        awsBVal = boatValues->findValueOrCreate("AWS");
+        cogBVal = boatValues->findValueOrCreate("COG");
+        stwBVal = boatValues->findValueOrCreate("STW");
+        sogBVal = boatValues->findValueOrCreate("SOG");
+        hdtBVal = boatValues->findValueOrCreate("HDT");
+        hdmBVal = boatValues->findValueOrCreate("HDM");
+        varBVal = boatValues->findValueOrCreate("VAR");
+    };
    static double to2PI(double a);
    static double toPI(double a);
    static double to360(double a);
    static double to180(double a);
-    static void toCart(const double* phi, const double* r, double* x, double* y);
-    static void toPol(const double* x, const double* y, double* phi, double* r);
-    static void addPolar(const double* phi1, const double* r1,
+    void toCart(const double* phi, const double* r, double* x, double* y);
+    void toPol(const double* x, const double* y, double* phi, double* r);
+    void addPolar(const double* phi1, const double* r1,
        const double* phi2, const double* r2,
        double* phi, double* r);
-    static void calcTwdSA(const double* AWA, const double* AWS,
+    void calcTwdSA(const double* AWA, const double* AWS,
        const double* CTW, const double* STW, const double* HDT,
        double* TWD, double* TWS, double* TWA);
    static double calcHDT(const double* hdmVal, const double* varVal, const double* cogVal, const double* sogVal);
-    static bool calcTrueWind(const double* awaVal, const double* awsVal,
+    bool calcTrueWind(const double* awaVal, const double* awsVal,
        const double* cogVal, const double* stwVal, const double* sogVal, const double* hdtVal,
        const double* hdmVal, const double* varVal, double* twdVal, double* twsVal, double* twaVal);
+    bool addTrueWind(GwApi* api, BoatValueList* boatValues, GwLog *log);
 };
--- a/lib/obp60task/OBPRingBuffer.h
+++ b/lib/obp60task/OBPRingBuffer.h
@@ -1,36 +1,73 @@
 #pragma once
 #include "GwSynchronized.h"
+#include "WString.h"
+#include "esp_heap_caps.h"
 #include <algorithm>
 #include <limits>
 #include <stdexcept>
 #include <vector>
-#include "WString.h"
+
+template <typename T>
+struct PSRAMAllocator {
+    using value_type = T;
+
+    PSRAMAllocator() = default;
+
+    template <class U>
+    constexpr PSRAMAllocator(const PSRAMAllocator<U>&) noexcept { }
+
+    T* allocate(std::size_t n)
+    {
+        void* ptr = heap_caps_malloc(n * sizeof(T), MALLOC_CAP_SPIRAM);
+        if (!ptr) {
+            return nullptr;
+        } else {
+            return static_cast<T*>(ptr);
+        }
+    }
+
+    void deallocate(T* p, std::size_t) noexcept
+    {
+        heap_caps_free(p);
+    }
+};
+
+template <class T, class U>
+bool operator==(const PSRAMAllocator<T>&, const PSRAMAllocator<U>&) { return true; }
+
+template <class T, class U>
+bool operator!=(const PSRAMAllocator<T>&, const PSRAMAllocator<U>&) { return false; }

 template <typename T>
 class RingBuffer {
 private:
-    mutable SemaphoreHandle_t bufLocker;
-    std::vector<T> buffer;
+    //    std::vector<T> buffer; // THE buffer vector
+    std::vector<T, PSRAMAllocator<T>> buffer; // THE buffer vector, allocated in PSRAM
    size_t capacity;
    size_t head; // Points to the next insertion position
    size_t first; // Points to the first (oldest) valid element
    size_t last; // Points to the last (newest) valid element
    size_t count; // Number of valid elements currently in buffer
    bool is_Full; // Indicates that all buffer elements are used and ringing is in use
-    T MIN_VAL; // lowest possible value of buffer
-    T MAX_VAL; // highest possible value of buffer of type <T>
+    T MIN_VAL; // lowest possible value of buffer of type <T>
+    T MAX_VAL; // highest possible value of buffer of type <T> -> indicates invalid value in buffer
+    mutable SemaphoreHandle_t bufLocker;

    // metadata for buffer
    String dataName; // Name of boat data in buffer
    String dataFmt; // Format of boat data in buffer
    int updFreq; // Update frequency in milliseconds
-    T smallest; // Value range of buffer: smallest value
-    T largest; // Value range of buffer: biggest value
+    T smallest; // Value range of buffer: smallest value; needs to be => MIN_VAL
+    T largest; // Value range of buffer: biggest value; needs to be < MAX_VAL, since MAX_VAL indicates invalid entries
+
+    void initCommon();

 public:
+    RingBuffer();
    RingBuffer(size_t size);
    void setMetaData(String name, String format, int updateFrequency, T minValue, T maxValue); // Set meta data for buffer
    bool getMetaData(String& name, String& format, int& updateFrequency, T& minValue, T& maxValue); // Get meta data of buffer
+    bool getMetaData(String& name, String& format);
    String getName() const; // Get buffer name
    String getFormat() const; // Get buffer data format
    void add(const T& value); // Add a new value to  buffer
@@ -51,9 +88,10 @@ public:
    size_t getLastIdx() const; // Get the index of newest value in buffer
    bool isEmpty() const; // Check if buffer is empty
    bool isFull() const; // Check if buffer is full
-    T getMinVal() const; // Get lowest possible value for buffer; used for initialized buffer data
-    T getMaxVal() const; // Get highest possible value for buffer
+    T getMinVal() const; // Get lowest possible value for buffer
+    T getMaxVal() const; // Get highest possible value for buffer; used for unset/invalid buffer data
    void clear(); // Clear buffer
+    void resize(size_t size); // Delete buffer and set new size
    T operator[](size_t index) const; // Operator[] for convenient access (same as get())
    std::vector<T> getAllValues() const; // Get all current values as a vector
 };
--- a/lib/obp60task/OBPRingBuffer.tpp
+++ b/lib/obp60task/OBPRingBuffer.tpp
@@ -1,5 +1,30 @@
 #include "OBPRingBuffer.h"

+template <typename T>
+void RingBuffer<T>::initCommon() {
+    MIN_VAL = std::numeric_limits<T>::lowest();
+    MAX_VAL = std::numeric_limits<T>::max();
+    dataName = "";
+    dataFmt = "";
+    updFreq = -1;
+    smallest = MIN_VAL;
+    largest = MAX_VAL;
+    bufLocker = xSemaphoreCreateMutex();
+}
+
+template <typename T>
+RingBuffer<T>::RingBuffer()
+    : capacity(0)
+    , head(0)
+    , first(0)
+    , last(0)
+    , count(0)
+    , is_Full(false)
+{
+    initCommon();
+    // <buffer> stays empty
+}
+
 template <typename T>
 RingBuffer<T>::RingBuffer(size_t size)
    : capacity(size)
@@ -9,23 +34,10 @@ RingBuffer<T>::RingBuffer(size_t size)
    , count(0)
    , is_Full(false)
 {
-    bufLocker = xSemaphoreCreateMutex();
+    initCommon();

-    if (size == 0) {
-        // return false;
-    }
-
-    MIN_VAL = std::numeric_limits<T>::lowest();
-    MAX_VAL = std::numeric_limits<T>::max();
-    dataName = "";
-    dataFmt = "";
-    updFreq = -1;
-    smallest = MIN_VAL;
-    largest = MAX_VAL;
-
-    buffer.resize(size, MIN_VAL);
-
-    // return true;
+    buffer.reserve(size);
+    buffer.resize(size, MAX_VAL); // MAX_VAL indicate invalid values
 }

 // Specify meta data of buffer content
@@ -57,6 +69,20 @@ bool RingBuffer<T>::getMetaData(String& name, String& format, int& updateFrequen
    return true;
 }

+// Get meta data of buffer content
+template <typename T>
+bool RingBuffer<T>::getMetaData(String& name, String& format)
+{
+    if (dataName == "" || dataFmt == "") {
+        return false; // Meta data not set
+    }
+
+    GWSYNCHRONIZED(&bufLocker);
+    name = dataName;
+    format = dataFmt;
+    return true;
+}
+
 // Get buffer name
 template <typename T>
 String RingBuffer<T>::getName() const
@@ -77,7 +103,7 @@ void RingBuffer<T>::add(const T& value)
 {
    GWSYNCHRONIZED(&bufLocker);
    if (value < smallest || value > largest) {
-        buffer[head] = MIN_VAL; // Store MIN_VAL if value is out of range
+        buffer[head] = MAX_VAL; // Store MAX_VAL if value is out of range
    } else {
        buffer[head] = value;
    }
@@ -101,7 +127,7 @@ T RingBuffer<T>::get(size_t index) const
 {
    GWSYNCHRONIZED(&bufLocker);
    if (isEmpty() || index < 0 || index >= count) {
-        return MIN_VAL;
+        return MAX_VAL;
    }

    size_t realIndex = (first + index) % capacity;
@@ -120,7 +146,7 @@ template <typename T>
 T RingBuffer<T>::getFirst() const
 {
    if (isEmpty()) {
-        return MIN_VAL;
+        return MAX_VAL;
    }
    return get(0);
 }
@@ -130,7 +156,7 @@ template <typename T>
 T RingBuffer<T>::getLast() const
 {
    if (isEmpty()) {
-        return MIN_VAL;
+        return MAX_VAL;
    }
    return get(count - 1);
 }
@@ -140,14 +166,14 @@ template <typename T>
 T RingBuffer<T>::getMin() const
 {
    if (isEmpty()) {
-        return MIN_VAL;
+        return MAX_VAL;
    }

    T minVal = MAX_VAL;
    T value;
    for (size_t i = 0; i < count; i++) {
        value = get(i);
-        if (value < minVal && value != MIN_VAL) {
+        if (value < minVal && value != MAX_VAL) {
            minVal = value;
        }
    }
@@ -159,7 +185,7 @@ template <typename T>
 T RingBuffer<T>::getMin(size_t amount) const
 {
    if (isEmpty() || amount <= 0) {
-        return MIN_VAL;
+        return MAX_VAL;
    }
    if (amount > count)
        amount = count;
@@ -168,7 +194,7 @@ T RingBuffer<T>::getMin(size_t amount) const
    T value;
    for (size_t i = 0; i < amount; i++) {
        value = get(count - 1 - i);
-        if (value < minVal && value != MIN_VAL) {
+        if (value < minVal && value != MAX_VAL) {
            minVal = value;
        }
    }
@@ -180,14 +206,14 @@ template <typename T>
 T RingBuffer<T>::getMax() const
 {
    if (isEmpty()) {
-        return MIN_VAL;
+        return MAX_VAL;
    }

    T maxVal = MIN_VAL;
    T value;
    for (size_t i = 0; i < count; i++) {
        value = get(i);
-        if (value > maxVal && value != MIN_VAL) {
+        if (value > maxVal && value != MAX_VAL) {
            maxVal = value;
        }
    }
@@ -199,7 +225,7 @@ template <typename T>
 T RingBuffer<T>::getMax(size_t amount) const
 {
    if (isEmpty() || amount <= 0) {
-        return MIN_VAL;
+        return MAX_VAL;
    }
    if (amount > count)
        amount = count;
@@ -208,7 +234,7 @@ T RingBuffer<T>::getMax(size_t amount) const
    T value;
    for (size_t i = 0; i < amount; i++) {
        value = get(count - 1 - i);
-        if (value > maxVal && value != MIN_VAL) {
+        if (value > maxVal && value != MAX_VAL) {
            maxVal = value;
        }
    }
@@ -220,7 +246,7 @@ template <typename T>
 T RingBuffer<T>::getMid() const
 {
    if (isEmpty()) {
-        return MIN_VAL;
+        return MAX_VAL;
    }

    return (getMin() + getMax()) / static_cast<T>(2);
@@ -231,7 +257,7 @@ template <typename T>
 T RingBuffer<T>::getMid(size_t amount) const
 {
    if (isEmpty() || amount <= 0) {
-        return MIN_VAL;
+        return MAX_VAL;
    }

    if (amount > count)
@@ -245,7 +271,7 @@ template <typename T>
 T RingBuffer<T>::getMedian() const
 {
    if (isEmpty()) {
-        return MIN_VAL;
+        return MAX_VAL;
    }

    // Create a temporary vector with current valid elements
@@ -274,7 +300,7 @@ template <typename T>
 T RingBuffer<T>::getMedian(size_t amount) const
 {
    if (isEmpty() || amount <= 0) {
-        return MIN_VAL;
+        return MAX_VAL;
    }
    if (amount > count)
        amount = count;
@@ -342,14 +368,14 @@ bool RingBuffer<T>::isFull() const
    return is_Full;
 }

-// Get lowest possible value for buffer; used for non-set buffer data
+// Get lowest possible value for buffer
 template <typename T>
 T RingBuffer<T>::getMinVal() const
 {
    return MIN_VAL;
 }

-// Get highest possible value for buffer
+// Get highest possible value for buffer; used for unset/invalid buffer data
 template <typename T>
 T RingBuffer<T>::getMaxVal() const
 {
@@ -368,6 +394,23 @@ void RingBuffer<T>::clear()
    is_Full = false;
 }

+// Delete buffer and set new size
+template <typename T>
+void RingBuffer<T>::resize(size_t newSize)
+{
+    GWSYNCHRONIZED(&bufLocker);
+    capacity = newSize;
+    head = 0;
+    first = 0;
+    last = 0;
+    count = 0;
+    is_Full = false;
+
+    buffer.clear();
+    buffer.reserve(newSize);
+    buffer.resize(newSize, MAX_VAL);
+}
+
 // Get all current values as a vector
 template <typename T>
 std::vector<T> RingBuffer<T>::getAllValues() const
--- a/lib/obp60task/PageSkyView.cpp
+++ b/lib/obp60task/PageSkyView.cpp
@@ -0,0 +1,204 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+
+#include <vector>
+#include <algorithm> // for vector sorting
+
+/*
+ * SkyView / Satellites
+ */
+
+class PageSkyView : public Page
+{
+private:
+    String flashLED;
+    GwBoatData *bd;
+
+public:
+    PageSkyView(CommonData &common)
+    {
+        commonData = &common;
+
+        // task name access is for example purpose only
+        TaskHandle_t currentTaskHandle = xTaskGetCurrentTaskHandle();
+        const char* taskName = pcTaskGetName(currentTaskHandle);
+        common.logger->logDebug(GwLog::LOG, "Instantiate PageSkyView in task '%s'", taskName);
+
+        flashLED = common.config->getString(common.config->flashLED);
+    }
+
+    int handleKey(int key) {
+        // return 0 to mark the key handled completely
+        // return the key to allow further action
+        if (key == 11) {
+            commonData->keylock = !commonData->keylock;
+            return 0;
+        }
+        return key;
+    }
+
+    void displayNew(PageData &pageData) {
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+        bd = pageData.api->getBoatData();
+    };
+
+    // Comparator function to sort by SNR
+    static bool compareBySNR(const GwSatInfo& a, const GwSatInfo& b) {
+       return a.SNR > b.SNR; // Sort in descending order
+    }
+
+    int displayPage(PageData &pageData) {
+        GwLog *logger = commonData->logger;
+
+        std::vector<GwSatInfo> sats;
+        int nSat = bd->SatInfo->getNumSats();
+
+        logger->logDebug(GwLog::LOG, "Drawing at PageSkyView, %d satellites", nSat);
+
+        for (int i = 0; i < nSat; i++) {
+            sats.push_back(*bd->SatInfo->getAt(i));
+        }
+        std::sort(sats.begin(), sats.end(), compareBySNR);
+
+        // Draw page
+        //***********************************************************
+
+        // Set display in partial refresh mode
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+
+        // current position
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+
+        // sky view
+        Point c = {130, 148};
+        uint16_t r = 120;
+        uint16_t r1 = r / 2;
+
+        getdisplay().fillCircle(c.x, c.y, r + 2, commonData->fgcolor);
+        getdisplay().fillCircle(c.x, c.y, r - 1, commonData->bgcolor);
+        getdisplay().drawCircle(c.x, c.y, r1, commonData->fgcolor);
+
+        // separation lines
+        getdisplay().drawLine(c.x - r, c.y, c.x + r, c.y, commonData->fgcolor);
+        getdisplay().drawLine(c.x, c.y - r, c.x, c.y + r, commonData->fgcolor);
+        Point p = {c.x, c.y - r};
+        Point p1, p2;
+        p1 = rotatePoint(c, p, 45);
+        p2 = rotatePoint(c, p, 45 + 180);
+        getdisplay().drawLine(p1.x, p1.y, p2.x, p2.y,  commonData->fgcolor);
+        p1 = rotatePoint(c, p, -45);
+        p2 = rotatePoint(c, p, -45 + 180);
+        getdisplay().drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
+
+        // directions 
+
+        int16_t x1, y1;
+        uint16_t w, h;
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+
+		getdisplay().getTextBounds("N", 0, 150, &x1, &y1, &w, &h);
+        getdisplay().setCursor(c.x - w / 2, c.y - r + h + 3);
+        getdisplay().print("N");
+
+		getdisplay().getTextBounds("S", 0, 150, &x1, &y1, &w, &h);
+        getdisplay().setCursor(c.x - w / 2, c.y + r - 3);
+        getdisplay().print("S");
+
+		getdisplay().getTextBounds("E", 0, 150, &x1, &y1, &w, &h);
+        getdisplay().setCursor(c.x + r - w - 3, c.y + h / 2);
+        getdisplay().print("E");
+        
+		getdisplay().getTextBounds("W", 0, 150, &x1, &y1, &w, &h);
+        getdisplay().setCursor(c.x - r + 3 , c.y + h / 2);
+        getdisplay().print("W");
+
+        // show satellites in "map"
+        getdisplay().setFont(&IBM8x8px);
+        for (int i = 0; i < nSat; i++) {
+            float arad = (sats[i].Azimut * M_PI / 180.0) + M_PI;
+            float erad = sats[i].Elevation * M_PI / 180.0;
+            uint16_t x = c.x + sin(arad) * erad * r1;
+            uint16_t y = c.y + cos(arad) * erad * r1;
+            getdisplay().fillRect(x-4, y-4, 8, 8, commonData->fgcolor);
+            getdisplay().setCursor(x-7, y+12);
+            getdisplay().printf("%02d", static_cast<int>(sats[i].PRN));
+        }
+
+        // Signal / Noise bars
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setCursor(325, 34);
+        getdisplay().print("SNR");
+//        getdisplay().drawRect(270, 20, 125, 257, commonData->fgcolor);
+        int maxsat = std::min(nSat, 12);
+        for (int i = 0; i < maxsat; i++) {
+            uint16_t y = 29 + (i + 1) * 20;
+            getdisplay().setCursor(276, y);
+            char buffer[3];
+            snprintf(buffer, 3, "%02d", static_cast<int>(sats[i].PRN));
+            getdisplay().print(String(buffer));
+            getdisplay().drawRect(305, y-12, 85, 14, commonData->fgcolor);
+            getdisplay().setCursor(315, y);
+            // TODO SNR as number or as bar via mode key?
+            if (sats[i].SNR <= 100) {
+                // getdisplay().print(sats[i].SNR);
+                getdisplay().fillRect(307, y-10, int(81 * sats[i].SNR / 100.0), 10, commonData->fgcolor);
+            } else {
+                getdisplay().print("n/a");
+            }
+        }
+
+        // Show SatInfo and HDOP
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+
+        getdisplay().setCursor(220, 34);
+        getdisplay().print("Sat:");
+
+        GwApi::BoatValue *bv_satinfo = pageData.values[0]; // SatInfo
+        String sval_satinfo = formatValue(bv_satinfo, *commonData).svalue;
+        getdisplay().setCursor(220, 49);
+        getdisplay().print(sval_satinfo);
+        
+        getdisplay().setCursor(220, 254);
+        getdisplay().print("HDOP:");
+
+        GwApi::BoatValue *bv_hdop = pageData.values[1]; // HDOP
+        double hdop = formatValue(bv_hdop, *commonData).value * 4; // 4 is factor for UERE (translation in meter)
+        char sval_hdop[20];
+        dtostrf(hdop, 0, 1, sval_hdop);  // Only one prefix
+        strcat(sval_hdop, "m");
+        getdisplay().setCursor(220, 269);
+        getdisplay().print(sval_hdop);
+
+        return PAGE_UPDATE;
+    };
+};
+
+static Page* createPage(CommonData &common){
+    return new PageSkyView(common);
+}
+
+/**
+ * with the code below we make this page known to the PageTask
+ * we give it a type (name) that can be selected in the config
+ * we define which function is to be called
+ * and we provide the number of user parameters we expect
+ * this will be number of BoatValue pointers in pageData.values
+ */
+PageDescription registerPageSkyView(
+    "SkyView",              // Page name
+    createPage,             // Action
+    0,                      // Number of bus values depends on selection in Web configuration
+    {"SatInfo", "HDOP"},    // Bus values we need in the page
+    true                    // Show display header on/off
+);
+
+#endif
--- a/lib/obp60task/PageWind.cpp
+++ b/lib/obp60task/PageWind.cpp
@@ -247,8 +247,8 @@ public:
        if(key == 1){               // Mode switch
            if(mode == 'N'){
                mode = 'L';
-            } else if (mode == 'L') {
-                mode = 'X';
+        //    } else if (mode == 'L') {
+        //        mode = 'X';
            } else {
                mode = 'N';
            }
--- a/lib/obp60task/PageWindPlot.cpp
+++ b/lib/obp60task/PageWindPlot.cpp
@@ -1,9 +1,10 @@
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

-#include "BoatDataCalibration.h"
+#include "Pagedata.h"
 #include "OBP60Extensions.h"
 #include "OBPRingBuffer.h"
-#include "Pagedata.h"
+#include "OBPDataOperations.h"
+#include "BoatDataCalibration.h"
 #include <vector>

 static const double radToDeg = 180.0 / M_PI; // Conversion factor from radians to degrees
@@ -11,7 +12,7 @@ static const double radToDeg = 180.0 / M_PI; // Conversion factor from radians t
 // 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();
+    const int MAX_VAL = windDirHstry.getMaxVal();
    size_t count = windDirHstry.getCurrentSize();

    if (windDirHstry.isEmpty() || amount <= 0) {
@@ -20,11 +21,11 @@ int getCntr(const RingBuffer<int16_t>& windDirHstry, size_t amount)
    if (amount > count)
        amount = count;

-    int16_t midWndDir, minWndDir, maxWndDir = 0;
+    uint16_t midWndDir, minWndDir, maxWndDir = 0;
    int wndCenter = 0;

    midWndDir = windDirHstry.getMid(amount);
-    if (midWndDir != INT16_MIN) {
+    if (midWndDir != MAX_VAL) {
        midWndDir = midWndDir / 1000.0 * radToDeg;
        wndCenter = int((midWndDir + (midWndDir >= 0 ? 5 : -5)) / 10) * 10; // Set new center value; round to nearest 10 degree value
        minWndDir = windDirHstry.getMin(amount) / 1000.0 * radToDeg;
@@ -41,10 +42,11 @@ int getCntr(const RingBuffer<int16_t>& windDirHstry, size_t amount)
 int getRng(const RingBuffer<int16_t>& windDirHstry, int center, size_t amount)
 {
    int minVal = windDirHstry.getMinVal();
+    const int MAX_VAL = windDirHstry.getMaxVal();
    size_t count = windDirHstry.getCurrentSize();

    if (windDirHstry.isEmpty() || amount <= 0) {
-        return minVal;
+        return MAX_VAL;
    }
    if (amount > count)
        amount = count;
@@ -56,8 +58,8 @@ int getRng(const RingBuffer<int16_t>& windDirHstry, int center, size_t amount)
    for (size_t i = 0; i < amount; i++) {
        value = windDirHstry.get(count - 1 - i);

-        if (value == minVal) {
-            continue;
+        if (value == MAX_VAL) {
+            continue;  // ignore invalid values
        }

        value = value / 1000.0 * radToDeg;
@@ -69,7 +71,7 @@ int getRng(const RingBuffer<int16_t>& windDirHstry, int center, size_t amount)
        maxRng = 180;
    }

-    return maxRng;
+    return (maxRng != minVal ? maxRng : MAX_VAL);
 }

 // ****************************************************************
@@ -78,8 +80,10 @@ class PageWindPlot : public Page {
    bool keylock = false; // Keylock
    char chrtMode = 'D'; // Chart mode: 'D' for TWD, 'S' for TWS, 'B' for both
    bool showTruW = true; // Show true wind or apparant wind in chart area
+    bool oldShowTruW = false; // remember recent user selection of wind data type
+
    int dataIntv = 1; // Update interval for wind history chart:
-                      // (1)|(2)|(3)|(4) seconds for approx. 4, 8, 12, 16 min. history chart
+                      // (1)|(2)|(3)|(4)|(8) x 240 seconds for 4, 8, 12, 16, 32 min. history chart
    bool useSimuData;
    String flashLED;
    String backlightMode;
@@ -101,7 +105,7 @@ public:
    virtual void setupKeys()
    {
        Page::setupKeys();
-        //        commonData->keydata[0].label = "MODE";
+        // commonData->keydata[0].label = "MODE";
 #if defined BOARD_OBP60S3
        commonData->keydata[1].label = "SRC";
        commonData->keydata[4].label = "INTV";
@@ -143,6 +147,8 @@ public:
                dataIntv = 3;
            } else if (dataIntv == 3) {
                dataIntv = 4;
+            } else if (dataIntv == 4) {
+                dataIntv = 8;
            } else {
                dataIntv = 1;
            }
@@ -169,34 +175,27 @@ public:
        }
        commonData->logger->logDebug(GwLog::LOG,"New PageWindPlot: wind source=%s", wndSrc);
 #endif
+        oldShowTruW = !showTruW; // makes wind source being initialized at initial page call
    }

-
-
    int displayPage(PageData& pageData)
    {
        GwConfigHandler* config = commonData->config;
        GwLog* logger = commonData->logger;

        static RingBuffer<int16_t>* wdHstry; // Wind direction data buffer
-        static RingBuffer<int16_t>* wsHstry; // Wind speed data buffer
+        static RingBuffer<uint16_t>* wsHstry; // Wind speed data buffer
        static String wdName, wdFormat; // Wind direction name and format
        static String wsName, wsFormat; // Wind speed name and format
-        static int updFreq; // Update frequency for wind direction
-        static int16_t wdLowest, wdHighest; // Wind direction range
+        static int16_t wdMAX_VAL; // Max. value of wd history buffer, indicating invalid values
        float wsValue; // Wind speed value in chart area
        String wsUnit; // Wind speed unit in chart area
        static GwApi::BoatValue* wsBVal = new GwApi::BoatValue("TWS"); // temp BoatValue for wind speed unit identification; required by OBP60Formater

-        // current boat data values; TWD/AWD only for validation test, TWS/AWS for display of current value
-        const int numBoatData = 4;
+        // current boat data values; TWD/AWD only for validation test
+        const int numBoatData = 2;
        GwApi::BoatValue* bvalue;
-        String BDataName[numBoatData];
-        double BDataValue[numBoatData];
        bool BDataValid[numBoatData];
-        String BDataText[numBoatData];
-        String BDataUnit[numBoatData];
-        String BDataFormat[numBoatData];

        static bool isInitialized = false; // Flag to indicate that page is initialized
        static bool wndDataValid = false; // Flag to indicate if wind data is valid
@@ -207,7 +206,7 @@ public:
        static int xCenter; // Center of screen in x direction
        static const int yOffset = 48; // Offset for y coordinates of chart area
        static int cHeight; // height of chart area
-        static int bufSize; // History buffer size: 960 values for appox. 16 min. history chart
+        static int bufSize; // History buffer size: 1.920 values for 32 min. history chart
        static int intvBufSize; // Buffer size used for currently selected time interval
        int count; // current size of buffer
        static int numWndVals; // number of wind values available for current interval selection
@@ -217,7 +216,6 @@ 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
@@ -234,13 +232,8 @@ public:
        static int chrtPrevVal; // Last wind value in chart area for check if value crosses 180 degree line

        LOG_DEBUG(GwLog::LOG, "Display PageWindPlot");
+        ulong timer = millis();

-/*        // Get config data
-        bool useSimuData = config->getBool(config->useSimuData);
-        // holdValues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-*/
        if (!isInitialized) {
            width = getdisplay().width();
            height = getdisplay().height();
@@ -249,18 +242,9 @@ public:
            numNoData = 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 = wdHstry->getLastIdx();
-            wndCenter = INT_MIN;
+            wndCenter = INT_MAX;
            midWndDir = 0;
            diffRng = dfltRng;
            chrtRng = dfltRng;
@@ -271,14 +255,7 @@ public:
        // read boat data values; TWD only for validation test, TWS for display of current value
        for (int i = 0; i < numBoatData; i++) {
            bvalue = pageData.values[i];
-            BDataName[i] = xdrDelete(bvalue->getName());
-            BDataName[i] = BDataName[i].substring(0, 6); // String length limit for value name
-            calibrationData.calibrateInstance(bvalue, logger); // Check if boat data value is to be calibrated
-            BDataValue[i] = bvalue->value; // Value as double in SI unit
            BDataValid[i] = bvalue->valid;
-            BDataText[i] = formatValue(bvalue, *commonData).svalue; // Formatted value as string including unit conversion and switching decimal places
-            BDataUnit[i] = formatValue(bvalue, *commonData).unit;
-            BDataFormat[i] = bvalue->getFormat(); // Unit of value
        }

        // Optical warning by limit violation (unused)
@@ -289,16 +266,18 @@ public:

        if (showTruW != oldShowTruW) {
            if (showTruW) {
-                wdHstry = pageData.boatHstry.twdHstry;
-                wsHstry = pageData.boatHstry.twsHstry;
+                wdHstry = pageData.boatHstry->hstryBufList.twdHstry;
+                wsHstry = pageData.boatHstry->hstryBufList.twsHstry;
            } else {
-                wdHstry = pageData.boatHstry.awdHstry;
-                wsHstry = pageData.boatHstry.awsHstry;
+                wdHstry = pageData.boatHstry->hstryBufList.awdHstry;
+                wsHstry = pageData.boatHstry->hstryBufList.awsHstry;
            }
-            wdHstry->getMetaData(wdName, wdFormat, updFreq, wdLowest, wdHighest);
-            wsHstry->getMetaData(wsName, wsFormat, updFreq, wdLowest, wdHighest);
+            wdHstry->getMetaData(wdName, wdFormat);
+            wsHstry->getMetaData(wsName, wsFormat);
+            wdMAX_VAL = wdHstry->getMaxVal();
            bufSize = wdHstry->getCapacity();
            wsBVal->setFormat(wsHstry->getFormat());
+            lastAddedIdx = wdHstry->getLastIdx();

            oldShowTruW = showTruW;
        }
@@ -308,7 +287,7 @@ public:
        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
+            // new data interval selected by user; this is only x * 230 values instead of 240 seconds (4 minutes) per interval step
            intvBufSize = cHeight * dataIntv;
            numWndVals = min(count, (cHeight - 60) * dataIntv);
            bufStart = max(0, count - numWndVals);
@@ -321,19 +300,20 @@ public:
                bufStart = max(0, bufStart - numAddedBufVals);
            }
        }
-        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, wdHstry->getLast() / 1000.0 * radToDeg, wsHstry->getLast() / 10.0 * 1.94384, BDataValid[0], intvBufSize, numWndVals, bufStart, numAddedBufVals, wdHstry->getLastIdx(),
+        // LOG_DEBUG(GwLog::DEBUG,"PSRAM Size: %d kByte; free: %d Byte", ESP.getPsramSize()/1024, ESP.getFreePsram());
+        LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Dataset: count: %d, xWD: %.1f, xWS: %.2f, xWD_valid? %d, intvBufSize: %d, numWndVals: %d, bufStart: %d, numAddedBufVals: %d, lastIdx: %d, wind source: %s",
+            count, wdHstry->getLast() / 1000.0 * radToDeg, wsHstry->getLast() / 1000.0 * 1.94384, BDataValid[0], intvBufSize, numWndVals, bufStart, numAddedBufVals, wdHstry->getLastIdx(),
            showTruW ? "True" : "App");

        // Set wndCenter from 1st real buffer value
-        if (wndCenter == INT_MIN || (wndCenter == 0 && count == 1)) {
+        if (wndCenter == INT_MAX || (wndCenter == 0 && count == 1)) {
            wndCenter = getCntr(*wdHstry, numWndVals);
-            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,
+            LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Range Init: count: %d, xWD: %.1f, wndCenter: %d, diffRng: %d, chrtRng: %d, Min: %.0f, Max: %.0f", count, wdHstry->getLast() / 1000.0 * radToDeg,
                wndCenter, diffRng, chrtRng, wdHstry->getMin(numWndVals) / 1000.0 * radToDeg, wdHstry->getMax(numWndVals) / 1000.0 * radToDeg);
        } else {
            // check and adjust range between left, center, and right chart limit
            diffRng = getRng(*wdHstry, wndCenter, numWndVals);
-            diffRng = (diffRng == INT16_MIN ? 0 : diffRng);
+            diffRng = (diffRng == wdMAX_VAL ? 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
@@ -365,7 +345,6 @@ 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(wdName); // Wind data name
        snprintf(sWndLbl, 4, "%03d", (wndCenter < 0) ? (wndCenter + 360) : wndCenter);
        drawTextCenter(xCenter, yOffset - 11, sWndLbl);
@@ -382,11 +361,11 @@ public:
        getdisplay().drawCircle(width - 5, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
        getdisplay().drawCircle(width - 5, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol

-        if (wdHstry->getMax() == wdHstry->getMinVal()) {
-            // only <INT16_MIN> values in buffer -> no valid wind data available
+        if (wdHstry->getMax() == wdMAX_VAL) {
+            // only <MAX_VAL> values in buffer -> no valid wind data available
            wndDataValid = false;
        } else if (!BDataValid[0] && !useSimuData) {
-            // currently no valid TWD data available and no simulation mode
+            // currently no valid xWD data available and no simulation mode
            numNoData++;
            wndDataValid = true;
            if (numNoData > 3) {
@@ -402,8 +381,8 @@ public:
        if (wndDataValid) {
            for (int i = 0; i < (numWndVals / dataIntv); i++) {
                chrtVal = static_cast<int>(wdHstry->get(bufStart + (i * dataIntv))); // show the latest wind values in buffer; keep 1st value constant in a rolling buffer
-                if (chrtVal == INT16_MIN) {
-                    chrtPrevVal = INT16_MIN;
+                if (chrtVal == wdMAX_VAL) {
+                    chrtPrevVal = wdMAX_VAL;
                } else {
                    chrtVal = static_cast<int>((chrtVal / 1000.0 * radToDeg) + 0.5); // Convert to degrees and round
                    x = ((chrtVal - wndLeft + 360) % 360) * chrtScl;
@@ -412,7 +391,7 @@ public:
                    if (i >= (numWndVals / dataIntv) - 1) // log chart data of 1 line (adjust for test purposes)
                        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)) {
+                    if ((i == 0) || (chrtPrevVal == wdMAX_VAL)) {
                        // just a dot for 1st chart point or after some invalid values
                        prevX = x;
                        prevY = y;
@@ -473,22 +452,24 @@ 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());
+            wsBVal->value = wsValue / 1000.0; // temp variable to retreive data unit from OBP60Formater
+            wsBVal->valid = (static_cast<uint16_t>(wsValue) != wsHstry->getMinVal());
+            String swsValue = formatValue(wsBVal, *commonData).svalue; // value (string)
            wsUnit = formatValue(wsBVal, *commonData).unit; // Unit of value
            getdisplay().fillRect(xPosTws - 4, yPosTws - 38, 142, 44, commonData->bgcolor); // Clear area for TWS value
            getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
            getdisplay().setCursor(xPosTws, yPosTws);
-            if (!wsBVal->valid) {
+            getdisplay().print(swsValue); // Value
+/*            if (!wsBVal->valid) {
                getdisplay().print("--.-");
            } else {
-                wsValue = wsValue / 10.0 * 1.94384; // Wind speed value in knots
+                wsValue = wsValue / 1000.0 * 1.94384; // Wind speed value in knots
                if (wsValue < 10.0) {
                    getdisplay().printf("!%3.1f", wsValue); // Value, round to 1 decimal
                } else {
                    getdisplay().printf("%4.1f", wsValue); // Value, round to 1 decimal
                }
-            }
+            } */
            getdisplay().setFont(&Ubuntu_Bold12pt8b);
            getdisplay().setCursor(xPosTws + 82, yPosTws - 14);
            getdisplay().print(wsName); // Name
@@ -523,6 +504,7 @@ public:
            getdisplay().printf("%3d", chrtLbl); // Wind value label
        }

+        LOG_DEBUG(GwLog::DEBUG, "PageWindPlot time: %ld", millis() - timer);
        return PAGE_UPDATE;
    };
 };
@@ -541,7 +523,7 @@ PageDescription registerPageWindPlot(
    "WindPlot", // Page name
    createPage, // Action
    0, // Number of bus values depends on selection in Web configuration
-    { "TWD", "TWS", "AWD", "AWS" }, // Bus values we need in the page
+    { "TWD", "AWD" }, // Bus values we need in the page
    true // Show display header on/off
 );

--- a/lib/obp60task/PageWindRoseFlex.cpp
+++ b/lib/obp60task/PageWindRoseFlex.cpp
@@ -58,6 +58,11 @@ public:
        static String unit5old = "";
        static String svalue6old = "";
        static String unit6old = "";
+        static GFXfont name3font;
+        static GFXfont name4font;
+        static GFXfont name5font;
+        static GFXfont name6font;
+

        // Get config data
        String lengthformat = config->getString(config->lengthFormat);
@@ -114,6 +119,12 @@ public:
        GwApi::BoatValue *bvalue3 = pageData.values[0]; 
        String name3 = xdrDelete(bvalue3->getName());   // Value name
        name3 = name3.substring(0, 6);                  // String length limit for value name
+        if (name3.length()>3){
+            name3font=Ubuntu_Bold8pt8b;
+        }
+        else{
+            name3font=Ubuntu_Bold12pt8b;
+        }
        calibrationData.calibrateInstance(bvalue3, logger); // Check if boat data value is to be calibrated
        double value3 = bvalue3->value;                 // Value as double in SI unit
        bool valid3 = bvalue3->valid;                   // Valid information 
@@ -128,6 +139,12 @@ public:
        GwApi::BoatValue *bvalue4 = pageData.values[1]; 
        String name4 = xdrDelete(bvalue4->getName());      // Value name
        name4 = name4.substring(0, 6);                  // String length limit for value name
+        if (name4.length()>3){
+            name4font=Ubuntu_Bold8pt8b;
+        }
+        else{
+            name4font=Ubuntu_Bold12pt8b;
+        }
        calibrationData.calibrateInstance(bvalue4, logger); // Check if boat data value is to be calibrated
        double value4 = bvalue4->value;                 // Value as double in SI unit
        bool valid4 = bvalue4->valid;                   // Valid information 
@@ -142,6 +159,12 @@ public:
        GwApi::BoatValue *bvalue5 = pageData.values[2]; 
        String name5 = xdrDelete(bvalue5->getName());      // Value name
        name5 = name5.substring(0, 6);                  // String length limit for value name
+        if (name5.length()>3){
+            name5font=Ubuntu_Bold8pt8b;
+        }
+        else{
+            name5font=Ubuntu_Bold12pt8b;
+        }
        calibrationData.calibrateInstance(bvalue5, logger); // Check if boat data value is to be calibrated
        double value5 = bvalue5->value;                 // Value as double in SI unit
        bool valid5 = bvalue5->valid;                   // Valid information 
@@ -152,10 +175,16 @@ public:
            unit5old = unit5;                           // Save old unit
        }

-        // Get boat value for center
+        // Get boat value for center (name is not displayed)
        GwApi::BoatValue *bvalue6 = pageData.values[3]; 
        String name6 = xdrDelete(bvalue6->getName());      // Value name
        name6 = name6.substring(0, 6);                  // String length limit for value name
+        if (name6.length()>3){
+            name6font=Ubuntu_Bold8pt8b;
+        }
+        else{
+            name6font=Ubuntu_Bold8pt8b;
+        }
        calibrationData.calibrateInstance(bvalue6, logger); // Check if boat data value is to be calibrated
        double value6 = bvalue6->value;                 // Value as double in SI unit
        bool valid6 = bvalue6->valid;                   // Valid information 
@@ -209,7 +238,7 @@ public:
        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
        getdisplay().setCursor(10, 270);
        getdisplay().print(svalue3);                     // Value
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&name3font);
        getdisplay().setCursor(10, 220);
        getdisplay().print(name3);                       // Name
        getdisplay().setFont(&Ubuntu_Bold8pt8b);
@@ -224,18 +253,13 @@ public:

        // Show value 4 (=second user-configured parameter) at top right
        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(295, 65);
-        if(valid3 == true){
-            getdisplay().print(svalue4);     // Value
-        }
-        else{
-            getdisplay().print("---");                   // Value
-        }
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 95);
+        getdisplay().setCursor(295, 65); 
+        getdisplay().print(svalue4);     // Value
+        getdisplay().setFont(&name4font);
+        getdisplay().setCursor(325, 95);
        getdisplay().print(name4);                       // Name
        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 115);
+        getdisplay().setCursor(325, 115);
        getdisplay().print(" ");
        if(holdvalues == false){
            getdisplay().print(unit4);                   // Unit
@@ -251,11 +275,11 @@ public:
        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
        getdisplay().setCursor(295, 270);
        getdisplay().print(svalue5);                     // Value
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 220);
+        getdisplay().setFont(&name5font);
+        getdisplay().setCursor(325, 220);
        getdisplay().print(name5);                       // Name
        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 190);
+        getdisplay().setCursor(325, 190);
        getdisplay().print(" ");
        if(holdvalues == false){
            getdisplay().print(unit5);                   // Unit
@@ -364,6 +388,7 @@ public:

 	// Show value6 (=fourth user-configured parameter) and ssource, so that they do not collide with the wind pointer
 if ( cos(value1) > 0){ 
+    //pointer points upwards 
    getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
    getdisplay().setCursor(160, 200);
    getdisplay().print(svalue6);                     // Value
@@ -385,6 +410,7 @@ if ( cos(value1) > 0){
    getdisplay().print(ssource);		// true or app.
 }
 else{ 
+    // pointer points downwards
    getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
    getdisplay().setCursor(160, 130);
    getdisplay().print(svalue6);                     // Value
@@ -398,10 +424,10 @@ else{
        getdisplay().print(unit6old);                // Unit
    }
    if (sin(value1)>0){
-	    getdisplay().setCursor(160, 130);
+	    getdisplay().setCursor(160, 200);
    }
    else{
-	    getdisplay().setCursor(220, 130);
+	    getdisplay().setCursor(220, 200);
    }
    getdisplay().print(ssource);		//true or app. 
 }
--- a/lib/obp60task/Pagedata.h
+++ b/lib/obp60task/Pagedata.h
@@ -4,7 +4,6 @@
 #include <functional>
 #include <vector>
 #include "LedSpiTask.h"
-#include "OBPRingBuffer.h"
 #include "OBPDataOperations.h"

 #define MAX_PAGE_NUMBER 10    // Max number of pages for show data
@@ -12,11 +11,12 @@
 typedef std::vector<GwApi::BoatValue *> ValueList;

 typedef struct{
+  GwApi *api;
  String pageName;
  uint8_t pageNumber; // page number in sequence of visible pages
  //the values will always contain the user defined values first
  ValueList values;
-  tBoatHstryData boatHstry;
+  HstryBuf* boatHstry;
 } PageData;

 // Sensor data structure (only for extended sensors, not for NMEA bus sensors)
@@ -99,20 +99,20 @@ typedef struct{
 } AlarmData;

 typedef struct{
-  GwApi::Status status;
-  GwLog *logger=NULL;
-  GwConfigHandler *config=NULL;
-  SensorData data;
-  SunData sundata;
-  TouchKeyData keydata[6];
-  BacklightData backlight;
-  AlarmData alarm;
-  GwApi::BoatValue *time=NULL;
-  GwApi::BoatValue *date=NULL;
-  uint16_t fgcolor;
-  uint16_t bgcolor;
-  bool keylock = false;
-  String powermode;
+    GwApi::Status status;
+    GwLog *logger = nullptr;
+    GwConfigHandler *config = nullptr;
+    SensorData data;
+    SunData sundata;
+    TouchKeyData keydata[6];
+    BacklightData backlight;
+    AlarmData alarm;
+    GwApi::BoatValue *time = nullptr;
+    GwApi::BoatValue *date = nullptr;
+    uint16_t fgcolor;
+    uint16_t bgcolor;
+    bool keylock = false;
+    String powermode;
 } CommonData;

 //a base class that all pages must inherit from
@@ -182,9 +182,9 @@ class PageDescription{

 class PageStruct{
    public:
-        Page *page=NULL;
+        Page *page = nullptr;
        PageData parameters;
-        PageDescription *description=NULL;
+        PageDescription *description = nullptr;
 };

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

-__version__ = "0.2"
+__version__ = "0.3"

 def detect_pages(filename):
    # returns a dictionary with page name and the number of gui fields
@@ -87,6 +87,11 @@ def create_json(device, no_of_pages, pagedata):
    output = []

    for page_no in range(1, no_of_pages + 1):
+
+        category = f"{device.upper()} Page {page_no}"
+        capabilities = {device.lower(): "true"}
+        visiblepages = [str(vp) for vp in range(page_no, no_of_pages + 1)]
+
        page_data = {
            "name": f"page{page_no}type",
            "label": "Type",
@@ -94,9 +99,11 @@ def create_json(device, no_of_pages, pagedata):
            "default": get_default_page(page_no),
            "description": f"Type of page for page {page_no}",
            "list": pages,
-            "category": f"{device.upper()} Page {page_no}",
+            "category": category,
            "capabilities": {device.lower(): "true"},
-            "condition": [{"visiblePages": vp} for vp in range(page_no, no_of_pages + 1)],
+            "condition": {
+                "visiblePages": visiblepages
+            },
            #"fields": [],
        }
        output.append(page_data)
@@ -108,39 +115,59 @@ def create_json(device, no_of_pages, pagedata):
                "type": "boatData",
                "default": "",
                "description": "The display for field {}".format(number_to_text(field_no)),
-                "category": f"{device.upper()} Page {page_no}",
-                "capabilities": {device.lower(): "true"},
-                "condition": [
-                    {f"page{page_no}type": page}
-                    for page in pages
-                    if pagedata[page] >= field_no
-                ],
+                "category": category,
+                "capabilities": capabilities,
+                "condition": { 
+                    f"page{page_no}type": [ p for p in pages if pagedata[p] >= field_no ]
+                    ,"visiblePages": visiblepages
+                }
            }
            output.append(field_data)

-        fluid_data ={
+        fluid_data = {
            "name": f"page{page_no}fluid",
            "label": "Fluid type",
            "type": "list",
            "default": "0",
            "list": [
-            {"l":"Fuel (0)","v":"0"},
-            {"l":"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"}
+                {"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"}]
+            "category": category,
+            "capabilities": capabilities,
+            "condition": {
+                f"page{page_no}type": "Fluid",
+                "visiblePages": visiblepages
            }
+        }
        output.append(fluid_data)

+        if device.upper() == 'OBP40':
+            windsource = {
+                "name": f"page{page_no}wndsrc",
+                "label": "Wind source",
+                "type": "list",
+                "default": "True wind",
+                "description": f"Wind source for page {page_no}: [true|apparent]",
+                "list": [
+                    "True wind",
+                    "Apparant wind"
+                ],
+                "category": category,
+                "capabilities": capabilities,
+                "condition": {
+                    f"page{page_no}type": "WindPlot",
+                    "visiblePages": visiblepages
+                }
+            }
+            output.append(windsource)
+
    return json.dumps(output, indent=4)

 def usage():
--- a/lib/obp60task/index.js
+++ b/lib/obp60task/index.js
@@ -1,10 +1,12 @@
+// Add a new register card in web configuration interface
+// This is a Java Script! 
 (function(){
    const api=window.esp32nmea2k;
    if (! api) return;
-    const tabName="OBP60";
+    const tabName="Screen";
    api.registerListener((id, data) => {
    //    if (!data.testboard) return; //do nothing if we are not active
-        let page = api.addTabPage(tabName, "OBP60");
+        let page = api.addTabPage(tabName, "Screen");
        api.addEl('button', '', page, 'Screenshot').addEventListener('click', function (ev) {
 	window.open('/api/user/OBP60Task/screenshot', 'screenshot');
        })
--- a/lib/obp60task/obp60task.cpp
+++ b/lib/obp60task/obp60task.cpp
@@ -13,7 +13,6 @@
 #include "OBP60Extensions.h"            // Functions lib for extension board
 #include "OBP60Keypad.h"                // Functions for keypad
 #include "BoatDataCalibration.h"        // Functions lib for data instance calibration
-#include "OBPRingBuffer.h"              // Functions lib with ring buffer for history storage of some boat data
 #include "OBPDataOperations.h"          // Functions lib for data operations such as true wind calculation

 #ifdef BOARD_OBP40S3
@@ -21,9 +20,6 @@
 #include <SPI.h>
 #endif

-// True type character sets includes
-// See OBP60ExtensionPort.cpp
-
 // Pictures
 //#include GxEPD_BitmapExamples         // Example picture
 #include "MFD_OBP60_400x300_sw.h"       // MFD with logo
@@ -89,7 +85,7 @@ void OBP60Init(GwApi *api){
    // Get CPU speed
    int freq = getCpuFrequencyMhz();
    logger->logDebug(GwLog::LOG,"CPU speed at boot: %i MHz", freq);
-    
+
    // Settings for backlight
    String backlightMode = api->getConfig()->getConfigItem(api->getConfig()->backlight,true)->asString();
    logger->logDebug(GwLog::DEBUG,"Backlight Mode is: %s", backlightMode.c_str());
@@ -125,8 +121,8 @@ void OBP60Init(GwApi *api){
 typedef struct {
        int page0=0;
        QueueHandle_t queue;
-        GwLog* logger = NULL;
-//        GwApi* api = NULL;
+        GwLog* logger = nullptr;
+//        GwApi* api = nullptr;
        uint sensitivity = 100;
        bool use_syspage = true;
    } MyData;
@@ -151,45 +147,37 @@ void keyboardTask(void *param){
    vTaskDelete(NULL);
 }

-class BoatValueList{
-    public:
-    static const int MAXVALUES=100;
-    //we create a list containing all our BoatValues
-    //this is the list we later use to let the api fill all the values
-    //additionally we put the necessary values into the paga data - see below
-    GwApi::BoatValue *allBoatValues[MAXVALUES];
-    int numValues=0;
-    
-    bool addValueToList(GwApi::BoatValue *v){
-        for (int i=0;i<numValues;i++){
-            if (allBoatValues[i] == v){
-                //already in list...
-                return true;
-            }
+// Scorgan: moved class declaration to header file <obp60task.h> to make class available to other functions
+// --- Class BoatValueList --------------
+bool BoatValueList::addValueToList(GwApi::BoatValue *v){
+    for (int i=0;i<numValues;i++){
+        if (allBoatValues[i] == v){
+            //already in list...
+            return true;
        }
-        if (numValues >= MAXVALUES) return false;
-        allBoatValues[numValues]=v;
-        numValues++;
-        return true;
    }
-    //helper to ensure that each BoatValue is only queried once
-    GwApi::BoatValue *findValueOrCreate(String name){
-        for (int i=0;i<numValues;i++){
-            if (allBoatValues[i]->getName() == name) {
-                return allBoatValues[i];
-            }
+    if (numValues >= MAXVALUES) return false;
+    allBoatValues[numValues]=v;
+    numValues++;
+    return true;
+}
+//helper to ensure that each BoatValue is only queried once
+GwApi::BoatValue *BoatValueList::findValueOrCreate(String name){
+    for (int i=0;i<numValues;i++){
+        if (allBoatValues[i]->getName() == name) {
+            return allBoatValues[i];
        }
-        GwApi::BoatValue *rt=new GwApi::BoatValue(name);
-        addValueToList(rt);
-        return rt;
    }
-};
+    GwApi::BoatValue *rt=new GwApi::BoatValue(name);
+    addValueToList(rt);
+    return rt;
+}
+// --- Class BoatValueList --------------

 //we want to have a list that has all our page definitions
 //this way each page can easily be added here
 //needs some minor tricks for the safe static initialization
 typedef std::vector<PageDescription*> Pages;
-//the page list class
 class PageList{
    public:
        Pages pages;
@@ -235,7 +223,7 @@ void registerAllPages(PageList &list){
    extern PageDescription registerPageWind;
    list.add(&registerPageWind);
    extern PageDescription registerPageWindPlot;
-    list.add(&registerPageWindPlot); 
+    list.add(&registerPageWindPlot);
    extern PageDescription registerPageWindRose;
    list.add(&registerPageWindRose);
    extern PageDescription registerPageWindRoseFlex;
@@ -270,263 +258,67 @@ void registerAllPages(PageList &list){
    list.add(&registerPageXTETrack);
    extern PageDescription registerPageFluid;
    list.add(&registerPageFluid);
+    extern PageDescription registerPageSkyView;
+    list.add(&registerPageSkyView);
 }

 // Undervoltage detection for shutdown display
-void underVoltageDetection(GwApi *api, CommonData &common){
-    // Read settings
-    double voffset = (api->getConfig()->getConfigItem(api->getConfig()->vOffset,true)->asString()).toFloat();
-    double vslope = (api->getConfig()->getConfigItem(api->getConfig()->vSlope,true)->asString()).toFloat();
+void underVoltageError(CommonData &common) {
+#if defined VOLTAGE_SENSOR && defined LIPO_ACCU_1200
+    // Switch off all power lines
+    setPortPin(OBP_BACKLIGHT_LED, false);   // Backlight Off
+    setFlashLED(false);                     // Flash LED Off
+    buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
+    // Shutdown EInk display
+    getdisplay().setFullWindow();           // Set full Refresh
+    //getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+    getdisplay().fillScreen(common.bgcolor);// Clear screen
+    getdisplay().setTextColor(common.fgcolor);
+    getdisplay().setFont(&Ubuntu_Bold20pt8b);
+    getdisplay().setCursor(65, 150);
+    getdisplay().print("Undervoltage");
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setCursor(65, 175);
+    getdisplay().print("Charge battery and restart system");
+    getdisplay().nextPage();                // Partial update
+    getdisplay().powerOff();                // Display power off
+    setPortPin(OBP_POWER_EPD, false);       // Power off ePaper display
+    setPortPin(OBP_POWER_SD, false);        // Power off SD card
+#else
+    // Switch off all power lines
+    setPortPin(OBP_BACKLIGHT_LED, false);   // Backlight Off
+    setFlashLED(false);                     // Flash LED Off
+    buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
+    setPortPin(OBP_POWER_50, false);        // Power rail 5.0V Off
+    // Shutdown EInk display
+    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+    getdisplay().fillScreen(common.bgcolor);// Clear screen
+    getdisplay().setTextColor(common.fgcolor);
+    getdisplay().setFont(&Ubuntu_Bold20pt8b);
+    getdisplay().setCursor(65, 150);
+    getdisplay().print("Undervoltage");
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setCursor(65, 175);
+    getdisplay().print("To wake up repower system");
+    getdisplay().nextPage();                // Partial update
+    getdisplay().powerOff();                // Display power off
+#endif
+    while (true) {
+        esp_deep_sleep_start(); // Deep Sleep without wakeup. Wakeup only after power cycle (restart).
+    }
+}
+
+inline bool underVoltageDetection(float voffset, float vslope) {
    // Read supply voltage
-    #if defined VOLTAGE_SENSOR && defined LIPO_ACCU_1200
+#if defined VOLTAGE_SENSOR && defined LIPO_ACCU_1200
    float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.53) * 2;   // Vin = 1/2 for OBP40
    float minVoltage = 3.65;  // Absolut minimum volatge for 3,7V LiPo accu
-    #else
+#else
    float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.17) * 20;   // Vin = 1/20 for OBP60
    float minVoltage = MIN_VOLTAGE;
-    #endif
-    double calVoltage = actVoltage * vslope + voffset;  // Calibration
-    if(calVoltage < minVoltage){
-        #if defined VOLTAGE_SENSOR && defined LIPO_ACCU_1200
-        // Switch off all power lines
-        setPortPin(OBP_BACKLIGHT_LED, false);   // Backlight Off
-        setFlashLED(false);                     // Flash LED Off            
-        buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
-        // Shutdown EInk display
-        getdisplay().setFullWindow();           // Set full Refresh
-        //getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-        getdisplay().fillScreen(common.bgcolor);// Clear screen
-        getdisplay().setTextColor(common.fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(65, 150);
-        getdisplay().print("Undervoltage");
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(65, 175);
-        getdisplay().print("Charge battery and restart system");
-        getdisplay().nextPage();                // Partial update
-        getdisplay().powerOff();                // Display power off
-        setPortPin(OBP_POWER_EPD, false);       // Power off ePaper display
-        setPortPin(OBP_POWER_SD, false);        // Power off SD card
-        #else
-        // Switch off all power lines
-        setPortPin(OBP_BACKLIGHT_LED, false);   // Backlight Off
-        setFlashLED(false);                     // Flash LED Off            
-        buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
-        setPortPin(OBP_POWER_50, false);        // Power rail 5.0V Off
-        // Shutdown EInk display
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-        getdisplay().fillScreen(common.bgcolor);// Clear screen
-        getdisplay().setTextColor(common.fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(65, 150);
-        getdisplay().print("Undervoltage");
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(65, 175);
-        getdisplay().print("To wake up repower system");
-        getdisplay().nextPage();                // Partial update
-        getdisplay().powerOff();                // Display power off
-        #endif
-        // Stop system
-        while(true){
-            esp_deep_sleep_start();             // Deep Sleep without weakup. Weakup only after power cycle (restart).
-        }
-    }
-}
-
-// Calculate true wind data and add to obp60task boat data list
-bool addTrueWind(GwApi* api, BoatValueList* boatValues) {
-
-    double awaVal, awsVal, cogVal, stwVal, sogVal, hdtVal, hdmVal, varVal;
-    double twd, tws, twa;
-    bool isCalculated = false;
-    const double DBL_MIN = std::numeric_limits<double>::lowest();
-
-    GwApi::BoatValue *twdBVal = boatValues->findValueOrCreate("TWD");
-    GwApi::BoatValue *twsBVal = boatValues->findValueOrCreate("TWS");
-    GwApi::BoatValue *twaBVal = boatValues->findValueOrCreate("TWA");
-    GwApi::BoatValue *awaBVal = boatValues->findValueOrCreate("AWA");
-    GwApi::BoatValue *awsBVal = boatValues->findValueOrCreate("AWS");
-    GwApi::BoatValue *cogBVal = boatValues->findValueOrCreate("COG");
-    GwApi::BoatValue *stwBVal = boatValues->findValueOrCreate("STW");
-    GwApi::BoatValue *sogBVal = boatValues->findValueOrCreate("SOG");
-    GwApi::BoatValue *hdtBVal = boatValues->findValueOrCreate("HDT");
-    GwApi::BoatValue *hdmBVal = boatValues->findValueOrCreate("HDM");
-    GwApi::BoatValue *varBVal = boatValues->findValueOrCreate("VAR");
-    awaVal = awaBVal->valid ? awaBVal->value : DBL_MIN;
-    awsVal = awsBVal->valid ? awsBVal->value : DBL_MIN;
-    cogVal = cogBVal->valid ? cogBVal->value : DBL_MIN;
-    stwVal = stwBVal->valid ? stwBVal->value : DBL_MIN;
-    sogVal = sogBVal->valid ? sogBVal->value : DBL_MIN;
-    hdtVal = hdtBVal->valid ? hdtBVal->value : DBL_MIN;
-    hdmVal = hdmBVal->valid ? hdmBVal->value : DBL_MIN;
-    varVal = varBVal->valid ? varBVal->value : DBL_MIN;
-    api->getLogger()->logDebug(GwLog::DEBUG,"obp60task addTrueWind: AWA %.1f, AWS %.1f, COG %.1f, STW %.1f, SOG %.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);
-
-    if (isCalculated) { // Replace values only, if successfully calculated and not already available
-        if (!twdBVal->valid) {
-            twdBVal->value = twd;
-            twdBVal->valid = true;
-        }
-        if (!twsBVal->valid) {
-            twsBVal->value = tws;
-            twsBVal->valid = true;
-        }
-        if (!twaBVal->valid) {
-            twaBVal->value = twa;
-            twaBVal->valid = true;
-        }
-    }
-    api->getLogger()->logDebug(GwLog::DEBUG,"obp60task addTrueWind: 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) {
-
-    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, AWD) in rad (0...2*PI), shifted by 1000 for 3 decimals
-    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, bool useSimuData) {
-    // Handle history buffers for TWD, TWS
-
-    GwLog *logger = api->getLogger();
-
-    int16_t twdHstryMin = hstryBufList.twdHstry->getMinVal();
-    int16_t twdHstryMax = hstryBufList.twdHstry->getMaxVal();
-    int16_t twsHstryMin = hstryBufList.twsHstry->getMinVal();
-    int16_t twsHstryMax = hstryBufList.twsHstry->getMaxVal();
-    int16_t 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);
-
-    if (twdBVal->valid) {
-        calBVal = new GwApi::BoatValue("TWD"); // temporary solution for calibration of history buffer values
-        calBVal->setFormat(twdBVal->getFormat());
-        calBVal->value = twdBVal->value;
-        calBVal->valid = twdBVal->valid;
-        calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated
-        twd = static_cast<int16_t>(std::round(calBVal->value * 1000));
-        if (twd >= twdHstryMin && twd <= twdHstryMax) {
-            hstryBufList.twdHstry->add(twd);
-        }
-        delete calBVal;
-        calBVal = nullptr;
-    } else if (useSimuData) {
-        twd += random(-20, 20);
-        twd = WindUtils::to360(twd);
-        hstryBufList.twdHstry->add(static_cast<int16_t>(DegToRad(twd) * 1000.0));
-    }
-
-    if (twsBVal->valid) {
-        calBVal = new GwApi::BoatValue("TWS"); // temporary solution for calibration of history buffer values
-        calBVal->setFormat(twsBVal->getFormat());
-        calBVal->value = twsBVal->value;
-        calBVal->valid = twsBVal->valid;
-        calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated
-        tws = static_cast<int16_t>(std::round(calBVal->value * 10));
-        if (tws >= twsHstryMin && tws <= twsHstryMax) {
-            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);
-    }
+#endif
+    float calVoltage = actVoltage * vslope + voffset;  // Calibration
+    return (calVoltage < minVoltage);
 }

 // OBP60 Task
@@ -552,6 +344,8 @@ void OBP60Task(GwApi *api){

    tN2kMsg N2kMsg;

+    QueueHandle_t keyboardQueue = api->getKbQueue();
+
    LOG_DEBUG(GwLog::LOG,"obp60task started");
    for (auto it=allPages.pages.begin();it != allPages.pages.end();it++){
        LOG_DEBUG(GwLog::LOG,"found registered page %s",(*it)->pageName.c_str());
@@ -610,7 +404,7 @@ void OBP60Task(GwApi *api){
        getdisplay().nextPage();                 // Fast Refresh
        getdisplay().nextPage();                 // Fast Refresh
    }
-    
+
    // Init pages
    int numPages=1;
    PageStruct pages[MAX_PAGE_NUMBER];
@@ -639,16 +433,11 @@ void OBP60Task(GwApi *api){
    int lastPage=pageNumber;

    BoatValueList boatValues; //all the boat values for the api query
+    HstryBuf hstryBufList(1920);  // Create ring buffers for history storage of some boat data (1920 seconds = 32 minutes)
+    WindUtils trueWind(&boatValues);  // Create helper object for true wind calculation
    //commonData.distanceformat=config->getString(xxx);
    //add all necessary data to common data

-    // Create ring buffers for history storage of some boat data
-    RingBuffer<int16_t> twdHstry(960); // Circular buffer to store true wind direction values; store 960 TWD values for 16 minutes history
-    RingBuffer<int16_t> twsHstry(960); // Circular buffer to store true wind speed values (TWS)
-    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);
    if (numPages < 1) numPages=1;
@@ -669,6 +458,7 @@ void OBP60Task(GwApi *api){
       pages[i].page=description->creator(commonData);
       pages[i].parameters.pageName=pageType;
       pages[i].parameters.pageNumber = i + 1;
+       pages[i].parameters.api = api;
       LOG_DEBUG(GwLog::DEBUG,"found page %s for number %d",pageType.c_str(),i);
       //fill in all the user defined parameters
       for (int uid=0;uid<description->userParam;uid++){
@@ -685,12 +475,10 @@ void OBP60Task(GwApi *api){
       for (auto it=description->fixedParam.begin();it != description->fixedParam.end();it++){
            GwApi::BoatValue *value=boatValues.findValueOrCreate(*it);
            LOG_DEBUG(GwLog::DEBUG,"added fixed value %s to page %d",value->getName().c_str(),i);
-            pages[i].parameters.values.push_back(value); 
+            pages[i].parameters.values.push_back(value);
       }
-        if (pages[i].description->pageName == "WindPlot") {
-            // Add boat history data to page parameters
-            pages[i].parameters.boatHstry = hstryBufList;
-        }
+       // Add boat history data to page parameters
+       pages[i].parameters.boatHstry = &hstryBufList;
    }
    // add out of band system page (always available)
    Page *syspage = allPages.pages[0]->creator(commonData);
@@ -698,12 +486,12 @@ void OBP60Task(GwApi *api){
    // Read all calibration data settings from config
    calibrationData.readConfig(config, logger);

-    // Check user setting for true wind calculation
+    // Check user settings for true wind calculation
    bool calcTrueWnds = api->getConfig()->getBool(api->getConfig()->calcTrueWnds, false);
    bool useSimuData = api->getConfig()->getBool(api->getConfig()->useSimuData, false);

    // Initialize history buffer for certain boat data
-    initHstryBuf(api, &boatValues, hstryBufList);
+    hstryBufList.init(&boatValues, logger);

    // Display screenshot handler for HTTP request
    // http://192.168.15.1/api/user/OBP60Task/screenshot
@@ -738,7 +526,9 @@ void OBP60Task(GwApi *api){
    commonData.backlight.brightness = 2.55 * uint(config->getConfigItem(config->blBrightness,true)->asInt());
    commonData.powermode = api->getConfig()->getConfigItem(api->getConfig()->powerMode,true)->asString();

-    bool uvoltage = api->getConfig()->getConfigItem(api->getConfig()->underVoltage,true)->asBoolean();
+    bool uvoltage = config->getConfigItem(config->underVoltage, true)->asBoolean();
+    float voffset = (config->getConfigItem(config->vOffset,true)->asString()).toFloat();
+    float vslope = (config->getConfigItem(config->vSlope,true)->asString()).toFloat();
    String cpuspeed = api->getConfig()->getConfigItem(api->getConfig()->cpuSpeed,true)->asString();
    uint hdopAccuracy = uint(api->getConfig()->getConfigItem(api->getConfig()->hdopAccuracy,true)->asInt());

@@ -761,11 +551,11 @@ void OBP60Task(GwApi *api){
    GwApi::BoatValue *hdop = boatValues.findValueOrCreate("HDOP");       // Load GpsHDOP

    LOG_DEBUG(GwLog::LOG,"obp60task: start mainloop");
-    
+
    commonData.time = boatValues.findValueOrCreate("GPST");      // Load GpsTime
    commonData.date = boatValues.findValueOrCreate("GPSD");      // Load GpsTime
    bool delayedDisplayUpdate = false;  // If select a new pages then make a delayed full display update
-    bool cpuspeedsetted = false;    // Marker for change CPU speed 
+    bool cpuspeedsetted = false;    // Marker for change CPU speed
    long firststart = millis();     // First start
    long starttime0 = millis();     // Mainloop
    long starttime1 = millis();     // Full display refresh for the first 5 min (more often as normal)
@@ -787,11 +577,14 @@ void OBP60Task(GwApi *api){
        bool keypressed = false;

        // Undervoltage detection
-        if(uvoltage == true){
-            underVoltageDetection(api, commonData);
+        if (uvoltage == true) {
+            if (underVoltageDetection(voffset, vslope)) {
+                LOG_DEBUG(GwLog::ERROR, "Undervoltage detected, shutting down!");
+                underVoltageError(commonData);
+            }
        }

-        // Set CPU speed after boot after 1min 
+        // Set CPU speed after boot after 1min
        if(millis() > firststart + (1 * 60 * 1000) && cpuspeedsetted == false){
            if(String(cpuspeed) == "80"){
                setCpuFrequencyMhz(80);
@@ -812,7 +605,7 @@ void OBP60Task(GwApi *api){
            commonData.data=shared->getSensorData();
            commonData.data.actpage = pageNumber + 1;
            commonData.data.maxpage = numPages;
-            
+
            // If GPS fix then LED off (HDOP)
            if(String(gpsFix) == "GPS Fix Lost" && hdop->value <= hdopAccuracy && hdop->valid == true){
                setFlashLED(false);
@@ -821,9 +614,18 @@ void OBP60Task(GwApi *api){
            if((String(gpsFix) == "GPS Fix Lost" && hdop->value > hdopAccuracy && hdop->valid == true) || (String(gpsFix) == "GPS Fix Lost" && hdop->valid == false)){
                setFlashLED(true);
            }
-         
+
+            // Keyboard messages from remote
+            uint8_t remotekey = 0;
+            if (xQueueReceive(keyboardQueue, &remotekey, 0) == pdPASS) {
+                LOG_DEBUG(GwLog::LOG, "OBP received remote key: %d", remotekey);
+                // inject into internal keyboard queue
+                 xQueueSend(allParameters.queue, &remotekey, 0);
+            }
+
            // Check the keyboard message
            int keyboardMessage=0;
+
            while (xQueueReceive(allParameters.queue,&keyboardMessage,0)){
                LOG_DEBUG(GwLog::LOG,"new key from keyboard %d",keyboardMessage);
                keypressed = true;
@@ -886,13 +688,13 @@ void OBP60Task(GwApi *api){
                        commonData.data.actpage = pageNumber + 1;
                        commonData.data.maxpage = numPages;
                    }
-                  
+
                    // #9 or #10 Refresh display after a new page after 4s waiting time and if refresh is disabled
                    if(refreshmode == true && (keyboardMessage == 9 || keyboardMessage == 10 || keyboardMessage == 4 || keyboardMessage == 3)){
                        starttime4 = millis();
                        starttime2 = millis();      // Reset the timer for full display update
                        delayedDisplayUpdate = true;
-                    }                 
+                    }
                }
                LOG_DEBUG(GwLog::LOG,"set pagenumber to %d",pageNumber);
            }
@@ -918,9 +720,9 @@ void OBP60Task(GwApi *api){
                    commonData.sundata = calcSunsetSunriseRTC(&commonData.data.rtcTime, homelat, homelon, tz);
                }
            }
-            
-            // Full display update afer a new selected page and 4s wait time
-            if(millis() > starttime4 + 4000 && delayedDisplayUpdate == true){
+
+            // Full display update afer a new selected page and 8s wait time
+            if(millis() > starttime4 + 8000 && delayedDisplayUpdate == true){
                starttime1 = millis();
                starttime2 = millis();
                getdisplay().setFullWindow();    // Set full update
@@ -995,8 +797,8 @@ void OBP60Task(GwApi *api){
 //                    getdisplay().nextPage();                     // Partial update
 //                    getdisplay().nextPage();                     // Partial update
                }
-            }        
-                
+            }
+
            // Refresh display data, default all 1s
            currentPage = pages[pageNumber].page;
            int pagetime = 1000;
@@ -1013,10 +815,10 @@ void OBP60Task(GwApi *api){
                api->getStatus(commonData.status);

                if (calcTrueWnds) {
-                    addTrueWind(api, &boatValues);
+                    trueWind.addTrueWind(api, &boatValues, logger);
                }
                // Handle history buffers for TWD, TWS for wind plot page and other usage
-                 handleHstryBuf(api, &boatValues, hstryBufList, useSimuData);
+                 hstryBufList.handleHstryBuf(useSimuData);

                // Clear display
                // getdisplay().fillRect(0, 0, getdisplay().width(), getdisplay().height(), commonData.bgcolor);
@@ -1032,6 +834,7 @@ void OBP60Task(GwApi *api){
                if (systemPage) {
                    displayFooter(commonData);
                    PageData sysparams; // empty
+                    sysparams.api = api;
                    if (systemPageNew) {
                        syspage->displayNew(sysparams);
                        systemPageNew = false;
--- a/lib/obp60task/obp60task.h
+++ b/lib/obp60task/obp60task.h
@@ -41,5 +41,24 @@
    #ifdef BOARD_OBP40S3
    DECLARE_CAPABILITY(obp40,true)
    #endif
-    DECLARE_STRING_CAPABILITY(HELP_URL, "https://obp60-v2-docu.readthedocs.io/de/latest/"); // Link to help pages
+    #ifdef BOARD_OBP60S3
+    DECLARE_STRING_CAPABILITY(HELP_URL, "https://obp60-v2-docu.readthedocs.io/en/latest/"); // Link to help pages
+    #endif
+    #ifdef BOARD_OBP40S3
+    DECLARE_STRING_CAPABILITY(HELP_URL, "https://obp40-v1-docu.readthedocs.io/en/latest/"); // Link to help pages
+    #endif
+
+    class BoatValueList{
+        public:
+        static const int MAXVALUES=100;
+        //we create a list containing all our BoatValues
+        //this is the list we later use to let the api fill all the values
+        //additionally we put the necessary values into the paga data - see below
+        GwApi::BoatValue *allBoatValues[MAXVALUES];
+        int numValues=0;
+        
+        bool addValueToList(GwApi::BoatValue *v);
+        //helper to ensure that each BoatValue is only queried once
+        GwApi::BoatValue *findValueOrCreate(String name);
+    };
 #endif
--- a/lib/usercode/GwUserCode.cpp
+++ b/lib/usercode/GwUserCode.cpp
@@ -189,6 +189,10 @@ public:
    {
        return api->getQueue();
    }
+    virtual QueueHandle_t getKbQueue()
+    {
+        return api->getKbQueue();
+    }
    virtual void sendN2kMessage(const tN2kMsg &msg,bool convert)
    {
        GWSYNCHRONIZED(mainLock);
@@ -428,4 +432,4 @@ void GwUserCode::handleWebRequest(const String &url,AsyncWebServerRequest *req){
    }
    LOG_DEBUG(GwLog::DEBUG,"no task found for web request %s[%s]",url.c_str(),tname.c_str());
    req->send(404, "text/plain", "not found");
-}
+}
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -158,6 +158,8 @@ GwCounter<unsigned long> countNMEA2KIn("countNMEA2000in");
 GwCounter<unsigned long> countNMEA2KOut("countNMEA2000out");
 GwIntervalRunner timers;

+QueueHandle_t keyboardQueue = NULL;
+
 bool checkPass(String hash){
  return config.checkPass(hash);
 }
@@ -269,6 +271,10 @@ public:
  {
    return &mainQueue;
  }
+  virtual QueueHandle_t getKbQueue()
+  {
+    return keyboardQueue;
+  }
  virtual void sendN2kMessage(const tN2kMsg &msg,bool convert)
  {
    handleN2kMessage(msg,sourceId,!convert);
@@ -860,6 +866,8 @@ void setup() {
  webserver.begin();
  xdrMappings.begin();
  logger.flush();
+  // remote keyboard support
+  keyboardQueue = xQueueCreate(10, sizeof(uint8_t));
  GwConverterConfig converterConfig;
  converterConfig.init(&config,&logger);
  nmea0183Converter= N2kDataToNMEA0183::create(&logger, &boatData, 
@@ -869,7 +877,8 @@ void setup() {
    , 
    config.getString(config.talkerId,String("GP")),
    &xdrMappings,
-    converterConfig
+    converterConfig,
+    keyboardQueue
    );

  toN2KConverter= NMEA0183DataToN2K::create(&logger,&boatData,[](const tN2kMsg &msg, int sourceId)->bool{
--- a/web/config.json
+++ b/web/config.json
@@ -88,6 +88,16 @@
        "description":"the brightness of the led (0..255)",
        "category":"system"
    },
+    {
+        "name": "swBankInstance",
+        "type": "number",
+        "default": 0,
+        "min": 0,
+        "max": 252,
+        "check": "checkMinMax",
+        "description": "the instance of switch bank to receive data for (0..252)",
+        "category": "system"
+    },
    {
        "name": "talkerId",
        "label": "NMEA0183 ID",
@@ -1287,4 +1297,4 @@
        "check": "checkXDR",
        "category": "xdr30"
    }
-]
+]
Author	SHA1	Message	Date
Thomas Hooge	898922769a	PGN 127502 remote keyboard support	2025-12-27 17:07:01 +01:00
Norbert Walter	470c0e5f4d	Merge pull request #208 from thooge/fonts Added small 8x8px font mainly for use with graphs	2025-10-06 18:25:44 +02:00
Norbert Walter	9a792b49db	Merge pull request #206 from TobiasE-github/master disabe mode x in PageWind	2025-10-06 18:23:56 +02:00
Thomas Hooge	8f851a4b61	Added small 8x8px font mainly for use with graphs Page skyview improved with the new font as example usage	2025-10-06 13:19:42 +02:00
Norbert Walter	f46a43d7fd	Merge pull request #207 from thooge/configfix Config file fixes and generation script update	2025-10-06 10:44:58 +02:00
Thomas Hooge	84e99365f7	Config file fixes and generation script update	2025-09-29 14:31:28 +02:00
TobiasE-github	e5950f95fd	disabe mode x in PageWind	2025-09-27 20:30:00 +02:00
Norbert Walter	d0076f336d	Merge pull request #205 from TobiasE-github/master use a smaller font on long names in WindRoseFlex	2025-09-25 23:59:28 +02:00
Tobias E	d94c4bbbdb	optimize font size	2025-09-20 11:16:17 +00:00
TobiasE-github	6ef7681a40	use a smaller font on long names in WindRoseFlex	2025-09-14 21:00:02 +02:00
norbert-walter	34a289048f	Fix HDOP and more delay for page refresh after new page	2025-09-10 18:48:24 +02:00
Norbert Walter	df1bd498ae	Merge pull request #204 from Scorgan01/PSRAM Data History Buffer: Moved buffers to PSRAM; extended wind buffer sizes to 1920 values	2025-09-10 18:17:00 +02:00
norbert-walter	e5eee37b59	Code cleaning	2025-08-29 17:02:25 +02:00
norbert-walter	28b3cfba0b	Change design PageSkyView	2025-08-29 16:58:15 +02:00
norbert-walter	674a78b03c	Fix PageSkyView	2025-08-29 12:17:03 +02:00
Scorgan01	de448974d9	Delete serial_output.txt	2025-08-27 23:21:21 +02:00
Scorgan01	6b91400cfc	Merge branch 'norbert-walter:master' into PSRAM	2025-08-27 23:17:18 +02:00
Norbert Walter	be946440d3	Merge pull request #203 from Scorgan01/PageWindPlot History Buffer + Wind Calculation CleanUp	2025-08-27 23:15:15 +02:00
Norbert Walter	ac86bfb304	Merge pull request #202 from TobiasE-github/master fix error in label position	2025-08-27 23:14:37 +02:00
Norbert Walter	d719c7260e	Merge pull request #201 from thooge/skyview Created new page SkyView. Additionally some graphics improvements.	2025-08-27 23:14:04 +02:00
Ulrich Meine	1abcb158ec	Moved history buffers to PSRAM; extended buffer to 1920 values each (32 min.)	2025-08-26 23:21:36 +02:00
Tobias E	00ea413411	fix error in label position	2025-08-23 18:55:33 +00:00
Ulrich Meine	851149bae6	Convert invalid marker of ringbuffer to MAX_VAL -> required for unsigned types	2025-08-23 13:43:02 +02:00
Ulrich Meine	c6c2ad537a	Merge remote-tracking branch 'upstream/master' into PageWindPlot	2025-08-23 11:58:14 +02:00
Thomas Hooge	3eb2c8093e	Created new page SkyView. Additionally some graphics improvements.	2025-08-23 09:53:26 +02:00
Ulrich Meine	636b1596f5	Code cleanup: moved buffer + wind calc to OBPDataOperations; <BoatValueList> header to obp60task.h; tws 3 decimals	2025-08-23 01:41:39 +02:00
Norbert Walter	a21ce00260	Merge pull request #200 from thooge/voltage Improve and speedup undervoltage detection code	2025-08-22 10:26:00 +02:00
norbert-walter	794cbf1c4f	New links for docu, rename new tab	2025-08-22 10:23:53 +02:00
Thomas Hooge	4f6079f418	Improve and speedup undervoltage detection code	2025-08-22 10:14:38 +02:00