Merge pull request #213 from TobiasE-github/master

force a blank digit in front of two-digit numbers

extra_script.py

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

lib/obp60task/BoatDataCalibration.cpp

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

lib/obp60task/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>
 

lib/obp60task/ConfigMenu.cpp

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

lib/obp60task/ConfigMenu.h

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

lib/obp60task/Create_new_pages.txt

@@ -0,0 +1,6 @@
+Craete new page for OBP60
+1. Create page under /lib/obp60task/PageXXXX.cpp
+2. Set page name in PageXXXX.cpp on file name
+3. Register new page in  /lib/obp60task/obp60task.cpp line 242 (registerAllPages)
+4. Add new page in /lib/obp60task/config.json for each page type or add new page to gen_set.py and run it to auto-generate the relevant section of  config.json
+

lib/obp60task/ImageDecoder.cpp

@@ -0,0 +1,14 @@
+#include "ImageDecoder.h"
+#include <mbedtls/base64.h>
+
+// Decoder for Base64 content
+bool ImageDecoder::decodeBase64(const String& base64, uint8_t* outBuffer, size_t outSize, size_t& decodedSize) {
+    int ret = mbedtls_base64_decode(
+        outBuffer,
+        outSize,
+        &decodedSize,
+        (const unsigned char*)base64.c_str(),
+        base64.length()
+    );
+    return (ret == 0);
+}

lib/obp60task/ImageDecoder.h

@@ -0,0 +1,9 @@
+
+#pragma once
+#include <Arduino.h>
+#include <vector>
+
+class ImageDecoder {
+public:
+    bool decodeBase64(const String& base64, uint8_t* outBuffer, size_t outSize, size_t& decodedSize);
+};

lib/obp60task/LedSpiTask.cpp

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

lib/obp60task/LedSpiTask.h

@@ -22,8 +22,6 @@ class Color{
     bool operator != (const Color &other) const{
         return ! equal(other);
     }
-    String toHex();
-    String toName();
 };
 
 static Color COLOR_GREEN=Color(0,255,0);

lib/obp60task/Logo_OBP_400x300_sw.h

@@ -0,0 +1,939 @@
+const unsigned char gImage_Logo_OBP_400x300_sw[15000] = { /* 0X00,0X01,0X90,0X01,0X2C,0X01, */
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X40,
+0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X01,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X01,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X03,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0X80,0X00,0X03,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0X80,0X00,0X03,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X80,
+0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X3F,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X3F,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X7F,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0XFF,0XFF,0X00,0X03,0XFF,0XFF,0XF8,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0XFF,0XE0,0X00,0X00,0X1F,0XFF,0XF8,0X00,0X00,0X00,0X07,0XFF,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,
+0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0X80,0X00,0X00,0X07,0XFF,0XF8,0X00,0X00,0X00,
+0X03,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X0F,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0X00,0X00,0X00,0X03,0XFF,0XF8,0X00,
+0X00,0X00,0X01,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X1F,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFE,0X00,0X00,0X00,0X00,0XFF,
+0XF8,0X00,0X00,0X00,0X00,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFC,0X00,0X00,0X00,
+0X00,0X7F,0XF8,0X00,0X00,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XF8,0X00,
+0X00,0X00,0X00,0X7F,0XF8,0X00,0X00,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0XF0,0X00,0X00,0X00,0X00,0X3F,0XF8,0X00,0X00,0X00,0X00,0X3F,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0XE0,0X00,0X00,0X00,0X00,0X1F,0XF8,0X00,0X1E,0X00,0X00,0X3F,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0XE0,0X00,0X0F,0XC0,0X00,0X1F,0XF8,0X00,0X1F,0XE0,0X00,0X3F,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,
+0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X3F,0XF0,0X00,0X0F,0XF8,0X00,0X1F,0XF0,
+0X00,0X3F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X01,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X7F,0XF8,0X00,0X0F,0XF8,0X00,
+0X1F,0XF8,0X00,0X3F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X03,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0XFF,0XFC,0X00,0X07,
+0XF8,0X00,0X1F,0XF8,0X00,0X3F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X80,0X01,0XFF,0XFE,
+0X00,0X07,0XF8,0X00,0X1F,0XF8,0X00,0X3F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X80,0X01,
+0XFF,0XFE,0X00,0X07,0XF8,0X00,0X1F,0XF8,0X00,0X3F,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0X80,0X01,0XFF,0XFF,0X00,0X07,0XF8,0X00,0X1F,0XF8,0X00,0X3F,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0X80,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,0X1F,0XF0,0X00,0X3F,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0X80,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,0X1F,0XE0,0X00,0X3F,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,
+0XFF,0X80,0X00,0X03,0XFF,0XFF,0X00,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,0X00,0X00,
+0X00,0X3F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X7F,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X00,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,
+0X00,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X00,0X03,0XFF,0XFF,0X00,0X03,
+0XF8,0X00,0X00,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X00,0X03,0XFF,0XFF,
+0X00,0X03,0XF8,0X00,0X00,0X00,0X00,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X00,0X03,
+0XFF,0XFF,0X00,0X03,0XF8,0X00,0X00,0X00,0X01,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0X00,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,0X00,0X00,0X03,0XFF,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0X00,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,0X00,0X00,0X07,0XFF,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0X00,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,0X00,0X00,0X0F,0XFF,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,
+0XFF,0X80,0X00,0X03,0XFF,0XFF,0X80,0X03,0XFF,0XFF,0X00,0X03,0XF8,0X00,0X00,0X00,
+0X7F,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,
+0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X80,0X03,0XFF,0XFF,0X00,0X07,0XF8,0X00,
+0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X1F,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X80,0X01,0XFF,0XFE,0X00,0X07,
+0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X80,0X01,0XFF,0XFE,
+0X00,0X07,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0X80,0X00,
+0XFF,0XFC,0X00,0X07,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0XC0,0X00,0XFF,0XFC,0X00,0X0F,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0XC0,0X00,0X3F,0XF8,0X00,0X0F,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0XE0,0X00,0X1F,0XE0,0X00,0X1F,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,
+0XFF,0X80,0X00,0X03,0XFF,0XFF,0XE0,0X00,0X00,0X00,0X00,0X1F,0XF8,0X00,0X1F,0XFF,
+0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,
+0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X3F,0XF8,0X00,
+0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X07,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X3F,
+0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XF8,0X00,0X00,0X00,
+0X00,0X7F,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFC,0X00,
+0X00,0X00,0X00,0XFF,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0XFE,0X00,0X00,0X00,0X01,0XFF,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0XFF,0X80,0X00,0X00,0X03,0XFF,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0XFF,0XC0,0X00,0X00,0X0F,0XFF,0XF8,0X00,0X1F,0XFF,0XFF,0XFF,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,
+0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X3F,0XFF,0XF8,0X00,0X1F,0XFF,
+0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,
+0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFE,0X00,0X01,0XFF,0XFF,0XF8,0X00,
+0X3F,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,
+0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,
+0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,
+0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,
+0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X7F,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X03,0XFE,0X00,0X1F,0XFF,0XF8,
+0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X03,0XFE,0X00,0X0F,
+0XFF,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X03,0XFE,
+0X00,0X07,0XFF,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X1F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,
+0X03,0XFE,0X00,0X03,0XFF,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,
+0X00,0X00,0X03,0XFE,0X00,0X03,0XFF,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0XC0,0X00,0X00,0X00,0X03,0XFE,0X00,0X01,0XFF,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0XC0,0X00,0X00,0X00,0X03,0XFE,0X00,0X00,0XFF,0XF0,0X00,0X7F,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X03,0XFE,0X00,0X00,0XFF,0XF0,0X00,0X7F,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X03,0XFE,0X00,0X00,0X7F,0XF0,
+0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X03,0XFE,0X00,0X00,
+0X3F,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,
+0X00,0X00,0X3F,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,
+0XFF,0XFE,0X00,0X00,0X1F,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,
+0XFF,0XFF,0XFF,0XFE,0X00,0X00,0X0F,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X00,0X0F,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X00,0X07,0XF0,0X00,0X7F,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X00,0X03,0XF0,0X00,0X7F,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X00,0X03,0XF0,
+0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X07,0XFE,0X00,0X00,
+0X01,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X07,0XFE,
+0X00,0X00,0X00,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,
+0X07,0XFE,0X00,0X00,0X00,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,
+0X00,0X00,0X07,0XFE,0X00,0X00,0X00,0X70,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0XC0,0X00,0X00,0X00,0X07,0XFE,0X00,0X00,0X00,0X30,0X00,0X7F,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0XC0,0X00,0X00,0X00,0X07,0XFE,0X00,0X08,0X00,0X30,0X00,0X7F,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X07,0XFE,0X00,0X0C,0X00,0X10,0X00,0X7F,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X07,0XFE,0X00,0X0C,0X00,0X00,
+0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X07,0XFE,0X00,0X0E,
+0X00,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,
+0X00,0X0F,0X00,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,
+0XFF,0XFE,0X00,0X0F,0X00,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X3F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,
+0XFF,0XFF,0XFF,0XFE,0X00,0X0F,0X80,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X7F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X0F,0XC0,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X0F,0XC0,0X00,0X00,0X7F,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X0F,0XE0,0X00,0X00,0X7F,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X0F,0XF0,0X00,
+0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X01,0XFF,0XFF,0XFF,0XFE,0X00,0X0F,
+0XF8,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0XFF,0XFF,0XFF,0XFE,
+0X00,0X0F,0XF8,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,
+0X01,0XFE,0X00,0X0F,0XFC,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,
+0X00,0X00,0X01,0XFE,0X00,0X0F,0XFE,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0XC0,0X00,0X00,0X00,0X01,0XFE,0X00,0X0F,0XFE,0X00,0X00,0X7F,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0XC0,0X00,0X00,0X00,0X01,0XFE,0X00,0X0F,0XFF,0X00,0X00,0X7F,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X01,0XFE,0X00,0X0F,0XFF,0X80,0X00,0X7F,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X01,0XFE,0X00,0X0F,0XFF,0X80,
+0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X01,0XFE,0X00,0X0F,
+0XFF,0XC0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X01,0XFE,
+0X00,0X0F,0XFF,0XE0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,
+0X01,0XFE,0X00,0X0F,0XFF,0XE0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XC0,0X00,
+0X00,0X00,0X01,0XFE,0X00,0X1F,0XFF,0XF0,0X00,0X7F,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X7F,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,0X00,0X03,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0X80,
+0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0X80,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XC0,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,
+0XFF,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X40,0X00,0X0F,0XFF,0XE0,0X00,0X00,
+0X00,0X00,0X00,0X7E,0X00,0X00,0X00,0X00,0X00,0X00,0X02,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X03,0XFF,0XFF,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XC0,0X00,0X0F,0XFF,0XF8,
+0X00,0X00,0X00,0X00,0X00,0X7E,0X00,0X00,0X00,0X00,0X00,0X00,0X0E,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X00,0X00,0X07,0XC0,0X00,0X0F,
+0XFF,0XFC,0X00,0X00,0X00,0X00,0X00,0X7E,0X00,0X00,0X00,0X00,0X00,0X00,0X3E,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XC0,0X00,0X00,0X00,0X00,0X00,0X0F,0XC0,
+0X00,0X0F,0XFF,0XFE,0X00,0X00,0X00,0X00,0X00,0X7E,0X00,0X00,0X00,0X00,0X00,0X00,
+0X7E,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XE0,0X00,0X00,0X00,0X00,0X00,
+0X0F,0XC0,0X00,0X0F,0XFF,0XFE,0X00,0X00,0X00,0X00,0X00,0X7E,0X00,0X00,0X00,0X00,
+0X00,0X00,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X1F,0XE0,0X00,0X00,0X00,
+0X00,0X00,0X0F,0XC0,0X00,0X0F,0XE0,0XFF,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X0F,0XE0,0X03,
+0XE0,0X00,0X3F,0XE0,0X1F,0XC0,0X00,0X0F,0XE0,0X7F,0X00,0X0E,0X00,0X7E,0X00,0X00,
+0X00,0X3F,0X00,0X01,0XFC,0X00,0XFE,0X00,0X3F,0XC0,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X0F,
+0XC0,0X1F,0XFC,0X00,0XFF,0XF8,0X7F,0XFC,0X00,0X0F,0XE0,0X7F,0X1F,0X9F,0X83,0XFF,
+0X80,0X7E,0X01,0XFF,0XE0,0X07,0XFF,0X03,0XFF,0XE0,0XFF,0XF0,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,
+0XF8,0X1F,0XC0,0X3F,0XFE,0X03,0XFF,0XFC,0X7F,0XFC,0X00,0X0F,0XE0,0X7F,0X1F,0XFF,
+0X07,0XFF,0XE0,0X7E,0X03,0XFF,0XF0,0X1F,0XFF,0XC3,0XFF,0XE1,0XFF,0XF8,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X03,0XFF,0XFF,0X80,0X7F,0XFF,0X83,0XFF,0XFE,0X7F,0XFC,0X00,0X0F,0XE0,0XFF,
+0X1F,0XFF,0X0F,0XFF,0XF0,0X7E,0X07,0XFF,0XF8,0X3F,0XFF,0XE3,0XFF,0XE3,0XFF,0XFC,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X03,0XFF,0XFF,0X00,0XFF,0XFF,0X87,0XF8,0XFE,0X7F,0XFC,0X00,0X0F,
+0XFF,0XFE,0X1F,0XFE,0X1F,0XFF,0XF0,0X7E,0X0F,0XE3,0XF8,0X3F,0XFF,0XE3,0XFF,0XE3,
+0XE1,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0X01,0XFE,0X3F,0XC7,0XF0,0X7E,0X1F,0XC0,
+0X00,0X0F,0XFF,0XFE,0X1F,0XF2,0X1F,0XC3,0XF8,0X7E,0X0F,0XC1,0XFC,0X7F,0X87,0XF0,
+0XFE,0X07,0XE0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XC1,0XFC,0X1F,0XC0,0X00,0XFE,
+0X0F,0XC0,0X00,0X0F,0XFF,0XFC,0X1F,0XE0,0X3F,0X83,0XF8,0X7E,0X1F,0XC0,0XFC,0X7F,
+0X03,0X80,0XFE,0X03,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XE1,0XFC,0X0F,0XC0,
+0X07,0XFE,0X0F,0XC0,0X00,0X0F,0XFF,0XF8,0X1F,0XC0,0X3F,0X81,0XF8,0X7E,0X1F,0XC0,
+0XFC,0X7E,0X00,0X00,0XFE,0X03,0XFF,0XE0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X0F,0XE1,0XF8,
+0X0F,0XC0,0XFF,0XFE,0X0F,0XC0,0X00,0X0F,0XFF,0XE0,0X1F,0XC0,0X3F,0X81,0XF8,0X7E,
+0X1F,0XFF,0XFE,0X7E,0X00,0X00,0XFE,0X01,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X0F,
+0XF1,0XF8,0X0F,0XC3,0XFF,0XFE,0X0F,0XC0,0X00,0X0F,0XE0,0X00,0X1F,0XC0,0X3F,0X01,
+0XFC,0X7E,0X1F,0XFF,0XFE,0X7E,0X00,0X00,0XFE,0X00,0XFF,0XFC,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,
+0XF8,0X0F,0XF1,0XF8,0X0F,0XC7,0XFC,0X7E,0X0F,0XC0,0X00,0X0F,0XE0,0X00,0X1F,0XC0,
+0X3F,0X81,0XF8,0X7E,0X1F,0XFF,0XFE,0X7E,0X00,0X00,0XFE,0X00,0X3F,0XFC,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X03,0XF8,0X0F,0XF1,0XFC,0X1F,0XC7,0XF0,0X7E,0X0F,0XC0,0X00,0X0F,0XE0,0X00,
+0X1F,0XC0,0X3F,0X81,0XF8,0X7E,0X1F,0XC0,0X00,0X7F,0X03,0XC0,0XFE,0X00,0X01,0XFE,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X03,0XFC,0X3F,0XF1,0XFC,0X1F,0XC7,0XE0,0X7E,0X0F,0XC0,0X00,0X0F,
+0XE0,0X00,0X1F,0XC0,0X1F,0X83,0XF8,0X7E,0X1F,0XC0,0X00,0X7F,0X07,0XF0,0XFE,0X00,
+0X60,0X7E,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XE0,0XFF,0X3F,0X87,0XE0,0XFE,0X0F,0XFC,
+0X00,0X0F,0XE0,0X00,0X1F,0XC0,0X1F,0XE7,0XF0,0X7E,0X0F,0XE1,0XFC,0X7F,0XCF,0XF0,
+0X7F,0XC7,0XF0,0X7E,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XE0,0XFF,0XFF,0X87,0XFF,0XFE,
+0X0F,0XFC,0X00,0X0F,0XE0,0X00,0X1F,0XC0,0X0F,0XFF,0XF0,0X7E,0X0F,0XFF,0XF8,0X3F,
+0XFF,0XE0,0X7F,0XC7,0XFF,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XC0,0X7F,0XFF,0X07,
+0XFF,0XFE,0X0F,0XFC,0X00,0X0F,0XE0,0X00,0X1F,0XC0,0X07,0XFF,0XE0,0X7E,0X07,0XFF,
+0XF0,0X1F,0XFF,0XC0,0X7F,0XE3,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0X80,0X1F,
+0XFE,0X03,0XFF,0X3F,0X07,0XFC,0X00,0X0F,0XE0,0X00,0X1F,0XC0,0X03,0XFF,0XC0,0X7E,
+0X03,0XFF,0XE0,0X0F,0XFF,0X80,0X3F,0XE1,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XF8,
+0X00,0X07,0XF8,0X00,0XFC,0X3F,0X03,0XFC,0X00,0X0F,0XE0,0X00,0X1F,0XC0,0X00,0XFF,
+0X00,0X7E,0X00,0XFF,0X80,0X03,0XFE,0X00,0X1F,0XE0,0X7F,0XC0,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X03,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFC,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFC,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XE0,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,};

lib/obp60task/MFD_OBP60_400x300_sw.h

@@ -0,0 +1,939 @@
+const unsigned char gImage_MFD_OBP60_400x300_sw[15000] = { /* 0X00,0X01,0X90,0X01,0X2C,0X01, */
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XE0,0X3F,
+0XC0,0X00,0X00,0X7E,0X00,0X40,0XFC,0X07,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X08,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XE0,0X0F,0XC0,0X00,0X00,0X00,
+0X00,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,
+0XF0,0X3F,0XC0,0X00,0X00,0X7E,0X01,0XC0,0XFC,0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X38,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XF8,0X0F,0XC0,0X00,
+0X00,0X00,0X00,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X1F,0XF0,0X7F,0XC0,0X00,0X00,0X7E,0X07,0XC0,0XFC,0X1F,0XF0,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0XF8,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFC,0X0F,
+0XC0,0X00,0X00,0X00,0X00,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X1F,0XF0,0X7F,0XC0,0X00,0X00,0X7E,0X0F,0XC0,0XFC,0X3F,0XE0,0X00,
+0X00,0X00,0X00,0X00,0X00,0X01,0XF8,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,
+0XFE,0X0F,0XC0,0X00,0X00,0X00,0X00,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X1F,0XF0,0X7F,0XC0,0X00,0X00,0X7E,0X0F,0XC0,0X00,0X3F,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X07,0XFF,0XFE,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X80,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XF8,0X7F,0XC0,0X00,0X00,0X7E,0X0F,0XC0,
+0X00,0X3F,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XF8,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X07,0XF0,0XFF,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X80,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XF8,0XFF,0XC3,0XE0,0XF8,0X7E,
+0X3F,0XF8,0XFC,0XFF,0XE7,0XC1,0XF0,0XF8,0XF8,0X01,0XFC,0X07,0XFF,0X1F,0X80,0X7F,
+0X00,0XF8,0XF8,0X00,0X07,0XF0,0X7F,0X0F,0XC0,0X7F,0X80,0XF9,0XF0,0X1F,0X80,0XFF,
+0X83,0XF0,0X3F,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X78,0XF7,0XC3,0XE0,
+0XF8,0X7E,0X3F,0XF8,0XFC,0XFF,0XE7,0XC1,0XF0,0XFB,0XFC,0X07,0XFF,0X07,0XFF,0X1F,
+0X81,0XFF,0XC0,0XFB,0XFC,0X00,0X07,0XF0,0X3F,0X0F,0XC1,0XFF,0XE0,0XFB,0XFC,0X1F,
+0X83,0XFF,0XE1,0XF8,0X3E,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X78,0XF7,
+0XC3,0XE0,0XF8,0X7E,0X3F,0XF8,0XFC,0XFF,0XE7,0XC1,0XF0,0XFF,0XFE,0X0F,0XFF,0XC7,
+0XFF,0X1F,0X83,0XFF,0XE0,0XFF,0XFE,0X00,0X07,0XF0,0X3F,0X0F,0XC3,0XFF,0XF0,0XFF,
+0XFE,0X1F,0X87,0XFF,0XF1,0XF8,0X3E,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,
+0X7C,0XF7,0XC3,0XE0,0XF8,0X7E,0X3F,0XF8,0XFC,0XFF,0XE7,0XC1,0XF0,0XFF,0XFE,0X1F,
+0XFF,0XC7,0XFF,0X1F,0X87,0XFF,0XF0,0XFF,0XFE,0X00,0X07,0XF0,0X3F,0X8F,0XC3,0XE3,
+0XF0,0XFF,0XFE,0X1F,0X87,0XFF,0XF0,0XF8,0X7E,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X1F,0X3D,0XE7,0XC3,0XE0,0XF8,0X7E,0X0F,0XC0,0XFC,0X3F,0X07,0XC1,0XF0,0XFF,
+0XFE,0X1F,0X87,0XE1,0XF8,0X1F,0X87,0XE3,0XF0,0XFF,0XFE,0X00,0X07,0XF0,0X3F,0X8F,
+0XC3,0XE1,0X80,0XFC,0X7F,0X1F,0X87,0XC1,0XF0,0XFC,0X7C,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X1F,0X3D,0XE7,0XC3,0XE0,0XF8,0X7E,0X0F,0XC0,0XFC,0X3F,0X07,0XC1,
+0XF0,0XFC,0X7E,0X3F,0X07,0X01,0XF8,0X1F,0X8F,0XC1,0XF8,0XFC,0X7E,0X00,0X07,0XF0,
+0X3F,0X8F,0XC3,0XFC,0X00,0XFC,0X3F,0X1F,0X80,0X07,0XF0,0X7C,0X7C,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X1F,0X3F,0XE7,0XC3,0XE0,0XF8,0X7E,0X0F,0XC0,0XFC,0X3F,
+0X07,0XC1,0XF0,0XFC,0X3E,0X3F,0X00,0X01,0XF8,0X1F,0X8F,0XC1,0XF8,0XFC,0X3E,0X00,
+0X07,0XF0,0X3F,0X0F,0XC3,0XFF,0XE0,0XF8,0X3F,0X1F,0X80,0X7F,0XF0,0X7C,0XF8,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X3F,0XE7,0XC3,0XE0,0XF8,0X7E,0X0F,0XC0,
+0XFC,0X3F,0X07,0XC1,0XF0,0XF8,0X3E,0X3F,0X00,0X01,0XF8,0X1F,0X8F,0XC1,0XF8,0XF8,
+0X3E,0X00,0X07,0XF0,0X3F,0X0F,0XC1,0XFF,0XF0,0XF8,0X3F,0X1F,0X83,0XFF,0XF0,0X7C,
+0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X1F,0XC7,0XC3,0XE1,0XF8,0X7E,
+0X0F,0XC0,0XFC,0X3F,0X07,0XC3,0XF0,0XF8,0X3E,0X3F,0X00,0X01,0XF8,0X1F,0X8F,0XC1,
+0XF8,0XF8,0X3E,0X00,0X07,0XF0,0X3F,0X0F,0XC0,0X7F,0XF8,0XF8,0X3F,0X1F,0X87,0XF1,
+0XF0,0X3E,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X1F,0XC7,0XC3,0XF1,
+0XF8,0X7E,0X0F,0XC0,0XFC,0X3F,0X07,0XE3,0XF0,0XF8,0X3E,0X3F,0X03,0X01,0XF8,0X1F,
+0X8F,0XC1,0XF8,0XF8,0X3E,0X00,0X07,0XF0,0X7F,0X0F,0XC0,0X03,0XF8,0XFC,0X3F,0X1F,
+0X8F,0XC1,0XF0,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0X1F,0XC7,
+0XC3,0XFF,0XF8,0X7E,0X0F,0XC0,0XFC,0X3F,0X07,0XFF,0XF0,0XF8,0X3E,0X1F,0X87,0XE1,
+0XF8,0X1F,0X87,0XE3,0XF0,0XF8,0X3E,0X00,0X07,0XFF,0XFE,0X0F,0XC0,0XE0,0XF8,0XFC,
+0X7F,0X1F,0X8F,0XC3,0XF0,0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,
+0X1F,0XC7,0XC3,0XFF,0XF8,0X7E,0X0F,0XF8,0XFC,0X3F,0X07,0XFF,0XF0,0XF8,0X3E,0X1F,
+0XFF,0XC1,0XFF,0X1F,0X87,0XFF,0XF0,0XF8,0X3E,0X00,0X07,0XFF,0XFE,0X0F,0XC7,0XE1,
+0XF8,0XFF,0XFE,0X1F,0X8F,0XFF,0XF0,0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X1F,0X0F,0X87,0XC3,0XFF,0XF8,0X7E,0X0F,0XF8,0XFC,0X3F,0X07,0XFF,0XF0,0XF8,
+0X3E,0X0F,0XFF,0XC1,0XFF,0X1F,0X83,0XFF,0XE0,0XF8,0X3E,0X00,0X07,0XFF,0XFC,0X0F,
+0XC3,0XFF,0XF0,0XFF,0XFE,0X1F,0X8F,0XFF,0XF0,0X1F,0XE0,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X1F,0X0F,0X87,0XC1,0XFE,0XF8,0X7E,0X07,0XF8,0XFC,0X3F,0X03,0XFD,
+0XF0,0XF8,0X3E,0X07,0XFF,0X80,0XFF,0X1F,0X81,0XFF,0XC0,0XF8,0X3E,0X00,0X07,0XFF,
+0XF8,0X0F,0XC3,0XFF,0XE0,0XFF,0XFC,0X1F,0X87,0XFD,0XF0,0X0F,0XE0,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X1F,0X0F,0X87,0XC0,0XF8,0XF8,0X7E,0X03,0XF8,0XFC,0X3F,
+0X01,0XF1,0XF0,0XF8,0X3E,0X01,0XFE,0X00,0X7F,0X1F,0X80,0X7F,0X00,0XF8,0X3E,0X00,
+0X07,0XFF,0XC0,0X0F,0XC0,0X7F,0X80,0XF9,0XF0,0X1F,0X81,0XF0,0XF8,0X0F,0XC0,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XF8,0X00,0X00,0X00,0X00,0X00,0X0F,
+0XC0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XF8,0X00,0X00,0X00,0X00,
+0X00,0X0F,0XC0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XF8,0X00,0X00,
+0X00,0X00,0X01,0XFF,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XF8,
+0X00,0X00,0X00,0X00,0X01,0XFF,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0XF8,0X00,0X00,0X00,0X00,0X01,0XFF,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0XF8,0X00,0X00,0X00,0X00,0X00,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XF8,0X01,0XFF,0XFC,0X03,0XFF,0XF0,0X00,0XFC,
+0X00,0X3F,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFE,0X01,0XFF,0XFF,0X03,0XFF,0XFC,
+0X03,0XFF,0X00,0XFF,0XE0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0X81,0XFF,0XFF,0X83,
+0XFF,0XFE,0X07,0XFF,0X81,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XC1,0XFF,
+0XFF,0X83,0XFF,0XFE,0X0F,0XFF,0XC3,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,
+0XC1,0XFF,0XFF,0XC3,0XFF,0XFE,0X1F,0X8F,0XC3,0XF1,0XF8,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,
+0XFE,0X1F,0XE1,0XFC,0X1F,0XC3,0XF0,0X7F,0X1F,0X87,0X83,0XE0,0XF8,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X01,0XFC,0X0F,0XE1,0XFC,0X1F,0X83,0XF0,0X3F,0X1F,0X00,0X07,0XE0,0XF8,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X01,0XF8,0X07,0XE1,0XFC,0X1F,0X83,0XF0,0X3F,0X3F,0X3E,0X07,0XE0,
+0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X07,0XF1,0XFF,0XFF,0X03,0XF0,0X7F,0X3F,0X7F,
+0X87,0XE0,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X07,0XF1,0XFF,0XFE,0X03,0XFF,0XFE,
+0X3F,0XFF,0XC7,0XE0,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X07,0XF1,0XFF,0XFF,0X03,
+0XFF,0XFE,0X3F,0XFF,0XC7,0XE0,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X07,0XF1,0XFF,
+0XFF,0X83,0XFF,0XFC,0X3F,0X87,0XE7,0XE0,0XFC,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XF8,0X07,
+0XF1,0XFF,0XFF,0XC3,0XFF,0XF8,0X3F,0X07,0XE7,0XE0,0XFC,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,
+0XF8,0X07,0XE1,0XFC,0X0F,0XC3,0XFF,0XE0,0X3F,0X03,0XE7,0XE0,0XFC,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X01,0XFC,0X0F,0XE1,0XFC,0X0F,0XE3,0XF0,0X00,0X1F,0X03,0XE3,0XE0,0XFC,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X01,0XFE,0X1F,0XE1,0XFC,0X0F,0XE3,0XF0,0X00,0X1F,0X07,0XE3,0XE0,
+0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XC1,0XFF,0XFF,0XC3,0XF0,0X00,0X1F,0X87,
+0XE3,0XF1,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XC1,0XFF,0XFF,0XC3,0XF0,0X00,
+0X0F,0XFF,0XC1,0XFF,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0X81,0XFF,0XFF,0X83,
+0XF0,0X00,0X07,0XFF,0X81,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFE,0X01,0XFF,
+0XFF,0X83,0XF0,0X00,0X03,0XFF,0X00,0XFF,0XE0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XF8,
+0X01,0XFF,0XFC,0X03,0XF0,0X00,0X00,0XFC,0X00,0X3F,0X80,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X40,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XC0,0X07,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XC0,0X07,
+0XFF,0XFC,0X07,0XFF,0X00,0X07,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,
+0XC0,0X07,0XFF,0XE0,0X00,0XFF,0X00,0X00,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X0F,0XC0,0X07,0XFF,0XC0,0X00,0X7F,0X00,0X00,0X7F,0XF0,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X1F,0XC0,0X07,0XFF,0X80,0X00,0X3F,0X00,0X00,0X3F,0XF0,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X1F,0XC0,0X07,0XFF,0X00,0X00,0X1F,0X00,0X00,0X1F,0XF0,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XC0,0X07,0XFE,0X00,0XC0,0X0F,0X01,0XE0,
+0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XC0,0X07,0XFE,0X03,0XF0,0X0F,
+0X01,0XF0,0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XC0,0X07,0XFC,0X03,
+0XF8,0X0F,0X01,0XF0,0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XC0,0X07,
+0XFC,0X07,0XF8,0X07,0X01,0XF0,0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,
+0XC0,0X07,0XFC,0X07,0XFC,0X07,0X01,0XE0,0X1F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X03,0XFF,0XC0,0X07,0XFC,0X07,0XFC,0X07,0X00,0X00,0X3F,0XF0,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X03,0XFF,0XC0,0X07,0XFC,0X07,0XFC,0X07,0X00,0X00,0X3F,0XF0,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X07,0XFF,0XC0,0X07,0XFC,0X07,0XFC,0X07,0X00,0X00,0X7F,0XF0,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XC0,0X07,0XFC,0X07,0XFC,0X07,0X00,0X00,
+0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XC0,0X07,0XFC,0X07,0XF8,0X07,
+0X01,0XDF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XC0,0X07,0XFC,0X07,
+0XF8,0X0F,0X01,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XC0,0X07,
+0XFE,0X03,0XF8,0X0F,0X01,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,
+0XC0,0X07,0XFE,0X00,0XE0,0X0F,0X01,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X7F,0XFF,0XC0,0X07,0XFF,0X00,0X00,0X1F,0X01,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0XFF,0XFF,0XC0,0X07,0XFF,0X00,0X00,0X3F,0X01,0XFF,0XFF,0XF0,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X01,0XFF,0XFF,0XC0,0X07,0XFF,0X80,0X00,0X7F,0X01,0XFF,0XFF,0XF0,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XC0,0X07,0XFF,0XE0,0X00,0XFF,0X01,0XFF,
+0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XC0,0X07,0XFF,0XF8,0X03,0XFF,
+0X01,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XC0,0X07,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,
+0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,
+0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X3F,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X3F,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X00,0X00,0X78,
+0X0F,0XF0,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X00,
+0X00,0X78,0X07,0XF0,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XC0,0X07,
+0XFE,0X00,0X00,0X78,0X07,0XF0,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,
+0XC0,0X07,0XFE,0X00,0X00,0X78,0X03,0XF0,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,
+0XFF,0XFF,0XC0,0X07,0XFE,0X00,0X00,0X78,0X01,0XF0,0X3F,0XF0,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X07,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X03,0XFF,0XF8,0X01,0XF0,0X3F,0XF0,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X03,0XFF,0XF8,0X00,0XF0,0X3F,0XF0,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X03,0XFF,0XF8,0X00,0X70,
+0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X00,0X00,0XF8,
+0X00,0X70,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X00,
+0X00,0XF8,0X00,0X30,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,0XC0,0X07,
+0XFE,0X00,0X00,0XF8,0X00,0X10,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X7F,0XFF,0XFF,0XFF,
+0XC0,0X07,0XFE,0X00,0X00,0XF8,0X00,0X10,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,
+0XFF,0XFF,0XC0,0X07,0XFE,0X00,0X00,0XF8,0X08,0X00,0X3F,0XF0,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X01,
+0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X03,0XFF,0XF8,0X0C,0X00,0X3F,0XF0,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X03,0XFF,0XF8,0X0E,0X00,0X3F,0XF0,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X03,0XFF,0XF8,0X0E,0X00,
+0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X03,0XFF,0XF8,
+0X0F,0X00,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X00,
+0X00,0X78,0X0F,0X80,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X0F,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,
+0XFE,0X00,0X00,0X78,0X0F,0X80,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X1F,0XFF,0XFF,0XFF,0XFF,
+0XC0,0X07,0XFE,0X00,0X00,0X78,0X0F,0XC0,0X3F,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,0XFF,0XFF,
+0XFF,0XFF,0XC0,0X07,0XFE,0X00,0X00,0X78,0X0F,0XE0,0X3F,0XF0,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X3F,
+0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFE,0X00,0X00,0X78,0X0F,0XE0,0X3F,0XF0,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X7F,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0XFF,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X01,0XFF,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,0XFF,0XFF,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X03,0XFF,0XFF,0XFF,0XFF,0XFF,0XC0,0X07,
+0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,
+0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFF,0XFF,0XFF,
+0XFF,0XFF,0XC0,0X07,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XFF,0XF0,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XF8,0X00,0X00,0X00,0X20,0X0F,0XE0,
+0X00,0X00,0X38,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFC,0X00,0X00,0X00,0X60,
+0X0F,0XF8,0X00,0X00,0X38,0X00,0X00,0X01,0X80,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFE,0X00,0X00,
+0X00,0XE0,0X0F,0XF8,0X00,0X00,0X00,0X00,0X00,0X03,0X80,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0X0E,
+0X06,0X00,0XC0,0XE0,0X0E,0X3C,0X08,0X38,0X00,0X18,0X03,0X03,0X81,0XC0,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X07,0X1E,0X1F,0X87,0XFB,0XF8,0X0E,0X3C,0XDC,0XFE,0X38,0X7F,0X0F,0XE7,0XE7,0XF0,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X07,0XFC,0X3F,0XCF,0X3B,0XF8,0X0F,0XF8,0XF9,0XFF,0X38,0XE7,0X1F,0XE7,
+0XE6,0X38,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X07,0XFE,0X78,0XE0,0X38,0XE0,0X0F,0XF8,0XE1,0XC7,0X39,0XE3,
+0XBC,0X03,0X87,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X07,0X0E,0X70,0XE3,0XF8,0XE0,0X0F,0XE0,0XE1,0XC7,
+0X39,0XFF,0XB8,0X03,0X87,0XF0,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0X0F,0X70,0XEF,0X38,0XE0,0X0E,0X00,
+0XE1,0XC7,0X39,0XFF,0XB8,0X03,0X81,0XF8,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0X1E,0X39,0XEE,0X38,0XE0,
+0X0E,0X00,0XE1,0XC7,0X38,0XE0,0X3C,0XF3,0X80,0X38,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFE,0X3F,0XCF,
+0XF8,0XF0,0X0E,0X00,0XE0,0XFF,0X38,0XFF,0X1F,0XE3,0XEF,0X78,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X07,0XFC,
+0X1F,0X87,0XD8,0XF8,0X0E,0X00,0XE0,0X7C,0X38,0X7E,0X0F,0XC1,0XE7,0XF0,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X38,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X78,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0XF8,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X20,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,
+0X00,0X00,0X00,0X00,0X00,0X00,0X00,0X00,};

lib/obp60task/NetworkClient.cpp

@@ -0,0 +1,181 @@
+#include "NetworkClient.h"
+
+extern "C" {
+    #include "puff.h"
+}
+
+// Constructor
+NetworkClient::NetworkClient(size_t reserveSize)
+    : _doc(reserveSize),
+      _valid(false)
+{
+}
+
+// Skip GZIP Header an goto DEFLATE content
+int NetworkClient::skipGzipHeader(const uint8_t* data, size_t len) {
+    if (len < 10) return -1;
+
+    if (data[0] != 0x1F || data[1] != 0x8B || data[2] != 8) {
+        return -1;
+    }
+
+    size_t pos = 10;
+    uint8_t flags = data[3];
+
+    if (flags & 4) {
+        if (pos + 2 > len) return -1;
+        uint16_t xlen = data[pos] | (data[pos+1] << 8);
+        pos += 2 + xlen;
+    }
+
+    if (flags & 8) {
+        while (pos < len && data[pos] != 0) pos++;
+        pos++;
+    }
+
+    if (flags & 16) {
+        while (pos < len && data[pos] != 0) pos++;
+        pos++;
+    }
+
+    if (flags & 2) pos += 2;
+
+    if (pos >= len) return -1;
+
+    return pos;
+}
+
+// HTTP GET + GZIP Decompression (reading in chunks)
+bool NetworkClient::httpGetGzip(const String& url, uint8_t*& outData, size_t& outLen) {
+
+    const size_t capacity = READLIMIT;   // Read limit for data (can be adjusted in NetworkClient.h)
+    uint8_t* buffer = (uint8_t*)malloc(capacity);
+
+    if (!buffer) {
+        if (DEBUG) {Serial.println("Malloc failed (buffer");}
+        return false;
+    }
+
+    HTTPClient http;
+
+    // Timeouts to prevent hanging connections
+    http.setConnectTimeout(CONNECTIONTIMEOUT);  // Connect timeout in ms (can be adjusted in NetworkClient.h)
+    http.setTimeout(TCPREADTIMEOUT);            // Read timeout in ms (can be adjusted in NetworkClient.h)
+
+    http.begin(url);
+    http.addHeader("Accept-Encoding", "gzip");
+
+    int code = http.GET();
+    if (code != HTTP_CODE_OK) {
+        Serial.printf("HTTP ERROR: %d\n", code);
+
+        // Hard reset HTTP + socket
+        WiFiClient* tmp = http.getStreamPtr();
+        if (tmp) tmp->stop();   // Force close TCP socket
+        http.end();
+
+        free(buffer);
+        return false;
+    }
+
+    WiFiClient* stream = http.getStreamPtr();
+
+    size_t len = 0;
+    uint32_t lastData = millis();
+    const uint32_t READ_TIMEOUT = READDATATIMEOUT;   // Timeout for reading data (can be adjusted in NetworkClient.h)
+
+    bool complete = false;
+
+    while (http.connected() && !complete) {
+
+        size_t avail = stream->available();
+
+        if (avail == 0) {
+            if (millis() - lastData > READ_TIMEOUT) {
+                Serial.println("TIMEOUT waiting for data!");
+                break;
+            }
+            delay(1);
+            continue;
+        }
+
+        if (len + avail > capacity)
+            avail = capacity - len;
+
+        int read = stream->readBytes(buffer + len, avail);
+        len += read;
+        lastData = millis();
+
+        if (DEBUG) {Serial.printf("Read chunk: %d (total: %d)\n", read, (int)len);}
+
+        if (len < 20) continue;  // Not enough data for header
+
+        int headerOffset = skipGzipHeader(buffer, len);
+        if (headerOffset < 0) continue;
+
+        unsigned long testLen = len * 8; // Dynamic expansion
+        uint8_t* test = (uint8_t*)malloc(testLen);
+
+        if (!test) continue;
+
+        unsigned long srcLen = len - headerOffset;
+
+        int res = puff(test, &testLen, buffer + headerOffset, &srcLen);
+        if (res == 0) {
+            if (DEBUG) {Serial.printf("Decompress OK! Size: %lu bytes\n", testLen);}
+            outData = test;
+            outLen = testLen;
+            complete = true;
+            break;
+        }
+
+        free(test);
+    }
+
+    // --- Added: Force-close connection in all cases to avoid stuck TCP sockets ---
+    if (stream) stream->stop();
+
+    http.end();
+    free(buffer);
+
+    if (!complete) {
+        Serial.println("Failed to complete decompress.");
+        return false;
+    }
+
+    return true;
+}
+
+// Decompress JSON
+bool NetworkClient::fetchAndDecompressJson(const String& url) {
+
+    _valid = false;
+
+    uint8_t* raw = nullptr;
+    size_t rawLen = 0;
+
+    if (!httpGetGzip(url, raw, rawLen)) {
+        Serial.println("GZIP download/decompress failed.");
+        return false;
+    }
+
+    DeserializationError err = deserializeJson(_doc, raw, rawLen);
+    free(raw);
+
+    if (err) {
+        Serial.printf("JSON ERROR: %s\n", err.c_str());
+        return false;
+    }
+
+    if (DEBUG) {Serial.println("JSON OK!");}
+    _valid = true;
+    return true;
+}
+
+JsonDocument& NetworkClient::json() {
+    return _doc;
+}
+
+bool NetworkClient::isValid() const {
+    return _valid;
+}

lib/obp60task/NetworkClient.h

@@ -0,0 +1,27 @@
+#pragma once
+#include <ArduinoJson.h>
+#include <WiFi.h>
+#include <HTTPClient.h>
+
+#define DEBUG false             // Debug flag for NetworkClient for more live information
+#define READLIMIT 200000        // HTTP read limit in byte for gzip content (can be adjusted)
+#define CONNECTIONTIMEOUT 3000  // Timeout in ms for HTTP connection 
+#define TCPREADTIMEOUT 2000     // Timeout in ms for read HTTP client stack
+#define READDATATIMEOUT 2000    // Timeout in ms for read data
+
+class NetworkClient {
+public:
+    NetworkClient(size_t reserveSize = 0);
+
+    bool fetchAndDecompressJson(const String& url);
+    JsonDocument& json();
+    bool isValid() const;
+
+private:
+    DynamicJsonDocument _doc;
+    bool _valid;
+
+    int skipGzipHeader(const uint8_t* data, size_t len);
+    bool httpGetGzip(const String& url, uint8_t*& outData, size_t& outLen);
+};
+

lib/obp60task/OBP60Extensions.cpp

@@ -1,10 +1,9 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include <Arduino.h>
-#include <PCF8574.h>      // Driver for PCF8574 output modul from Horter
 #include <Wire.h>         // I2C
 #include <RTClib.h>       // Driver for DS1388 RTC
+#include <PCF8574.h>      // PCF8574 modules from Horter
 #include "SunRise.h"      // Lib for sunrise and sunset calculation
 #include "Pagedata.h"
 #include "OBP60Hardware.h"
@@ -25,28 +24,37 @@
 #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
+// Definition for e-paper width an height refer OBP60Hardware.h
-#define GxEPD_HEIGHT 300    // Display height
-
 #ifdef DISPLAY_GDEW042T2
 // Set display type and SPI pins for display
 GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> display(GxEPD2_420(OBP_SPI_CS, OBP_SPI_DC, OBP_SPI_RST, OBP_SPI_BUSY)); // GDEW042T2 400x300, UC8176 (IL0398)
+// Export display in new funktion
+GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> & getdisplay(){return display;}
 #endif
+
 #ifdef DISPLAY_GDEY042T81
 // Set display type and SPI pins for display
 GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> display(GxEPD2_420_GDEY042T81(OBP_SPI_CS, OBP_SPI_DC, OBP_SPI_RST, OBP_SPI_BUSY)); // GDEW042T2 400x300, UC8176 (IL0398)
+// Export display in new funktion
+GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> & getdisplay(){return display;}
 #endif
+
 #ifdef DISPLAY_GYE042A87
 // Set display type and SPI pins for display
 GxEPD2_BW<GxEPD2_420_GYE042A87, GxEPD2_420_GYE042A87::HEIGHT> display(GxEPD2_420_GYE042A87(OBP_SPI_CS, OBP_SPI_DC, OBP_SPI_RST, OBP_SPI_BUSY)); // GDEW042T2 400x300, UC8176 (IL0398)
+// Export display in new funktion
+GxEPD2_BW<GxEPD2_420_GYE042A87, GxEPD2_420_GYE042A87::HEIGHT> & getdisplay(){return display;}
 #endif
+
 #ifdef DISPLAY_SE0420NQ04
 // Set display type and SPI pins for display
 GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> display(GxEPD2_420_SE0420NQ04(OBP_SPI_CS, OBP_SPI_DC, OBP_SPI_RST, OBP_SPI_BUSY)); // GDEW042T2 400x300, UC8176 (IL0398)
+// Export display in new funktion
+GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> & getdisplay(){return display;}
 #endif
-gxepd2display *epd = &display;
 
 // Horter I2C moduls
 PCF8574 pcf8574_Out(PCF8574_I2C_ADDR1); // First digital output modul PCF8574 from Horter
@@ -80,14 +88,15 @@ void hardwareInit(GwApi *api)
 
     Wire.begin();
     // Init PCF8574 digital outputs
-    Wire.setClock(I2C_SPEED);       // Set I2C clock on 10 kHz
+    Wire.setClock(I2C_SPEED_LOW);   // Set I2C clock on 10 kHz
     if(pcf8574_Out.begin()){        // Initialize PCF8574
         pcf8574_Out.write8(255);    // Clear all outputs
     }
+    Wire.setClock(I2C_SPEED);       // Set I2C clock on 100 kHz
     fram = Adafruit_FRAM_I2C();
     if (esp_reset_reason() ==  ESP_RST_POWERON) {
         // help initialize FRAM
-        LOG_DEBUG(GwLog::LOG,"Delaying I2C init for 250ms due to cold boot");
+        logger->logDebug(GwLog::LOG, "Delaying I2C init for 250ms due to cold boot");
         delay(250);
     }
     // FRAM (e.g. MB85RC256V)
@@ -99,11 +108,11 @@ void hardwareInit(GwApi *api)
         // Boot counter
         uint8_t framcounter = fram.read(0x0000);
         fram.write(0x0000, framcounter+1);
-        LOG_DEBUG(GwLog::LOG,"FRAM detected: 0x%04x/0x%04x (counter=%d)", manufacturerID, productID, framcounter);
+        logger->logDebug(GwLog::LOG, "FRAM detected: 0x%04x/0x%04x (counter=%d)", manufacturerID, productID, framcounter);
     }
     else {
         hasFRAM = false;
-        LOG_DEBUG(GwLog::LOG,"NO FRAM detected");
+        logger->logDebug(GwLog::LOG, "NO FRAM detected");
     }
     // SD Card
     hasSDCard = false;
@@ -112,6 +121,7 @@ void hardwareInit(GwApi *api)
         esp_err_t ret;
         sdmmc_host_t host = SDSPI_HOST_DEFAULT();
         host.slot = SPI3_HOST;
+        logger->logDebug(GwLog::DEBUG, "SDSPI_HOST: max_freq_khz=%d" , host.max_freq_khz);
         spi_bus_config_t bus_cfg = {
             .mosi_io_num = SD_SPI_MOSI,
             .miso_io_num = SD_SPI_MISO,
@@ -122,7 +132,7 @@ void hardwareInit(GwApi *api)
         };
         ret = spi_bus_initialize((spi_host_device_t) host.slot, &bus_cfg, SDSPI_DEFAULT_DMA);
         if (ret != ESP_OK) {
-            LOG_DEBUG(GwLog::ERROR,"Failed to initialize SPI bus for SD card");
+            logger->logDebug(GwLog::ERROR, "Failed to initialize SPI bus for SD card");
         } else {
             sdspi_device_config_t slot_config = SDSPI_DEVICE_CONFIG_DEFAULT();
             slot_config.gpio_cs = SD_SPI_CS;
@@ -135,15 +145,29 @@ void hardwareInit(GwApi *api)
             ret = esp_vfs_fat_sdspi_mount(MOUNT_POINT, &host, &slot_config, &mount_config, &sdcard);
             if (ret != ESP_OK) {
                 if (ret == ESP_FAIL) {
-                    LOG_DEBUG(GwLog::ERROR,"Failed to mount SD card filesystem");
+                    logger->logDebug(GwLog::ERROR, "Failed to mount SD card filesystem");
                 } else {
-                    LOG_DEBUG(GwLog::ERROR,"Failed to initialize SD card");
+                    // ret == 263 could be not powered up yet
+                    logger->logDebug(GwLog::ERROR, "Failed to initialize SD card (error #%d)", ret);
                 }
             } else {
-                LOG_DEBUG(GwLog::ERROR,"SD card filesystem mounted");
+                logger->logDebug(GwLog::LOG, "SD card filesystem mounted at '%s'", MOUNT_POINT);
                 hasSDCard = true;
             }
         }
+        if (hasSDCard) {
+            // read some stats
+            String features = "";
+            if (sdcard->is_mem) features += "MEM "; // Memory card
+            if (sdcard->is_sdio) features += "IO "; // IO Card
+            if (sdcard->is_mmc) features += "MMC "; // MMC Card
+            if (sdcard->is_ddr) features += "DDR ";
+            // if (sdcard->is_uhs1) features += "UHS-1 ";
+            // ext_csd. Extended information
+            // uint8_t rev, uint8_t power_class
+            logger->logDebug(GwLog::LOG, "SD card features: %s", features);
+            logger->logDebug(GwLog::LOG, "SD card size: %lluMB", ((uint64_t) sdcard->csd.capacity) * sdcard->csd.sector_size / (1024 * 1024));
+        }
     }
 #endif
 }
@@ -169,6 +193,15 @@ void powerInit(String powermode) {
     }
 }
 
+void setPCF8574PortPin(uint pin, uint8_t value){
+    Wire.setClock(I2C_SPEED_LOW);   // Set I2C clock on 10 kHz
+    if(pcf8574_Out.begin()){        // Check available and initialize PCF8574
+        pcf8574_Out.write(pin, value); // Toggle pin
+    }
+    Wire.setClock(I2C_SPEED);       // Set I2C clock on 100 kHz
+}
+
+
 void setPortPin(uint pin, bool value){
     pinMode(pin, OUTPUT);
     digitalWrite(pin, value);
@@ -196,17 +229,17 @@ void deepSleep(CommonData &common){
     setFlashLED(false);                     // Flash LED Off
     buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
     // Shutdown EInk display
-    epd->setFullWindow();               // Set full Refresh
+    getdisplay().setFullWindow();               // Set full Refresh
-    epd->fillScreen(common.bgcolor);    // Clear screen
+    getdisplay().fillScreen(common.bgcolor);    // Clear screen
-    epd->setTextColor(common.fgcolor);
+    getdisplay().setTextColor(common.fgcolor);
-    epd->setFont(&Ubuntu_Bold20pt8b);
+    getdisplay().setFont(&Ubuntu_Bold20pt8b);
-    epd->setCursor(85, 150);
+    getdisplay().setCursor(85, 150);
-    epd->print("Sleep Mode");
+    getdisplay().print("Sleep Mode");
-    epd->setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-    epd->setCursor(65, 175);
+    getdisplay().setCursor(65, 175);
-    epd->print("To wake up press key and wait 5s");
+    getdisplay().print("To wake up press key and wait 5s");
-    epd->nextPage();                // Update display contents
+    getdisplay().nextPage();                // Update display contents
-    epd->powerOff();                // Display power off
+    getdisplay().powerOff();                // Display power off
     setPortPin(OBP_POWER_50, false);        // Power off ePaper display
     // Stop system
     esp_deep_sleep_start();                 // Deep Sleep with weakup via touch pin
@@ -220,18 +253,18 @@ void deepSleep(CommonData &common){
     setPortPin(OBP_BACKLIGHT_LED, false);   // Backlight Off
     setFlashLED(false);                     // Flash LED Off
     // Shutdown EInk display
-    epd->setFullWindow();               // Set full Refresh
+    getdisplay().setFullWindow();               // Set full Refresh
-    //epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+    //getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-    epd->fillScreen(common.bgcolor);    // Clear screen
+    getdisplay().fillScreen(common.bgcolor);    // Clear screen
-    epd->setTextColor(common.fgcolor);
+    getdisplay().setTextColor(common.fgcolor);
-    epd->setFont(&Ubuntu_Bold20pt8b);
+    getdisplay().setFont(&Ubuntu_Bold20pt8b);
-    epd->setCursor(85, 150);
+    getdisplay().setCursor(85, 150);
-    epd->print("Sleep Mode");
+    getdisplay().print("Sleep Mode");
-    epd->setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-    epd->setCursor(65, 175);
+    getdisplay().setCursor(65, 175);
-    epd->print("To wake up press wheel and wait 5s");
+    getdisplay().print("To wake up press wheel and wait 5s");
-    epd->nextPage();                // Partial update
+    getdisplay().nextPage();                // Partial update
-    epd->powerOff();                // Display power off
+    getdisplay().powerOff();                // Display power off
     setPortPin(OBP_POWER_EPD, false);       // Power off ePaper display
     setPortPin(OBP_POWER_SD, false);        // Power off SD card
     // Stop system
@@ -339,17 +372,17 @@ String xdrDelete(String input){
 }
 
 void fillPoly4(const std::vector<Point>& p4, uint16_t color) {
-    epd->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[1].x, p4[1].y, p4[2].x, p4[2].y, color);
-    epd->fillTriangle(p4[0].x, p4[0].y, p4[2].x, p4[2].y, p4[3].x, p4[3].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++) {
-        epd->drawLine(points[i].x, points[i].y, points[i+1].x, points[i+1].y, color);
+        getdisplay().drawLine(points[i].x, points[i].y, points[i+1].x, points[i+1].y, color);
     }
     // close path
-    epd->drawLine(points[polysize-1].x, points[polysize-1].y, points[0].x, points[0].y, color);
+    getdisplay().drawLine(points[polysize-1].x, points[polysize-1].y, points[0].x, points[0].y, color);
 }
 
 // Split string into words, whitespace separated
@@ -399,50 +432,50 @@ std::vector<String> wordwrap(String &line, uint16_t maxwidth) {
 void drawTextCenter(int16_t cx, int16_t cy, String text) {
     int16_t x1, y1;
     uint16_t w, h;
-    epd->getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
+    getdisplay().getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
-    epd->setCursor(cx - w / 2, cy + h / 2);
+    getdisplay().setCursor(cx - w / 2, cy + h / 2);
-    epd->print(text);
+    getdisplay().print(text);
 }
 
 // Draw right aligned text
 void drawTextRalign(int16_t x, int16_t y, String text) {
     int16_t x1, y1;
     uint16_t w, h;
-    epd->getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
+    getdisplay().getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
-    epd->setCursor(x - w, y);
+    getdisplay().setCursor(x - w, y);
-    epd->print(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) {
-        epd->fillRect(box.x, box.y, box.w, box.h, fg);
+        getdisplay().fillRect(box.x, box.y, box.w, box.h, fg);
-        epd->setTextColor(bg);
+        getdisplay().setTextColor(bg);
     } else {
         if (border) {
-            epd->fillRect(box.x + 1, box.y + 1, box.w - 2, box.h - 2, bg);
+            getdisplay().fillRect(box.x + 1, box.y + 1, box.w - 2, box.h - 2, bg);
-            epd->drawRect(box.x, box.y, box.w, box.h, fg);
+            getdisplay().drawRect(box.x, box.y, box.w, box.h, fg);
         }
-        epd->setTextColor(fg);
+        getdisplay().setTextColor(fg);
     }
     uint16_t border_offset = box.h / 4; // 25% of box height
-    epd->setCursor(box.x + border_offset, box.y + box.h - border_offset);
+    getdisplay().setCursor(box.x + border_offset, box.y + box.h - border_offset);
-    epd->print(text);
+    getdisplay().print(text);
-    epd->setTextColor(fg);
+    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){
-    epd->fillTriangle(x, y, x+size*2, y, x+size, y-size*2, color);
+    getdisplay().fillTriangle(x, y, x+size*2, y, x+size, y-size*2, color);
 }
 
 // Show a triangle for trend direction low (x, y is the left edge)
 void displayTrendLow(int16_t x, int16_t y, uint16_t size, uint16_t color){
-    epd->fillTriangle(x, y, x+size*2, y, x+size, y+size*2, color);
+    getdisplay().fillTriangle(x, y, x+size*2, y, x+size, y+size*2, color);
 }
 
 // Show header informations
-void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop){
+void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop){
 
     static bool heartbeat = false;
     static unsigned long usbRxOld = 0;
@@ -456,70 +489,31 @@ void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *da
     static unsigned long n2kRxOld = 0;
     static unsigned long n2kTxOld = 0;
 
-    uint16_t symbol_x = 2;
-    static const uint16_t symbol_offset = 20;
-
     if(commonData.config->getBool(commonData.config->statusLine) == true){
 
-       if (symbolmode) {
-           commonData.logger->logDebug(GwLog::LOG,"Header: Symbolmode");
-       } else {
-           commonData.logger->logDebug(GwLog::LOG,"Header: Textmode");
-        }
-
         // Show status info
-        epd->setTextColor(commonData.fgcolor);
+        getdisplay().setTextColor(commonData.fgcolor);
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(0, 15);
+        getdisplay().setCursor(0, 15);
         if(commonData.status.wifiApOn){
-            if (symbolmode) {
+        getdisplay().print(" AP ");
-                epd->drawXBitmap(symbol_x, 1, iconmap["AP"], icon_width, icon_height, commonData.fgcolor);
-                symbol_x += symbol_offset;
-            } else {
-                epd->print(" AP ");
-            }
         }
         // If receive new telegram data then display bus name
         if(commonData.status.tcpClRx != tcpClRxOld || commonData.status.tcpClTx != tcpClTxOld || commonData.status.tcpSerRx != tcpSerRxOld || commonData.status.tcpSerTx != tcpSerTxOld){
-            if (symbolmode) {
+        getdisplay().print("TCP ");
-                epd->drawXBitmap(symbol_x, 1, iconmap["TCP"], icon_width, icon_height, commonData.fgcolor);
-                symbol_x += symbol_offset;
-            } else {
-                epd->print("TCP ");
-            }
         }
         if(commonData.status.n2kRx != n2kRxOld || commonData.status.n2kTx != n2kTxOld){
-            if (symbolmode) {
+        getdisplay().print("N2K ");
-                epd->drawXBitmap(symbol_x, 1, iconmap["N2K"], icon_width, icon_height, commonData.fgcolor);
-                symbol_x += symbol_offset;
-            } else {
-                epd->print("N2K ");
-            }
         }
         if(commonData.status.serRx != serRxOld || commonData.status.serTx != serTxOld){
-            if (symbolmode) {
+        getdisplay().print("183 ");
-                epd->drawXBitmap(symbol_x, 1, iconmap["0183"], icon_width, icon_height, commonData.fgcolor);
-                symbol_x += symbol_offset;
-            } else {
-                epd->print("183 ");
-            }
         }
         if(commonData.status.usbRx != usbRxOld || commonData.status.usbTx != usbTxOld){
-            if (symbolmode) {
+        getdisplay().print("USB ");
-                epd->drawXBitmap(symbol_x, 1, iconmap["USB"], icon_width, icon_height, commonData.fgcolor);
-                symbol_x += symbol_offset;
-            } else {
-                epd->print("USB ");
-            }
         }
         double gpshdop = formatValue(hdop, commonData).value;
         if(commonData.config->getString(commonData.config->useGPS) != "off" &&  gpshdop <= commonData.config->getInt(commonData.config->hdopAccuracy) && hdop->valid == true){
-            if (symbolmode) {
+        getdisplay().print("GPS");
-                epd->drawXBitmap(symbol_x, 1, iconmap["GPS"], icon_width, icon_height, commonData.fgcolor);
-                symbol_x += symbol_offset;
-            } else {
-                epd->print("GPS");
-            }
         }
         // Save old telegram counter
         tcpClRxOld = commonData.status.tcpClRx;
@@ -536,26 +530,26 @@ void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *da
 #ifdef HARDWARE_V21
         // Display key lock status
         if (commonData.keylock) {
-            epd->drawXBitmap(170, 1, lock_bits, icon_width, icon_height, commonData.fgcolor);
+            getdisplay().drawXBitmap(170, 1, lock_bits, icon_width, icon_height, commonData.fgcolor);
         } else {
-            epd->drawXBitmap(166, 1, swipe_bits, swipe_width, swipe_height, commonData.fgcolor);
+            getdisplay().drawXBitmap(166, 1, swipe_bits, swipe_width, swipe_height, commonData.fgcolor);
         }
 #endif
 #ifdef LIPO_ACCU_1200
         if (commonData.data.BatteryChargeStatus == 1) {
-             epd->drawXBitmap(170, 1, battery_loading_bits, battery_width, battery_height, commonData.fgcolor);
+             getdisplay().drawXBitmap(170, 1, battery_loading_bits, battery_width, battery_height, commonData.fgcolor);
         } else {
 #ifdef VOLTAGE_SENSOR
             if (commonData.data.batteryLevelLiPo < 10) {
-                epd->drawXBitmap(170, 1, battery_0_bits, battery_width, battery_height, commonData.fgcolor);
+                getdisplay().drawXBitmap(170, 1, battery_0_bits, battery_width, battery_height, commonData.fgcolor);
             } else if (commonData.data.batteryLevelLiPo < 25) {
-                epd->drawXBitmap(170, 1, battery_25_bits, battery_width, battery_height, commonData.fgcolor);
+                getdisplay().drawXBitmap(170, 1, battery_25_bits, battery_width, battery_height, commonData.fgcolor);
             } else if (commonData.data.batteryLevelLiPo < 50) {
-                epd->drawXBitmap(170, 1, battery_50_bits, battery_width, battery_height, commonData.fgcolor);
+                getdisplay().drawXBitmap(170, 1, battery_50_bits, battery_width, battery_height, commonData.fgcolor);
             } else if (commonData.data.batteryLevelLiPo < 75) {
-                epd->drawXBitmap(170, 1, battery_75_bits, battery_width, battery_height, commonData.fgcolor);
+                getdisplay().drawXBitmap(170, 1, battery_75_bits, battery_width, battery_height, commonData.fgcolor);
             } else {
-                epd->drawXBitmap(170, 1, battery_100_bits, battery_width, battery_height, commonData.fgcolor);
+                getdisplay().drawXBitmap(170, 1, battery_100_bits, battery_width, battery_height, commonData.fgcolor);
             }
 #endif // VOLTAGE_SENSOR
         }
@@ -563,13 +557,13 @@ void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *da
 
         // Heartbeat as page number
         if (heartbeat) {
-            epd->setTextColor(commonData.bgcolor);
+            getdisplay().setTextColor(commonData.bgcolor);
-            epd->fillRect(201, 0, 23, 19, commonData.fgcolor);
+            getdisplay().fillRect(201, 0, 23, 19, commonData.fgcolor);
         } else {
-            epd->setTextColor(commonData.fgcolor);
+            getdisplay().setTextColor(commonData.fgcolor);
-            epd->drawRect(201, 0, 23, 19, commonData.fgcolor);
+            getdisplay().drawRect(201, 0, 23, 19, commonData.fgcolor);
         }
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
         drawTextCenter(211, 9, String(commonData.data.actpage));
         heartbeat = !heartbeat;
 
@@ -577,19 +571,19 @@ void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *da
         String fmttype = commonData.config->getString(commonData.config->dateFormat);
         String timesource = commonData.config->getString(commonData.config->timeSource);
         double tz = commonData.config->getString(commonData.config->timeZone).toDouble();
-        epd->setTextColor(commonData.fgcolor);
+        getdisplay().setTextColor(commonData.fgcolor);
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(230, 15);
+        getdisplay().setCursor(230, 15);
         if (timesource == "RTC" or timesource == "iRTC") {
             // TODO take DST into account
             if (commonData.data.rtcValid) {
                 time_t tv = mktime(&commonData.data.rtcTime) + (int)(tz * 3600);
                 struct tm *local_tm = localtime(&tv);
-                epd->print(formatTime('m', local_tm->tm_hour, local_tm->tm_min, 0));
+                getdisplay().print(formatTime('m', local_tm->tm_hour, local_tm->tm_min, 0));
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(formatDate(fmttype, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
+                getdisplay().print(formatDate(fmttype, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(tz == 0 ? "UTC" : "LOT");
+                getdisplay().print(tz == 0 ? "UTC" : "LOT");
             } else {
                 drawTextRalign(396, 15, "RTC invalid");
             }
@@ -600,15 +594,15 @@ void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *da
                 String acttime = formatValue(time, commonData).svalue;
                 acttime = acttime.substring(0, 5);
                 String actdate = formatValue(date, commonData).svalue;
-                epd->print(acttime);
+                getdisplay().print(acttime);
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(actdate);
+                getdisplay().print(actdate);
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(tz == 0 ? "UTC" : "LOT");
+                getdisplay().print(tz == 0 ? "UTC" : "LOT");
             }
             else{
                 if(commonData.config->getBool(commonData.config->useSimuData) == true){
-                    epd->print("12:00 01.01.2024 LOT");
+                    getdisplay().print("12:00 01.01.2024 LOT");
                 }
                 else{
                     drawTextRalign(396, 15, "No GPS data");
@@ -616,15 +610,15 @@ void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *da
             }
         } // timesource == "GPS"
         else {
-            epd->print("No time source");
+            getdisplay().print("No time source");
         }
     }
 }
 
 void displayFooter(CommonData &commonData) {
 
-    epd->setFont(&Atari16px);
+    getdisplay().setFont(&Atari16px);
-    epd->setTextColor(commonData.fgcolor);
+    getdisplay().setTextColor(commonData.fgcolor);
 
 #ifdef HARDWARE_V21
     // Frame around key icon area
@@ -633,14 +627,14 @@ void displayFooter(CommonData &commonData) {
         const uint16_t top = 280;
         const uint16_t bottom = 299;
         // horizontal stub lines
-        epd->drawLine(commonData.keydata[0].x, top, commonData.keydata[0].x+10, top, commonData.fgcolor);
+        getdisplay().drawLine(commonData.keydata[0].x, top, commonData.keydata[0].x+10, top, commonData.fgcolor);
         for (int i = 1; i <= 5; i++) {
-            epd->drawLine(commonData.keydata[i].x-10, top, commonData.keydata[i].x+10, top, commonData.fgcolor);
+            getdisplay().drawLine(commonData.keydata[i].x-10, top, commonData.keydata[i].x+10, top, commonData.fgcolor);
         }
-        epd->drawLine(commonData.keydata[5].x + commonData.keydata[5].w - 10, top, commonData.keydata[5].x + commonData.keydata[5].w + 1, top, commonData.fgcolor);
+        getdisplay().drawLine(commonData.keydata[5].x + commonData.keydata[5].w - 10, top, commonData.keydata[5].x + commonData.keydata[5].w + 1, top, commonData.fgcolor);
         // vertical key separators
         for (int i = 0; i <= 4; i++) {
-            epd->drawLine(commonData.keydata[i].x + commonData.keydata[i].w, top, commonData.keydata[i].x + commonData.keydata[i].w, bottom, commonData.fgcolor);
+            getdisplay().drawLine(commonData.keydata[i].x + commonData.keydata[i].w, top, commonData.keydata[i].x + commonData.keydata[i].w, bottom, commonData.fgcolor);
         }
         for (int i = 0; i < 6; i++) {
             uint16_t x, y;
@@ -651,7 +645,7 @@ void displayFooter(CommonData &commonData) {
                     if (iconmap.find(icon_name) != iconmap.end()) {
                         x = commonData.keydata[i].x + (commonData.keydata[i].w - icon_width) / 2;
                         y = commonData.keydata[i].y + (commonData.keydata[i].h - icon_height) / 2;
-                        epd->drawXBitmap(x, y, iconmap[icon_name], icon_width, icon_height, commonData.fgcolor);
+                        getdisplay().drawXBitmap(x, y, iconmap[icon_name], icon_width, icon_height, commonData.fgcolor);
                     } else {
                         // icon is missing, use name instead
                         x = commonData.keydata[i].x + commonData.keydata[i].w / 2;
@@ -666,8 +660,8 @@ void displayFooter(CommonData &commonData) {
             }
         }
     } else {
-        epd->setCursor(65, 295);
+        getdisplay().setCursor(65, 295);
-        epd->print("Press 1 and 6 fast to unlock keys");
+        getdisplay().print("Press 1 and 6 fast to unlock keys");
     }
 #endif
 #ifdef BOARD_OBP40S3
@@ -678,21 +672,21 @@ void displayFooter(CommonData &commonData) {
     uint16_t x0 = (GxEPD_WIDTH - w) / 2 + r * 2;
     for (int i = 0; i < commonData.data.maxpage; i++) {
         if (i == (commonData.data.actpage - 1)) {
-            epd->fillCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
+            getdisplay().fillCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
         } else {
-            epd->drawCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
+            getdisplay().drawCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
         }
     }
     // key indicators
     // left side = top key "menu"
-    epd->drawLine(0, 280, 10, 280, commonData.fgcolor);
+    getdisplay().drawLine(0, 280, 10, 280, commonData.fgcolor);
-    epd->drawLine(55, 280, 65, 280, commonData.fgcolor);
+    getdisplay().drawLine(55, 280, 65, 280, commonData.fgcolor);
-    epd->drawLine(65, 280, 65, 299, commonData.fgcolor);
+    getdisplay().drawLine(65, 280, 65, 299, commonData.fgcolor);
     drawTextCenter(33, 291, commonData.keydata[0].label);
     // right side = bottom key "exit"
-    epd->drawLine(390, 280, 399, 280, commonData.fgcolor);
+    getdisplay().drawLine(390, 280, 399, 280, commonData.fgcolor);
-    epd->drawLine(335, 280, 345, 280, commonData.fgcolor);
+    getdisplay().drawLine(335, 280, 345, 280, commonData.fgcolor);
-    epd->drawLine(335, 280, 335, 399, commonData.fgcolor);
+    getdisplay().drawLine(335, 280, 335, 399, commonData.fgcolor);
     drawTextCenter(366, 291, commonData.keydata[1].label);
 #endif
 }
@@ -705,31 +699,31 @@ void displayAlarm(CommonData &commonData) {
     const uint16_t w = 300;
     const uint16_t h = 150;
 
-    epd->setFont(&Atari16px);
+    getdisplay().setFont(&Atari16px);
-    epd->setTextColor(commonData.fgcolor);
+    getdisplay().setTextColor(commonData.fgcolor);
 
     // overlay
-    epd->drawRect(x, y, w, h, commonData.fgcolor);
+    getdisplay().drawRect(x, y, w, h, commonData.fgcolor);
-    epd->fillRect(x + 1, y + 1, w - 1, h - 1, commonData.bgcolor);
+    getdisplay().fillRect(x + 1, y + 1, w - 1, h - 1, commonData.bgcolor);
-    epd->drawRect(x + 3, y + 3, w - 5, h - 5, commonData.fgcolor);
+    getdisplay().drawRect(x + 3, y + 3, w - 5, h - 5, commonData.fgcolor);
 
     // exclamation icon in left top corner
-    epd->drawXBitmap(x + 16, y + 16, exclamation_bits, exclamation_width, exclamation_height, commonData.fgcolor);
+    getdisplay().drawXBitmap(x + 16, y + 16, exclamation_bits, exclamation_width, exclamation_height, commonData.fgcolor);
 
     // title
-    epd->setCursor(x + 64, y + 30);
+    getdisplay().setCursor(x + 64, y + 30);
-    epd->print("A L A R M");
+    getdisplay().print("A L A R M");
-    epd->setCursor(x + 64, y + 48);
+    getdisplay().setCursor(x + 64, y + 48);
-    epd->print("#" + commonData.alarm.id);
+    getdisplay().print("#" + commonData.alarm.id);
-    epd->print(" from ");
+    getdisplay().print(" from ");
-    epd->print(commonData.alarm.source);
+    getdisplay().print(commonData.alarm.source);
 
     // message, but maximum 4 lines
     std::vector<String> lines = wordwrap (commonData.alarm.message, w - 16 - 8 / 8);
     int n = 0;
     for (const auto& l : lines) {
-        epd->setCursor(x + 16, y + 80 + n);
+        getdisplay().setCursor(x + 16, y + 80 + n);
-        epd->print(l);
+        getdisplay().print(l);
         n += 16;
         if (n > 64) {
             break;
@@ -822,20 +816,20 @@ void batteryGraphic(uint x, uint y, float percent, int pcolor, int bcolor){
         }
         // Battery corpus 100x80 with fill level
         int level = int((100.0 - percent) * (80-(2*t)) / 100.0);
-        epd->fillRect(xb, yb, 100, 80, pcolor);
+        getdisplay().fillRect(xb, yb, 100, 80, pcolor);
         if(percent < 99){
-            epd->fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
+            getdisplay().fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
         }
         // Plus pol 20x15
         int xp = xb + 20;
         int yp = yb - 15 + t;
-        epd->fillRect(xp, yp, 20, 15, pcolor);
+        getdisplay().fillRect(xp, yp, 20, 15, pcolor);
-        epd->fillRect(xp+t, yp+t, 20-(2*t), 15-(2*t), bcolor);
+        getdisplay().fillRect(xp+t, yp+t, 20-(2*t), 15-(2*t), bcolor);
         // Minus pol 20x15
         int xm = xb + 60;
         int ym = yb -15 + t;
-        epd->fillRect(xm, ym, 20, 15, pcolor);
+        getdisplay().fillRect(xm, ym, 20, 15, pcolor);
-        epd->fillRect(xm+t, ym+t, 20-(2*t), 15-(2*t), bcolor);
+        getdisplay().fillRect(xm+t, ym+t, 20-(2*t), 15-(2*t), bcolor);
 }
 
 // Solar graphic with fill level
@@ -847,17 +841,17 @@ void solarGraphic(uint x, uint y, int pcolor, int bcolor){
         int percent = 0;
         // Solar corpus 100x80
         int level = int((100.0 - percent) * (80-(2*t)) / 100.0);
-        epd->fillRect(xb, yb, 100, 80, pcolor);
+        getdisplay().fillRect(xb, yb, 100, 80, pcolor);
         if(percent < 99){
-            epd->fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
+            getdisplay().fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
         }
         // Draw horizontel lines
-        epd->fillRect(xb, yb+28-t, 100, t, pcolor);
+        getdisplay().fillRect(xb, yb+28-t, 100, t, pcolor);
-        epd->fillRect(xb, yb+54-t, 100, t, pcolor);
+        getdisplay().fillRect(xb, yb+54-t, 100, t, pcolor);
         // Draw vertical lines
-        epd->fillRect(xb+19+t, yb, t, 80, pcolor);
+        getdisplay().fillRect(xb+19+t, yb, t, 80, pcolor);
-        epd->fillRect(xb+39+2*t, yb, t, 80, pcolor);
+        getdisplay().fillRect(xb+39+2*t, yb, t, 80, pcolor);
-        epd->fillRect(xb+59+3*t, yb, t, 80, pcolor);
+        getdisplay().fillRect(xb+59+3*t, yb, t, 80, pcolor);
 
 }
 
@@ -869,13 +863,13 @@ void generatorGraphic(uint x, uint y, int pcolor, int bcolor){
         int t = 4;      // Line thickness
 
         // Generator corpus with radius 45
-        epd->fillCircle(xb, yb, 45, pcolor);
+        getdisplay().fillCircle(xb, yb, 45, pcolor);
-        epd->fillCircle(xb, yb, 41, bcolor);
+        getdisplay().fillCircle(xb, yb, 41, bcolor);
         // Insert G
-        epd->setTextColor(pcolor);
+        getdisplay().setTextColor(pcolor);
-        epd->setFont(&Ubuntu_Bold32pt8b);
+        getdisplay().setFont(&Ubuntu_Bold32pt8b);
-        epd->setCursor(xb-22, yb+20);
+        getdisplay().setCursor(xb-22, yb+20);
-        epd->print("G");
+        getdisplay().print("G");
 }
 
 // Function to handle HTTP image request
@@ -889,7 +883,7 @@ void doImageRequest(GwApi *api, int *pageno, const PageStruct pages[MAX_PAGE_NUM
 
     logger->logDebug(GwLog::LOG,"handle image request [%s]: %s", imgformat, filename);
 
-    uint8_t *fb = epd->getBuffer(); // EPD framebuffer
+    uint8_t *fb = getdisplay().getBuffer(); // EPD framebuffer
     std::vector<uint8_t> imageBuffer;       // image in webserver transferbuffer
     String mimetype;
 
@@ -919,4 +913,30 @@ void doImageRequest(GwApi *api, int *pageno, const PageStruct pages[MAX_PAGE_NUM
     imageBuffer.clear();
 }
 
+
+
+// Calculate the distance between two Geo coordinates
+double distanceBetweenCoordinates(double lat1, double lon1, double lat2, double lon2) {
+    // Grad → Radiant
+    double lat1Rad = lat1 * DEG_TO_RAD;
+    double lon1Rad = lon1 * DEG_TO_RAD;
+    double lat2Rad = lat2 * DEG_TO_RAD;
+    double lon2Rad = lon2 * DEG_TO_RAD;
+
+    // Differenzen
+    double dLat = lat2Rad - lat1Rad;
+    double dLon = lon2Rad - lon1Rad;
+
+    // Haversine-Formel
+    double a = sin(dLat / 2.0) * sin(dLat / 2.0) +
+               cos(lat1Rad) * cos(lat2Rad) *
+               sin(dLon / 2.0) * sin(dLon / 2.0);
+
+    double c = 2.0 * atan2(sqrt(a), sqrt(1.0 - a));
+
+    // Abstand in Metern
+    return double(EARTH_RADIUS) * c;
+}
+
+
 #endif

lib/obp60task/OBP60Extensions.h

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #ifndef _OBP60EXTENSIONPORT_H
 #define _OBP60EXTENSIONPORT_H
 
@@ -8,6 +7,7 @@
 #include "Graphics.h"
 #include <GxEPD2_BW.h>                  // E-paper lib V2
 #include <Adafruit_FRAM_I2C.h>          // I2C FRAM
+#include <math.h>
 
 #ifdef BOARD_OBP40S3
 #include "esp_vfs_fat.h"
@@ -23,6 +23,7 @@
 #define FRAM_VOLTAGE_AVG 0x000A
 #define FRAM_VOLTAGE_TREND 0x000B
 #define FRAM_VOLTAGE_MODE 0x000C
+// Wind page
 #define FRAM_WIND_SIZE 0x000D
 #define FRAM_WIND_SRC 0x000E
 #define FRAM_WIND_MODE 0x000F
@@ -30,8 +31,15 @@
 #define FRAM_BAROGRAPH_START 0x0400
 #define FRAM_BAROGRAPH_END 0x13FF
 
+#define PI 3.1415926535897932384626433832795
+#define EARTH_RADIUS 6371000.0
+
 extern Adafruit_FRAM_I2C fram;
 extern bool hasFRAM;
+extern bool hasSDCard;
+#ifdef BOARD_OBP40S3
+extern sdmmc_card_t *sdcard;
+#endif
 
 // Fonts declarations for display (#includes see OBP60Extensions.cpp)
 extern const GFXfont DSEG7Classic_BoldItalic16pt7b;
@@ -47,21 +55,24 @@ 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
-typedef GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> gxepd2display;
+GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> & getdisplay();
 #endif
+
 #ifdef DISPLAY_GDEY042T81
-typedef GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> gxepd2display;
+GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> & getdisplay();
 #endif
+
 #ifdef DISPLAY_GYE042A87
-typedef GxEPD2_BW<GxEPD2_420_GYE042A87, GxEPD2_420_GYE042A87::HEIGHT> gxepd2display;
+GxEPD2_BW<GxEPD2_420_GYE042A87, GxEPD2_420_GYE042A87::HEIGHT> & getdisplay();
 #endif
+
 #ifdef DISPLAY_SE0420NQ04
-typedef GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> gxepd2display;
+GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> & getdisplay();
 #endif
-extern gxepd2display *epd;
 
 // Page display return values
 #define PAGE_OK 0          // all ok, do nothing
@@ -78,8 +89,8 @@ uint8_t getLastPage();
 void hardwareInit(GwApi *api);
 void powerInit(String powermode);
 
+void setPCF8574PortPin(uint pin, uint8_t value);// Set PCF8574 port pin
 void setPortPin(uint pin, bool value);          // Set port pin for extension port
-
 void togglePortPin(uint pin);                   // Toggle extension port pin
 
 Color colorMapping(const String &colorString);          // Color mapping string to CHSV colors
@@ -103,7 +114,7 @@ void drawTextBoxed(Rect box, String text, uint16_t fg, uint16_t bg, bool inverte
 void displayTrendHigh(int16_t x, int16_t y, uint16_t size, uint16_t color);
 void displayTrendLow(int16_t x, int16_t y, uint16_t size, uint16_t color);
 
-void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop); // Draw display header
+void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop); // Draw display header
 void displayFooter(CommonData &commonData);
 void displayAlarm(CommonData &commonData);
 
@@ -151,62 +162,24 @@ static unsigned char fram_bits[] PROGMEM = {
    0xff, 0xff, 0xf8, 0x1f, 0xf8, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x1f,
    0xf8, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x1f };
 
-// Header symbols
-
 static unsigned char ap_bits[] PROGMEM = {
    0xe0, 0x03, 0x18, 0x0c, 0x04, 0x10, 0xc2, 0x21, 0x30, 0x06, 0x08, 0x08,
    0xc0, 0x01, 0x20, 0x02, 0x00, 0x00, 0x80, 0x00, 0xc0, 0x01, 0xc0, 0x01,
    0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00 };
 
-static unsigned char gps_bits[] PROGMEM = {
+static unsigned char dish_bits[] PROGMEM = {
    0x3c, 0x00, 0x42, 0x18, 0xfa, 0x1b, 0x02, 0x04, 0x02, 0x0a, 0x02, 0x09,
    0x82, 0x08, 0x06, 0x0a, 0x0e, 0x1b, 0x9c, 0x2b, 0x38, 0x2b, 0x74, 0x20,
    0xec, 0x1f, 0x1c, 0x00, 0xf4, 0x00, 0xfe, 0x03 };
 
-static unsigned char nmea_bits[] PROGMEM = {
-   0x00, 0x00, 0x22, 0x21, 0x26, 0x33, 0x26, 0x33, 0x2a, 0x2d, 0x32, 0x2d,
-   0x32, 0x21, 0x22, 0x21, 0x00, 0x00, 0x3c, 0x0c, 0x04, 0x0c, 0x04, 0x12,
-   0x3c, 0x12, 0x04, 0x1e, 0x04, 0x21, 0x3c, 0x21 };
-
-static unsigned char n2k_bits[] PROGMEM = {
-   0xe0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x02, 0x40, 0x32, 0x4c, 0x31, 0x8c,
-   0x01, 0x80, 0x81, 0x81, 0x81, 0x81, 0x01, 0x80, 0x31, 0x8c, 0x32, 0x4c,
-   0x02, 0x40, 0x04, 0x20, 0x98, 0x19, 0xe0, 0x07 };
-
-static unsigned char tcp_bits[] PROGMEM = {
-   0x00, 0x00, 0xe0, 0x03, 0x20, 0x02, 0x20, 0x02, 0x20, 0x02, 0xe0, 0x03,
-   0x80, 0x00, 0x80, 0x00, 0xff, 0xff, 0x08, 0x10, 0x08, 0x10, 0x3e, 0x7c,
-   0x22, 0x44, 0x22, 0x44, 0x22, 0x44, 0x3e, 0x7c };
-
-static unsigned char usb_bits[] PROGMEM = {
-   0x00, 0x00, 0x92, 0x39, 0x52, 0x4a, 0x52, 0x48, 0x92, 0x39, 0x12, 0x4a,
-   0x52, 0x4a, 0x8c, 0x39, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0x04, 0x20,
-   0xf4, 0x2f, 0x04, 0x20, 0xf8, 0x1f, 0x00, 0x00 };
-
-static unsigned char sdcard_bits[] PROGMEM = {
-   0xf8, 0x07, 0x0c, 0x08, 0x04, 0x08, 0xc4, 0x09, 0x24, 0x1a, 0xe4, 0x13,
-   0x04, 0x20, 0x24, 0x21, 0xa4, 0x12, 0x44, 0x12, 0x04, 0x20, 0x04, 0x20,
-   0xc4, 0x23, 0x34, 0x2c, 0xd8, 0x1b, 0x00, 0x00 };
-
-static unsigned char bluetooth_bits[] PROGMEM = {
-   0x00, 0x00, 0x22, 0x21, 0x26, 0x33, 0x26, 0x33, 0x2a, 0x2d, 0x32, 0x2d,
-   0x32, 0x21, 0x22, 0x21, 0x00, 0x00, 0x3c, 0x0c, 0x04, 0x0c, 0x04, 0x12,
-   0x3c, 0x12, 0x04, 0x1e, 0x04, 0x21, 0x3c, 0x21 };
-
 static std::map<String, unsigned char *> iconmap = {
     {"LEFT", left_bits},
     {"RIGHT", right_bits},
     {"LOCK", lock_bits},
     {"PLUS", plus_bits},
     {"MINUS", minus_bits},
-    {"GPS", gps_bits},
+    {"DISH", dish_bits},
-    {"AP", ap_bits},
+    {"AP", ap_bits}
-    {"0183", nmea_bits},
-    {"N2K", n2k_bits},
-    {"TCP", tcp_bits},
-    {"USB", usb_bits},
-    {"SDCARD", sdcard_bits},
-    {"BLUE", bluetooth_bits}
 };
 
 // Battery

lib/obp60task/OBP60Formatter.cpp

@@ -55,6 +55,8 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
     static int dayoffset = 0;
     double rawvalue = 0;
 
+    result.cvalue = value->value;
+
     // Load configuration values
     String stimeZone = commondata.config->getString(commondata.config->timeZone);               // [UTC -14.00...+12.00]
     double timeZone = stimeZone.toDouble();
@@ -77,9 +79,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
     const char* fmt_dec_10;
     const char* fmt_dec_100;
     if (precision == "1") {
-        fmt_dec_1 = "%3.1f";
+	//
-        fmt_dec_10 = "%3.0f";
+	//All values are displayed using a DSEG7* font. In this font, ' ' is a very short space, and '.' takes up no space at all. 
-        fmt_dec_100 = "%3.0f";
+	//For a space that is as long as a number, '!' is used. For details see  https://www.keshikan.net/fonts-e.html
+	//
+        fmt_dec_1 = "!%1.1f";  //insert a blank digit and then display a two-digit number
+        fmt_dec_10 = "!%2.0f"; //insert a blank digit and then display a two-digit number
+        fmt_dec_100 = "%3.0f"; //dispay a three digit number
     } else {
         fmt_dec_1 = "%3.2f";
         fmt_dec_10 = "%3.1f";
@@ -149,6 +155,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             val = modf(val*3600.0/60.0, &intmin);
             modf(val*60.0,&intsec);
             snprintf(buffer, bsize, "%02.0f:%02.0f:%02.0f", inthr, intmin, intsec);
+            result.cvalue = timeInSeconds;
         }
         else{
             static long sec;
@@ -158,6 +165,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             }
             sec = sec % 60;
             snprintf(buffer, bsize, "11:36:%02i", int(sec));
+            result.cvalue = sec;
             lasttime = millis();
         }
         if(timeZone == 0){
@@ -178,6 +186,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer, bsize, "%3.0f", rawvalue);
         }
         result.unit = "";
+        result.cvalue = rawvalue;
     }
     //########################################################
     else if (value->getFormat() == "formatCourse" || value->getFormat() == "formatWind"){
@@ -195,6 +204,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
         // Format 3 numbers with prefix zero
         snprintf(buffer,bsize,"%03.0f",course);
         result.unit = "Deg";
+        result.cvalue = course;
     }
     //########################################################
     else if (value->getFormat() == "formatKnots" && (value->getName() == "SOG" || value->getName() == "STW")){
@@ -228,6 +238,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
         else {
             snprintf(buffer, bsize, fmt_dec_100, speed);
         }
+        result.cvalue = speed;
     }
     //########################################################
     else if (value->getFormat() == "formatKnots" && (value->getName() == "AWS" || value->getName() == "TWS" || value->getName() == "MaxAws" || value->getName() == "MaxTws")){
@@ -298,16 +309,18 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer, bsize, "%2.0f", speed);
         }
         else{
-            if (speed < 10){
+            speed = std::round(speed * 100) / 100;    // in rare cases, speed could be 9.9999 kn instead of 10.0 kn
+            if (speed < 10.0){
                 snprintf(buffer, bsize, fmt_dec_1, speed);
             }
-            else if (speed < 100){
+            else if (speed < 100.0){
                 snprintf(buffer, bsize, fmt_dec_10, speed);
             }
             else {
                 snprintf(buffer, bsize, fmt_dec_100, speed);
             }
         }
+        result.cvalue = speed;
     }
     //########################################################
     else if (value->getFormat() == "formatRot"){
@@ -334,6 +347,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
         if (rotation <= -10 || rotation >= 10){
             snprintf(buffer, bsize, "%3.0f", rotation);
         }
+        result.cvalue = rotation;
     }
     //########################################################
     else if (value->getFormat() == "formatDop"){
@@ -359,6 +373,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
         else {
             snprintf(buffer, bsize, fmt_dec_100, dop);
         }
+        result.cvalue = dop;
     }
     //########################################################
     else if (value->getFormat() == "formatLatitude"){
@@ -383,6 +398,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             rawvalue = 35.0 + float(random(0, 10)) / 10000.0;
             snprintf(buffer, bsize, " 51\" %2.4f' N", rawvalue);
         }
+        result.cvalue = rawvalue;
     }
     //########################################################
     else if (value->getFormat() == "formatLongitude"){
@@ -407,6 +423,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             rawvalue = 6.0 + float(random(0, 10)) / 100000.0;
             snprintf(buffer, bsize, " 15\" %2.4f'", rawvalue);
         }
+        result.cvalue = rawvalue;
     }
     //########################################################
     else if (value->getFormat() == "formatDepth"){
@@ -435,26 +452,41 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
         else {
             snprintf(buffer, bsize, fmt_dec_100, depth);
         }
+        result.cvalue = depth;
     }
     //########################################################
     else if (value->getFormat() == "formatXte"){
         double xte = 0;
-        if (!usesimudata) {
+        if(usesimudata == false) {
-            xte = abs(value->value);
+            xte = value->value;
             rawvalue = value->value;
-        } else {
+        }
+        else{
             rawvalue = 6.0 + float(random(0, 4));
             xte = rawvalue;
         }
-        if (xte >= 100) {
+        if(String(distanceFormat) == "km"){
-            snprintf(buffer, bsize, fmt_dec_100, value->value);
+            xte = xte * 0.001;
-        } else if (xte >= 10) {
+            result.unit = "km";
-            snprintf(buffer, bsize, fmt_dec_10, value->value);
-        } else {
-            snprintf(buffer, bsize, fmt_dec_1, value->value);
         }
+        else if(String(distanceFormat) == "nm"){
+            xte = xte * 0.000539957;
             result.unit = "nm";
         }
+        else{;
+            result.unit = "m";
+        }
+        if(xte < 10){
+            snprintf(buffer,bsize,"%3.2f",xte);
+        }
+        if(xte >= 10 && xte < 100){
+            snprintf(buffer,bsize,"%3.1f",xte);
+        }
+        if(xte >= 100){
+            snprintf(buffer,bsize,"%3.0f",xte);
+        }
+        result.cvalue = xte;
+    }
     //########################################################
     else if (value->getFormat() == "kelvinToC"){
         double temp = 0;
@@ -486,6 +518,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
         else {
             snprintf(buffer, bsize, fmt_dec_100, temp);
         }
+        result.cvalue = temp;
     }
     //########################################################
     else if (value->getFormat() == "mtr2nm"){
@@ -518,6 +551,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
         else {
             snprintf(buffer, bsize, fmt_dec_100, distance);
         }
+        result.cvalue = distance;
     }
     //########################################################
     // Special XDR formats
@@ -536,6 +570,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
         }
         snprintf(buffer, bsize, "%4.0f", pressure);
         result.unit = "hPa";
+        result.cvalue = pressure;
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:P:B"){
@@ -551,6 +586,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
         }
         snprintf(buffer, bsize, "%4.0f", pressure);
         result.unit = "mBar";
+        result.cvalue = pressure;
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:U:V"){
@@ -570,6 +606,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer, bsize, fmt_dec_10, voltage);
         }
         result.unit = "V";
+        result.cvalue = voltage;
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:I:A"){
@@ -592,6 +629,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer, bsize, fmt_dec_100, current);
         }
         result.unit = "A";
+        result.cvalue = current;
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:C:K"){
@@ -614,6 +652,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer, bsize, fmt_dec_100, temperature);
         }
         result.unit = "Deg C";
+        result.cvalue = temperature;
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:C:C"){
@@ -636,6 +675,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer, bsize, fmt_dec_100, temperature);
         }
         result.unit = "Deg C";
+        result.cvalue = temperature;
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:H:P"){
@@ -658,6 +698,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer, bsize, fmt_dec_100, humidity);
         }
         result.unit = "%";
+        result.cvalue = humidity;
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:V:P"){
@@ -680,6 +721,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer, bsize, fmt_dec_100, volume);
         }
         result.unit = "%";
+        result.cvalue = volume;
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:V:M"){
@@ -702,6 +744,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer, bsize, fmt_dec_100, volume);
         }
         result.unit = "l";
+        result.cvalue = volume;
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:R:I"){
@@ -724,6 +767,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer, bsize, fmt_dec_100, flow);
         }
         result.unit = "l/min";
+        result.cvalue = flow;
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:G:"){
@@ -746,6 +790,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer, bsize, fmt_dec_100, generic);
         }
         result.unit = "";
+        result.cvalue = generic;
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:A:P"){
@@ -768,6 +813,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer, bsize, fmt_dec_100, dplace);
         }
         result.unit = "%";
+        result.cvalue = dplace;
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:A:D"){
@@ -788,6 +834,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer,bsize,"%3.0f",angle);
         }
         result.unit = "Deg";
+        result.cvalue = angle;
     }
     //########################################################
     else if (value->getFormat() == "formatXdr:T:R"){
@@ -810,6 +857,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer, bsize, fmt_dec_100, rpm);
         }
         result.unit = "rpm";
+        result.cvalue = rpm;
     }
     //########################################################
     // Default format
@@ -825,6 +873,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             snprintf(buffer, bsize, fmt_dec_100, value->value);
         }
         result.unit = "";
+        result.cvalue = value->value;
     }
     buffer[bsize] = 0;
     result.value = rawvalue;        // Return value is only necessary in case of simulation of graphic pointer

lib/obp60task/OBP60Hardware.h

@@ -5,7 +5,8 @@
     // Direction pin for RS485 NMEA0183
     #define OBP_DIRECTION_PIN 18
     // I2C
-    #define I2C_SPEED 10000UL       // 10kHz clock speed on I2C bus
+    #define I2C_SPEED 10000UL       // 100kHz clock speed on I2C bus
+    #define I2C_SPEED_LOW 1000UL    // 10kHz clock speed on I2C bus for external bus
     #define OBP_I2C_SDA 47
     #define OBP_I2C_SCL 21
     // DS1388 RTC
@@ -42,6 +43,8 @@
     #define OBP_SPI_DIN 48
     #define SHOW_TIME 6000        // Show time in [ms] for logo and WiFi QR code
     #define FULL_REFRESH_TIME 600 // Refresh cycle time in [s][600...3600] for full display update (very important healcy function)
+    #define GxEPD_WIDTH 400       // Display width
+    #define GxEPD_HEIGHT 300      // Display height
 
     // GPS (NEO-6M, NEO-M8N, ATGM336H)
     #define OBP_GPS_RX 2
@@ -82,7 +85,8 @@
     // Direction pin for RS485 NMEA0183
     #define OBP_DIRECTION_PIN 8
     // I2C
-    #define I2C_SPEED 10000UL       // 10kHz clock speed on I2C bus
+    #define I2C_SPEED 100000UL      // 100kHz clock speed on I2C bus
+    #define I2C_SPEED_LOW 1000UL    // 10kHz clock speed on I2C bus for external bus
     #define OBP_I2C_SDA 21
     #define OBP_I2C_SCL 38
     // DS1388 RTC
@@ -119,6 +123,8 @@
     #define OBP_SPI_DIN 11
     #define SHOW_TIME 6000        // Show time in [ms] for logo and WiFi QR code
     #define FULL_REFRESH_TIME 600 // Refresh cycle time in [s][600...3600] for full display update (very important healcy function)
+    #define GxEPD_WIDTH 400       // Display width
+    #define GxEPD_HEIGHT 300      // Display height
     // SPI SD-Card
     #define SD_SPI_CS GPIO_NUM_10
     #define SD_SPI_MOSI GPIO_NUM_40

lib/obp60task/OBP60QRWiFi.h

@@ -26,20 +26,20 @@ void qrWiFi(String ssid, String passwd, uint16_t fgcolor, uint16_t bgcolor){
     // Each horizontal module
     for (uint8_t x = 0; x < qrcode.size; x++) {
       if(qrcode_getModule(&qrcode, x, y)){
-        epd->fillRect(box_x, box_y, box_s, box_s, fgcolor);
+        getdisplay().fillRect(box_x, box_y, box_s, box_s, fgcolor);
       } else {
-        epd->fillRect(box_x, box_y, box_s, box_s, bgcolor);
+        getdisplay().fillRect(box_x, box_y, box_s, box_s, bgcolor);
       }
       box_x = box_x + box_s;
     }
     box_y = box_y + box_s;
     box_x = init_x;
   }
-  epd->setFont(&Ubuntu_Bold32pt8b);
+  getdisplay().setFont(&Ubuntu_Bold32pt8b);
-  epd->setTextColor(fgcolor);
+  getdisplay().setTextColor(fgcolor);
-  epd->setCursor(140, 285);
+  getdisplay().setCursor(140, 285);
-  epd->print("WiFi");
+  getdisplay().print("WiFi");
-  epd->nextPage();                 // Full Refresh
+  getdisplay().nextPage();                 // Full Refresh
 }
 
 #endif

lib/obp60task/OBPDataOperations.cpp

@@ -1,10 +1,163 @@
 #include "OBPDataOperations.h"
+#include "BoatDataCalibration.h"        // Functions lib for data instance calibration
+#include <math.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 mltplr = 1000; // Multiplier which transforms original <double> value into buffer type format
+    double hstryMinVal = 0; // Minimum value for these history buffers
+    twdHstryMax = 2 * M_PI; // Max value for wind direction (TWD, AWD) in rad [0...2*PI]
+    twsHstryMax = 65; // Max value for wind speed (TWS, AWS) in m/s [0..65] (limit due to type capacity of buffer - shifted by <mltplr>)
+    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
+    mltplr = 10000; // Store 4 decimals for course data
+    hstryBufList.twdHstry->setMetaData("TWD", "formatCourse", hstryUpdFreq, mltplr, hstryMinVal, twdHstryMax);
+    hstryBufList.awdHstry->setMetaData("AWD", "formatCourse", hstryUpdFreq, mltplr, hstryMinVal, twdHstryMax);
+    mltplr = 1000; // Store 3 decimals for windspeed data
+    hstryBufList.twsHstry->setMetaData("TWS", "formatKnots", hstryUpdFreq, mltplr, hstryMinVal, twsHstryMax);
+    hstryBufList.awsHstry->setMetaData("AWS", "formatKnots", hstryUpdFreq, mltplr, 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 double twd, tws, 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) {
+//    if (!useSimuData) {
+        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 = calBVal->value;
+        if (twd >= twdHstryMin && twd <= twdHstryMax) {
+            hstryBufList.twdHstry->add(twd);
+            LOG_DEBUG(GwLog::DEBUG,"obp60task handleHstryBuf: calBVal.value %.2f, twd: %.2f, twdHstryMin: %.1f, twdHstryMax: %.2f", calBVal->value, twd, twdHstryMin, twdHstryMax);
+        }
+        delete calBVal;
+        calBVal = nullptr;
+    } else if (useSimuData) {
+//    } else {
+        twd += random(-20, 20);
+        twd += static_cast<double>(random(-349, 349) / 1000.0); // add up to +/- 20 degree in RAD
+        twd = WindUtils::to2PI(twd);
+        hstryBufList.twdHstry->add(twd);
+    }
+
+    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 = calBVal->value;
+        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 += static_cast<double>(random(-5000, 5000) / 1000.0); // add up to +/- 5 m/s TWS speed
+        tws = constrain(tws, 0, 40); // Limit TWS to [0..40] 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 = calBVal->value;
+        if (awd >= awdHstryMin && awd <= awdHstryMax) {
+            hstryBufList.awdHstry->add(awd);
+        }
+        delete calBVal;
+        calBVal = nullptr;
+    } else if (useSimuData) {
+        awd += static_cast<double>(random(-349, 349) / 1000.0); // add up to +/- 20 degree in RAD
+        awd = WindUtils::to2PI(awd);
+        hstryBufList.awdHstry->add(awd);
+    }
+    
+    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 = calBVal->value;
+        if (aws >= awsHstryMin && aws <= awsHstryMax) {
+            hstryBufList.awsHstry->add(aws);
+        }
+        delete calBVal;
+        calBVal = nullptr;
+    } else if (useSimuData) {
+        aws += static_cast<double>(random(-5000, 5000) / 1000.0); // add up to +/- 5 m/s TWS speed
+        aws = constrain(aws, 0, 40); // Limit TWS to [0..40] m/s
+        hstryBufList.awsHstry->add(aws);
+    }
+    LOG_DEBUG(GwLog::DEBUG,"obp60task handleHstryBuf-End: Buffer twdHstry: %.3f, twsHstry: %.3f, awdHstry: %.3f, awsHstry: %.3f", hstryBufList.twdHstry->getLast(), hstryBufList.twsHstry->getLast(),
+        hstryBufList.awdHstry->getLast(),hstryBufList.awsHstry->getLast());
+}
+// --- Class HstryBuf ---------------
+
+// --- Class WindUtils --------------
 double WindUtils::to2PI(double a)
 {
-    a = fmod(a, 2 * M_PI);
+    a = fmod(a, M_TWOPI);
     if (a < 0.0) {
-        a += 2 * M_PI;
+        a += M_TWOPI;
     }
     return a;
 }
@@ -20,18 +173,18 @@ double WindUtils::toPI(double a)
 
 double WindUtils::to360(double a)
 {
-    a = fmod(a, 360);
+    a = fmod(a, 360.0);
     if (a < 0.0) {
-        a += 360;
+        a += 360.0;
     }
     return a;
 }
 
 double WindUtils::to180(double a)
 {
-    a += 180;
+    a += 180.0;
     a = to360(a);
-    a -= 180;
+    a -= 180.0;
 
     return a;
 }
@@ -68,13 +221,28 @@ void WindUtils::calcTwdSA(const double* AWA, const double* AWS,
     double awd = *AWA + *HDT;
     awd = to2PI(awd);
     double stw = -*STW;
-    //    Serial.println("\ncalcTwdSA: AWA: " + String(*AWA) + ", AWS: " + String(*AWS) + ", CTW: " + String(*CTW) + ", STW: " + String(*STW) + ", HDT: " + String(*HDT));
     addPolar(&awd, AWS, CTW, &stw, TWD, TWS);
 
     // Normalize TWD and TWA to 0-360°
     *TWD = to2PI(*TWD);
     *TWA = toPI(*TWD - *HDT);
-    //    Serial.println("calcTwdSA: TWD: " + String(*TWD) + ", TWS: " + String(*TWS));
+}
+
+double WindUtils::calcHDT(const double* hdmVal, const double* varVal, const double* cogVal, const double* sogVal)
+{
+    double hdt;
+    double minSogVal = 0.1; // SOG below this value (m/s) is assumed to be  data noise from GPS sensor
+
+    if (*hdmVal != DBL_MAX) {
+        hdt = *hdmVal + (*varVal != DBL_MAX ? *varVal : 0.0); // Use corrected HDM if HDT is not available (or just HDM if VAR is not available)
+        hdt = to2PI(hdt);
+    } else if (*cogVal != DBL_MAX && *sogVal >= minSogVal) {
+        hdt = *cogVal; // Use COG as fallback if HDT and HDM are not available, and SOG is not data noise
+    } else {
+        hdt = DBL_MAX; // Cannot calculate HDT without valid HDM or HDM+VAR or COG
+    }
+
+    return hdt;
 }
 
 bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal,
@@ -83,38 +251,32 @@ bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal,
 {
     double stw, hdt, ctw;
     double twd, tws, twa;
-    static const double DBL_MIN = std::numeric_limits<double>::lowest();
+    double minSogVal = 0.1; // SOG below this value (m/s) is assumed to be  data noise from GPS sensor
 
-    if (*hdtVal != DBL_MIN) {
+    if (*hdtVal != DBL_MAX) {
         hdt = *hdtVal; // Use HDT if available
     } else {
-        if (*hdmVal != DBL_MIN && *varVal != DBL_MIN) {
+        hdt = calcHDT(hdmVal, varVal, cogVal, sogVal);
-            hdt = *hdmVal + *varVal; // Use corrected HDM if HDT is not available
-            hdt = to2PI(hdt);
-        } else if (*cogVal != DBL_MIN) {
-            hdt = *cogVal; // Use COG as fallback if HDT and HDM are not available
-        } else {
-            return false; // Cannot calculate without valid HDT or HDM+VAR or COG
-        }
     }
 
-    if (*cogVal != DBL_MIN) {
+    if (*cogVal != DBL_MAX && *sogVal >= minSogVal) { // if SOG is data noise, we don't trust COG
-        ctw = *cogVal; // Use COG as CTW if available
+
-        //    ctw = *cogVal + ((*cogVal - hdt) / 2); // Estimate CTW from COG
+        ctw = *cogVal; // Use COG for CTW if available
     } else {
         ctw = hdt; // 2nd approximation for CTW; hdt must exist if we reach this part of the code
     }
 
-    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
         return false;
     }
+//    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 {
@@ -127,31 +289,45 @@ bool WindUtils::calcTrueWind(const double* awaVal, const double* awsVal,
     }
 }
 
-void HstryBuf::fillWndBufSimData(tBoatHstryData& hstryBufs)
+// Calculate true wind data and add to obp60task boat data list
-// Fill most part of TWD and TWS history buffer with simulated data
+bool WindUtils::addTrueWind(GwApi* api, BoatValueList* boatValues, GwLog* log) {
-{
+
-    double value = 20.0;
+    GwLog* logger = log;
-    int16_t value2 = 0;
+
-    for (int i = 0; i < 900; i++) {
+    double awaVal, awsVal, cogVal, stwVal, sogVal, hdtVal, hdmVal, varVal;
-        value += random(-20, 20);
+    double twd, tws, twa;
-        value = WindUtils::to360(value);
+    bool isCalculated = false;
-        value2 = static_cast<int16_t>(value * DEG_TO_RAD * 1000);
+
-        hstryBufs.twdHstry->add(value2);
+    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);
 
-/* double genTwdSimDat()
+    return isCalculated;
-{
+}
-    simTwd += random(-20, 20);
+// --- Class WindUtils --------------
-    if (simTwd < 0.0)
-        simTwd += 360.0;
-    if (simTwd >= 360.0)
-        simTwd -= 360.0;
-
-    int16_t z = static_cast<int16_t>(DegToRad(simTwd) * 1000.0);
-    pageData.boatHstry.twdHstry->add(z); // Fill the buffer with some test data
-
-    simTws += random(-200, 150) / 10.0; // TWS value in knots
-    simTws = constrain(simTws, 0.0f, 50.0f); // Ensure TWS is between 0 and 50 knots
-    twsValue = simTws;
-}*/

lib/obp60task/OBPDataOperations.h

@@ -1,36 +1,90 @@
+// Function lib for history buffer handling, true wind calculation, and other operations on boat data
 #pragma once
-#include "GwApi.h"
 #include "OBPRingBuffer.h"
-#include <Arduino.h>
+#include "obp60task.h"
-#include <math.h>
 
 typedef struct {
-    RingBuffer<int16_t>* twdHstry;
+    RingBuffer<uint16_t>* twdHstry;
-    RingBuffer<int16_t>* twsHstry;
+    RingBuffer<uint16_t>* twsHstry;
+    RingBuffer<uint16_t>* awdHstry;
+    RingBuffer<uint16_t>* awsHstry;
 } tBoatHstryData; // Holds pointers to all history buffers for boat data
 
 class HstryBuf {
+private:
+    GwLog *logger;
+
+    RingBuffer<uint16_t> twdHstry; // Circular buffer to store true wind direction values
+    RingBuffer<uint16_t> twsHstry; // Circular buffer to store true wind speed values (TWS)
+    RingBuffer<uint16_t> awdHstry; // Circular buffer to store apparent wind direction values
+    RingBuffer<uint16_t> awsHstry; // Circular buffer to store apparent xwind speed values (AWS)
+    double twdHstryMin; // Min value for wind direction (TWD) in history buffer
+    double twdHstryMax; // Max value for wind direction (TWD) in history buffer
+    double twsHstryMin;
+    double twsHstryMax;
+    double awdHstryMin;
+    double awdHstryMax;
+    double awsHstryMin;
+    double 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:
-    void fillWndBufSimData(tBoatHstryData& hstryBufs); // Fill most part of the TWD and TWS history buffer with simulated data
+    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);
+    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);
+    void toPol(const double* x, const double* y, double* phi, double* r);
-    static void addPolar(const double* phi1, const double* r1,
+    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 bool calcTrueWind(const double* awaVal, const double* awsVal,
+    static double calcHDT(const double* hdmVal, const double* varVal, const double* cogVal, const double* sogVal);
+    bool calcTrueWind(const double* awaVal, const double* awsVal,
         const double* cogVal, const double* stwVal, const double* sogVal, const double* hdtVal,
         const double* hdmVal, const double* varVal, double* twdVal, double* twsVal, double* twaVal);
+    bool addTrueWind(GwApi* api, BoatValueList* boatValues, GwLog *log);
 };

lib/obp60task/OBPRingBuffer.h

@@ -1,60 +1,98 @@
 #pragma once
+#include "FreeRTOS.h"
 #include "GwSynchronized.h"
-#include <algorithm>
-#include <limits>
-#include <stdexcept>
 #include <vector>
-#include "WString.h"
+#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, PSRAMAllocator<T>> buffer; // THE buffer vector, allocated in PSRAM
-    std::vector<T> buffer;
     size_t capacity;
     size_t head; // Points to the next insertion position
     size_t first; // Points to the first (oldest) valid element
     size_t last; // Points to the last (newest) valid element
     size_t count; // Number of valid elements currently in buffer
     bool is_Full; // Indicates that all buffer elements are used and ringing is in use
-    T MIN_VAL; // lowest possible value of buffer
+    T MIN_VAL; // lowest possible value of buffer of type <T>
-    T MAX_VAL; // highest possible value of buffer of type <T>
+    T MAX_VAL; // highest possible value of buffer of type <T> -> indicates invalid value in buffer
+    double dblMIN_VAL, dblMAX_VAL; // MIN_VAL, MAX_VAL in double format
+    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
+    double mltplr; // Multiplier which transforms original <double> value into buffer type format
-    T largest; // Value range of buffer: biggest value
+    double smallest; // Value range of buffer: smallest value; needs to be => MIN_VAL
+    double 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
+    void setMetaData(String name, String format, int updateFrequency, double multiplier, double minValue, double 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, int& updateFrequency, double& multiplier, double& minValue, double& maxValue); // Get meta data of buffer
+    bool getMetaData(String& name, String& format);
     String getName() const; // Get buffer name
-    void add(const T& value); // Add a new value to  buffer
+    String getFormat() const; // Get buffer data format
-    T get(size_t index) const; // Get value at specific position (0-based index from oldest to newest)
+    void add(const double& value); // Add a new value to  buffer
-    T getFirst() const; // Get the first (oldest) value in buffer
+    double get(size_t index) const; // Get value at specific position (0-based index from oldest to newest)
-    T getLast() const; // Get the last (newest) value in buffer
+    double getFirst() const; // Get the first (oldest) value in buffer
-    T getMin() const; // Get the lowest value in buffer
+    double getLast() const; // Get the last (newest) value in buffer
-    T getMin(size_t amount) const; // Get minimum value of the last <amount> values of buffer
+    double getMin() const; // Get the lowest value in buffer
-    T getMax() const; // Get the highest value in buffer
+    double getMin(size_t amount) const; // Get minimum value of the last <amount> values of buffer
-    T getMax(size_t amount) const; // Get maximum value of the last <amount> values of buffer
+    double getMax() const; // Get the highest value in buffer
-    T getMid() const; // Get mid value between <min> and <max> value in buffer
+    double getMax(size_t amount) const; // Get maximum value of the last <amount> values of buffer
-    T getMid(size_t amount) const; // Get mid value between <min> and <max> value of the last <amount> values of buffer
+    double getMid() const; // Get mid value between <min> and <max> value in buffer
-    T getMedian() const; // Get the median value in buffer
+    double getMid(size_t amount) const; // Get mid value between <min> and <max> value of the last <amount> values of buffer
-    T getMedian(size_t amount) const; // Get the median value of the last <amount> values of buffer
+    double getMedian() const; // Get the median value in buffer
+    double getMedian(size_t amount) const; // Get the median value of the last <amount> values of buffer
     size_t getCapacity() const; // Get the buffer capacity (maximum size)
     size_t getCurrentSize() const; // Get the current number of elements in buffer
     size_t getFirstIdx() const; // Get the index of oldest value in buffer
     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
+    double getMinVal() const; // Get lowest possible value for buffer
-    T getMaxVal() const; // Get highest possible value for buffer
+    double getMaxVal() const; // Get highest possible value for buffer; used for unset/invalid buffer data
     void clear(); // Clear buffer
-    T operator[](size_t index) const; // Operator[] for convenient access (same as get())
+    void resize(size_t size); // Delete buffer and set new size
-    std::vector<T> getAllValues() const; // Get all current values as a vector
+    double operator[](size_t index) const; // Operator[] for convenient access (same as get())
+    std::vector<double> getAllValues() const; // Get all current values in native buffer format as a vector
+    std::vector<double> getAllValues(size_t amount) const; // Get last <amount> values in native buffer format as a vector
 };
 
 #include "OBPRingBuffer.tpp"

lib/obp60task/OBPRingBuffer.tpp

@@ -1,4 +1,36 @@
 #include "OBPRingBuffer.h"
+#include <algorithm>
+#include <limits>
+#include <cmath>
+
+template <typename T>
+void RingBuffer<T>::initCommon()
+{
+    MIN_VAL = std::numeric_limits<T>::lowest();
+    MAX_VAL = std::numeric_limits<T>::max();
+    dblMIN_VAL = static_cast<double>(MIN_VAL);
+    dblMAX_VAL = static_cast<double>(MAX_VAL);
+    dataName = "";
+    dataFmt = "";
+    updFreq = -1;
+    mltplr = 1;
+    smallest = dblMIN_VAL;
+    largest = dblMAX_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)
@@ -9,40 +41,28 @@ RingBuffer<T>::RingBuffer(size_t size)
     , count(0)
     , is_Full(false)
 {
-    bufLocker = xSemaphoreCreateMutex();
+    initCommon();
 
-    if (size == 0) {
+    buffer.reserve(size);
-        // return false;
+    buffer.resize(size, MAX_VAL); // MAX_VAL indicate invalid values
-    }
-
-    MIN_VAL = std::numeric_limits<T>::lowest();
-    MAX_VAL = std::numeric_limits<T>::max();
-    dataName = "";
-    dataFmt = "";
-    updFreq = -1;
-    smallest = MIN_VAL;
-    largest = MAX_VAL;
-
-    buffer.resize(size, MIN_VAL);
-
-    // return true;
 }
 
 // Specify meta data of buffer content
 template <typename T>
-void RingBuffer<T>::setMetaData(String name, String format, int updateFrequency, T minValue, T maxValue)
+void RingBuffer<T>::setMetaData(String name, String format, int updateFrequency, double multiplier, double minValue, double maxValue)
 {
     GWSYNCHRONIZED(&bufLocker);
     dataName = name;
     dataFmt = format;
     updFreq = updateFrequency;
-    smallest = std::max(MIN_VAL, minValue);
+    mltplr = multiplier;
-    largest = std::min(MAX_VAL, maxValue);
+    smallest = std::max(dblMIN_VAL, minValue);
+    largest = std::min(dblMAX_VAL, maxValue);
 }
 
 // Get meta data of buffer content
 template <typename T>
-bool RingBuffer<T>::getMetaData(String& name, String& format, int& updateFrequency, T& minValue, T& maxValue)
+bool RingBuffer<T>::getMetaData(String& name, String& format, int& updateFrequency, double& multiplier, double& minValue, double& maxValue)
 {
     if (dataName == "" || dataFmt == "" || updFreq == -1) {
         return false; // Meta data not set
@@ -52,11 +72,26 @@ bool RingBuffer<T>::getMetaData(String& name, String& format, int& updateFrequen
     name = dataName;
     format = dataFmt;
     updateFrequency = updFreq;
+    multiplier = mltplr;
     minValue = smallest;
     maxValue = largest;
     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
@@ -64,15 +99,22 @@ String RingBuffer<T>::getName() const
     return dataName;
 }
 
+// Get buffer data format
+template <typename T>
+String RingBuffer<T>::getFormat() const
+{
+    return dataFmt;
+}
+
 // Add a new value to buffer
 template <typename T>
-void RingBuffer<T>::add(const T& value)
+void RingBuffer<T>::add(const double& 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;
+        buffer[head] = static_cast<T>(std::round(value * mltplr));
     }
     last = head;
 
@@ -84,63 +126,63 @@ void RingBuffer<T>::add(const T& value)
             is_Full = true;
         }
     }
-
+    // Serial.printf("Ringbuffer: value %.3f, multiplier: %.1f, buffer: %d\n", value, mltplr, buffer[head]);
     head = (head + 1) % capacity;
 }
 
 // Get value at specific position (0-based index from oldest to newest)
 template <typename T>
-T RingBuffer<T>::get(size_t index) const
+double RingBuffer<T>::get(size_t index) const
 {
     GWSYNCHRONIZED(&bufLocker);
     if (isEmpty() || index < 0 || index >= count) {
-        return MIN_VAL;
+        return dblMAX_VAL;
     }
 
     size_t realIndex = (first + index) % capacity;
-    return buffer[realIndex];
+    return static_cast<double>(buffer[realIndex] / mltplr);
 }
 
 // Operator[] for convenient access (same as get())
 template <typename T>
-T RingBuffer<T>::operator[](size_t index) const
+double RingBuffer<T>::operator[](size_t index) const
 {
     return get(index);
 }
 
 // Get the first (oldest) value in the buffer
 template <typename T>
-T RingBuffer<T>::getFirst() const
+double RingBuffer<T>::getFirst() const
 {
     if (isEmpty()) {
-        return MIN_VAL;
+        return dblMAX_VAL;
     }
     return get(0);
 }
 
 // Get the last (newest) value in the buffer
 template <typename T>
-T RingBuffer<T>::getLast() const
+double RingBuffer<T>::getLast() const
 {
     if (isEmpty()) {
-        return MIN_VAL;
+        return dblMAX_VAL;
     }
     return get(count - 1);
 }
 
 // Get the lowest value in the buffer
 template <typename T>
-T RingBuffer<T>::getMin() const
+double RingBuffer<T>::getMin() const
 {
     if (isEmpty()) {
-        return MIN_VAL;
+        return dblMAX_VAL;
     }
 
-    T minVal = MAX_VAL;
+    double minVal = dblMAX_VAL;
-    T value;
+    double value;
     for (size_t i = 0; i < count; i++) {
         value = get(i);
-        if (value < minVal && value != MIN_VAL) {
+        if (value < minVal && value != dblMAX_VAL) {
             minVal = value;
         }
     }
@@ -149,19 +191,19 @@ T RingBuffer<T>::getMin() const
 
 // Get minimum value of the last <amount> values of buffer
 template <typename T>
-T RingBuffer<T>::getMin(size_t amount) const
+double RingBuffer<T>::getMin(size_t amount) const
 {
     if (isEmpty() || amount <= 0) {
-        return MIN_VAL;
+        return dblMAX_VAL;
     }
     if (amount > count)
         amount = count;
 
-    T minVal = MAX_VAL;
+    double minVal = dblMAX_VAL;
-    T value;
+    double value;
     for (size_t i = 0; i < amount; i++) {
         value = get(count - 1 - i);
-        if (value < minVal && value != MIN_VAL) {
+        if (value < minVal && value != dblMAX_VAL) {
             minVal = value;
         }
     }
@@ -170,75 +212,81 @@ T RingBuffer<T>::getMin(size_t amount) const
 
 // Get the highest value in the buffer
 template <typename T>
-T RingBuffer<T>::getMax() const
+double RingBuffer<T>::getMax() const
 {
     if (isEmpty()) {
-        return MIN_VAL;
+        return dblMAX_VAL;
     }
 
-    T maxVal = MIN_VAL;
+    double maxVal = dblMIN_VAL;
-    T value;
+    double value;
     for (size_t i = 0; i < count; i++) {
         value = get(i);
-        if (value > maxVal && value != MIN_VAL) {
+        if (value > maxVal && value != dblMAX_VAL) {
             maxVal = value;
         }
     }
+    if (maxVal == dblMIN_VAL) { // no change of initial value -> buffer has only invalid values (MAX_VAL)
+        maxVal = dblMAX_VAL;
+    }
     return maxVal;
 }
 
 // Get maximum value of the last <amount> values of buffer
 template <typename T>
-T RingBuffer<T>::getMax(size_t amount) const
+double RingBuffer<T>::getMax(size_t amount) const
 {
     if (isEmpty() || amount <= 0) {
-        return MIN_VAL;
+        return dblMAX_VAL;
     }
     if (amount > count)
         amount = count;
 
-    T maxVal = MIN_VAL;
+    double maxVal = dblMIN_VAL;
-    T value;
+    double value;
     for (size_t i = 0; i < amount; i++) {
         value = get(count - 1 - i);
-        if (value > maxVal && value != MIN_VAL) {
+        if (value > maxVal && value != dblMAX_VAL) {
             maxVal = value;
         }
     }
+    if (maxVal == dblMIN_VAL) { // no change of initial value -> buffer has only invalid values (MAX_VAL)
+        maxVal = dblMAX_VAL;
+    }
     return maxVal;
 }
 
 // Get mid value between <min> and <max> value in the buffer
 template <typename T>
-T RingBuffer<T>::getMid() const
+double RingBuffer<T>::getMid() const
 {
     if (isEmpty()) {
-        return MIN_VAL;
+        return dblMAX_VAL;
     }
 
-    return (getMin() + getMax()) / static_cast<T>(2);
+    return (getMin() + getMax()) / 2;
 }
 
 // Get mid value between <min> and <max> value of the last <amount> values of buffer
 template <typename T>
-T RingBuffer<T>::getMid(size_t amount) const
+double RingBuffer<T>::getMid(size_t amount) const
 {
     if (isEmpty() || amount <= 0) {
-        return MIN_VAL;
+        return dblMAX_VAL;
     }
 
     if (amount > count)
         amount = count;
 
-    return (getMin(amount) + getMax(amount)) / static_cast<T>(2);
+    return (getMin(amount) + getMax(amount)) / 2;
 }
 
 // Get the median value in the buffer
 template <typename T>
-T RingBuffer<T>::getMedian() const
+double RingBuffer<T>::getMedian() const
 {
     if (isEmpty()) {
-        return MIN_VAL;
+        return dblMAX_VAL;
     }
 
     // Create a temporary vector with current valid elements
@@ -254,20 +302,20 @@ T RingBuffer<T>::getMedian() const
 
     if (count % 2 == 1) {
         // Odd number of elements
-        return temp[count / 2];
+        return static_cast<double>(temp[count / 2]);
     } else {
         // Even number of elements - return average of middle two
         // Note: For integer types, this truncates. For floating point, it's exact.
-        return (temp[count / 2 - 1] + temp[count / 2]) / 2;
+        return static_cast<double>((temp[count / 2 - 1] + temp[count / 2]) / 2);
     }
 }
 
 // Get the median value of the last <amount> values of buffer
 template <typename T>
-T RingBuffer<T>::getMedian(size_t amount) const
+double RingBuffer<T>::getMedian(size_t amount) const
 {
     if (isEmpty() || amount <= 0) {
-        return MIN_VAL;
+        return dblMAX_VAL;
     }
     if (amount > count)
         amount = count;
@@ -277,7 +325,7 @@ T RingBuffer<T>::getMedian(size_t amount) const
     temp.reserve(amount);
 
     for (size_t i = 0; i < amount; i++) {
-        temp.push_back(get(i));
+        temp.push_back(get(count - 1 - i));
     }
 
     // Sort to find median
@@ -285,11 +333,11 @@ T RingBuffer<T>::getMedian(size_t amount) const
 
     if (amount % 2 == 1) {
         // Odd number of elements
-        return temp[amount / 2];
+        return static_cast<double>(temp[amount / 2]);
     } else {
         // Even number of elements - return average of middle two
         // Note: For integer types, this truncates. For floating point, it's exact.
-        return (temp[amount / 2 - 1] + temp[amount / 2]) / 2;
+        return static_cast<double>((temp[amount / 2 - 1] + temp[amount / 2]) / 2);
     }
 }
 
@@ -335,18 +383,18 @@ 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
+double RingBuffer<T>::getMinVal() const
 {
-    return MIN_VAL;
+    return dblMIN_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
+double RingBuffer<T>::getMaxVal() const
 {
-    return MAX_VAL;
+    return dblMAX_VAL;
 }
 
 // Clear buffer
@@ -361,11 +409,28 @@ void RingBuffer<T>::clear()
     is_Full = false;
 }
 
-// Get all current values as a vector
+// Delete buffer and set new size
 template <typename T>
-std::vector<T> RingBuffer<T>::getAllValues() const
+void RingBuffer<T>::resize(size_t newSize)
 {
-    std::vector<T> result;
+    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 in native buffer format as a vector
+template <typename T>
+std::vector<double> RingBuffer<T>::getAllValues() const
+{
+    std::vector<double> result;
     result.reserve(count);
 
     for (size_t i = 0; i < count; i++) {
@@ -374,3 +439,24 @@ std::vector<T> RingBuffer<T>::getAllValues() const
 
     return result;
 }
+
+// Get last <amount> values in native buffer format as a vector
+template <typename T>
+std::vector<double> RingBuffer<T>::getAllValues(size_t amount) const
+{
+    std::vector<double> result;
+
+    if (isEmpty() || amount <= 0) {
+        return result;
+    }
+    if (amount > count)
+        amount = count;
+
+    result.reserve(amount);
+
+    for (size_t i = 0; i < amount; i++) {
+        result.push_back(get(count - 1 - i));
+    }
+
+    return result;
+}

lib/obp60task/OBPcharts.cpp

@@ -0,0 +1,609 @@
+// Function lib for display of boat data in various chart formats
+#include "OBPcharts.h"
+#include "OBP60Extensions.h"
+#include "OBPRingBuffer.h"
+
+// --- Class Chart ---------------
+template <typename T>
+Chart<T>::Chart(RingBuffer<T>& dataBuf, int8_t chrtDir, int8_t chrtSz, double dfltRng, CommonData& common, bool useSimuData)
+    : dataBuf(dataBuf)
+    , chrtDir(chrtDir)
+    , chrtSz(chrtSz)
+    , dfltRng(dfltRng)
+    , commonData(&common)
+    , useSimuData(useSimuData)
+{
+    logger = commonData->logger;
+    fgColor = commonData->fgcolor;
+    bgColor = commonData->bgcolor;
+
+    // LOG_DEBUG(GwLog::DEBUG, "Chart Init: Chart::dataBuf: %p, passed dataBuf: %p", (void*)&this->dataBuf, (void*)&dataBuf);
+    dWidth = getdisplay().width();
+    dHeight = getdisplay().height();
+
+    if (chrtDir == 0) {
+        // horizontal chart timeline direction
+        timAxis = dWidth;
+        switch (chrtSz) {
+        case 0:
+            valAxis = dHeight - top - bottom;
+            cStart = { 0, top };
+            break;
+        case 1:
+            valAxis = (dHeight - top - bottom) / 2 - hGap;
+            cStart = { 0, top };
+            break;
+        case 2:
+            valAxis = (dHeight - top - bottom) / 2 - hGap;
+            cStart = { 0, top + (valAxis + hGap) + hGap };
+            break;
+        default:
+            LOG_DEBUG(GwLog::ERROR, "displayChart: wrong init parameter");
+            return;
+        }
+    } else if (chrtDir == 1) {
+        // vertical chart timeline direction
+        timAxis = dHeight - top - bottom;
+        switch (chrtSz) {
+        case 0:
+            valAxis = dWidth;
+            cStart = { 0, top };
+            break;
+        case 1:
+            valAxis = dWidth / 2 - vGap - 1;
+            cStart = { 0, top };
+            break;
+        case 2:
+            valAxis = dWidth / 2 - vGap - 1;
+            cStart = { dWidth / 2 + vGap, top };
+            break;
+        default:
+            LOG_DEBUG(GwLog::ERROR, "displayChart: wrong init parameter");
+            return;
+        }
+    } else {
+        LOG_DEBUG(GwLog::ERROR, "displayChart: wrong init parameter");
+        return;
+    }
+
+    dataBuf.getMetaData(dbName, dbFormat);
+    dbMIN_VAL = dataBuf.getMinVal();
+    dbMAX_VAL = dataBuf.getMaxVal();
+    bufSize = dataBuf.getCapacity();
+
+    if (dbFormat == "formatCourse" || dbFormat == "FormatWind" || dbFormat == "FormatRot") {
+
+        if (dbFormat == "FormatRot") {
+            chrtDataFmt = 2; // Chart is showing data of rotational <degree> format
+        } else {
+            chrtDataFmt = 1; // Chart is showing data of course / wind <degree> format
+        }
+        rngStep = M_TWOPI / 360.0 * 10.0; // +/-10 degrees on each end of chrtMid; we are calculating with SI values
+
+    } else {
+        chrtDataFmt = 0; // Chart is showing any other data format than <degree>
+        rngStep = 5.0; // +/- 10 for all other values (eg. m/s, m, K, mBar)
+    }
+
+    chrtMin = 0;
+    chrtMax = 0;
+    chrtMid = dbMAX_VAL;
+    chrtRng = dfltRng;
+    recalcRngCntr = true; // initialize <chrtMid> on first screen call
+
+    LOG_DEBUG(GwLog::DEBUG, "Chart Init: dWidth: %d, dHeight: %d, timAxis: %d, valAxis: %d, cStart {x,y}: %d, %d, dbname: %s, rngStep: %.4f", dWidth, dHeight, timAxis, valAxis, cStart.x, cStart.y, dbName, rngStep);
+};
+
+template <typename T>
+Chart<T>::~Chart()
+{
+}
+
+// Perform all actions to draw chart
+// Parameters are chart time interval, and the current boat data value to be printed
+template <typename T>
+void Chart<T>::showChrt(int8_t chrtIntv, GwApi::BoatValue currValue)
+{
+    drawChrt(chrtIntv, currValue);
+    drawChrtTimeAxis(chrtIntv);
+    drawChrtValAxis();
+
+    if (bufDataValid) {
+        // uses BoatValue temp variable <currValue> to format latest buffer value
+        // doesn't work unfortunately when 'simulation data' is active, because OBP60Formatter generates own simulation value in that case
+        currValue.value = dataBuf.getLast();
+        currValue.valid = currValue.value != dbMAX_VAL;
+        Chart<T>::prntCurrValue(currValue);
+        LOG_DEBUG(GwLog::DEBUG, "Chart drawChrt: currValue-value: %.1f, Valid: %d, Name: %s, Address: %p", currValue.value, currValue.valid, currValue.getName(), (void*)&currValue);
+    }
+}
+
+// draw chart
+template <typename T>
+void Chart<T>::drawChrt(int8_t chrtIntv, GwApi::BoatValue& currValue)
+{
+    double chrtVal; // Current data value
+    double chrtScl; // Scale for data values in pixels per value
+    static double chrtPrevVal; // Last data value in chart area
+    // bool bufDataValid = false; // Flag to indicate if buffer data is valid
+    static int numNoData; // Counter for multiple invalid data values in a row
+
+    int x, y; // x and y coordinates for drawing
+    static int prevX, prevY; // Last x and y coordinates for drawing
+
+    // Identify buffer size and buffer start position for chart
+    count = dataBuf.getCurrentSize();
+    currIdx = dataBuf.getLastIdx();
+    numAddedBufVals = (currIdx - lastAddedIdx + bufSize) % bufSize; // Number of values added to buffer since last display
+
+    if (chrtIntv != oldChrtIntv || count == 1) {
+        // new data interval selected by user; this is only x * 230 values instead of 240 seconds (4 minutes) per interval step
+        // intvBufSize = timAxis * chrtIntv; // obsolete
+        numBufVals = min(count, (timAxis - 60) * chrtIntv); // keep free or release 60 values on chart for plotting of new values
+        bufStart = max(0, count - numBufVals);
+        lastAddedIdx = currIdx;
+        oldChrtIntv = chrtIntv;
+
+    } else {
+        numBufVals = numBufVals + numAddedBufVals;
+        lastAddedIdx = currIdx;
+        if (count == bufSize) {
+            bufStart = max(0, bufStart - numAddedBufVals);
+        }
+    }
+
+    calcChrtBorders(chrtMid, chrtMin, chrtMax, chrtRng);
+    chrtScl = double(valAxis) / chrtRng; // Chart scale: pixels per value step
+
+    // Do we have valid buffer data?
+    if (dataBuf.getMax() == dbMAX_VAL) { // only <MAX_VAL> values in buffer -> no valid wind data available
+        bufDataValid = false;
+    } else if (!currValue.valid && !useSimuData) { // currently no valid boat data available and no simulation mode
+        numNoData++;
+        bufDataValid = true;
+        if (numNoData > 3) { // If more than 4 invalid values in a row, send message
+            bufDataValid = false;
+        }
+    } else {
+        numNoData = 0; // reset data error counter
+        bufDataValid = true; // At least some wind data available
+    }
+
+    // Draw wind values in chart
+    //***********************************************************************
+    if (bufDataValid) {
+        for (int i = 0; i < (numBufVals / chrtIntv); i++) {
+            chrtVal = dataBuf.get(bufStart + (i * chrtIntv)); // show the latest wind values in buffer; keep 1st value constant in a rolling buffer
+            if (chrtVal == dbMAX_VAL) {
+                chrtPrevVal = dbMAX_VAL;
+            } else {
+
+                if (chrtDir == 0) { // horizontal chart
+                    x = cStart.x + i; // Position in chart area
+                    if (chrtDataFmt == 0) {
+                        y = cStart.y + static_cast<int>(((chrtVal - chrtMin) * chrtScl) + 0.5); // calculate chart point and round
+                    } else { // degree type value
+                        y = cStart.y + static_cast<int>((WindUtils::to2PI(chrtVal - chrtMin) * chrtScl) + 0.5); // calculate chart point and round
+                    }
+                } else { // vertical chart
+                    y = cStart.y + timAxis - i; // Position in chart area
+                    if (chrtDataFmt == 0) {
+                        x = cStart.x + static_cast<int>(((chrtVal - chrtMin) * chrtScl) + 0.5); // calculate chart point and round
+                    } else { // degree type value
+                        x = cStart.x + static_cast<int>((WindUtils::to2PI(chrtVal - chrtMin) * chrtScl) + 0.5); // calculate chart point and round
+                    }
+                }
+
+                // if (i >= (numBufVals / chrtIntv) - 5) // log chart data of 1 line (adjust for test purposes)
+                //    LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Chart: i: %d, chrtVal: %.4f, {x,y} {%d,%d}", i, chrtVal, x, y);
+
+                if ((i == 0) || (chrtPrevVal == dbMAX_VAL)) {
+                    // just a dot for 1st chart point or after some invalid values
+                    prevX = x;
+                    prevY = y;
+
+                } else if (chrtDataFmt != 0) {
+                    // cross borders check for degree values; shift values to [-PI..0..PI]; when crossing borders, range is 2x PI degrees
+                    double normCurr = WindUtils::to2PI(chrtVal - chrtMin);
+                    double normPrev = WindUtils::to2PI(chrtPrevVal - chrtMin);
+                    // Check if pixel positions are far apart (crossing chart boundary); happens when one value is near chrtMax and the other near chrtMin
+                    bool crossedBorders = std::abs(normCurr - normPrev) > (chrtRng / 2.0);
+
+                    if (crossedBorders) { // If current value crosses chart borders compared to previous value, split line
+                        // LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Chart: crossedBorders: %d, chrtVal: %.2f, chrtPrevVal: %.2f", crossedBorders, chrtVal, chrtPrevVal);
+                        bool wrappingFromHighToLow = normCurr < normPrev; // Determine which edge we're crossing
+                        if (chrtDir == 0) {
+                            int ySplit = wrappingFromHighToLow ? (cStart.y + valAxis) : cStart.y;
+                            getdisplay().drawLine(prevX, prevY, x, ySplit, fgColor);
+                            if (x != prevX) { // line with some horizontal trend
+                                getdisplay().drawLine(prevX, prevY - 1, x, ySplit - 1, fgColor);
+                            } else {
+                                getdisplay().drawLine(prevX, prevY - 1, x - 1, ySplit, fgColor);
+                            }
+                            prevY = wrappingFromHighToLow ? cStart.y : (cStart.y + valAxis);
+                        } else { // vertical chart
+                            int xSplit = wrappingFromHighToLow ? (cStart.x + valAxis) : cStart.x;
+                            getdisplay().drawLine(prevX, prevY, xSplit, y, fgColor);
+                            getdisplay().drawLine(prevX, prevY - 1, ((xSplit != prevX) ? xSplit : xSplit - 1), ((xSplit != prevX) ? y - 1 : y), fgColor);
+                            prevX = wrappingFromHighToLow ? cStart.x : (cStart.x + valAxis);
+                        }
+                    }
+                }
+
+                // Draw line with 2 pixels width + make sure vertical lines are drawn correctly
+                if (chrtDir == 0 || x == prevX) { // horizontal chart & vertical line
+//                if (x == prevX) { // vertical line
+                    getdisplay().drawLine(prevX, prevY, x, y, fgColor);
+                    getdisplay().drawLine(prevX - 1, prevY, x - 1, y, fgColor);
+                } else if (chrtDir == 1 || x != prevX) { // vertical chart & line with some horizontal trend -> normal state
+//                } else { // line with some horizontal trend -> normal state
+                    getdisplay().drawLine(prevX, prevY, x, y, fgColor);
+                    getdisplay().drawLine(prevX, prevY - 1, x, y - 1, fgColor);
+                }
+                chrtPrevVal = chrtVal;
+                prevX = x;
+                prevY = y;
+            }
+
+            // Reaching chart area bottom end
+            if (i >= timAxis - 1) {
+                oldChrtIntv = 0; // force reset of buffer start and number of values to show in next display loop
+
+                if (chrtDataFmt == 1) { // degree of course or wind
+                    recalcRngCntr = true;
+                    LOG_DEBUG(GwLog::DEBUG, "PageWindPlot FreeTop: timAxis: %d, i: %d, bufStart: %d, numBufVals: %d, recalcRngCntr: %d", timAxis, i, bufStart, numBufVals, recalcRngCntr);
+                }
+                break;
+            }
+        }
+
+    } else {
+        // No valid data available
+        getdisplay().setFont(&Ubuntu_Bold10pt8b);
+
+        int pX, pY;
+        if (chrtDir == 0) { // horizontal chart
+            pX = cStart.x + (timAxis / 2);
+            pY = cStart.y + (valAxis / 2) - 10;
+        } else { // vertical chart
+            pX = cStart.x + (valAxis / 2);
+            pY = cStart.y + (timAxis / 2) - 10;
+        }
+
+        getdisplay().fillRect(pX - 33, pY - 10, 66, 24, bgColor); // Clear area for message
+        drawTextCenter(pX, pY, "No data");
+        LOG_DEBUG(GwLog::LOG, "PageWindPlot: No valid data available");
+    }
+}
+
+// Get maximum difference of last <amount> of dataBuf ringbuffer values to center chart
+template <typename T>
+double Chart<T>::getRng(double center, size_t amount)
+{
+    size_t count = dataBuf.getCurrentSize();
+
+    if (dataBuf.isEmpty() || amount <= 0) {
+        return dbMAX_VAL;
+    }
+    if (amount > count)
+        amount = count;
+
+    double value = 0;
+    double range = 0;
+    double maxRng = dbMIN_VAL;
+
+    // Start from the newest value (last) and go backwards x times
+    for (size_t i = 0; i < amount; i++) {
+        value = dataBuf.get(count - 1 - i);
+
+        if (value == dbMAX_VAL) {
+            continue; // ignore invalid values
+        }
+
+        range = abs(fmod((value - center + (M_TWOPI + M_PI)), M_TWOPI) - M_PI);
+        if (range > maxRng)
+            maxRng = range;
+    }
+
+    if (maxRng > M_PI) {
+        maxRng = M_PI;
+    }
+
+    return (maxRng != dbMIN_VAL ? maxRng : dbMAX_VAL); // Return range from <mid> to <max>
+}
+
+// check and adjust chart range and set range borders and range middle
+template <typename T>
+void Chart<T>::calcChrtBorders(double& rngMid, double& rngMin, double& rngMax, double& rng)
+{
+    if (chrtDataFmt == 0) {
+        // Chart data is of any type but 'degree'
+
+        double oldRngMin = rngMin;
+        double oldRngMax = rngMax;
+
+        // Chart starts at lowest range value, but at least '0' or includes even negative values
+        double currMinVal = dataBuf.getMin(numBufVals);
+        LOG_DEBUG(GwLog::DEBUG, "calcChrtRange0a: currMinVal: %.1f, currMaxVal: %.1f, rngMin: %.1f, rngMid: %.1f, rngMax: %.1f, rng: %.1f, rngStep: %.1f, oldRngMin: %.1f, oldRngMax: %.1f, dfltRng: %.1f, numBufVals: %d",
+            currMinVal, dataBuf.getMax(numBufVals), rngMin, rngMid, rngMax, rng, rngStep, oldRngMin, oldRngMax, dfltRng, numBufVals);
+
+        if (currMinVal != dbMAX_VAL) { // current min value is valid
+            if (currMinVal > 0 && dbMIN_VAL == 0) { // Chart range starts at least at '0' or includes negative values
+                rngMin = 0;
+            } else if (currMinVal < oldRngMin || (oldRngMin < 0 && (currMinVal > (oldRngMin + rngStep)))) { // decrease rngMin if required or increase if lowest value is higher than old rngMin
+                rngMin = std::floor(currMinVal / rngStep) * rngStep;
+            }
+        } // otherwise keep rngMin unchanged
+
+        double currMaxVal = dataBuf.getMax(numBufVals);
+        if (currMaxVal != dbMAX_VAL) { // current max value is valid
+            if ((currMaxVal > oldRngMax) || (currMaxVal < (oldRngMax - rngStep))) { // increase rngMax if required or decrease if lowest value is lower than old rngMax
+                rngMax = std::ceil(currMaxVal / rngStep) * rngStep;
+                rngMax = std::max(rngMax, rngMin + dfltRng); // keep at least default chart range
+            }
+        } // otherwise keep rngMax unchanged
+
+        rngMid = (rngMin + rngMax) / 2.0;
+        rng = rngMax - rngMin;
+        LOG_DEBUG(GwLog::DEBUG, "calcChrtRange1a: currMinVal: %.1f, currMaxVal: %.1f, rngMin: %.1f, rngMid: %.1f, rngMax: %.1f, rng: %.1f, rngStep: %.1f, oldRngMin: %.1f, oldRngMax: %.1f, dfltRng: %.1f, numBufVals: %d",
+            currMinVal, currMaxVal, rngMin, rngMid, rngMax, rng, rngStep, oldRngMin, oldRngMax, dfltRng, numBufVals);
+    } else {
+
+        if (chrtDataFmt == 1) {
+            // Chart data is of type 'course' or 'wind'
+
+            if ((count == 1 && rngMid == 0) || rngMid == dbMAX_VAL) {
+                recalcRngCntr = true; // initialize <rngMid>
+            }
+
+            // Set rngMid
+            if (recalcRngCntr) {
+                rngMid = dataBuf.getMid(numBufVals);
+                if (rngMid == dbMAX_VAL) {
+                    rngMid = 0;
+                } else {
+                    rngMid = std::round(rngMid / rngStep) * rngStep; // Set new center value; round to next <rngStep> value
+
+                    // Check if range between  'min' and 'max' is > 180° or crosses '0'
+                    rngMin = dataBuf.getMin(numBufVals);
+                    rngMax = dataBuf.getMax(numBufVals);
+                    rng = (rngMax >= rngMin ? rngMax - rngMin : M_TWOPI - rngMin + rngMax);
+                    rng = max(rng, dfltRng); // keep at least default chart range
+                    if (rng > M_PI) { // If wind range > 180°, adjust wndCenter to smaller wind range end
+                        rngMid = WindUtils::to2PI(rngMid + M_PI);
+                    }
+                }
+                recalcRngCntr = false; // Reset flag for <rngMid> determination
+                LOG_DEBUG(GwLog::DEBUG, "calcChrtRange1b: rngMid: %.1f°, rngMin: %.1f°, rngMax: %.1f°, rng: %.1f°, rngStep: %.1f°", rngMid * RAD_TO_DEG, rngMin * RAD_TO_DEG, rngMax * RAD_TO_DEG,
+                    rng * RAD_TO_DEG, rngStep * RAD_TO_DEG);
+            }
+
+        } else if (chrtDataFmt == 2) {
+            // Chart data is of type 'rotation'; then we want to have <rndMid> always to be '0'
+            rngMid = 0;
+        }
+
+        // check and adjust range between left, center, and right chart limit
+        double halfRng = rng / 2.0; // we calculate with range between <rngMid> and edges
+        double diffRng = getRng(rngMid, numBufVals);
+        // LOG_DEBUG(GwLog::DEBUG, "calcChrtRange2: diffRng: %.1f°, halfRng: %.1f°", diffRng * RAD_TO_DEG, halfRng * RAD_TO_DEG);
+        diffRng = (diffRng == dbMAX_VAL ? 0 : std::ceil(diffRng / rngStep) * rngStep);
+        // LOG_DEBUG(GwLog::DEBUG, "calcChrtRange2: diffRng: %.1f°, halfRng: %.1f°", diffRng * RAD_TO_DEG, halfRng * RAD_TO_DEG);
+
+        if (diffRng > halfRng) {
+            halfRng = diffRng; // round to next <rngStep> value
+        } else if (diffRng + rngStep < halfRng) { // Reduce chart range for higher resolution if possible
+            halfRng = max(dfltRng / 2.0, diffRng);
+        }
+
+        rngMin = WindUtils::to2PI(rngMid - halfRng);
+        rngMax = (halfRng < M_PI ? rngMid + halfRng : rngMid + halfRng - (M_TWOPI / 360)); // if chart range is 360°, then make <rngMax> 1° smaller than <rngMin>
+        rngMax = WindUtils::to2PI(rngMax);
+        // LOG_DEBUG(GwLog::DEBUG, "calcChrtRange2: diffRng: %.1f°, halfRng: %.1f°", diffRng * RAD_TO_DEG, halfRng * RAD_TO_DEG);
+
+        rng = halfRng * 2.0;
+        LOG_DEBUG(GwLog::DEBUG, "calcChrtRange2b: rngMid: %.1f°, rngMin: %.1f°, rngMax: %.1f°, diffRng: %.1f°, rng: %.1f°, rngStep: %.1f°", rngMid * RAD_TO_DEG, rngMin * RAD_TO_DEG, rngMax * RAD_TO_DEG,
+            diffRng * RAD_TO_DEG, rng * RAD_TO_DEG, rngStep * RAD_TO_DEG);
+    }
+}
+
+// chart time axis label + lines
+template <typename T>
+void Chart<T>::drawChrtTimeAxis(int8_t chrtIntv)
+{
+    int timeRng;
+    float slots, intv, i;
+    char sTime[6];
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setTextColor(fgColor);
+
+    if (chrtDir == 0) { // horizontal chart
+        getdisplay().fillRect(0, cStart.y, dWidth, 2, fgColor);
+
+        timeRng = chrtIntv * 4; // Chart time interval: [1] 4 min., [2] 8 min., [3] 12 min., [4] 16 min., [8] 32 min.
+        slots = timAxis / 80.0; // number of axis labels
+        intv = timeRng / slots; // minutes per chart axis interval
+        i = timeRng; // Chart axis label start at -32, -16, -12, ... minutes
+
+        for (int j = 0; j < timAxis - 30; j += 80) { // fill time axis with values but keep area free on right hand side for value label
+            // LOG_DEBUG(GwLog::DEBUG, "ChartTimeAxis: timAxis: %d, {x,y}: {%d,%d}, i: %.1f, j: %d, chrtIntv: %d, intv: %.1f, slots: %.1f", timAxis, cStart.x, cStart.y, i, j, chrtIntv, intv, slots);
+
+            // Format time label based on interval
+            if (chrtIntv < 3) {
+                snprintf(sTime, sizeof(sTime), "-%.1f", i);
+            } else {
+                snprintf(sTime, sizeof(sTime), "-%.0f", std::round(i));
+            }
+
+            // draw text with appropriate offset
+            //            int tOffset = (j == 0) ? 13 : (chrtIntv < 3 ? -4 : -4);
+            int tOffset = j == 0 ? 13 : -4;
+            drawTextCenter(cStart.x + j + tOffset, cStart.y - 8, sTime);
+            getdisplay().drawLine(cStart.x + j, cStart.y, cStart.x + j, cStart.y + 5, fgColor); // draw short vertical time mark
+
+            i -= intv;
+        }
+
+    } else { // vertical chart
+        timeRng = chrtIntv * 4; // chart time interval: [1] 4 min., [2] 8 min., [3] 12 min., [4] 16 min., [8] 32 min.
+        slots = timAxis / 75.0; // number of axis labels
+        intv = timeRng / slots; // minutes per chart axis interval
+        i = -intv; // chart axis label start at -32, -16, -12, ... minutes
+
+        for (int j = 75; j < (timAxis - 75); j += 75) { // don't print time label at upper and lower end of time axis
+            if (chrtIntv < 3) { // print 1 decimal if time range is single digit (4 or 8 minutes)
+                snprintf(sTime, sizeof(sTime), "%.1f", i);
+            } else {
+                snprintf(sTime, sizeof(sTime), "%.0f", std::floor(i));
+            }
+
+            getdisplay().drawLine(cStart.x, cStart.y + j, cStart.x + valAxis, cStart.y + j, fgColor); // Grid line
+
+            if (chrtSz == 0) { // full size chart
+                getdisplay().fillRect(0, cStart.y + j - 9, 32, 15, bgColor); // clear small area to remove potential chart lines
+                getdisplay().setCursor((4 - strlen(sTime)) * 7, cStart.y + j + 3); // time value; print left screen; value right-formated
+                getdisplay().printf("%s", sTime); // Range value
+            } else if (chrtSz == 2) { // half size chart; right side
+                drawTextCenter(dWidth / 2, cStart.y + j, sTime); // time value; print mid screen
+            }
+
+            i -= intv;
+        }
+    }
+}
+
+// chart value axis labels + lines
+template <typename T>
+void Chart<T>::drawChrtValAxis()
+{
+    double slots;
+    int i, intv;
+    double cVal, cchrtRng, crngMin;
+    char sVal[6];
+    int sLen;
+    std::unique_ptr<GwApi::BoatValue> tmpBVal; // Temp variable to get formatted and converted data value from OBP60Formatter
+    tmpBVal = std::unique_ptr<GwApi::BoatValue>(new GwApi::BoatValue(dataBuf.getName()));
+    tmpBVal->setFormat(dataBuf.getFormat());
+    tmpBVal->valid = true;
+
+    if (chrtDir == 0) { // horizontal chart
+        slots = valAxis / 60.0; // number of axis labels
+        tmpBVal->value = chrtRng;
+        cchrtRng = formatValue(tmpBVal.get(), *commonData).cvalue; // value (converted)
+        intv = static_cast<int>(round(cchrtRng / slots));
+        i = intv;
+
+        if (chrtSz == 0) { // full size chart -> print multiple value lines
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            for (int j = 60; j < valAxis - 30; j += 60) {
+                getdisplay().drawLine(cStart.x, cStart.y + j, cStart.x + timAxis, cStart.y + j, fgColor);
+
+                getdisplay().fillRect(cStart.x, cStart.y + j - 11, 42, 21, bgColor); // Clear small area to remove potential chart lines
+                String sVal = String(i);
+                getdisplay().setCursor((3 - sVal.length()) * 10, cStart.y + j + 7); // value right-formated
+                getdisplay().printf("%s", sVal); // Range value
+
+                i += intv;
+            }
+        } else { // half size chart -> print just edge values + middle chart line
+            getdisplay().setFont(&Ubuntu_Bold10pt8b);
+
+            tmpBVal->value = chrtMin;
+            cVal = formatValue(tmpBVal.get(), *commonData).cvalue; // value (converted)
+            sLen = snprintf(sVal, sizeof(sVal), "%.0f", round(cVal));
+            getdisplay().fillRect(cStart.x, cStart.y + 2, 42, 16, bgColor); // Clear small area to remove potential chart lines
+            getdisplay().setCursor(cStart.x + ((3 - sLen) * 10), cStart.y + 16);
+            getdisplay().printf("%s", sVal); // Range low end
+
+            tmpBVal->value = chrtMid;
+            cVal = formatValue(tmpBVal.get(), *commonData).cvalue; // value (converted)
+            sLen = snprintf(sVal, sizeof(sVal), "%.0f", round(cVal));
+            getdisplay().fillRect(cStart.x, cStart.y + (valAxis / 2) - 9, 42, 16, bgColor); // Clear small area to remove potential chart lines
+            getdisplay().setCursor(cStart.x + ((3 - sLen) * 10), cStart.y + (valAxis / 2) + 5);
+            getdisplay().printf("%s", sVal); // Range mid value
+            getdisplay().drawLine(cStart.x + 43, cStart.y + (valAxis / 2), cStart.x + timAxis, cStart.y + (valAxis / 2), fgColor);
+
+            tmpBVal->value = chrtMax;
+            cVal = formatValue(tmpBVal.get(), *commonData).cvalue; // value (converted)
+            sLen = snprintf(sVal, sizeof(sVal), "%.0f", round(cVal));
+            getdisplay().fillRect(cStart.x, cStart.y + valAxis - 16, 42, 16, bgColor); // Clear small area to remove potential chart lines
+            getdisplay().setCursor(cStart.x + ((3 - sLen) * 10), cStart.y + valAxis - 1);
+            getdisplay().printf("%s", sVal); // Range high end
+            getdisplay().drawLine(cStart.x + 43, cStart.y + valAxis, cStart.x + timAxis, cStart.y + valAxis, fgColor);
+        }
+
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        drawTextRalign(cStart.x + timAxis, cStart.y - 3, dbName); // buffer data name
+
+    } else { // vertical chart
+        if (chrtSz == 0) { // full size chart -> use larger font
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            drawTextCenter(cStart.x + (valAxis / 4) + 25, cStart.y - 10, dbName); // buffer data name
+        } else {
+            getdisplay().setFont(&Ubuntu_Bold10pt8b);
+        }
+        getdisplay().fillRect(cStart.x, top, valAxis, 2, fgColor); // top chart line
+
+        tmpBVal->value = chrtMin;
+        cVal = formatValue(tmpBVal.get(), *commonData).cvalue; // value (converted)
+        snprintf(sVal, sizeof(sVal), "%.0f", round(cVal));
+        getdisplay().setCursor(cStart.x, cStart.y - 2);
+        getdisplay().printf("%s", sVal); // Range low end
+
+        tmpBVal->value = chrtMid;
+        cVal = formatValue(tmpBVal.get(), *commonData).cvalue; // value (converted)
+        snprintf(sVal, sizeof(sVal), "%.0f", round(cVal));
+        drawTextCenter(cStart.x + (valAxis / 2), cStart.y - 10, sVal); // Range mid end
+
+        tmpBVal->value = chrtMax;
+        cVal = formatValue(tmpBVal.get(), *commonData).cvalue; // value (converted)
+        snprintf(sVal, sizeof(sVal), "%.0f", round(cVal));
+        drawTextRalign(cStart.x + valAxis - 2, cStart.y - 2, sVal); // Range high end
+
+        for (int j = 0; j <= valAxis + 2; j += ((valAxis + 2) / 2)) {
+            getdisplay().drawLine(cStart.x + j, cStart.y, cStart.x + j, cStart.y + timAxis, fgColor);
+        }
+
+        //        if (chrtSz == 0) {
+        //            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        //            drawTextCenter(cStart.x + (valAxis / 4) + 15, cStart.y - 11, dbName); // buffer data name
+        //        }
+    }
+}
+
+// Print current data value
+template <typename T>
+void Chart<T>::prntCurrValue(GwApi::BoatValue& currValue)
+{
+    const int xPosVal = (chrtDir == 0) ? cStart.x + (timAxis / 2) - 56 : cStart.x + 32;
+    const int yPosVal = (chrtDir == 0) ? cStart.y + valAxis - 7 : cStart.y + timAxis - 7;
+
+    FormattedData frmtDbData = formatValue(&currValue, *commonData);
+    double testdbValue = frmtDbData.value;
+    String sdbValue = frmtDbData.svalue; // value (string)
+    String dbUnit = frmtDbData.unit; // Unit of value
+    // LOG_DEBUG(GwLog::DEBUG, "Chart CurrValue: dbValue: %.2f, sdbValue: %s, fmrtDbValue: %.2f, dbFormat: %s, dbUnit: %s, Valid: %d, Name: %s, Address: %p", currValue.value, sdbValue,
+    //    testdbValue, currValue.getFormat(), dbUnit, currValue.valid, currValue.getName(), currValue);
+
+    getdisplay().fillRect(xPosVal - 1, yPosVal - 34, 125, 41, bgColor); // Clear area for TWS value
+    getdisplay().drawRect(xPosVal, yPosVal - 33, 123, 39, fgColor); // Draw box for TWS value
+    getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+    getdisplay().setCursor(xPosVal + 1, yPosVal);
+    if (useSimuData) {
+        getdisplay().printf("%2.1f", currValue.value); // Value
+    } else {
+        getdisplay().print(sdbValue); // Value
+    }
+
+    getdisplay().setFont(&Ubuntu_Bold10pt8b);
+    getdisplay().setCursor(xPosVal + 76, yPosVal - 17);
+    getdisplay().print(dbName); // Name
+
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setCursor(xPosVal + 76, yPosVal + 0);
+    getdisplay().print(dbUnit); // Unit
+}
+
+// Explicitly instantiate class with required data types to avoid linker errors
+template class Chart<uint16_t>;
+// --- Class Chart ---------------

lib/obp60task/OBPcharts.h

@@ -0,0 +1,70 @@
+// Function lib for display of boat data in various graphical chart formats
+#pragma once
+#include "Pagedata.h"
+
+struct Pos {
+    int x;
+    int y;
+};
+template <typename T> class RingBuffer;
+class GwLog;
+
+template <typename T>
+class Chart {
+protected:
+    CommonData *commonData;
+    GwLog *logger;
+
+    RingBuffer<T> &dataBuf; // Buffer to display
+    int8_t chrtDir; // Chart timeline direction: [0] = horizontal, [1] = vertical
+    int8_t chrtSz; // Chart size: [0] = full size, [1] = half size left/top, [2] half size right/bottom
+    double dfltRng; // Default range of chart, e.g. 30 = [0..30]
+    uint16_t fgColor; // color code for any screen writing
+    uint16_t bgColor; // color code for screen background
+    bool useSimuData; // flag to indicate if simulation data is active
+
+    int top = 48; // display top header lines
+    int bottom = 22; // display bottom lines
+    int hGap = 11; // gap between 2 horizontal charts; actual gap is 2x <gap>
+    int vGap = 20; // gap between 2 vertical charts; actual gap is 2x <gap>
+    int xOffset = 33; // offset for horizontal axis (time/value), because of space for left vertical axis labeling
+    int yOffset = 10; // offset for vertical axis (time/value), because of space for top horizontal axis labeling
+    int dWidth; // Display width
+    int dHeight; // Display height
+    int timAxis, valAxis; // size of time and value chart axis
+    Pos cStart; // start point of chart area
+    double chrtRng; // Range of buffer values from min to max value
+    double chrtMin; // Range low end value
+    double chrtMax; // Range high end value
+    double chrtMid; // Range mid value
+    double rngStep; // Defines the step of adjustment (e.g. 10 m/s) for value axis range
+    bool recalcRngCntr = false; // Flag for re-calculation of mid value of chart for wind data types
+
+    String dbName, dbFormat; // Name and format of data buffer
+    int chrtDataFmt; // Data format of chart: [0] size values; [1] degree of course or wind; [2] rotational degrees
+    double dbMIN_VAL; // Lowest possible value of buffer of type <T>
+    double dbMAX_VAL; // Highest possible value of buffer of type <T>; indicates invalid value in buffer
+    size_t bufSize; // History buffer size: 1.920 values for 32 min. history chart
+    int count; // current size of buffer
+    int numBufVals; // number of wind values available for current interval selection
+    int bufStart; // 1st data value in buffer to show
+    int numAddedBufVals; // Number of values added to buffer since last display
+    size_t currIdx; // Current index in TWD history buffer
+    size_t lastIdx; // Last index of TWD history buffer
+    size_t lastAddedIdx = 0; // Last index of TWD history buffer when new data was added
+    bool bufDataValid = false; // Flag to indicate if buffer data is valid
+    int oldChrtIntv = 0; // remember recent user selection of data interval
+
+    void drawChrt(int8_t chrtIntv, GwApi::BoatValue& currValue); // Draw chart line
+    double getRng(double center, size_t amount); // Calculate range between chart center and edges
+    void calcChrtBorders(double& rngMid, double& rngMin, double& rngMax, double& rng); // Calculate chart points for value axis and return range between <min> and <max>
+    void drawChrtTimeAxis(int8_t chrtIntv); // Draw time axis of chart, value and lines
+    void drawChrtValAxis(); // Draw value axis of chart, value and lines
+    void prntCurrValue(GwApi::BoatValue& currValue); // Add current boat data value to chart 
+
+public:
+    Chart(RingBuffer<T>& dataBuf, int8_t chrtDir, int8_t chrtSz, double dfltRng, CommonData& common, bool useSimuData); // Chart object of data chart
+    ~Chart();
+    void showChrt(int8_t chrtIntv, GwApi::BoatValue currValue); // Perform all actions to draw chart
+
+};

lib/obp60task/PageAIS.cpp

@@ -1,199 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
-
-#include "Pagedata.h"
-#include "OBP60Extensions.h"
-#include "ConfigMenu.h"
-
-/*
-  AIS Overview
-    - circle with certain range, e.g. 5nm
-    - AIS-Targets in range with speed and heading
-    - perhaps collision alarm
-  Data: LAT LON SOG HDT
-
-*/
-
-class PageAIS : public Page
-{
-private:
-    GwConfigHandler *config;
-    GwLog *logger;
-    bool simulation = false;
-    bool holdvalues = false;
-    String flashLED;
-    String backlightMode;
-
-    int scale = 5; // Radius of display circle in nautical miles
-
-    bool alarm = false;
-    bool alarm_enabled = false;
-    int alarm_range = 3;
-
-    char mode = 'N'; // (N)ormal, (C)onfig
-    int8_t editmode = -1; // marker for menu/edit/set function
-
-    ConfigMenu *menu;
-
-    void displayModeNormal(PageData &pageData) {
-
-        // TBD Boatvalues: ...
-
-        LOG_DEBUG(GwLog::DEBUG,"Drawing at PageAIS");
-
-        Point c = {200, 150}; // center = current boat position
-        uint16_t r = 125;
-
-        const std::vector<Point> pts_boat = { // polygon lines
-            {c.x - 5, c.y},
-            {c.x - 5, c.y - 10},
-            {c.x, c.y - 16},
-            {c.x + 5, c.y - 10},
-            {c.x + 5, c.y}
-        };
-        drawPoly(pts_boat, commonData->fgcolor);
-
-        // Title and corner value headings
-        epd->setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(8, 48);
-        epd->print("AIS");
-
-        // zoom scale
-        epd->drawLine(c.x + 10, c.y, c.x + r - 4, c.y, commonData->fgcolor);
-        // arrow left
-        epd->drawLine(c.x + 10, c.y, c.x + 16, c.y - 4, commonData->fgcolor);
-        epd->drawLine(c.x + 10, c.y, c.x + 16, c.y + 4, commonData->fgcolor);
-        // arrow right
-        epd->drawLine(c.x + r - 4, c.y, c.x + r - 10, c.y - 4, commonData->fgcolor);
-        epd->drawLine(c.x + r - 4, c.y, c.x + r - 10, c.y + 4, commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold8pt8b);
-        drawTextCenter(c.x + r / 2, c.y + 8, String(scale) + "nm");
- 
-    }
-
-    void displayModeConfig() {
-
-        epd->setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(8, 48);
-        epd->print("AIS configuration");
-
-        epd->setFont(&Ubuntu_Bold8pt8b);
-        // TODO menu
-
-    }
-
-public:
-    PageAIS(CommonData &common) 
-    {
-        commonData = &common;
-        config = commonData->config;
-        logger = commonData->logger;
-        logger->logDebug(GwLog::LOG,"Instantiate PageAIS");
-
-        // preload configuration data
-        simulation = config->getBool(config->useSimuData);
-        holdvalues = config->getBool(config->holdvalues);
-        flashLED = config->getString(config->flashLED);
-        backlightMode = config->getString(config->backlight);
-
-        alarm_range = 30;
-
-        // Initialize config menu
-        /* menu = new ConfigMenu("Options", 40, 80);
-        menu->setItemDimension(150, 20);
-
-        ConfigMenuItem *newitem;
-        newitem = menu->addItem("range", "Range", "int", 4, "nm");
-        if (! newitem) {
-            // Demo: in case of failure exit here, should never be happen
-            logger->logDebug(GwLog::ERROR,"Menu item creation failed");
-            return;
-        }
-        newitem->setRange(0, 20, {1, 5});
-        menu->setItemActive("range"); */
-     }
-
-    void setupKeys(){
-        Page::setupKeys();
-        commonData->keydata[0].label = "MODE";
-        commonData->keydata[1].label = "ALARM";
-    }
-
-#ifdef BOARD_OBP60S3
-    int handleKey(int key){
-        if (key == 1) { // Switch between normal and config mode
-            if (mode == 'N') {
-                mode = 'C';
-            } else {
-                mode = 'N';
-            }
-            return 0;
-        }
-        if (key == 11) { // Code for keylock
-            commonData->keylock = !commonData->keylock;
-            return 0;
-        }
-        return key;
-    }
-#endif
-#ifdef BOARD_OBP40S3
-    int handleKey(int key) {
-        if (key == 1) { // Switch between normal and config mode
-            if (mode == 'N') {
-                mode = 'C';
-            } else {
-                mode = 'N';
-            }
-            return 0;
-        }
-        if (key == 11) { // Code for keylock
-            commonData->keylock = !commonData->keylock;
-            return 0;
-        }
-        return key;
-    }
-#endif
-
-    void displayNew(PageData &pageData){
-    };
-
-    int displayPage(PageData &pageData){
-
-        // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageAIS; Mode=%c", mode);
-
-        // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height());
-
-       if (mode == 'N') {
-           displayModeNormal(pageData);
-       } else if (mode == 'C') {
-           displayModeConfig();
-       }
-
-        return PAGE_UPDATE;
-    };
-};
-
-static Page *createPage(CommonData &common){
-    return new PageAIS(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 registerPageAIS(
-    "AIS",      // Page name
-    createPage, // Action
-    0,          // Number of bus values depends on selection in Web configuration
-    {"LAT", "LON", "SOG", "HDT"}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h)
-    true        // Show display header on/off
-);
-
-#endif

lib/obp60task/PageAnchor.cpp

@@ -1,434 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
-
-#include "Pagedata.h"
-#include "OBP60Extensions.h"
-#include "ConfigMenu.h"
-
-/*
-  Anchor overview with additional associated data
-  This page is in experimental stage so be warned!
-  North is up.
-
-  Boatdata used
-    DBS - Water depth
-    HDT - Boat heading
-    AWS - Wind strength; Boat not moving so we assume AWS=TWS and AWD=TWD
-    AWD - Wind direction
-    LAT/LON - Boat position, current
-    HDOP - Position error
-
-  This is the fist page to contain a configuration page with 
-  data entry option.
-  Also it will make use of the new alarm function.
-
-  Data
-    Anchor position lat/lon
-    Depth at anchor position
-    Chain length used
-    Boat position current
-    Depth at boat position
-    Boat heading
-    Wind direction
-    Wind strength
-    Alarm j/n
-    Alarm radius
-    GPS position error
-    Timestamp while dropping anchor
-
-   Drop / raise function in device OBP40 has to be done inside 
-   config mode because of limited number of buttons.
-
-*/
-
-#define anchor_width 16
-#define anchor_height 16
-static unsigned char anchor_bits[] = {
-   0x80, 0x01, 0x40, 0x02, 0x40, 0x02, 0x80, 0x01, 0xf0, 0x0f, 0x80, 0x01,
-   0x80, 0x01, 0x88, 0x11, 0x8c, 0x31, 0x8e, 0x71, 0x84, 0x21, 0x86, 0x61,
-   0x86, 0x61, 0xfc, 0x3f, 0xf8, 0x1f, 0x80, 0x01 };
-
-class PageAnchor : public Page
-{
-private:
-    GwConfigHandler *config;
-    GwLog *logger;
-    bool simulation = false;
-    bool holdvalues = false;
-    String flashLED;
-    String backlightMode;
-    String lengthformat;
-
-    int scale = 50; // Radius of display circle in meter
-
-    bool alarm = false;
-    bool alarm_enabled = false;
-    uint8_t alarm_range;
-
-    uint8_t chain_length;
-    uint8_t chain;
-
-    bool anchor_set = false;
-    double anchor_lat;
-    double anchor_lon;
-    double anchor_depth;
-    int anchor_ts; // time stamp anchor dropped
-
-    char mode = 'N'; // (N)ormal, (C)onfig
-    int8_t editmode = -1; // marker for menu/edit/set function
-
-    ConfigMenu *menu;
-
-    void displayModeNormal(PageData &pageData) {
-
-        // Boatvalues: DBS, HDT, AWS, AWD, LAT, LON, HDOP
-        GwApi::BoatValue *bv_dbs = pageData.values[0]; // DBS
-        String sval_dbs = formatValue(bv_dbs, *commonData).svalue;
-        String sunit_dbs = formatValue(bv_dbs, *commonData).unit; 
-        GwApi::BoatValue *bv_hdt = pageData.values[1]; // HDT
-        String sval_hdt = formatValue(bv_hdt, *commonData).svalue;
-        GwApi::BoatValue *bv_aws = pageData.values[2]; // AWS
-        String sval_aws = formatValue(bv_aws, *commonData).svalue;
-        String sunit_aws = formatValue(bv_aws, *commonData).unit; 
-        GwApi::BoatValue *bv_awd = pageData.values[3]; // AWD
-        String sval_awd = formatValue(bv_awd, *commonData).svalue;
-        GwApi::BoatValue *bv_lat = pageData.values[4]; // LAT
-        String sval_lat = formatValue(bv_lat, *commonData).svalue;
-        GwApi::BoatValue *bv_lon = pageData.values[5]; // LON
-        String sval_lon = formatValue(bv_lon, *commonData).svalue;
-        GwApi::BoatValue *bv_hdop = pageData.values[6]; // HDOP
-        String sval_hdop = formatValue(bv_hdop, *commonData).svalue;
-        String sunit_hdop = formatValue(bv_hdop, *commonData).unit; 
-
-        LOG_DEBUG(GwLog::DEBUG,"Drawing at PageAnchor; DBS=%f, HDT=%f, AWS=%f", bv_dbs->value, bv_hdt->value, bv_aws->value);
-
-        Point c = {200, 150}; // center = anchor position
-        uint16_t r = 125;
-
-        Point b = {200, 180}; // boat position while dropping anchor
-
-        const std::vector<Point> pts_boat = { // polygon lines
-            {b.x - 5, b.y},
-            {b.x - 5, b.y - 10},
-            {b.x, b.y - 16},
-            {b.x + 5, b.y - 10},
-            {b.x + 5, b.y}
-        };
-        //rotatePoints und dann Linien zeichnen
-        // TODO rotate boat according to current heading
-        //drawPoly(rotatePoints(c, pts, RadToDeg(value2)), commonData->fgcolor);
-        drawPoly(pts_boat, commonData->fgcolor);
-
-        // Draw wind arrow
-        const std::vector<Point> pts_wind = {
-            {c.x, c.y - r + 25},
-            {c.x - 12, c.y - r - 4},
-            {c.x, c.y - r + 6},
-            {c.x + 12, c.y - r - 4}
-        };
-        if (bv_awd->valid) {
-            fillPoly4(rotatePoints(c, pts_wind, bv_awd->value), commonData->fgcolor);
-        }
-
-        // Title and corner value headings
-        epd->setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(8, 48);
-        epd->print("Anchor");
-
-        epd->setFont(&Ubuntu_Bold10pt8b);
-        epd->setCursor(8, 200);
-        epd->print("Depth");
-        drawTextRalign(392, 38, "Chain");
-        drawTextRalign(392, 200, "Wind");
-
-        // Units
-        epd->setCursor(8, 272);
-        epd->print(sunit_dbs);
-        drawTextRalign(392, 272, sunit_aws);
-        drawTextRalign(392, 100, lengthformat); // chain unit not implemented
-
-        // Corner values
-        epd->setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(8, 70);
-        epd->print("Alarm: ");
-        epd->print(alarm_enabled ? "On" : "Off");
-
-        epd->setCursor(8, 90);
-        epd->print("HDOP");
-        epd->setCursor(8, 106);
-        if (bv_hdop->valid) {
-            epd->print(round(bv_hdop->value), 0);
-            epd->print(sunit_hdop);
-        } else {
-            epd->print("n/a");
-        }
-
-        // Values
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        // Current chain used
-        epd->setCursor(328, 85);
-        epd->print("27");
-
-        // Depth
-        epd->setCursor(8, 250);
-        epd->print(sval_dbs);
-        // Wind
-        epd->setCursor(328, 250);
-        epd->print(sval_aws);
-
-        epd->drawCircle(c.x, c.y, r, commonData->fgcolor);
-        epd->drawCircle(c.x, c.y, r + 1, commonData->fgcolor);
- 
-        // zoom scale
-        epd->drawLine(c.x + 10, c.y, c.x + r - 4, c.y, commonData->fgcolor);
-        // arrow left
-        epd->drawLine(c.x + 10, c.y, c.x + 16, c.y - 4, commonData->fgcolor);
-        epd->drawLine(c.x + 10, c.y, c.x + 16, c.y + 4, commonData->fgcolor);
-        // arrow right
-        epd->drawLine(c.x + r - 4, c.y, c.x + r - 10, c.y - 4, commonData->fgcolor);
-        epd->drawLine(c.x + r - 4, c.y, c.x + r - 10, c.y + 4, commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold8pt8b);
-        drawTextCenter(c.x + r / 2, c.y + 8, String(scale) + "m");
- 
-        // alarm range circle
-        if (alarm_enabled) {
-            // alarm range in meter has to be smaller than the scale in meter
-            // r and r_range are pixel values
-            uint16_t r_range = int(alarm_range * r / scale);
-            LOG_DEBUG(GwLog::LOG,"Drawing at PageAnchor; Alarm range = %d", r_range);
-            epd->drawCircle(c.x, c.y, r_range, commonData->fgcolor);
-        }
- 
-        // draw anchor symbol (as bitmap)
-        epd->drawXBitmap(c.x - anchor_width / 2, c.y - anchor_height / 2,
-                                 anchor_bits, anchor_width, anchor_height, commonData->fgcolor);
-
-    }
-
-    void displayModeConfig() {
-
-        epd->setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(8, 48);
-        epd->print("Anchor configuration");
-        
-        // TODO
-        // show lat/lon for anchor pos
-        // show lat/lon for boat pos
-        // show distance anchor <-> boat
-
-        epd->setFont(&Ubuntu_Bold8pt8b);
-        for (int i = 0 ; i < menu->getItemCount(); i++) {
-            ConfigMenuItem *itm = menu->getItemByIndex(i);
-            if (!itm) {
-                LOG_DEBUG(GwLog::ERROR, "Menu item not found: %d", i);
-            } else {
-                Rect r = menu->getItemRect(i);
-                bool inverted = (i == menu->getActiveIndex());
-                drawTextBoxed(r, itm->getLabel(), commonData->fgcolor, commonData->bgcolor, inverted, false);
-                if (inverted and editmode > 0) {
-                    // triangle as edit marker
-                    epd->fillTriangle(r.x + r.w + 20, r.y, r.x + r.w + 30, r.y + r.h / 2, r.x + r.w + 20, r.y + r.h,  commonData->fgcolor);
-                }
-                epd->setCursor(r.x + r.w + 40, r.y + r.h - 4);
-                if (itm->getType() == "int") {
-                    epd->print(itm->getValue());
-                    epd->print(itm->getUnit());
-                } else {
-                     epd->print(itm->getValue() == 0 ? "No" : "Yes");
-                }
-            }
-        } 
-
-    }
-
-public:
-    PageAnchor(CommonData &common) 
-    {
-        commonData = &common;
-        config = commonData->config;
-        logger = commonData->logger;
-        logger->logDebug(GwLog::LOG,"Instantiate PageAnchor");
-
-        // preload configuration data
-        simulation = config->getBool(config->useSimuData);
-        holdvalues = config->getBool(config->holdvalues);
-        flashLED = config->getString(config->flashLED);
-        backlightMode = config->getString(config->backlight);
-        lengthformat = config->getString(config->lengthFormat);
-        chain_length = config->getInt(config->chainLength);
-
-        chain = 0;
-        anchor_set = false;
-        alarm_range = 30;
-
-        // Initialize config menu
-        menu = new ConfigMenu("Options", 40, 80);
-        menu->setItemDimension(150, 20);
-
-        ConfigMenuItem *newitem;
-        newitem = menu->addItem("chain", "Chain out", "int", 0, "m");
-        if (! newitem) {
-            // Demo: in case of failure exit here, should never be happen
-            logger->logDebug(GwLog::ERROR,"Menu item creation failed");
-            return;
-        }
-        newitem->setRange(0, 200, {1, 5, 10});
-        newitem = menu->addItem("chainmax", "Chain max", "int", chain_length, "m");
-        newitem->setRange(0, 200, {1, 5, 10});
-        newitem = menu->addItem("zoom", "Zoom", "int", 50, "m");
-        newitem->setRange(0, 200, {1, });
-        newitem = menu->addItem("range", "Alarm range", "int", 40, "m");
-        newitem->setRange(0, 200, {1, 5, 10});
-        newitem = menu->addItem("alat", "Adjust anchor lat.", "int", 0, "m");
-        newitem->setRange(0, 200, {1, 5, 10});
-        newitem = menu->addItem("alon", "Adjust anchor lon.", "int", 0, "m");
-        newitem->setRange(0, 200, {1, 5, 10});
-#ifdef BOARD_OBP40S3
-        // Intodruced here because of missing keys for OBP40
-        newitem = menu->addItem("anchor", "Anchor down", "bool", 0, "");
-#endif
-        menu->setItemActive("zoom");
-     }
-
-    void setupKeys(){
-        Page::setupKeys();
-        commonData->keydata[0].label = "MODE";
-        commonData->keydata[1].label = "ALARM";
-    }
-
-#ifdef BOARD_OBP60S3
-    int handleKey(int key){
-        if (key == 1) { // Switch between normal and config mode
-            if (mode == 'N') {
-                mode = 'C';
-            } else {
-                mode = 'N';
-            }
-            return 0;
-        }
-        if (mode == 'N') {
-            if (key == 2) { // Toggle alarm
-                alarm_enabled = !alarm_enabled;
-                return 0;
-            }
-        } else { // Config mode
-            if (key == 3) {
-                // menu down
-                menu->goNext();
-                return 0;
-            }
-            if (key == 4) {
-                // menu up
-                menu->goPrev();
-                return 0;
-            }
-        }
-        if (key == 11) { // Code for keylock
-            commonData->keylock = !commonData->keylock;
-            return 0;
-        }
-        return key;
-    }
-#endif
-#ifdef BOARD_OBP40S3
-    int handleKey(int key){
-        if (key == 1) { // Switch between normal and config mode
-            if (mode == 'N') {
-                mode = 'C';
-                commonData->keydata[1].label = "EDIT";
-            } else {
-                mode = 'N';
-                commonData->keydata[1].label = "ALARM";
-            }
-            return 0;
-        }
-        if (mode == 'N') {
-            if (key == 2) { // Toggle alarm
-                alarm_enabled = !alarm_enabled;
-                return 0;
-            }
-        } else { // Config mode
-            // TODO different code for OBP40 / OBP60 
-            if (key == 9) {
-                // menu down
-                if (editmode > 0) {
-                    // decrease item value
-                    menu->getActiveItem()->decValue();
-                } else {
-                    menu->goNext();
-                }
-                return 0;
-            }
-            if (key == 10) {
-                // menu up or value up
-                if (editmode > 0) {
-                    // increase item value
-                    menu->getActiveItem()->incValue();
-                } else {
-                    menu->goPrev();
-                }
-                return 0;
-            }
-            if (key == 2) {
-                // enter / leave edit mode for current menu item
-                if (editmode > 0) {
-                    commonData->keydata[1].label = "EDIT";
-                    editmode = 0;
-                } else {
-                    commonData->keydata[1].label = "SET";
-                    editmode = 1;
-                }
-                return 0;
-            }
-        }
-        if (key == 11) { // Code for keylock
-            commonData->keylock = !commonData->keylock;
-            return 0;
-        }
-        return key;
-    }
-#endif
-
-    void displayNew(PageData &pageData){
-    };
-
-    int displayPage(PageData &pageData){
-
-        // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageAnchor; Mode=%c", mode);
-
-        // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-
-       if (mode == 'N') {
-           displayModeNormal(pageData);
-       } else if (mode == 'C') {
-           displayModeConfig();
-       }
-
-        return PAGE_UPDATE;
-    };
-};
-
-static Page *createPage(CommonData &common){
-    return new PageAnchor(common);
-}
-
-/**
- * with the code below we make this page known to the PageTask
- * we give it a type (name) that can be selected in the config
- * we define which function is to be called
- * and we provide the number of user parameters we expect
- * this will be number of BoatValue pointers in pageData.values
- */
-PageDescription registerPageAnchor(
-    "Anchor",   // Page name
-    createPage, // Action
-    0,          // Number of bus values depends on selection in Web configuration
-    {"DBS", "HDT", "AWS", "AWD", "LAT", "LON", "HDOP"}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h)
-    true        // Show display header on/off
-);
-
-#endif

lib/obp60task/PageAutopilot.cpp

@@ -1,152 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
-
-#include "Pagedata.h"
-#include "OBP60Extensions.h"
-#include "ConfigMenu.h"
-
-/*
-  Autopilot
-
-*/
-
-class PageAutopilot : public Page
-{
-private:
-    GwConfigHandler *config;
-    GwLog *logger;
-    bool simulation = false;
-    bool holdvalues = false;
-    String flashLED;
-    String backlightMode;
-
-    char mode = 'N'; // (N)ormal, (C)onfig
-    int8_t editmode = -1; // marker for menu/edit/set function
-
-    ConfigMenu *menu;
-
-    void displayModeNormal(PageData &pageData) {
-
-        // TBD Boatvalues: ...
-
-        LOG_DEBUG(GwLog::DEBUG,"Drawing at PageAutopilot");
-
-        // Title and corner value headings
-        epd->setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(8, 48);
-        epd->print("Autopilot");
-
-    }
-
-    void displayModeConfig() {
-
-        epd->setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(8, 48);
-        epd->print("Autopilot configuration");
-
-        epd->setFont(&Ubuntu_Bold8pt8b);
-        // TODO menu
-
-    }
-
-public:
-    PageAutopilot(CommonData &common) 
-    {
-        commonData = &common;
-        config = commonData->config;
-        logger = commonData->logger;
-        logger->logDebug(GwLog::LOG,"Instantiate PageAutopilot");
-
-        // preload configuration data
-        simulation = config->getBool(config->useSimuData);
-        holdvalues = config->getBool(config->holdvalues);
-        flashLED = config->getString(config->flashLED);
-        backlightMode = config->getString(config->backlight);
-
-     }
-
-    void setupKeys(){
-        Page::setupKeys();
-        commonData->keydata[0].label = "MODE";
-    }
-
-#ifdef BOARD_OBP60S3
-    int handleKey(int key){
-        if (key == 1) { // Switch between normal and config mode
-            if (mode == 'N') {
-                mode = 'C';
-            } else {
-                mode = 'N';
-            }
-            return 0;
-        }
-        if (key == 11) { // Code for keylock
-            commonData->keylock = !commonData->keylock;
-            return 0;
-        }
-        return key;
-    }
-#endif
-#ifdef BOARD_OBP40S3
-    int handleKey(int key){
-        if (key == 1) { // Switch between normal and config mode
-            if (mode == 'N') {
-                mode = 'C';
-                commonData->keydata[1].label = "EDIT";
-            } else {
-                mode = 'N';
-                commonData->keydata[1].label = "ALARM";
-            }
-            return 0;
-        }
-        if (key == 11) { // Code for keylock
-            commonData->keylock = !commonData->keylock;
-            return 0;
-        }
-        return key;
-    }
-#endif
-
-    void displayNew(PageData &pageData){
-    };
-
-    int displayPage(PageData &pageData){
-
-        // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageAutopilot; Mode=%c", mode);
-
-        // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height());
-
-       if (mode == 'N') {
-           displayModeNormal(pageData);
-       } else if (mode == 'C') {
-           displayModeConfig();
-       }
-
-        return PAGE_UPDATE;
-    };
-};
-
-static Page *createPage(CommonData &common){
-    return new PageAutopilot(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 registerPageAutopilot(
-    "Autopilot",      // Page name
-    createPage, // Action
-    0,          // Number of bus values depends on selection in Web configuration
-    {}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h)
-    true        // Show display header on/off
-);
-
-#endif

lib/obp60task/PageBME280.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -106,76 +105,76 @@ class PageBME280 : public Page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 55);
+        getdisplay().setCursor(20, 55);
-        epd->print(name1);                           // Page name
+        getdisplay().print(name1);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 90);
+        getdisplay().setCursor(20, 90);
-        epd->print(unit1);                           // Unit
+        getdisplay().print(unit1);                           // Unit
 
         // Switch font if format for any values
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(180, 90);
+        getdisplay().setCursor(180, 90);
 
         // Show bus data
-        epd->print(svalue1);                         // Real value as formated string
+        getdisplay().print(svalue1);                         // Real value as formated string
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 145);
+        getdisplay().setCursor(20, 145);
-        epd->print(name2);                           // Page name
+        getdisplay().print(name2);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 180);
+        getdisplay().setCursor(20, 180);
-        epd->print(unit2);                           // Unit
+        getdisplay().print(unit2);                           // Unit
 
         // Switch font if format for any values
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(180, 180);
+        getdisplay().setCursor(180, 180);
 
         // Show bus data
-        epd->print(svalue2);                         // Real value as formated string
+        getdisplay().print(svalue2);                         // Real value as formated string
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 235);
+        getdisplay().setCursor(20, 235);
-        epd->print(name3);                           // Page name
+        getdisplay().print(name3);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 270);
+        getdisplay().setCursor(20, 270);
-        epd->print(unit3);                           // Unit
+        getdisplay().print(unit3);                           // Unit
 
         // Switch font if format for any values
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(140, 270);
+        getdisplay().setCursor(140, 270);
 
         // Show bus data
-        epd->print(svalue3);                         // Real value as formated string
+        getdisplay().print(svalue3);                         // Real value as formated string
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageBattery.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -159,134 +158,134 @@ class PageBattery : public Page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
         // Show average settings
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
         switch (average) {
             case 0:
-                epd->setCursor(60, 90);
+                getdisplay().setCursor(60, 90);
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
-                epd->setCursor(60, 180);
+                getdisplay().setCursor(60, 180);
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
-                epd->setCursor(60, 270);
+                getdisplay().setCursor(60, 270);
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
                 break;
             case 1:
-                epd->setCursor(60, 90);
+                getdisplay().setCursor(60, 90);
-                epd->print("Avg: 10s");
+                getdisplay().print("Avg: 10s");
-                epd->setCursor(60, 180);
+                getdisplay().setCursor(60, 180);
-                epd->print("Avg: 10s");
+                getdisplay().print("Avg: 10s");
-                epd->setCursor(60, 270);
+                getdisplay().setCursor(60, 270);
-                epd->print("Avg: 10s");
+                getdisplay().print("Avg: 10s");
                 break;
             case 2:
-                epd->setCursor(60, 90);
+                getdisplay().setCursor(60, 90);
-                epd->print("Avg: 60s");
+                getdisplay().print("Avg: 60s");
-                epd->setCursor(60, 180);
+                getdisplay().setCursor(60, 180);
-                epd->print("Avg: 60s");
+                getdisplay().print("Avg: 60s");
-                epd->setCursor(60, 270);
+                getdisplay().setCursor(60, 270);
-                epd->print("Avg: 60s");
+                getdisplay().print("Avg: 60s");
                 break;
             case 3:
-                epd->setCursor(60, 90);
+                getdisplay().setCursor(60, 90);
-                epd->print("Avg: 300s");
+                getdisplay().print("Avg: 300s");
-                epd->setCursor(60, 180);
+                getdisplay().setCursor(60, 180);
-                epd->print("Avg: 300s");
+                getdisplay().print("Avg: 300s");
-                epd->setCursor(60, 270);
+                getdisplay().setCursor(60, 270);
-                epd->print("Avg: 300s");
+                getdisplay().print("Avg: 300s");
                 break;
             default:
-                epd->setCursor(60, 90);
+                getdisplay().setCursor(60, 90);
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
-                epd->setCursor(60, 180);
+                getdisplay().setCursor(60, 180);
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
-                epd->setCursor(60, 270);
+                getdisplay().setCursor(60, 270);
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
                 break;
         } 
 
         // ############### Value 1 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 55);
+        getdisplay().setCursor(20, 55);
-        epd->print(name1);                           // Value name
+        getdisplay().print(name1);                           // Value name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 90);
+        getdisplay().setCursor(20, 90);
-        epd->print(unit1);                           // Unit
+        getdisplay().print(unit1);                           // Unit
 
         // Show value
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(180, 90);
+        getdisplay().setCursor(180, 90);
 
         // Show bus data
         if(String(powsensor1) != "off"){
-            epd->print(value1,2);                    // Real value as formated string
+            getdisplay().print(value1,2);                    // Real value as formated string
         }
         else{
-            epd->print("---");                       // No sensor data (sensor is off)
+            getdisplay().print("---");                       // No sensor data (sensor is off)
         }
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 145);
+        getdisplay().setCursor(20, 145);
-        epd->print(name2);                           // Value name
+        getdisplay().print(name2);                           // Value name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 180);
+        getdisplay().setCursor(20, 180);
-        epd->print(unit2);                           // Unit
+        getdisplay().print(unit2);                           // Unit
 
         // Show value
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(180, 180);
+        getdisplay().setCursor(180, 180);
 
         // Show bus data
         if(String(powsensor1) != "off"){
-            epd->print(value2,1);                    // Real value as formated string
+            getdisplay().print(value2,1);                    // Real value as formated string
         }
         else{
-            epd->print("---");                       // No sensor data (sensor is off)
+            getdisplay().print("---");                       // No sensor data (sensor is off)
         }
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 235);
+        getdisplay().setCursor(20, 235);
-        epd->print(name3);                           // Value name
+        getdisplay().print(name3);                           // Value name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 270);
+        getdisplay().setCursor(20, 270);
-        epd->print(unit3);                           // Unit
+        getdisplay().print(unit3);                           // Unit
 
         // Show value
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(180, 270);
+        getdisplay().setCursor(180, 270);
 
         // Show bus data
         if(String(powsensor1) != "off"){
-            epd->print(value3,1);                    // Real value as formated string
+            getdisplay().print(value3,1);                    // Real value as formated string
         }
         else{
-            epd->print("---");                       // No sensor data (sensor is off)
+            getdisplay().print("---");                       // No sensor data (sensor is off)
         }
 
         return PAGE_UPDATE;

lib/obp60task/PageBattery2.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -185,107 +184,107 @@ public:
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(10, 65);
+        getdisplay().setCursor(10, 65);
-        epd->print("Bat.");
+        getdisplay().print("Bat.");
 
          // Show battery type
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(90, 65);
+        getdisplay().setCursor(90, 65);
-        epd->print(batType);
+        getdisplay().print(batType);
 
         // Show voltage type
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 140);
+        getdisplay().setCursor(10, 140);
         int bvoltage = 0;
         if(String(batVoltage) == "12V") bvoltage = 12;
         else bvoltage = 24;
-        epd->print(bvoltage);
+        getdisplay().print(bvoltage);
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("V");
+        getdisplay().print("V");
 
         // Show battery capacity
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 200);
+        getdisplay().setCursor(10, 200);
-        if(batCapacity <= 999) epd->print(batCapacity, 0);
+        if(batCapacity <= 999) getdisplay().print(batCapacity, 0);
-        if(batCapacity > 999) epd->print(float(batCapacity/1000.0), 1);
+        if(batCapacity > 999) getdisplay().print(float(batCapacity/1000.0), 1);
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        if(batCapacity <= 999) epd->print("Ah");
+        if(batCapacity <= 999) getdisplay().print("Ah");
-        if(batCapacity > 999) epd->print("kAh");
+        if(batCapacity > 999) getdisplay().print("kAh");
 
         // Show info
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 235);
+        getdisplay().setCursor(10, 235);
-        epd->print("Installed");
+        getdisplay().print("Installed");
-        epd->setCursor(10, 255);
+        getdisplay().setCursor(10, 255);
-        epd->print("Battery Type");
+        getdisplay().print("Battery Type");
 
         // Show battery with fill level
         batteryGraphic(150, 45, batPercentage, commonData->fgcolor, commonData->bgcolor);
 
         // Show average settings
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(150, 145);
+        getdisplay().setCursor(150, 145);
         switch (average) {
             case 0:
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
                 break;
             case 1:
-                epd->print("Avg: 10s");
+                getdisplay().print("Avg: 10s");
                 break;
             case 2:
-                epd->print("Avg: 60s");
+                getdisplay().print("Avg: 60s");
                 break;
             case 3:
-                epd->print("Avg: 300s");
+                getdisplay().print("Avg: 300s");
                 break;
             default:
-                epd->print("Avg: 1s");
+                getdisplay().print("Avg: 1s");
                 break;
         } 
 
         // Show fill level in percent
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(150, 200);
+        getdisplay().setCursor(150, 200);
-        epd->print(batPercentage);
+        getdisplay().print(batPercentage);
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("%");
+        getdisplay().print("%");
 
         // Show time to full discharge
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(150, 260);
+        getdisplay().setCursor(150, 260);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(batRange < 9.9) epd->print(batRange, 1);
+            if(batRange < 9.9) getdisplay().print(batRange, 1);
-            else epd->print(batRange, 0);
+            else getdisplay().print(batRange, 0);
         }
-        else  epd->print("--");
+        else  getdisplay().print("--");
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("h");
+        getdisplay().print("h");
 
         // Show sensor type info
         String i2cAddr = "";
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(270, 60);
+        getdisplay().setCursor(270, 60);
-        if(powerSensor == "off") epd->print("Internal");
+        if(powerSensor == "off") getdisplay().print("Internal");
         if(powerSensor == "INA219"){
-            epd->print("INA219");
+            getdisplay().print("INA219");
         }
         if(powerSensor == "INA226"){
-            epd->print("INA226");
+            getdisplay().print("INA226");
             i2cAddr = " (0x" + String(INA226_I2C_ADDR1, HEX) + ")";
         }
-        epd->print(i2cAddr);
+        getdisplay().print(i2cAddr);
-        epd->setCursor(270, 80);
+        getdisplay().setCursor(270, 80);
-        epd->print("Sensor Modul");
+        getdisplay().print("Sensor Modul");
 
         // Reading bus data or using simulation data
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(260, 140);
+        getdisplay().setCursor(260, 140);
         if(simulation == true){
             if(batVoltage == "12V"){
                 value1 = 12.0;
@@ -294,46 +293,46 @@ public:
                 value1 = 24.0;
             }
             value1 += float(random(0, 5)) / 10;         // Simulation data
-            epd->print(value1,1);
+            getdisplay().print(value1,1);
         }
         else{
             // Check for valid real data, display also if hold values activated
             if(valid1 == true || holdvalues == true){
                 // Resolution switching
-                if(value1 <= 9.9) epd->print(value1, 2);
+                if(value1 <= 9.9) getdisplay().print(value1, 2);
-                if(value1 > 9.9 && value1 <= 99.9)epd->print(value1, 1);
+                if(value1 > 9.9 && value1 <= 99.9)getdisplay().print(value1, 1);
-                if(value1 > 99.9) epd->print(value1, 0);
+                if(value1 > 99.9) getdisplay().print(value1, 0);
             }
             else{
-            epd->print("---");                       // Missing bus data
+            getdisplay().print("---");                       // Missing bus data
             }
         }
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("V");
+        getdisplay().print("V");
 
         // Show actual current in A
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(260, 200);
+        getdisplay().setCursor(260, 200);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(value2 <= 9.9) epd->print(value2, 2);
+            if(value2 <= 9.9) getdisplay().print(value2, 2);
-            if(value2 > 9.9 && value2 <= 99.9)epd->print(value2, 1);
+            if(value2 > 9.9 && value2 <= 99.9)getdisplay().print(value2, 1);
-            if(value2 > 99.9) epd->print(value2, 0);
+            if(value2 > 99.9) getdisplay().print(value2, 0);
         }
-        else  epd->print("---");
+        else  getdisplay().print("---");
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("A");
+        getdisplay().print("A");
 
         // Show actual consumption in W
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(260, 260);
+        getdisplay().setCursor(260, 260);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(value3 <= 9.9) epd->print(value3, 2);
+            if(value3 <= 9.9) getdisplay().print(value3, 2);
-            if(value3 > 9.9 && value3 <= 99.9)epd->print(value3, 1);
+            if(value3 > 9.9 && value3 <= 99.9)getdisplay().print(value3, 1);
-            if(value3 > 99.9) epd->print(value3, 0);
+            if(value3 > 99.9) getdisplay().print(value3, 0);
         }
-        else  epd->print("---");
+        else  getdisplay().print("---");
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("W");
+        getdisplay().print("W");
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageClock.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -32,15 +31,6 @@ bool homevalid = false; // homelat and homelon are valid
     PageClock(CommonData &common){
         commonData = &common;
         common.logger->logDebug(GwLog::LOG,"Instantiate PageClock");
-
-        // WIP time source
-#ifdef BOARD_OBP60S3
-        String use_rtc = common.config->getString(common.config->useRTC);
-        if (use_rtc == "off") {
-            source = 'G';
-        }
-#endif
-
         simulation = common.config->getBool(common.config->useSimuData);
         timezone = common.config->getString(common.config->timeZone).toDouble();
         homelat = common.config->getString(common.config->homeLAT).toDouble();
@@ -110,10 +100,9 @@ bool homevalid = false; // homelat and homelon are valid
         static String svalue5old = "";
         static String svalue6old = "";
 
-        double value1 = 0; // GPS time
+        double value1 = 0;
-        double value2 = 0; // GPS date FIXME date defined as uint32_t!
+        double value2 = 0;
-        double value3 = 0; // HDOP
+        double value3 = 0;
-        bool gpsvalid = false;
 
         // Get config data
         String lengthformat = config->getString(config->lengthFormat);
@@ -166,9 +155,6 @@ bool homevalid = false; // homelat and homelon are valid
             unit3old = unit3;                           // Save old unit
         }
 
-        // GPS date and time are valid and can be used
-        gpsvalid = (valid1 && valid2 && valid3);
-
         // Optical warning by limit violation (unused)
         if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
@@ -177,108 +163,108 @@ bool homevalid = false; // homelat and homelon are valid
 
         // Logging boat values
         if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageClock, %s:%f,  %s:%f, %s:%f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3);
+        LOG_DEBUG(GwLog::LOG,"Drawing at PageClock, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         time_t tv = mktime(&commonData->data.rtcTime) + timezone * 3600;
         struct tm *local_tm = localtime(&tv);
 
         // Show values GPS date
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 65);
+        getdisplay().setCursor(10, 65);
         if (holdvalues == false) {
             if (source == 'G') {
                  // GPS value
-                 epd->print(svalue2);
+                 getdisplay().print(svalue2);
             } else if (commonData->data.rtcValid) {
                 // RTC value
                  if (tz == 'L') {
-                     epd->print(formatDate(dateformat, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
+                     getdisplay().print(formatDate(dateformat, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
                  }
                  else {
-                     epd->print(formatDate(dateformat, commonData->data.rtcTime.tm_year + 1900, commonData->data.rtcTime.tm_mon + 1, commonData->data.rtcTime.tm_mday));
+                     getdisplay().print(formatDate(dateformat, commonData->data.rtcTime.tm_year + 1900, commonData->data.rtcTime.tm_mon + 1, commonData->data.rtcTime.tm_mday));
                  }
             } else {
-                epd->print("---");
+                getdisplay().print("---");
             }
         } else {
-            epd->print(svalue2old);
+            getdisplay().print(svalue2old);
         }
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 95);
+        getdisplay().setCursor(10, 95);
-        epd->print("Date");                          // Name
+        getdisplay().print("Date");                          // Name
 
         // Horizintal separator left
-        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
 
         // Show values GPS time
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 250);
+        getdisplay().setCursor(10, 250);
         if (holdvalues == false) {
             if (source == 'G') {
-                epd->print(svalue1); // Value
+                getdisplay().print(svalue1); // Value
             }
             else if (commonData->data.rtcValid) {
                  if (tz == 'L') {
-                      epd->print(formatTime('s', local_tm->tm_hour, local_tm->tm_min, local_tm->tm_sec));
+                      getdisplay().print(formatTime('s', local_tm->tm_hour, local_tm->tm_min, local_tm->tm_sec));
                  }
                  else {
-                      epd->print(formatTime('s', commonData->data.rtcTime.tm_hour, commonData->data.rtcTime.tm_min, commonData->data.rtcTime.tm_sec));
+                      getdisplay().print(formatTime('s', commonData->data.rtcTime.tm_hour, commonData->data.rtcTime.tm_min, commonData->data.rtcTime.tm_sec));
                  }
             } else {
-                epd->print("---");
+                getdisplay().print("---");
             }
         }
         else {
-             epd->print(svalue1old);
+             getdisplay().print(svalue1old);
         }
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 220);
+        getdisplay().setCursor(10, 220);
-        epd->print("Time");                          // Name
+        getdisplay().print("Time");                          // Name
 
         // Show values sunrise
         String sunrise = "---";
-        if (((source == 'G') and gpsvalid) or (homevalid and commonData->data.rtcValid)) {
+        if ((valid1 and valid2 and valid3 == true) or (homevalid and commonData->data.rtcValid)) {
             sunrise = String(commonData->sundata.sunriseHour) + ":" + String(commonData->sundata.sunriseMinute + 100).substring(1);
             svalue5old = sunrise;
         } else if (simulation) {
             sunrise = String("06:42");
         }
 
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(335, 65);
+        getdisplay().setCursor(335, 65);
-        if(holdvalues == false) epd->print(sunrise); // Value
+        if(holdvalues == false) getdisplay().print(sunrise); // Value
-        else epd->print(svalue5old);
+        else getdisplay().print(svalue5old);
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(335, 95);
+        getdisplay().setCursor(335, 95);
-        epd->print("SunR");                          // Name
+        getdisplay().print("SunR");                          // Name
 
         // Horizintal separator right
-        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
+        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
 
         // Show values sunset
         String sunset = "---";
-        if (((source == 'G') and gpsvalid) or (homevalid and commonData->data.rtcValid)) {
+        if ((valid1 and valid2 and valid3 == true) or (homevalid and commonData->data.rtcValid)) {
             sunset = String(commonData->sundata.sunsetHour) + ":" +  String(commonData->sundata.sunsetMinute + 100).substring(1);
             svalue6old = sunset;
         } else if (simulation) {
             sunset = String("21:03");
         }
 
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(335, 250);
+        getdisplay().setCursor(335, 250);
-        if(holdvalues == false) epd->print(sunset);  // Value
+        if(holdvalues == false) getdisplay().print(sunset);  // Value
-        else epd->print(svalue6old);
+        else getdisplay().print(svalue6old);
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(335, 220);
+        getdisplay().setCursor(335, 220);
-        epd->print("SunS");                          // Name
+        getdisplay().print("SunS");                          // Name
 
 //*******************************************************************************************
 
@@ -286,8 +272,8 @@ bool homevalid = false; // homelat and homelon are valid
         int rInstrument = 110;     // Radius of clock
         float pi = 3.141592;
 
-        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
 
         for(int i=0; i<360; i=i+1)
         {
@@ -315,11 +301,11 @@ bool homevalid = false; // homelat and homelon are valid
             // Print text centered on position x, y
             int16_t x1, y1;     // Return values of getTextBounds
             uint16_t w, h;      // Return values of getTextBounds
-            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            epd->setCursor(x-w/2, y+h/2);
+            getdisplay().setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                epd->setFont(&Ubuntu_Bold12pt8b);
+                getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                epd->print(ii);
+                getdisplay().print(ii);
             }
 
             // Draw sub scale with dots
@@ -328,7 +314,7 @@ bool homevalid = false; // homelat and homelon are valid
              if(i % 6 == 0){
                 float x1c = 200 + rInstrument*sin(i/180.0*pi);
                 float y1c = 150 - rInstrument*cos(i/180.0*pi);
-                epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+                getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
                 sinx=sin(i/180.0*pi);
                 cosx=cos(i/180.0*pi);
              }
@@ -340,31 +326,31 @@ bool homevalid = false; // homelat and homelon are valid
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),
                         200+(int)(cosx*xx2-sinx*yy2),150+(int)(sinx*xx2+cosx*yy2),commonData->fgcolor);
             }
         }
 
         // Print Unit in clock
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(175, 110);
+        getdisplay().setCursor(175, 110);
         if(holdvalues == false){
-            epd->print(tz == 'L' ? "LOT" : "UTC");
+            getdisplay().print(tz == 'L' ? "LOT" : "UTC");
         }
         else{
-            epd->print(unit2old); // date unit
+            getdisplay().print(unit2old); // date unit
         }
 
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(185, 190);
+        getdisplay().setCursor(185, 190);
         if (source == 'G') {
-            epd->print("GPS");
+            getdisplay().print("GPS");
         } else {
-            epd->print("RTC");
+            getdisplay().print("RTC");
         }
 
         // Clock values
@@ -407,7 +393,7 @@ bool homevalid = false; // homelat and homelon are valid
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument * 0.5);
-            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -417,7 +403,7 @@ bool homevalid = false; // homelat and homelon are valid
             float ix2 = -endwidth;
             float iy1 = -(rInstrument * 0.5);
             float iy2 = -endwidth;
-            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
@@ -433,7 +419,7 @@ bool homevalid = false; // homelat and homelon are valid
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument - 15);
-            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -443,14 +429,14 @@ bool homevalid = false; // homelat and homelon are valid
             float ix2 = -endwidth;
             float iy1 = -(rInstrument - 15);
             float iy2 = -endwidth;
-            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
 
         // Center circle
-        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageCompass.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -110,27 +109,27 @@ class PageCompass : public Page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // Horizontal line 2 pix top & bottom
         // Print data on top half
-        epd->fillRect(0, 130, 400, 2, commonData->fgcolor); 
+        getdisplay().fillRect(0, 130, 400, 2, commonData->fgcolor); 
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(10, 70);
+        getdisplay().setCursor(10, 70);
-        epd->print(DataName[WhichDataDisplay]);                         // Page name
+        getdisplay().print(DataName[WhichDataDisplay]);                         // Page name
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 120);
+        getdisplay().setCursor(10, 120);
-        epd->print(DataUnits[WhichDataDisplay]); 
+        getdisplay().print(DataUnits[WhichDataDisplay]); 
-        epd->setCursor(190, 120);
+        getdisplay().setCursor(190, 120);
-        epd->setFont(&DSEG7Classic_BoldItalic42pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic42pt7b);
   
         if(holdvalues == false){
-            epd->print(DataText[WhichDataDisplay]);                     // Real value as formated string
+            getdisplay().print(DataText[WhichDataDisplay]);                     // Real value as formated string
         }
         else{
-            epd->print(OldDataText[WhichDataDisplay]);                  // Old value as formated string
+            getdisplay().print(OldDataText[WhichDataDisplay]);                  // Old value as formated string
         }
         if(DataValid[WhichDataDisplay] == true){
             OldDataText[WhichDataDisplay] = DataText[WhichDataDisplay];         // Save the old value
@@ -149,14 +148,14 @@ class PageCompass : public Page
         char buffer[bsize+1];
         buffer[0]=0;              
 
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->setCursor(10, Compass_Y0-60);
+        getdisplay().setCursor(10, Compass_Y0-60);
-        epd->print(DataName[WhichDataCompass]);                         // Page name
+        getdisplay().print(DataName[WhichDataCompass]);                         // Page name
  
      
         // Draw compass base line and pointer
-        epd->fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);            
+        getdisplay().fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);            
-        epd->fillTriangle(Compass_X0,Compass_Y0-40,Compass_X0-10,Compass_Y0-80,Compass_X0+10,Compass_Y0-80,commonData->fgcolor);
+        getdisplay().fillTriangle(Compass_X0,Compass_Y0-40,Compass_X0-10,Compass_Y0-80,Compass_X0+10,Compass_Y0-80,commonData->fgcolor);
         // Draw trendlines
         for ( int i = 1; i < abs(TheTrend) / 2; i++){
             int x1;
@@ -165,7 +164,7 @@ class PageCompass : public Page
             else
                     x1 = Compass_X0 - 20 * ( i + 1 );
 
-            epd->fillRect(x1, Compass_Y0 -55, 10, 6, commonData->fgcolor);            
+            getdisplay().fillRect(x1, Compass_Y0 -55, 10, 6, commonData->fgcolor);            
                 }          
         // Central line +  satellite lines
         double NextSector = round(TheAngle / ( M_PI / 9 )) * ( M_PI / 9 );  // Get the next 20degree value
@@ -175,28 +174,28 @@ class PageCompass : public Page
         for ( int i = 0; i <=4; i++ ){
                 int x0;
                 x0 = Compass_X0 + Delta_X + 2 * i * 5 * Compass_LineDelta;
-                epd->fillRect(x0-2, Compass_Y0 - 2 * Compass_LineLength, 5, 2 * Compass_LineLength, commonData->fgcolor);
+                getdisplay().fillRect(x0-2, Compass_Y0 - 2 * Compass_LineLength, 5, 2 * Compass_LineLength, commonData->fgcolor);
                 x0 = Compass_X0 + Delta_X + ( 2 * i + 1 ) * 5 * Compass_LineDelta;
-                epd->fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
+                getdisplay().fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
 
                 x0 = Compass_X0 + Delta_X - 2 * i * 5 * Compass_LineDelta;
-                epd->fillRect(x0-2, Compass_Y0 - 2 * Compass_LineLength, 5, 2 * Compass_LineLength, commonData->fgcolor);
+                getdisplay().fillRect(x0-2, Compass_Y0 - 2 * Compass_LineLength, 5, 2 * Compass_LineLength, commonData->fgcolor);
                 x0 = Compass_X0 + Delta_X - ( 2 * i + 1 ) * 5 * Compass_LineDelta;
-                epd->fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
+                getdisplay().fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
             }
 
-        epd->fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);
         // Add the numbers to the compass band
         int x0;
         float AngleToDisplay = NextSector * 180.0 / M_PI;
 
         x0 = Compass_X0 + Delta_X;
-        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
 
         do {
-                epd->setCursor(x0 - 40, Compass_Y0 + 40);
+                getdisplay().setCursor(x0 - 40, Compass_Y0 + 40);
                 snprintf(buffer,bsize,"%03.0f", AngleToDisplay);
-                epd->print(buffer);
+                getdisplay().print(buffer);
                 AngleToDisplay += 20;
                 if ( AngleToDisplay >= 360.0 )
                     AngleToDisplay -= 360.0;
@@ -209,7 +208,7 @@ class PageCompass : public Page
 
         x0 = Compass_X0 + Delta_X + 4 * 5 * Compass_LineDelta;
         do {
-            epd->setCursor(x0 - 40, Compass_Y0 + 40);
+            getdisplay().setCursor(x0 - 40, Compass_Y0 + 40);
             snprintf(buffer,bsize,"%03.0f", AngleToDisplay);
             // Quick and dirty way to prevent wrapping text in next line
             if ( ( x0 - 40 ) > 380 )
@@ -219,7 +218,7 @@ class PageCompass : public Page
             else if ( ( x0 - 40 )  >  325 ) 
                 buffer[2] = 0;
                 
-            epd->print(buffer);             
+            getdisplay().print(buffer);             
 
             AngleToDisplay -= 20;
             if ( AngleToDisplay < 0 )
@@ -231,8 +230,8 @@ class PageCompass : public Page
         // x_test += 2;
 
         // snprintf(buffer,bsize,"%03d", x_test);
-        // epd->setCursor(x_test, Compass_Y0 - 60);
+        // getdisplay().setCursor(x_test, Compass_Y0 - 60);
-        // epd->print(buffer);
+        // getdisplay().print(buffer);
         // if ( x_test > 390)
         //     x_test = 320;
 

lib/obp60task/PageDST810.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -92,37 +91,37 @@ public:
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 55);
+        getdisplay().setCursor(20, 55);
-        epd->print("Depth");                         // Page name
+        getdisplay().print("Depth");                         // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 90);
+        getdisplay().setCursor(20, 90);
         if(holdvalues == false){
-            epd->print(unit1);                       // Unit
+            getdisplay().print(unit1);                       // Unit
         }
         else{
-            epd->print(unit1old);
+            getdisplay().print(unit1old);
         }
 
         // Set font
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(180, 90);
+        getdisplay().setCursor(180, 90);
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue1);                                     // Real value as formated string
+            getdisplay().print(svalue1);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue1old);                                  // Old value as formated string
+            getdisplay().print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -132,35 +131,35 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 145);
+        getdisplay().setCursor(20, 145);
-        epd->print("Speed");                         // Page name
+        getdisplay().print("Speed");                         // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 180);
+        getdisplay().setCursor(20, 180);
         if(holdvalues == false){
-            epd->print(unit2);                       // Unit
+            getdisplay().print(unit2);                       // Unit
         }
         else{
-            epd->print(unit2old);
+            getdisplay().print(unit2old);
         }
 
         // Setfont
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-        epd->setCursor(180, 180);
+        getdisplay().setCursor(180, 180);
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue2);                                     // Real value as formated string
+            getdisplay().print(svalue2);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue2old);                                  // Old value as formated string
+            getdisplay().print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
@@ -170,35 +169,35 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 220);
+        getdisplay().setCursor(20, 220);
-        epd->print("Log");                           // Page name
+        getdisplay().print("Log");                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(20, 240);
+        getdisplay().setCursor(20, 240);
         if(holdvalues == false){
-            epd->print(unit3);                       // Unit
+            getdisplay().print(unit3);                       // Unit
         }
         else{
-            epd->print(unit3old);
+            getdisplay().print(unit3old);
         }
 
         // Set font
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(80, 270);
+        getdisplay().setCursor(80, 270);
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue3);                                     // Real value as formated string
+            getdisplay().print(svalue3);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue3old);                                  // Old value as formated string
+            getdisplay().print(svalue3old);                                  // Old value as formated string
         }
         if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value
@@ -208,35 +207,35 @@ public:
         // ############### Vertical Line ################
 
         // Vertical line 3 pix
-        epd->fillRect(200, 195, 3, 75, commonData->fgcolor);
+        getdisplay().fillRect(200, 195, 3, 75, commonData->fgcolor);
 
         // ############### Value 4 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(220, 220);
+        getdisplay().setCursor(220, 220);
-        epd->print("Temp");                           // Page name
+        getdisplay().print("Temp");                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(220, 240);
+        getdisplay().setCursor(220, 240);
         if(holdvalues == false){
-            epd->print(unit4);                       // Unit
+            getdisplay().print(unit4);                       // Unit
         }
         else{
-            epd->print(unit4old);
+            getdisplay().print(unit4old);
         }
 
         // Set font
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(280, 270);
+        getdisplay().setCursor(280, 270);
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue4);                                     // Real value as formated string
+            getdisplay().print(svalue4);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue4old);                                  // Old value as formated string
+            getdisplay().print(svalue4old);                                  // Old value as formated string
         }
         if(valid4 == true){
             svalue4old = svalue4;                                       // Save the old value

lib/obp60task/PageDigitalOut.cpp

@@ -0,0 +1,131 @@
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+
+#include <PCF8574.h>                  // PCF8574 modules from Horter
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+
+#include "images/OBP_400x300.xbm"     // OBP Logo
+#ifdef BOARD_OBP60S3
+#include "images/OBP60_400x300.xbm"   // MFD with logo
+#endif
+#ifdef BOARD_OBP40S3
+#include "images/OBP40_400x300.xbm"   // MFD with logo
+#endif
+
+class PageDigitalOut : public Page
+{
+
+// Status values
+bool button1 = false;
+bool button2 = false;
+bool button3 = false;
+bool button4 = false;
+bool button5 = false;
+
+public:
+    PageDigitalOut(CommonData &common){
+        commonData = &common;
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageDigitalOut");
+    }
+
+    virtual int handleKey(int key){
+        // Code for keylock
+        if(key == 11){
+            commonData->keylock = !commonData->keylock;
+            return 0;                       // Commit the key
+        }
+        // Code for button 1 
+        if(key == 1){
+            button1 = !button1;
+            setPCF8574PortPin(0, button1 ? 0 : 1); // Attention! Inverse logic for PCF8574
+            return 0;                       // Commit the key
+        }
+        // Code for button 2
+        if(key == 2){
+            button2 = !button2;
+            setPCF8574PortPin(1, button2 ? 0 : 1); // Attention! Inverse logic for PCF8574
+            return 0;                       // Commit the key
+        }
+        // Code for button 3
+        if(key == 3){
+            button3 = !button3;
+            setPCF8574PortPin(2, button3 ? 0 : 1); // Attention! Inverse logic for PCF8574
+            return 0;                       // Commit the key
+        }
+        // Code for button 4
+        if(key == 4){
+            button4 = !button4;
+            setPCF8574PortPin(3, button4 ? 0 : 1); // Attention! Inverse logic for PCF8574
+            return 0;                       // Commit the key
+        }
+        // Code for button 5
+        if(key == 5){
+            button5 = !button5;
+            setPCF8574PortPin(4, button5 ? 0 : 1); // Attention! Inverse logic for PCF8574
+            return 0;                       // Commit the key
+        }
+        return key;
+    }
+
+    int displayPage(PageData &pageData){
+        GwConfigHandler *config = commonData->config;
+        GwLog *logger = commonData->logger;
+
+        // Get config data
+        String lengthformat = config->getString(config->lengthFormat);
+        bool simulation = config->getBool(config->useSimuData);
+        bool holdvalues = config->getBool(config->holdvalues);
+        String flashLED = config->getString(config->flashLED);
+        String backlightMode = config->getString(config->backlight);
+
+        // Optical warning by limit violation (unused)
+        if(String(flashLED) == "Limit Violation"){
+            setBlinkingLED(false);
+            setFlashLED(false); 
+        }
+
+        // Logging boat values
+        LOG_DEBUG(GwLog::LOG,"Drawing at PageDigitalOut");
+
+        // Draw page
+        //***********************************************************
+
+        // Set display in partial refresh mode
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        getdisplay().setTextColor(commonData->fgcolor);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().fillRoundRect(200, 250 , 200, 25, 5, commonData->fgcolor); // Black rect
+        getdisplay().fillRoundRect(202, 252 , 196, 21, 5, commonData->bgcolor); // White rect
+        getdisplay().setCursor(210, 270);
+        getdisplay().print("Map server lost");
+
+        // Set botton labels
+        commonData->keydata[0].label = "BTN 1";
+        commonData->keydata[1].label = "BTN 2";
+        commonData->keydata[2].label = "BTN 3";
+        commonData->keydata[3].label = "BTN 4";
+        commonData->keydata[4].label = "BTN 5";
+
+        return PAGE_UPDATE;
+    };
+};
+
+static Page* createPage(CommonData &common){
+    return new PageDigitalOut(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 registerPageDigitalOut(
+    "DigitalOut",   // Page name
+    createPage,     // Action
+    0,              // Number of bus values depends on selection in Web configuration
+    true            // Show display header on/off
+);
+
+#endif

lib/obp60task/PageEPropulsion.cpp

@@ -1,147 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
-
-#include "Pagedata.h"
-#include "OBP60Extensions.h"
-
-/*
-  Electric propulsion
-
-*/
-
-class PageEPropulsion : public Page
-{
-private:
-    GwConfigHandler *config;
-    GwLog *logger;
-    bool simulation = false;
-    bool holdvalues = false;
-    String flashLED;
-    String backlightMode;
-
-    char mode = 'N'; // (N)ormal, (C)onfig
-
-    void displayModeNormal(PageData &pageData) {
-
-        // TBD Boatvalues: ...
-
-        LOG_DEBUG(GwLog::DEBUG,"Drawing at PageEPropulsion");
-
-        // Title and corner value headings
-        epd->setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(8, 48);
-        epd->print("Electric propulsion");
- 
-    }
-
-    void displayModeConfig() {
-
-        epd->setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(8, 48);
-        epd->print("EPropulsion configuration");
-
-        epd->setFont(&Ubuntu_Bold8pt8b);
-        // TODO menu
-
-    }
-
-public:
-    PageEPropulsion(CommonData &common) 
-    {
-        commonData = &common;
-        config = commonData->config;
-        logger = commonData->logger;
-        logger->logDebug(GwLog::LOG,"Instantiate PageEPropulsion");
-
-        // preload configuration data
-        simulation = config->getBool(config->useSimuData);
-        holdvalues = config->getBool(config->holdvalues);
-        flashLED = config->getString(config->flashLED);
-        backlightMode = config->getString(config->backlight);
-
-     }
-
-    void setupKeys(){
-        Page::setupKeys();
-    }
-
-#ifdef BOARD_OBP60S3
-    int handleKey(int key){
-        if (key == 1) { // Switch between normal and config mode
-            if (mode == 'N') {
-                mode = 'C';
-            } else {
-                mode = 'N';
-            }
-            return 0;
-        }
-        if (key == 11) { // Code for keylock
-            commonData->keylock = !commonData->keylock;
-            return 0;
-        }
-        return key;
-    }
-#endif
-#ifdef BOARD_OBP40S3
-    int handleKey(int key){
-        if (key == 1) { // Switch between normal and config mode
-            if (mode == 'N') {
-                mode = 'C';
-                commonData->keydata[1].label = "EDIT";
-            } else {
-                mode = 'N';
-                commonData->keydata[1].label = "ALARM";
-            }
-            return 0;
-        }
-        if (key == 11) { // Code for keylock
-            commonData->keylock = !commonData->keylock;
-            return 0;
-        }
-        return key;
-    }
-#endif
-
-    void displayNew(PageData &pageData){
-    };
-
-    int displayPage(PageData &pageData){
-
-        // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageEPropulsion; Mode=%c", mode);
-
-        // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height());
-
-       if (mode == 'N') {
-           displayModeNormal(pageData);
-       } else if (mode == 'C') {
-           displayModeConfig();
-       }
-
-        return PAGE_UPDATE;
-    };
-};
-
-static Page *createPage(CommonData &common){
-    return new PageEPropulsion(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 registerPageEPropulsion(
-    "EPropulsion",      // Page name
-    createPage, // Action
-    0,          // Number of bus values depends on selection in Web configuration
-    {}, // Names of bus values undepends on selection in Web configuration (refer GwBoatData.h)
-    true        // Show display header on/off
-);
-
-#endif

lib/obp60task/PageFluid.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -139,17 +138,17 @@ class PageFluid : public Page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height());
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height());
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // descriptions
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 60);
+        getdisplay().setCursor(20, 60);
-        epd->print("Fluid");
+        getdisplay().print("Fluid");
 
-        epd->setCursor(300, 60);
+        getdisplay().setCursor(300, 60);
-        epd->print(xdrDelete(name1).substring(0, 6));
+        getdisplay().print(xdrDelete(name1).substring(0, 6));
 
         // analog instrument
         // scale from -120 to 120
@@ -159,11 +158,11 @@ class PageFluid : public Page
         uint8_t r = 110;
 
         // circular frame
-        epd->drawCircle(c.x, c.y, r+5, commonData->fgcolor);
+        getdisplay().drawCircle(c.x, c.y, r+5, commonData->fgcolor);
-        epd->fillCircle(c.x, c.y, r+2, commonData->fgcolor);
+        getdisplay().fillCircle(c.x, c.y, r+2, commonData->fgcolor);
-        epd->fillCircle(c.x, c.y, r-1, commonData->bgcolor);
+        getdisplay().fillCircle(c.x, c.y, r-1, commonData->bgcolor);
         // center of pointer as dot 
-        epd->fillCircle(c.x, c.y, 8, commonData->fgcolor);
+        getdisplay().fillCircle(c.x, c.y, 8, commonData->fgcolor);
 
         // value down centered
         char buffer[6];
@@ -177,32 +176,32 @@ class PageFluid : public Page
         // draw symbol (as bitmap)
         switch (fluidtype) {
             case 0:
-                epd->drawXBitmap(c.x-8, c.y-50, fuel_bits, fuel_width, fuel_height, commonData->fgcolor);
+                getdisplay().drawXBitmap(c.x-8, c.y-50, fuel_bits, fuel_width, fuel_height, commonData->fgcolor);
                 break;
             case 1:
-                epd->drawXBitmap(c.x-8, c.y-50, water_bits, water_width, water_height, commonData->fgcolor);
+                getdisplay().drawXBitmap(c.x-8, c.y-50, water_bits, water_width, water_height, commonData->fgcolor);
                 break;
             case 2: // gray water no symbol yet
-                // epd->drawXBitmap(c.x-8, c.y-50, gray_bits, gray_width, gray_height, commonData->fgcolor);
+                // getdisplay().drawXBitmap(c.x-8, c.y-50, gray_bits, gray_width, gray_height, commonData->fgcolor);
                 break;
             case 3:
-                epd->drawXBitmap(c.x-8, c.y-50, fish_bits, fish_width, fish_height, commonData->fgcolor);
+                getdisplay().drawXBitmap(c.x-8, c.y-50, fish_bits, fish_width, fish_height, commonData->fgcolor);
                 break;
             case 4:
-                epd->drawXBitmap(c.x-8, c.y-50, oil_bits, oil_width, oil_height, commonData->fgcolor);
+                getdisplay().drawXBitmap(c.x-8, c.y-50, oil_bits, oil_width, oil_height, commonData->fgcolor);
                 break;
             case 5:
-                epd->drawXBitmap(c.x-8, c.y-50, waste_bits, waste_width, waste_height, commonData->fgcolor);
+                getdisplay().drawXBitmap(c.x-8, c.y-50, waste_bits, waste_width, waste_height, commonData->fgcolor);
                 break;
             case 6:
-                epd->drawXBitmap(c.x-8, c.y-50, gasoline_bits, gasoline_width, gasoline_height, commonData->fgcolor);
+                getdisplay().drawXBitmap(c.x-8, c.y-50, gasoline_bits, gasoline_width, gasoline_height, commonData->fgcolor);
                 break;
         }
 
         Point p, pr;
 
         // scale texts
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
         p = {c.x, c.y - r + 30};
         drawTextCenter(p.x, p.y, "1/2");
         pr = rotatePoint(c, p, -60);
@@ -211,7 +210,7 @@ class PageFluid : public Page
         drawTextCenter(pr.x, pr.y, "3/4");
 
         // empty and full
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
         p = rotatePoint(c, {c.x, c.y - r + 30}, -130);
         drawTextCenter(p.x, p.y, "E");
         p = rotatePoint(c, {c.x, c.y - r + 30}, 130);
@@ -237,7 +236,7 @@ class PageFluid : public Page
                 continue;
             }
             p = rotatePoint(c, {c.x, c.y - r + 10}, angle);
-            epd->fillCircle(p.x, p.y, 3, commonData->fgcolor);
+            getdisplay().fillCircle(p.x, p.y, 3, commonData->fgcolor);
         }
 
         // pointer
@@ -250,7 +249,7 @@ class PageFluid : public Page
             };
             fillPoly4(rotatePoints(c, pts, -120 + fluidlevel * 2.4), commonData->fgcolor);
             // Pointer axis is white
-            epd->fillCircle(c.x, c.y, 6, commonData->bgcolor);
+            getdisplay().fillCircle(c.x, c.y, 6, commonData->bgcolor);
         }
  
         return PAGE_UPDATE;

lib/obp60task/PageFourValues.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -97,47 +96,47 @@ class PageFourValues : public Page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->setCursor(20, 45);
+        getdisplay().setCursor(20, 45);
-        epd->print(name1);                           // Page name
+        getdisplay().print(name1);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(20, 65);
+        getdisplay().setCursor(20, 65);
         if(holdvalues == false){
-            epd->print(unit1);                       // Unit
+            getdisplay().print(unit1);                       // Unit
         }
         else{
-            epd->print(unit1old);
+            getdisplay().print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(120, 55);
+            getdisplay().setCursor(120, 55);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(150, 58);
+            getdisplay().setCursor(150, 58);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(180, 65);
+            getdisplay().setCursor(180, 65);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue1);                                     // Real value as formated string
+            getdisplay().print(svalue1);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue1old);                                  // Old value as formated string
+            getdisplay().print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -147,45 +146,45 @@ class PageFourValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 80, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 80, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->setCursor(20, 113);
+        getdisplay().setCursor(20, 113);
-        epd->print(name2);                           // Page name
+        getdisplay().print(name2);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(20, 133);
+        getdisplay().setCursor(20, 133);
         if(holdvalues == false){
-            epd->print(unit2);                       // Unit
+            getdisplay().print(unit2);                       // Unit
         }
         else{
-            epd->print(unit2old);
+            getdisplay().print(unit2old);
         }
 
         // Switch font if format for any values
         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(120, 123);
+            getdisplay().setCursor(120, 123);
         }
         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(150, 123);
+            getdisplay().setCursor(150, 123);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(180, 133);
+            getdisplay().setCursor(180, 133);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue2);                                     // Real value as formated string
+            getdisplay().print(svalue2);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue2old);                                  // Old value as formated string
+            getdisplay().print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
@@ -195,45 +194,45 @@ class PageFourValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 146, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 146, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->setCursor(20, 181);
+        getdisplay().setCursor(20, 181);
-        epd->print(name3);                           // Page name
+        getdisplay().print(name3);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(20, 201);
+        getdisplay().setCursor(20, 201);
         if(holdvalues == false){
-            epd->print(unit3);                       // Unit
+            getdisplay().print(unit3);                       // Unit
         }
         else{
-            epd->print(unit3old);
+            getdisplay().print(unit3old);
         }
 
         // Switch font if format for any values
         if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(120, 191);
+            getdisplay().setCursor(120, 191);
         }
         else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(150, 191);
+            getdisplay().setCursor(150, 191);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(180, 201);
+            getdisplay().setCursor(180, 201);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue3);                                     // Real value as formated string
+            getdisplay().print(svalue3);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue3old);                                  // Old value as formated string
+            getdisplay().print(svalue3old);                                  // Old value as formated string
         }
         if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value
@@ -243,45 +242,45 @@ class PageFourValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 214, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 214, 400, 3, commonData->fgcolor);
 
         // ############### Value 4 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->setCursor(20, 249);
+        getdisplay().setCursor(20, 249);
-        epd->print(name4);                           // Page name
+        getdisplay().print(name4);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(20, 269);
+        getdisplay().setCursor(20, 269);
         if(holdvalues == false){
-            epd->print(unit4);                       // Unit
+            getdisplay().print(unit4);                       // Unit
         }
         else{
-            epd->print(unit4old);
+            getdisplay().print(unit4old);
         }
 
         // Switch font if format for any values
         if(bvalue4->getFormat() == "formatLatitude" || bvalue4->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(120, 259);
+            getdisplay().setCursor(120, 259);
         }
         else if(bvalue4->getFormat() == "formatTime" || bvalue4->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(150, 259);
+            getdisplay().setCursor(150, 259);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(180, 269);
+            getdisplay().setCursor(180, 269);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue4);                                     // Real value as formated string
+            getdisplay().print(svalue4);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue4old);                                  // Old value as formated string
+            getdisplay().print(svalue4old);                                  // Old value as formated string
         }
         if(valid4 == true){
             svalue4old = svalue4;                                       // Save the old value

lib/obp60task/PageFourValues2.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -97,47 +96,47 @@ class PageFourValues2 : public Page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 55);
+        getdisplay().setCursor(20, 55);
-        epd->print(name1);                           // Page name
+        getdisplay().print(name1);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 90);
+        getdisplay().setCursor(20, 90);
         if(holdvalues == false){
-            epd->print(unit1);                       // Unit
+            getdisplay().print(unit1);                       // Unit
         }
         else{
-            epd->print(unit1old);
+            getdisplay().print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(100, 90);
+            getdisplay().setCursor(100, 90);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(180, 77);
+            getdisplay().setCursor(180, 77);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-            epd->setCursor(180, 90);
+            getdisplay().setCursor(180, 90);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue1);                                     // Real value as formated string
+            getdisplay().print(svalue1);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue1old);                                  // Old value as formated string
+            getdisplay().print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -147,45 +146,45 @@ class PageFourValues2 : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 145);
+        getdisplay().setCursor(20, 145);
-        epd->print(name2);                           // Page name
+        getdisplay().print(name2);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 180);
+        getdisplay().setCursor(20, 180);
         if(holdvalues == false){
-            epd->print(unit2);                       // Unit
+            getdisplay().print(unit2);                       // Unit
         }
         else{
-            epd->print(unit2old);
+            getdisplay().print(unit2old);
         }
 
         // Switch font if format for any values
         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(100, 180);
+            getdisplay().setCursor(100, 180);
         }
         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(180, 158);
+            getdisplay().setCursor(180, 158);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-            epd->setCursor(180, 180);
+            getdisplay().setCursor(180, 180);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue2);                                     // Real value as formated string
+            getdisplay().print(svalue2);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue2old);                                  // Old value as formated string
+            getdisplay().print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
@@ -195,45 +194,45 @@ class PageFourValues2 : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 220);
+        getdisplay().setCursor(20, 220);
-        epd->print(name3);                           // Page name
+        getdisplay().print(name3);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(20, 240);
+        getdisplay().setCursor(20, 240);
         if(holdvalues == false){
-            epd->print(unit3);                       // Unit
+            getdisplay().print(unit3);                       // Unit
         }
         else{
-            epd->print(unit3old);
+            getdisplay().print(unit3old);
         }
 
         // Switch font if format for any values
         if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(50, 240);
+            getdisplay().setCursor(50, 240);
         }
         else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(100, 240);
+            getdisplay().setCursor(100, 240);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(80, 270);
+            getdisplay().setCursor(80, 270);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue3);                                     // Real value as formated string
+            getdisplay().print(svalue3);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue3old);                                  // Old value as formated string
+            getdisplay().print(svalue3old);                                  // Old value as formated string
         }
         if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value
@@ -243,45 +242,45 @@ class PageFourValues2 : public Page
         // ############### Vertical Line ################
 
         // Vertical line 3 pix
-        epd->fillRect(200, 195, 3, 75, commonData->fgcolor);
+        getdisplay().fillRect(200, 195, 3, 75, commonData->fgcolor);
 
         // ############### Value 4 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(220, 220);
+        getdisplay().setCursor(220, 220);
-        epd->print(name4);                           // Page name
+        getdisplay().print(name4);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(220, 240);
+        getdisplay().setCursor(220, 240);
         if(holdvalues == false){
-            epd->print(unit4);                       // Unit
+            getdisplay().print(unit4);                       // Unit
         }
         else{
-            epd->print(unit4old);
+            getdisplay().print(unit4old);
         }
 
         // Switch font if format for any values
         if(bvalue4->getFormat() == "formatLatitude" || bvalue4->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(250, 240);
+            getdisplay().setCursor(250, 240);
         }
         else if(bvalue4->getFormat() == "formatTime" || bvalue4->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(300, 240);
+            getdisplay().setCursor(300, 240);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(280, 270);
+            getdisplay().setCursor(280, 270);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue4);                                     // Real value as formated string
+            getdisplay().print(svalue4);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue4old);                                  // Old value as formated string
+            getdisplay().print(svalue4old);                                  // Old value as formated string
         }
         if(valid4 == true){
             svalue4old = svalue4;                                       // Save the old value

lib/obp60task/PageGenerator.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -84,77 +83,77 @@ public:
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(10, 65);
+        getdisplay().setCursor(10, 65);
-        epd->print("Power");
+        getdisplay().print("Power");
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(12, 82);
+        getdisplay().setCursor(12, 82);
-        epd->print("Generator");
+        getdisplay().print("Generator");
 
         // Show voltage type
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 140);
+        getdisplay().setCursor(10, 140);
         int bvoltage = 0;
         if(String(batVoltage) == "12V") bvoltage = 12;
         else bvoltage = 24;
-        epd->print(bvoltage);
+        getdisplay().print(bvoltage);
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("V");
+        getdisplay().print("V");
 
         // Show solar power
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 200);
+        getdisplay().setCursor(10, 200);
-        if(genPower <= 999) epd->print(genPower, 0);
+        if(genPower <= 999) getdisplay().print(genPower, 0);
-        if(genPower > 999) epd->print(float(genPower/1000.0), 1);
+        if(genPower > 999) getdisplay().print(float(genPower/1000.0), 1);
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        if(genPower <= 999) epd->print("W");
+        if(genPower <= 999) getdisplay().print("W");
-        if(genPower > 999) epd->print("kW");
+        if(genPower > 999) getdisplay().print("kW");
 
         // Show info
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 235);
+        getdisplay().setCursor(10, 235);
-        epd->print("Installed");
+        getdisplay().print("Installed");
-        epd->setCursor(10, 255);
+        getdisplay().setCursor(10, 255);
-        epd->print("Power Modul");
+        getdisplay().print("Power Modul");
 
         // Show generator
         generatorGraphic(200, 95, commonData->fgcolor, commonData->bgcolor);
 
         // Show load level in percent
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(150, 200);
+        getdisplay().setCursor(150, 200);
-        epd->print(genPercentage);
+        getdisplay().print(genPercentage);
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("%");
+        getdisplay().print("%");
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(150, 235);
+        getdisplay().setCursor(150, 235);
-        epd->print("Load");
+        getdisplay().print("Load");
 
         // Show sensor type info
         String i2cAddr = "";
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(270, 60);
+        getdisplay().setCursor(270, 60);
-        if(powerSensor == "off") epd->print("Internal");
+        if(powerSensor == "off") getdisplay().print("Internal");
         if(powerSensor == "INA219"){
-            epd->print("INA219");
+            getdisplay().print("INA219");
             i2cAddr = " (0x" + String(INA219_I2C_ADDR3, HEX) + ")";
         }
         if(powerSensor == "INA226"){
-            epd->print("INA226");
+            getdisplay().print("INA226");
             i2cAddr = " (0x" + String(INA226_I2C_ADDR3, HEX) + ")";
         }
-        epd->print(i2cAddr);
+        getdisplay().print(i2cAddr);
-        epd->setCursor(270, 80);
+        getdisplay().setCursor(270, 80);
-        epd->print("Sensor Modul");
+        getdisplay().print("Sensor Modul");
 
         // Reading bus data or using simulation data
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(260, 140);
+        getdisplay().setCursor(260, 140);
         if(simulation == true){
             if(batVoltage == "12V"){
                 value1 = 12.0;
@@ -163,46 +162,46 @@ public:
                 value1 = 24.0;
             }
             value1 += float(random(0, 5)) / 10;         // Simulation data
-            epd->print(value1,1);
+            getdisplay().print(value1,1);
         }
         else{
             // Check for valid real data, display also if hold values activated
             if(valid1 == true || holdvalues == true){
                 // Resolution switching
-                if(value1 <= 9.9) epd->print(value1, 2);
+                if(value1 <= 9.9) getdisplay().print(value1, 2);
-                if(value1 > 9.9 && value1 <= 99.9)epd->print(value1, 1);
+                if(value1 > 9.9 && value1 <= 99.9)getdisplay().print(value1, 1);
-                if(value1 > 99.9) epd->print(value1, 0);
+                if(value1 > 99.9) getdisplay().print(value1, 0);
             }
             else{
-            epd->print("---");                       // Missing bus data
+            getdisplay().print("---");                       // Missing bus data
             }
         }
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("V");
+        getdisplay().print("V");
 
         // Show actual current in A
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(260, 200);
+        getdisplay().setCursor(260, 200);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(value2 <= 9.9) epd->print(value2, 2);
+            if(value2 <= 9.9) getdisplay().print(value2, 2);
-            if(value2 > 9.9 && value2 <= 99.9)epd->print(value2, 1);
+            if(value2 > 9.9 && value2 <= 99.9)getdisplay().print(value2, 1);
-            if(value2 > 99.9) epd->print(value2, 0);
+            if(value2 > 99.9) getdisplay().print(value2, 0);
         }
-        else  epd->print("---");
+        else  getdisplay().print("---");
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("A");
+        getdisplay().print("A");
 
         // Show actual consumption in W
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(260, 260);
+        getdisplay().setCursor(260, 260);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(value3 <= 9.9) epd->print(value3, 2);
+            if(value3 <= 9.9) getdisplay().print(value3, 2);
-            if(value3 > 9.9 && value3 <= 99.9)epd->print(value3, 1);
+            if(value3 > 9.9 && value3 <= 99.9)getdisplay().print(value3, 1);
-            if(value3 > 99.9) epd->print(value3, 0);
+            if(value3 > 99.9) getdisplay().print(value3, 0);
         }
-        else  epd->print("---");
+        else  getdisplay().print("---");
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("W");
+        getdisplay().print("W");
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageKeelPosition.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -69,7 +68,7 @@ public:
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
 //*******************************************************************************************
         
@@ -77,9 +76,9 @@ public:
         int rInstrument = 110;     // Radius of KeelPosition
         float pi = 3.141592;
 
-        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);       // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);       // Outer circle
-        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);        // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);        // Outer circle
-        epd->fillRect(0, 30, 400, 122, commonData->bgcolor);                    // Delete half top circle
+        getdisplay().fillRect(0, 30, 400, 122, commonData->bgcolor);                    // Delete half top circle
 
         for(int i=90; i<=270; i=i+10)
         {
@@ -106,17 +105,17 @@ public:
             // Print text centered on position x, y
             int16_t x1, y1;     // Return values of getTextBounds
             uint16_t w, h;      // Return values of getTextBounds
-            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            epd->setCursor(x-w/2, y+h/2);
+            getdisplay().setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                epd->setFont(&Ubuntu_Bold8pt8b);
+                getdisplay().setFont(&Ubuntu_Bold8pt8b);
-                epd->print(ii);
+                getdisplay().print(ii);
             }
 
             // Draw sub scale with dots
             float x1c = 200 + rInstrument*sin(i/180.0*pi);
             float y1c = 150 - rInstrument*cos(i/180.0*pi);
-            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
             float sinx=sin(i/180.0*pi);
             float cosx=cos(i/180.0*pi); 
 
@@ -127,10 +126,10 @@ public:
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),
                         200+(int)(cosx*xx2-sinx*yy2),150+(int)(sinx*xx2+cosx*yy2),commonData->fgcolor);
             }
@@ -164,7 +163,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument * 0.6); 
-            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -174,36 +173,36 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument * 0.6);
             float iy2 = -endwidth;
-            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
 
             // Draw counterweight
-            epd->fillCircle(200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2), 5, commonData->fgcolor);
+            getdisplay().fillCircle(200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2), 5, commonData->fgcolor);
         }
 
         // Center circle
-        epd->fillCircle(200, 140, startwidth + 22, commonData->bgcolor);
+        getdisplay().fillCircle(200, 140, startwidth + 22, commonData->bgcolor);
-        epd->fillCircle(200, 140, startwidth + 20, commonData->fgcolor);      // Boat circle
+        getdisplay().fillCircle(200, 140, startwidth + 20, commonData->fgcolor);      // Boat circle
-        epd->fillRect(200 - 30, 140 - 30, 2 * 30, 30, commonData->bgcolor);   // Delete half top of boat circle
+        getdisplay().fillRect(200 - 30, 140 - 30, 2 * 30, 30, commonData->bgcolor);   // Delete half top of boat circle
-        epd->fillRect(150, 150, 100, 4, commonData->fgcolor);                 // Water line
+        getdisplay().fillRect(150, 150, 100, 4, commonData->fgcolor);                 // Water line
 
         // Print label
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->setCursor(100, 70);
+        getdisplay().setCursor(100, 70);
-        epd->print("Keel Position");                 // Label
+        getdisplay().print("Keel Position");                 // Label
 
         if((rotsensor == "AS5600" && rotfunction == "Keel" && (valid1 == true || holdvalues == true)) || simulation == true){
             // Print Unit of keel position
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(175, 110);
+            getdisplay().setCursor(175, 110);
-            epd->print(unit1);                       // Unit
+            getdisplay().print(unit1);                       // Unit
         }
         else{
             // Print Unit of keel position
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(145, 110);
+            getdisplay().setCursor(145, 110);
-            epd->print("No sensor data");            // Info missing sensor
+            getdisplay().print("No sensor data");            // Info missing sensor
         }
 
         return PAGE_UPDATE;

lib/obp60task/PageNavigation.cpp

@@ -0,0 +1,505 @@
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+#include "NetworkClient.h"      // Network connection
+#include "ImageDecoder.h"       // Image decoder for navigation map
+
+#include "Logo_OBP_400x300_sw.h"
+
+// Defines for reading of navigation map 
+#define JSON_BUFFER 30000       // Max buffer size for JSON content (30 kB picture + values)
+NetworkClient net(JSON_BUFFER); // Define network client
+ImageDecoder decoder;           // Define image decoder        
+
+class PageNavigation : public Page
+{
+// Values for buttons
+bool firstRun = true;    // Detect the first page run
+int zoom = 15;           // Default zoom level
+bool showValues = false; // Show values HDT, SOG, DBT in navigation map
+
+private:
+    uint8_t* imageBackupData = nullptr;
+    int imageBackupWidth = 0;
+    int imageBackupHeight = 0;
+    size_t imageBackupSize = 0;
+    bool hasImageBackup = false;
+
+public:
+    PageNavigation(CommonData &common){
+        commonData = &common;
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageNavigation");
+        imageBackupData = (uint8_t*)heap_caps_malloc((GxEPD_WIDTH * GxEPD_HEIGHT), MALLOC_CAP_SPIRAM);
+    }
+
+    virtual int handleKey(int key){
+        // Code for keylock
+        if(key == 11){
+            commonData->keylock = !commonData->keylock;
+            return 0;                   // Commit the key
+        }
+        // Code for zoom -
+        if(key == 1){
+            zoom --;                    // Zoom -
+            if(zoom <7){
+                zoom = 7;
+            }
+            return 0;                   // Commit the key
+        }
+        // Code for zoom -
+        if(key == 2){
+            zoom ++;                    // Zoom +
+            if(zoom >17){
+                zoom = 17;
+            }
+            return 0;                   // Commit the key
+        }
+        if(key == 5){
+            showValues = !showValues;   // Toggle show values
+            return 0;                   // Commit the key
+        }
+        return key;
+    }
+
+    int displayPage(PageData &pageData){
+        GwConfigHandler *config = commonData->config;
+        GwLog *logger = commonData->logger;
+
+        // Get config data
+        String lengthformat = config->getString(config->lengthFormat);
+        bool simulation = config->getBool(config->useSimuData);
+        bool holdvalues = config->getBool(config->holdvalues);
+        String flashLED = config->getString(config->flashLED);
+        String backlightMode = config->getString(config->backlight);
+        String mapsource = config->getString(config->mapsource);
+        String ipAddress = config->getString(config->ipAddress);
+        int localPort = config->getInt(config->localPort);
+        String mapType = config->getString(config->maptype);
+        int zoomLevel = config->getInt(config->zoomlevel);
+        bool grid = config->getBool(config->grid);
+        String orientation = config->getString(config->orientation);
+        int refreshDistance = config->getInt(config->refreshDistance);
+        bool showValuesMap = config->getBool(config->showvalues);
+        bool ownHeading = config->getBool(config->ownheading);
+
+        if(firstRun == true){
+            zoom = zoomLevel;           // Over write zoom level with setup value
+            showValues = showValuesMap; // Over write showValues with setup value 
+            firstRun = false;           // Restet variable
+        }
+
+        // Local variables
+        String server = "norbert-walter.dnshome.de";
+        int port = 80;
+        int mType = 1;
+        int dType = 1;
+        int mapRot = 0;
+        int symbolRot = 0;
+        int mapGrid = 0;
+
+        
+        // Old values for hold function
+        static double value1old = 0;
+        static String svalue1old = "";
+        static String unit1old = "";
+        static double value2old = 0;
+        static String svalue2old = "";
+        static String unit2old = "";
+        static double value3old = 0;    // Deg
+        static String svalue3old = "";
+        static String unit3old = "";
+        static double value4old = 0;
+        static String svalue4old = "";
+        static String unit4old = "";
+        static double value5old = 0;
+        static String svalue5old = "";
+        static String unit5old = "";
+        static double value6old = 0;
+        static String svalue6old = "";
+        static String unit6old = "";
+
+        static double latitude = 0;
+        static double latitudeold = 0;
+        static double longitude = 0;
+        static double longitudeold = 0;
+        static double trueHeading = 0;
+        static double magneticHeading = 0;
+        static double speedOverGround = 0;
+        static double depthBelowTransducer = 0;
+        static int lostCounter = 0; // Counter for connection lost to the map server (increment by each page refresh)
+        int imgWidth = 0;
+        int imgHeight = 0;
+
+        // Get boat values #1 Latitude
+        GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
+        String name1 = xdrDelete(bvalue1->getName());   // Value name
+        name1 = name1.substring(0, 6);                  // String length limit for value name
+        double value1 = bvalue1->value;                 // Value as double in SI unit
+        bool valid1 = bvalue1->valid;                   // Valid information 
+        String svalue1 = formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
+
+        // Get boat values #2 Longitude
+        GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list (only one value by PageOneValue)
+        String name2 = xdrDelete(bvalue2->getName());   // Value name
+        name2 = name2.substring(0, 6);                  // String length limit for value name
+        double value2 = bvalue2->value;                 // Value as double in SI unit
+        bool valid2 = bvalue2->valid;                   // Valid information 
+        String svalue2 = formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String unit2 = formatValue(bvalue2, *commonData).unit;        // Unit of value
+
+        // Get boat values #3 HDT
+        GwApi::BoatValue *bvalue3 = pageData.values[2]; // Second element in list (only one value by PageOneValue)
+        String name3 = xdrDelete(bvalue3->getName());   // Value name
+        name3 = name3.substring(0, 6);                  // String length limit for value name
+        double value3 = bvalue3->value;                 // Value as double in SI unit
+        bool valid3 = bvalue3->valid;                   // Valid information 
+        String svalue3 = formatValue(bvalue3, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String unit3 = formatValue(bvalue3, *commonData).unit;        // Unit of value
+
+        // Get boat values #4 HDM
+        GwApi::BoatValue *bvalue4 = pageData.values[3]; // Second element in list (only one value by PageOneValue)
+        String name4 = xdrDelete(bvalue4->getName());   // Value name
+        name4 = name4.substring(0, 6);                  // String length limit for value name
+        double value4 = bvalue4->value;                 // Value as double in SI unit
+        bool valid4 = bvalue4->valid;                   // Valid information 
+        String svalue4 = formatValue(bvalue4, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String unit4 = formatValue(bvalue4, *commonData).unit;        // Unit of value
+
+        // Get boat values #5 SOG
+        GwApi::BoatValue *bvalue5 = pageData.values[4]; // Second element in list (only one value by PageOneValue)
+        String name5 = xdrDelete(bvalue5->getName());   // Value name
+        name5 = name5.substring(0, 6);                  // String length limit for value name
+        double value5 = bvalue5->value;                 // Value as double in SI unit
+        bool valid5 = bvalue5->valid;                   // Valid information 
+        String svalue5 = formatValue(bvalue5, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String unit5 = formatValue(bvalue5, *commonData).unit;        // Unit of value
+
+        // Get boat values #6 DBT
+        GwApi::BoatValue *bvalue6 = pageData.values[5]; // Second element in list (only one value by PageOneValue)
+        String name6 = xdrDelete(bvalue6->getName());   // Value name
+        name6 = name6.substring(0, 6);                  // String length limit for value name
+        double value6 = bvalue6->value;                 // Value as double in SI unit
+        bool valid6 = bvalue6->valid;                   // Valid information 
+        String svalue6 = formatValue(bvalue6, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+        String unit6 = formatValue(bvalue6, *commonData).unit;        // Unit of value
+
+        // Optical warning by limit violation (unused)
+        if(String(flashLED) == "Limit Violation"){
+            setBlinkingLED(false);
+            setFlashLED(false); 
+        }
+
+        // Logging boat values
+        if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
+        LOG_DEBUG(GwLog::LOG,"Drawing at PageNavigation, %s: %f, %s: %f, %s: %f, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4, name5.c_str(), value5, name6.c_str(), value6);
+
+        // Set variables
+        //***********************************************************
+
+        // Latitude
+        if(valid1){
+            latitude = value1;
+            latitudeold = value1;
+            value3old = value1;
+        }
+        else{
+            latitude = value1old;
+        }
+        // Longitude
+        if(valid2){
+            longitude = value2;
+            longitudeold = value2;
+            value2old = value2;
+        }
+        else{
+            longitude = value2old;
+        }
+        // HDT value (True Heading, GPS)
+        if(valid3){
+            trueHeading = (value3 * 360) / (2 * PI);
+            value3old = trueHeading;
+        }
+        else{
+            trueHeading = value3old;
+        }
+        // HDM value (Magnetic Heading)
+        if(valid4){
+            magneticHeading = (value4 * 360) / (2 * PI);
+            value4old = magneticHeading;
+        }
+        else{
+            speedOverGround = value4old;
+        }
+        // SOG value (Speed Over Ground)
+        if(valid5){
+            speedOverGround = value5;
+            value5old = value5;
+        }
+        else{
+            speedOverGround = value5old;
+        }
+        // DBT value (Depth Below Transducer)
+        if(valid6){
+            depthBelowTransducer = value6;
+            value6old = value6;
+        }
+        else{
+            depthBelowTransducer = value6old;
+        }
+
+        // Prepare config values for URL
+        //***********************************************************
+
+        // Server settings
+        if(mapsource == "OBP Service"){
+            server = "norbert-walter.dnshome.de";
+            port = 80;
+        }
+        else if(mapsource == "Local Service"){
+            server = String(ipAddress);
+            port = localPort;
+        }
+        else{
+            server = "norbert-walter.dnshome.de";
+            port = 80;
+        }
+
+        // Type of navigation map
+        if(mapType == "Open Street Map"){
+            mType = 1;  // Map type
+            dType = 1;  // Dithering type
+        }
+        else if(mapType == "Google Street"){
+            mType = 3;
+            dType = 2;
+        }
+        else if(mapType == "Open Topo Map"){
+            mType = 5;
+            dType = 2;
+        }
+        else if(mapType == "Stadimaps Toner"){
+            mType = 7;
+            dType = 1;
+        }
+        else if(mapType == "Free Nautical Chart"){
+            mType = 9;
+            dType = 1;
+        }
+        else{
+            mType = 1;
+            dType = 1;
+        }
+
+        // Map grid on/off
+        if(grid == true){
+            mapGrid = 1;
+        }
+        else{
+            mapGrid = 0;
+        }
+
+        // Map orientation
+        if(orientation == "North Direction"){
+            mapRot = 0;
+            // If true heading available then use HDT oterwise HDM
+            if(valid3 == true){
+                symbolRot = trueHeading;
+            }
+            else{
+                symbolRot = magneticHeading;
+            }
+        }
+        else if(orientation == "Travel Direction"){
+            // If true heading available then use HDT oterwise HDM
+            if(valid3 == true){
+                mapRot = trueHeading;
+                symbolRot = trueHeading;
+            }
+            else{
+                mapRot = magneticHeading;
+                symbolRot = magneticHeading;
+            }
+        }
+        else{
+            mapRot = 0;
+            // If true heading available then use HDT oterwise HDM
+            if(valid3 == true){
+                symbolRot = trueHeading;
+            }
+            else{
+                symbolRot = magneticHeading;
+            }
+        }
+
+        // Load navigation map
+        //***********************************************************
+
+        // URL to OBP Maps Converter
+        // For more details see: https://github.com/norbert-walter/maps-converter
+        String url = String("http://") + server + ":" + port +  // OBP Server
+                    String("/get_image_json?") +               // Service: Output B&W picture as JSON (Base64 + gzip)
+                    "zoom=" + zoom +   // Default zoom level: 15
+                    "&lat=" + String(latitude, 6) +   // Latitude
+                    "&lon=" + String(longitude, 6) +  // Longitude
+                    "&mrot=" + mapRot + // Rotation angle navigation map in degree
+                    "&mtype=" + mType + // Default Map: Open Street Map
+                    "&dtype=" + dType + // Dithering type: Atkinson dithering
+                    "&width=400" +     // With navigation map
+                    "&height=250" +    // Height navigation map
+                    "&cutout=0" +      // No picture cutouts
+                    "&tab=0" +         // No tab size
+                    "&border=2" +      // Border line size: 2 pixel
+                    "&symbol=2" +      // Symbol: Triangle
+                    "&srot=" + symbolRot + // Symbol rotation angle
+                    "&ssize=15" +      // Symbole size: 15 pixel
+                    "&grid=" + mapGrid // Show grid: On
+                    ;         
+        
+        // Draw page
+        //***********************************************************
+
+        // ############### Draw Navigation Map ################
+        
+        // Set display in partial refresh mode
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        getdisplay().setTextColor(commonData->fgcolor);
+
+        // If a network connection to URL then load the navigation map
+        if (net.fetchAndDecompressJson(url)) {
+
+            auto& json = net.json();                // Extract JSON content
+            int numPix = json["number_pixels"] | 0; // Read number of pixels
+            imgWidth = json["width"] | 0;           // Read width of image
+            imgHeight = json["height"] | 0;         // Read height og image
+
+            const char* b64src = json["picture_base64"].as<const char*>();  // Read picture as Base64 content
+            size_t b64len = strlen(b64src);                                 // Calculate length of Base64 content
+            // Copy Base64 content in PSRAM
+            char* b64 = (char*) heap_caps_malloc(b64len + 1, MALLOC_CAP_SPIRAM);    // Allcate PSRAM for Base64 content
+            if (!b64) {
+                LOG_DEBUG(GwLog::ERROR,"Error PageNavigation: PSRAM alloc base64 failed");
+                return PAGE_UPDATE;
+            }
+            memcpy(b64, b64src, b64len + 1);    // Copy Base64 content in PSRAM
+
+            // Set image buffer in PSRAM
+            //size_t imgSize = getdisplay().width() * getdisplay().height();
+            size_t imgSize = numPix;    // Calculate image size
+            uint8_t* imageData = (uint8_t*) heap_caps_malloc(imgSize, MALLOC_CAP_SPIRAM);           // Allocate PSRAM for image
+            if (!imageData) {
+                LOG_DEBUG(GwLog::ERROR,"Error PageNavigation: PPSRAM alloc image buffer failed");
+                free(b64);
+                return PAGE_UPDATE;
+            }
+
+            // Decode Base64 content to image
+            size_t decodedSize = 0;
+            decoder.decodeBase64(b64, imageData, imgSize, decodedSize);
+
+            // Copy actual navigation man to ackup map
+            imageBackupWidth  = imgWidth;
+            imageBackupHeight = imgHeight;
+            imageBackupSize   = imgSize;
+            if (decodedSize > 0) {
+                memcpy(imageBackupData, imageData, decodedSize);
+                imageBackupSize = decodedSize;
+            }
+            hasImageBackup = true;
+            lostCounter = 0;
+
+            // Show image (navigation map)
+            getdisplay().drawBitmap(0, 25, imageData, imgWidth, imgHeight, commonData->fgcolor);
+
+            // Clean PSRAM
+            free(b64);
+            free(imageData);
+        }
+        // If no network connection then use backup navigation map
+        else{
+            // Show backup image (backup navigation map)
+            if (hasImageBackup) {
+                getdisplay().drawBitmap(0, 25, imageBackupData, imageBackupWidth, imageBackupHeight, commonData->fgcolor);
+            }    
+
+            // Show info: Connection lost when 5 page refreshes has a connection lost to the map server
+            // Short connection losts are uncritical
+            if(lostCounter >= 5){
+                getdisplay().setFont(&Ubuntu_Bold12pt8b);
+                getdisplay().fillRect(200, 250 , 200, 25, commonData->fgcolor); // Black rect
+                getdisplay().fillRect(202, 252 , 196, 21, commonData->bgcolor); // White rect
+                getdisplay().setCursor(210, 270);
+                getdisplay().print("Map server lost");
+            }
+
+            lostCounter++; // Increment lost counter
+        }
+
+
+        // ############### Draw Values ################
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+
+        // Show zoom level
+        getdisplay().fillRect(355, 25 , 45, 25, commonData->fgcolor);   // Black rect
+        getdisplay().fillRect(357, 27 , 41, 21, commonData->bgcolor);   // White rect
+        getdisplay().setCursor(364, 45);
+        getdisplay().print(zoom);
+        // If true heading available then use HDT oterwise HDM
+        if(showValues == true){
+            // Frame
+            getdisplay().fillRect(0, 25 , 130, 65, commonData->fgcolor);   // Black rect
+            getdisplay().fillRect(2, 27 , 126, 61, commonData->bgcolor);   // White rect
+            if(valid3 == true){
+                // HDT
+                getdisplay().setCursor(10, 45);
+                getdisplay().print(name3);
+                getdisplay().setCursor(70, 45);
+                getdisplay().print(svalue3);
+            }
+            else{
+                // HDM
+                getdisplay().setCursor(10, 45);
+                getdisplay().print(name4);
+                getdisplay().setCursor(70, 45);
+                getdisplay().print(svalue4);
+            }
+            // SOG
+            getdisplay().setCursor(10, 65);
+            getdisplay().print(name5);
+            getdisplay().setCursor(70, 65);
+            getdisplay().print(svalue5);
+            // DBT
+            getdisplay().setCursor(10, 85);
+            getdisplay().print(name6);
+            getdisplay().setCursor(70, 85);
+            getdisplay().print(svalue6);
+        }
+
+        // Set botton labels
+        commonData->keydata[0].label = "ZOOM -";
+        commonData->keydata[1].label = "ZOOM +";
+        commonData->keydata[4].label = "VALUES";
+
+        return PAGE_UPDATE;
+    };
+};
+
+static Page *createPage(CommonData &common){
+    return new PageNavigation(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 registerPageNavigation(
+    "Navigation",       // Page name
+    createPage,         // Action
+    0,                  // Number of bus values depends on selection in Web configuration
+    {"LAT","LON","HDT","HDM","SOG","DBT"},  // Bus values we need in the page
+    true                // Show display header on/off
+);
+
+#endif

lib/obp60task/PageOneValue.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -61,44 +60,44 @@ class PageOneValue : public Page
         //***********************************************************
 
         /// Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
         // Show name
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold32pt8b);
+        getdisplay().setFont(&Ubuntu_Bold32pt8b);
-        epd->setCursor(20, 100);
+        getdisplay().setCursor(20, 100);
-        epd->print(name1);                           // Page name
+        getdisplay().print(name1);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(270, 100);
+        getdisplay().setCursor(270, 100);
         if(holdvalues == false){
-            epd->print(unit1);                       // Unit
+            getdisplay().print(unit1);                       // Unit
         }
         else{
-            epd->print(unit1old);
+            getdisplay().print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(20, 180);
+            getdisplay().setCursor(20, 180);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold32pt8b);
+            getdisplay().setFont(&Ubuntu_Bold32pt8b);
-            epd->setCursor(20, 200);
+            getdisplay().setCursor(20, 200);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic60pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic60pt7b);
-            epd->setCursor(20, 240);
+            getdisplay().setCursor(20, 240);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue1);                                     // Real value as formated string
+            getdisplay().print(svalue1);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue1old);                                  // Old value as formated string
+            getdisplay().print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value

lib/obp60task/PageRollPitch.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -117,52 +116,52 @@ public:
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // Show roll limit
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 65);
+        getdisplay().setCursor(10, 65);
-        epd->print(rolllimit);                   // Value
+        getdisplay().print(rolllimit);                   // Value
-        //epd->print(svalue1);                   // Value
+        //getdisplay().print(svalue1);                   // Value
 
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 95);
+        getdisplay().setCursor(10, 95);
-        epd->print("Limit");                     // Name
+        getdisplay().print("Limit");                     // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 115);
+        getdisplay().setCursor(10, 115);
-        epd->print("DEG");
+        getdisplay().print("DEG");
 
         // Horizintal separator left
-        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
 
         // Show roll value
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 270);
+        getdisplay().setCursor(10, 270);
-        if(holdvalues == false) epd->print(svalue1); // Value
+        if(holdvalues == false) getdisplay().print(svalue1); // Value
-        else epd->print(svalue1old);
+        else getdisplay().print(svalue1old);
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 220);
+        getdisplay().setCursor(10, 220);
-        epd->print(name1);                           // Name
+        getdisplay().print(name1);                           // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 190);
+        getdisplay().setCursor(10, 190);
-        epd->print("Deg");
+        getdisplay().print("Deg");
 
         // Horizintal separator right
-        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
+        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
 
         // Show pitch value
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(295, 270);
+        getdisplay().setCursor(295, 270);
-        if(holdvalues == false) epd->print(svalue2); // Value
+        if(holdvalues == false) getdisplay().print(svalue2); // Value
-        else epd->print(svalue2old);
+        else getdisplay().print(svalue2old);
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(335, 220);
+        getdisplay().setCursor(335, 220);
-        epd->print(name2);                           // Name
+        getdisplay().print(name2);                           // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(335, 190);
+        getdisplay().setCursor(335, 190);
-        epd->print("Deg");
+        getdisplay().print("Deg");
 
 //*******************************************************************************************
 
@@ -170,8 +169,8 @@ public:
         int rInstrument = 100;     // Radius of instrument
         float pi = 3.141592;
 
-        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
 
         for(int i=0; i<360; i=i+10)
         {
@@ -195,17 +194,17 @@ public:
                 // Print text centered on position x, y
                 int16_t x1, y1;     // Return values of getTextBounds
                 uint16_t w, h;      // Return values of getTextBounds
-                epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+                getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-                epd->setCursor(x-w/2, y+h/2);
+                getdisplay().setCursor(x-w/2, y+h/2);
                 if(i % 20 == 0){
-                    epd->setFont(&Ubuntu_Bold8pt8b);
+                    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-                    epd->print(ii);
+                    getdisplay().print(ii);
                 }
 
                 // Draw sub scale with dots
                 float x1c = 200 + rInstrument*sin(i/180.0*M_PI);
                 float y1c = 150 - rInstrument*cos(i/180.0*M_PI);
-                epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+                getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
                 float sinx=sin(i/180.0*M_PI);
                 float cosx=cos(i/180.0*M_PI);
 
@@ -216,10 +215,10 @@ public:
                     float xx2 = +dx;
                     float yy1 =  -(rInstrument-10);
                     float yy2 =  -(rInstrument+10);
-                    epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                    getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                             200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                             200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                    epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                    getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                             200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),
                             200+(int)(cosx*xx2-sinx*yy2),150+(int)(sinx*xx2+cosx*yy2),commonData->fgcolor);
                 }
@@ -240,7 +239,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument * 0.7);
-            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -250,28 +249,28 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument * 0.7);
             float iy2 = -endwidth;
-            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
 
             // Draw counterweight
-            epd->fillCircle(200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2), 5, commonData->fgcolor);
+            getdisplay().fillCircle(200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2), 5, commonData->fgcolor);
         }
 
         // Center circle
-        epd->fillCircle(200, 150, startwidth + 22, commonData->bgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 22, commonData->bgcolor);
-        epd->fillCircle(200, 150, startwidth + 20, commonData->fgcolor);      // Boat circle
+        getdisplay().fillCircle(200, 150, startwidth + 20, commonData->fgcolor);      // Boat circle
         int x0 = 200;
         int y0 = 150;
         int x1 = x0 + 50*cos(value1);
         int y1 = y0 + 50*sin(value1);
         int x2 = x0 + 50*cos(value1 - pi/2);
         int y2 = y0 + 50*sin(value1 - pi/2);
-        epd->fillTriangle(x0, y0, x1, y1, x2, y2, commonData->bgcolor);          // Clear half top side of boat circle (right triangle)
+        getdisplay().fillTriangle(x0, y0, x1, y1, x2, y2, commonData->bgcolor);          // Clear half top side of boat circle (right triangle)
         x1 = x0 + 50*cos(value1 + pi);
         y1 = y0 + 50*sin(value1 + pi);
-        epd->fillTriangle(x0, y0, x1, y1, x2, y2, commonData->bgcolor);          // Clear half top side of boat circle (left triangle)
+        getdisplay().fillTriangle(x0, y0, x1, y1, x2, y2, commonData->bgcolor);          // Clear half top side of boat circle (left triangle)
-        epd->fillRect(150, 160, 100, 4, commonData->fgcolor);                 // Water line
+        getdisplay().fillRect(150, 160, 100, 4, commonData->fgcolor);                 // Water line
 
         // Draw roll pointer
         startwidth = 4;     // Start width of pointer
@@ -284,7 +283,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument - 15);
-            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -294,15 +293,15 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument - 15);
             float iy2 = -endwidth;
-            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
         else{
             // Print sensor info
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(145, 200);
+            getdisplay().setCursor(145, 200);
-            epd->print("No sensor data");            // Info missing sensor
+            getdisplay().print("No sensor data");            // Info missing sensor
         }
 
         return PAGE_UPDATE;

lib/obp60task/PageRudderPosition.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -75,7 +74,7 @@ public:
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
 //*******************************************************************************************
         
@@ -83,9 +82,9 @@ public:
         int rInstrument = 110;     // Radius of RudderPosition
         float pi = 3.141592;
 
-        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);        // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);        // Outer circle
-        epd->fillRect(0, 30, 400, 122, commonData->bgcolor);                      // Delete half top circle
+        getdisplay().fillRect(0, 30, 400, 122, commonData->bgcolor);                      // Delete half top circle
 
         for(int i=90; i<=270; i=i+10)
         {
@@ -113,17 +112,17 @@ public:
             // Print text centered on position x, y
             int16_t x1, y1;     // Return values of getTextBounds
             uint16_t w, h;      // Return values of getTextBounds
-            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            epd->setCursor(x-w/2, y+h/2);
+            getdisplay().setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                epd->setFont(&Ubuntu_Bold8pt8b);
+                getdisplay().setFont(&Ubuntu_Bold8pt8b);
-                epd->print(ii);
+                getdisplay().print(ii);
             }
 
             // Draw sub scale with dots
             float x1c = 200 + rInstrument*sin(i/180.0*pi);
             float y1c = 150 - rInstrument*cos(i/180.0*pi);
-            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
             float sinx=sin(i/180.0*pi);
             float cosx=cos(i/180.0*pi); 
 
@@ -134,10 +133,10 @@ public:
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),
                         200+(int)(cosx*xx2-sinx*yy2),150+(int)(sinx*xx2+cosx*yy2),commonData->fgcolor);
             }
@@ -145,28 +144,28 @@ public:
         }
 
         // Print label
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->setCursor(80, 70);
+        getdisplay().setCursor(80, 70);
-        epd->print("Rudder Position");               // Label
+        getdisplay().print("Rudder Position");               // Label
 
         // Print Unit in RudderPosition
         if(valid1 == true || simulation == true){
             if(holdvalues == false){
-                epd->setFont(&Ubuntu_Bold12pt8b);
+                getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                epd->setCursor(175, 110);
+                getdisplay().setCursor(175, 110);
-                epd->print(unit1);                   // Unit
+                getdisplay().print(unit1);                   // Unit
             }
             else{
-                epd->setFont(&Ubuntu_Bold12pt8b);
+                getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                epd->setCursor(175, 110);
+                getdisplay().setCursor(175, 110);
-                epd->print(unit1old);                // Unit
+                getdisplay().print(unit1old);                // Unit
             }
         }
         else{
             // Print Unit of keel position
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(145, 110);
+            getdisplay().setCursor(145, 110);
-            epd->print("No sensor data");            // Info missing sensor
+            getdisplay().print("No sensor data");            // Info missing sensor
             }
 
         // Calculate rudder position
@@ -189,7 +188,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument * 0.5); 
-            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -199,14 +198,14 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument * 0.5);
             float iy2 = -endwidth;
-            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
 
         // Center circle
-        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageSixValues.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -78,13 +77,13 @@ class PageSixValues : public Page
             //***********************************************************
     
             // Set display in partial refresh mode
-            epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+            getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-            epd->setTextColor(commonData->fgcolor);
+            getdisplay().setTextColor(commonData->fgcolor);
 
             for (int i = 0; i < ( HowManyValues / 2 ); i++){
                 if (i < (HowManyValues / 2) - 1) {          // Don't draw horizontal line after last line of values -> standard design
                    // Horizontal line 3 pix
-                    epd->fillRect(0, SixValues_y1+(i+1)*SixValues_DeltaY, 400, 3, commonData->fgcolor);
+                    getdisplay().fillRect(0, SixValues_y1+(i+1)*SixValues_DeltaY, 400, 3, commonData->fgcolor);
                 }
                 for (int j = 0; j < 2; j++){
                     int ValueIndex = i * 2 + j;
@@ -93,53 +92,53 @@ class PageSixValues : public Page
                     LOG_DEBUG(GwLog::LOG,"Drawing at PageSixValue: %d %s %f %s",  ValueIndex,  DataName[ValueIndex], DataValue[ValueIndex], DataFormat[ValueIndex] );
     
            // Show name
-                    epd->setFont(&Ubuntu_Bold12pt8b);
+                    getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                    epd->setCursor(x0, y0+25);
+                    getdisplay().setCursor(x0, y0+25);
-                    epd->print(DataName[ValueIndex]);                           // Page name
+                    getdisplay().print(DataName[ValueIndex]);                           // Page name
     
             // Show unit
-                    epd->setFont(&Ubuntu_Bold8pt8b);
+                    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-                    epd->setCursor(x0, y0+72);
+                    getdisplay().setCursor(x0, y0+72);
                     if(holdvalues == false){
-                        epd->print(DataUnits[ValueIndex]);                       // Unit
+                        getdisplay().print(DataUnits[ValueIndex]);                       // Unit
                         }
                     else{
-                        epd->print(OldDataUnits[ValueIndex]);
+                        getdisplay().print(OldDataUnits[ValueIndex]);
                         }
     
             // Switch font if format for any values
                     if(DataFormat[ValueIndex] == "formatLatitude" || DataFormat[ValueIndex] == "formatLongitude"){
-                        epd->setFont(&Ubuntu_Bold12pt8b);
+                        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                        epd->setCursor(x0+10, y0+60);
+                        getdisplay().setCursor(x0+10, y0+60);
                         }
                     else if(DataFormat[ValueIndex] == "formatTime" || DataFormat[ValueIndex] == "formatDate"){
-                        epd->setFont(&Ubuntu_Bold16pt8b);
+                        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-                        epd->setCursor(x0+20,y0+55);
+                        getdisplay().setCursor(x0+20,y0+55);
                         } 
             // pressure in hPa          
                     else if(DataFormat[ValueIndex] == "formatXdr:P:P"){
-                        epd->setFont(&DSEG7Classic_BoldItalic26pt7b);
+                        getdisplay().setFont(&DSEG7Classic_BoldItalic26pt7b);
-                        epd->setCursor(x0+5, y0+70);
+                        getdisplay().setCursor(x0+5, y0+70);
                      }
             // RPM
                      else if(DataFormat[ValueIndex] == "formatXdr:T:R"){
-                        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
+                        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-                        epd->setCursor(x0+25, y0+70);
+                        getdisplay().setCursor(x0+25, y0+70);
                      }
                     else{
-                        epd->setFont(&DSEG7Classic_BoldItalic26pt7b);
+                        getdisplay().setFont(&DSEG7Classic_BoldItalic26pt7b);
                         if ( DataText[ValueIndex][0] == '-' )
-                            epd->setCursor(x0+25, y0+70);
+                            getdisplay().setCursor(x0+25, y0+70);
                         else
-                            epd->setCursor(x0+65, y0+70);
+                            getdisplay().setCursor(x0+65, y0+70);
                         }
     
             // Show bus data
                     if(holdvalues == false){
-                        epd->print(DataText[ValueIndex]);                                     // Real value as formated string
+                        getdisplay().print(DataText[ValueIndex]);                                     // Real value as formated string
                         }
                     else{
-                        epd->print(OldDataText[ValueIndex]);                                  // Old value as formated string
+                        getdisplay().print(OldDataText[ValueIndex]);                                  // Old value as formated string
                         }
                     if(DataValid[ValueIndex] == true){
                         OldDataText[ValueIndex] = DataText[ValueIndex];                                       // Save the old value
@@ -147,7 +146,7 @@ class PageSixValues : public Page
                         }
                 }
                    // Vertical line 3 pix
-            epd->fillRect(SixValues_x1+SixValues_DeltaX-8, SixValues_y1+i*SixValues_DeltaY, 3, SixValues_DeltaY, commonData->fgcolor);
+            getdisplay().fillRect(SixValues_x1+SixValues_DeltaX-8, SixValues_y1+i*SixValues_DeltaY, 3, SixValues_DeltaY, commonData->fgcolor);
             }
     
             return PAGE_UPDATE;

lib/obp60task/PageSkyView.cpp

@@ -4,129 +4,179 @@
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
 
+#include <vector>
+#include <algorithm> // for vector sorting
+
 /*
  * SkyView / Satellites
  */
 
 class PageSkyView : public Page
 {
+private:
+    String flashLED;
+    GwBoatData *bd;
+
 public:
-    PageSkyView(CommonData &common){
+    PageSkyView(CommonData &common)
+    {
         commonData = &common;
-        common.logger->logDebug(GwLog::LOG,"Show PageSkyView");
+
+        // task name access is for example purpose only
+        TaskHandle_t currentTaskHandle = xTaskGetCurrentTaskHandle();
+        const char* taskName = pcTaskGetName(currentTaskHandle);
+        common.logger->logDebug(GwLog::LOG, "Instantiate PageSkyView in task '%s'", taskName);
+
+        flashLED = common.config->getString(common.config->flashLED);
     }
 
     int handleKey(int key) {
-        // Code for keylock
+        // return 0 to mark the key handled completely
+        // return the key to allow further action
         if (key == 11) {
             commonData->keylock = !commonData->keylock;
-            return 0;                   // Commit the key
+            return 0;
         }
         return key;
     }
 
-    int displayPage(PageData &pageData) {
+    void displayNew(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
+#ifdef BOARD_OBP60S3
-        GwLog *logger = commonData->logger;
+        // Clear optical warning
-
+        if (flashLED == "Limit Violation") {
-        // Get config data
-        String flashLED = config->getString(config->flashLED);
-        String displaycolor = config->getString(config->displaycolor);
-        String backlightMode = config->getString(config->backlight);
-        
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
             setFlashLED(false);
         }
+#endif
+        bd = pageData.api->getBoatData();
+    };
 
-        // Logging boat values
+    // Comparator function to sort by SNR
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageSkyView");
+    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
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
         // current position
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-
-        GwApi::BoatValue *bv_lat = pageData.values[0];
-        String sv_lat = formatValue(bv_lat, *commonData).svalue;
-        //epd->setCursor(300, 40);
-        //epd->print(sv_lat);
-
-        GwApi::BoatValue *bv_lon = pageData.values[1];
-        String sv_lon = formatValue(bv_lon, *commonData).svalue;
-        //epd->setCursor(300, 60);
-        //epd->print(sv_lon);
-
-        GwApi::BoatValue *bv_hdop = pageData.values[2];
-        String sv_hdop = formatValue(bv_hdop, *commonData).svalue;
-        //epd->setCursor(300, 80);
-        //epd->print(sv_hdop);
 
         // sky view
         Point c = {130, 148};
-        uint16_t r = 125;
+        uint16_t r = 120;
         uint16_t r1 = r / 2;
 
-        epd->fillCircle(c.x, c.y, r, commonData->bgcolor);
+        getdisplay().fillCircle(c.x, c.y, r + 2, commonData->fgcolor);
-        epd->drawCircle(c.x, c.y, r + 1, commonData->fgcolor);
+        getdisplay().fillCircle(c.x, c.y, r - 1, commonData->bgcolor);
-        epd->drawCircle(c.x, c.y, r + 2, commonData->fgcolor);
+        getdisplay().drawCircle(c.x, c.y, r1, commonData->fgcolor);
-        epd->drawCircle(c.x, c.y, r1, commonData->fgcolor);
 
         // separation lines
-        epd->drawLine(c.x - r, c.y, c.x + r, c.y, commonData->fgcolor);
+        getdisplay().drawLine(c.x - r, c.y, c.x + r, c.y, commonData->fgcolor);
-        epd->drawLine(c.x, c.y - r, c.x, c.y + r, 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);
-        epd->drawLine(p1.x, p1.y, p2.x, p2.y,  commonData->fgcolor);
+        getdisplay().drawLine(p1.x, p1.y, p2.x, p2.y,  commonData->fgcolor);
         p1 = rotatePoint(c, p, -45);
         p2 = rotatePoint(c, p, -45 + 180);
-        epd->drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
+        getdisplay().drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
 
         // directions 
 
         int16_t x1, y1;
         uint16_t w, h;
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
 
-		epd->getTextBounds("N", 0, 150, &x1, &y1, &w, &h);
+		getdisplay().getTextBounds("N", 0, 150, &x1, &y1, &w, &h);
-        epd->setCursor(c.x - w / 2, c.y - r + h + 2);
+        getdisplay().setCursor(c.x - w / 2, c.y - r + h + 3);
-        epd->print("N");
+        getdisplay().print("N");
 
-		epd->getTextBounds("S", 0, 150, &x1, &y1, &w, &h);
+		getdisplay().getTextBounds("S", 0, 150, &x1, &y1, &w, &h);
-        epd->setCursor(c.x - w / 2, c.y + r - 2);
+        getdisplay().setCursor(c.x - w / 2, c.y + r - 3);
-        epd->print("S");
+        getdisplay().print("S");
 
-		epd->getTextBounds("E", 0, 150, &x1, &y1, &w, &h);
+		getdisplay().getTextBounds("E", 0, 150, &x1, &y1, &w, &h);
-        epd->setCursor(c.x + r - w - 2, c.y + h / 2);
+        getdisplay().setCursor(c.x + r - w - 3, c.y + h / 2);
-        epd->print("E");
+        getdisplay().print("E");
         
-		epd->getTextBounds("W", 0, 150, &x1, &y1, &w, &h);
+		getdisplay().getTextBounds("W", 0, 150, &x1, &y1, &w, &h);
-        epd->setCursor(c.x - r + 2 , c.y + h / 2);
+        getdisplay().setCursor(c.x - r + 3 , c.y + h / 2);
-        epd->print("W");
+        getdisplay().print("W");
-
-        // satellites
 
+        // 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
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(325, 34);
+        getdisplay().setCursor(325, 34);
-        epd->print("SNR");
+        getdisplay().print("SNR");
-        epd->drawRect(270, 20, 125, 257, commonData->fgcolor);
+//        getdisplay().drawRect(270, 20, 125, 257, commonData->fgcolor);
-        for (int i = 0; i < 12; i++) {
+        int maxsat = std::min(nSat, 12);
+        for (int i = 0; i < maxsat; i++) {
             uint16_t y = 29 + (i + 1) * 20;
-            epd->setCursor(276, y);
+            getdisplay().setCursor(276, y);
             char buffer[3];
-            snprintf(buffer, 3, "%02d", i+1);
+            snprintf(buffer, 3, "%02d", static_cast<int>(sats[i].PRN));
-            epd->print(String(buffer));
+            getdisplay().print(String(buffer));
-            epd->drawRect(305, y-12, 85, 14, commonData->fgcolor);
+            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;
     };
@@ -147,7 +197,7 @@ PageDescription registerPageSkyView(
     "SkyView",              // Page name
     createPage,             // Action
     0,                      // Number of bus values depends on selection in Web configuration
-    {"LAT", "LON", "HDOP"}, // Bus values we need in the page
+    {"SatInfo", "HDOP"},    // Bus values we need in the page
     true                    // Show display header on/off
 );
 

lib/obp60task/PageSolar.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -83,74 +82,74 @@ public:
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(10, 65);
+        getdisplay().setCursor(10, 65);
-        epd->print("Solar");
+        getdisplay().print("Solar");
 
         // Show voltage type
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 140);
+        getdisplay().setCursor(10, 140);
         int bvoltage = 0;
         if(String(batVoltage) == "12V") bvoltage = 12;
         else bvoltage = 24;
-        epd->print(bvoltage);
+        getdisplay().print(bvoltage);
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("V");
+        getdisplay().print("V");
 
         // Show solar power
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 200);
+        getdisplay().setCursor(10, 200);
-        if(solPower <= 999) epd->print(solPower, 0);
+        if(solPower <= 999) getdisplay().print(solPower, 0);
-        if(solPower > 999) epd->print(float(solPower/1000.0), 1);
+        if(solPower > 999) getdisplay().print(float(solPower/1000.0), 1);
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        if(solPower <= 999) epd->print("W");
+        if(solPower <= 999) getdisplay().print("W");
-        if(solPower > 999) epd->print("kW");
+        if(solPower > 999) getdisplay().print("kW");
 
         // Show info
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 235);
+        getdisplay().setCursor(10, 235);
-        epd->print("Installed");
+        getdisplay().print("Installed");
-        epd->setCursor(10, 255);
+        getdisplay().setCursor(10, 255);
-        epd->print("Solar Modul");
+        getdisplay().print("Solar Modul");
 
         // Show solar panel
         solarGraphic(150, 45, commonData->fgcolor, commonData->bgcolor);
 
         // Show load level in percent
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(150, 200);
+        getdisplay().setCursor(150, 200);
-        epd->print(solPercentage);
+        getdisplay().print(solPercentage);
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("%");
+        getdisplay().print("%");
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(150, 235);
+        getdisplay().setCursor(150, 235);
-        epd->print("Load");
+        getdisplay().print("Load");
 
         // Show sensor type info
         String i2cAddr = "";
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(270, 60);
+        getdisplay().setCursor(270, 60);
-        if(powerSensor == "off") epd->print("Internal");
+        if(powerSensor == "off") getdisplay().print("Internal");
         if(powerSensor == "INA219"){
-            epd->print("INA219");
+            getdisplay().print("INA219");
             i2cAddr = " (0x" + String(INA219_I2C_ADDR2, HEX) + ")";
         }
         if(powerSensor == "INA226"){
-            epd->print("INA226");
+            getdisplay().print("INA226");
             i2cAddr = " (0x" + String(INA226_I2C_ADDR2, HEX) + ")";
         }
-        epd->print(i2cAddr);
+        getdisplay().print(i2cAddr);
-        epd->setCursor(270, 80);
+        getdisplay().setCursor(270, 80);
-        epd->print("Sensor Modul");
+        getdisplay().print("Sensor Modul");
 
         // Reading bus data or using simulation data
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(260, 140);
+        getdisplay().setCursor(260, 140);
         if(simulation == true){
             if(batVoltage == "12V"){
                 value1 = 12.0;
@@ -159,46 +158,46 @@ public:
                 value1 = 24.0;
             }
             value1 += float(random(0, 5)) / 10;         // Simulation data
-            epd->print(value1,1);
+            getdisplay().print(value1,1);
         }
         else{
             // Check for valid real data, display also if hold values activated
             if(valid1 == true || holdvalues == true){
                 // Resolution switching
-                if(value1 <= 9.9) epd->print(value1, 2);
+                if(value1 <= 9.9) getdisplay().print(value1, 2);
-                if(value1 > 9.9 && value1 <= 99.9)epd->print(value1, 1);
+                if(value1 > 9.9 && value1 <= 99.9)getdisplay().print(value1, 1);
-                if(value1 > 99.9) epd->print(value1, 0);
+                if(value1 > 99.9) getdisplay().print(value1, 0);
             }
             else{
-            epd->print("---");                       // Missing bus data
+            getdisplay().print("---");                       // Missing bus data
             }
         }
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("V");
+        getdisplay().print("V");
 
         // Show actual current in A
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(260, 200);
+        getdisplay().setCursor(260, 200);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(value2 <= 9.9) epd->print(value2, 2);
+            if(value2 <= 9.9) getdisplay().print(value2, 2);
-            if(value2 > 9.9 && value2 <= 99.9)epd->print(value2, 1);
+            if(value2 > 9.9 && value2 <= 99.9)getdisplay().print(value2, 1);
-            if(value2 > 99.9) epd->print(value2, 0);
+            if(value2 > 99.9) getdisplay().print(value2, 0);
         }
-        else  epd->print("---");
+        else  getdisplay().print("---");
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("A");
+        getdisplay().print("A");
 
         // Show actual consumption in W
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(260, 260);
+        getdisplay().setCursor(260, 260);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(value3 <= 9.9) epd->print(value3, 2);
+            if(value3 <= 9.9) getdisplay().print(value3, 2);
-            if(value3 > 9.9 && value3 <= 99.9)epd->print(value3, 1);
+            if(value3 > 9.9 && value3 <= 99.9)getdisplay().print(value3, 1);
-            if(value3 > 99.9) epd->print(value3, 0);
+            if(value3 > 99.9) getdisplay().print(value3, 0);
         }
-        else  epd->print("---");
+        else  getdisplay().print("---");
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->print("W");
+        getdisplay().print("W");
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageSystem.cpp

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

lib/obp60task/PageThreeValues.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -85,46 +84,46 @@ class PageThreeValues : public Page
         //***********************************************************
 
         /// Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
         // ############### Value 1 ################
 
         // Show name
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 55);
+        getdisplay().setCursor(20, 55);
-        epd->print(name1);                           // Page name
+        getdisplay().print(name1);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 90);
+        getdisplay().setCursor(20, 90);
         if(holdvalues == false){
-            epd->print(unit1);                       // Unit
+            getdisplay().print(unit1);                       // Unit
         }
         else{
-            epd->print(unit1old);
+            getdisplay().print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(50, 90);
+            getdisplay().setCursor(50, 90);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(170, 68);
+            getdisplay().setCursor(170, 68);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-            epd->setCursor(180, 90);
+            getdisplay().setCursor(180, 90);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue1);                                     // Real value as formated string
+            getdisplay().print(svalue1);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue1old);                                  // Old value as formated string
+            getdisplay().print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -134,45 +133,45 @@ class PageThreeValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 145);
+        getdisplay().setCursor(20, 145);
-        epd->print(name2);                           // Page name
+        getdisplay().print(name2);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 180);
+        getdisplay().setCursor(20, 180);
         if(holdvalues == false){
-            epd->print(unit2);                       // Unit
+            getdisplay().print(unit2);                       // Unit
         }
         else{
-            epd->print(unit2old);
+            getdisplay().print(unit2old);
         }
 
         // Switch font if format for any values
         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(50, 180);
+            getdisplay().setCursor(50, 180);
         }
         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(170, 158);
+            getdisplay().setCursor(170, 158);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-            epd->setCursor(180, 180);
+            getdisplay().setCursor(180, 180);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue2);                                     // Real value as formated string
+            getdisplay().print(svalue2);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue2old);                                  // Old value as formated string
+            getdisplay().print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
@@ -182,45 +181,45 @@ class PageThreeValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 235);
+        getdisplay().setCursor(20, 235);
-        epd->print(name3);                           // Page name
+        getdisplay().print(name3);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 270);
+        getdisplay().setCursor(20, 270);
         if(holdvalues == false){
-            epd->print(unit3);                       // Unit
+            getdisplay().print(unit3);                       // Unit
         }
         else{
-            epd->print(unit3old);
+            getdisplay().print(unit3old);
         }
 
         // Switch font if format for any values
         if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(50, 270);
+            getdisplay().setCursor(50, 270);
         }
         else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(170, 248);
+            getdisplay().setCursor(170, 248);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
-            epd->setCursor(180, 270);
+            getdisplay().setCursor(180, 270);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue3);                                     // Real value as formated string
+            getdisplay().print(svalue3);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue3old);                                  // Old value as formated string
+            getdisplay().print(svalue3old);                                  // Old value as formated string
         }
         if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value

lib/obp60task/PageTwoValues.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -73,46 +72,46 @@ class PageTwoValues : public Page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
         // ############### Value 1 ################
 
         // Show name
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 80);
+        getdisplay().setCursor(20, 80);
-        epd->print(name1);                           // Page name
+        getdisplay().print(name1);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 130);
+        getdisplay().setCursor(20, 130);
         if(holdvalues == false){
-            epd->print(unit1);                       // Unit
+            getdisplay().print(unit1);                       // Unit
         }
         else{
-            epd->print(unit1old);
+            getdisplay().print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(50, 130);
+            getdisplay().setCursor(50, 130);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(170, 105);
+            getdisplay().setCursor(170, 105);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic42pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic42pt7b);
-            epd->setCursor(180, 130);
+            getdisplay().setCursor(180, 130);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue1);                                     // Real value as formated string
+            getdisplay().print(svalue1);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue1old);                                  // Old value as formated string
+            getdisplay().print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -122,45 +121,45 @@ class PageTwoValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        epd->fillRect(0, 145, 400, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 145, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        epd->setFont(&Ubuntu_Bold20pt8b);
+        getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(20, 190);
+        getdisplay().setCursor(20, 190);
-        epd->print(name2);                           // Page name
+        getdisplay().print(name2);                           // Page name
 
         // Show unit
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(20, 240);
+        getdisplay().setCursor(20, 240);
         if(holdvalues == false){
-            epd->print(unit2);                       // Unit
+            getdisplay().print(unit2);                       // Unit
         }
         else{
-            epd->print(unit2old);
+            getdisplay().print(unit2old);
         }
 
         // Switch font if format for any values
         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(50, 240);
+            getdisplay().setCursor(50, 240);
         }
         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(170, 215);
+            getdisplay().setCursor(170, 215);
         }
         else{
-            epd->setFont(&DSEG7Classic_BoldItalic42pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic42pt7b);
-            epd->setCursor(180, 240);
+            getdisplay().setCursor(180, 240);
         }
 
         // Show bus data
         if(holdvalues == false){
-            epd->print(svalue2);                                     // Real value as formated string
+            getdisplay().print(svalue2);                                     // Real value as formated string
         }
         else{
-            epd->print(svalue2old);                                  // Old value as formated string
+            getdisplay().print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value

lib/obp60task/PageVoltage.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -7,7 +6,6 @@
 
 class PageVoltage : public Page
 {
-private:
 bool init = false;                  // Marker for init done
 uint8_t average = 0;                // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s
 bool trend = true;                  // Trend indicator [0|1], 0=off, 1=on
@@ -17,10 +15,7 @@ private:
 public:
     PageVoltage(CommonData &common){
         commonData = &common;
-        config = commonData->config;
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageVoltage");
-        logger = commonData->logger;
-
-        logger->logDebug(GwLog::LOG,"Instantiate PageVoltage");
         if (hasFRAM) {
             average = fram.read(FRAM_VOLTAGE_AVG);
             trend = fram.read(FRAM_VOLTAGE_TREND);
@@ -28,10 +23,6 @@ public:
         }
     }
 
-    ~PageVoltage(){
-	    logger->logDebug(GwLog::LOG,"Destroy PageVoltage");
-	}
-
     virtual void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "AVG";
@@ -75,38 +66,38 @@ public:
     }
 
     void printAvg(int avg, uint16_t x, uint16_t y, bool prefix) {
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(x, y);
+        getdisplay().setCursor(x, y);
         if (prefix) {
-            epd->print("Avg: ");
+            getdisplay().print("Avg: ");
         }
         switch (average) {
             case 0:
-                epd->print("1s");
+                getdisplay().print("1s");
                 break;
             case 1:
-                epd->print("10s");
+                getdisplay().print("10s");
                 break;
             case 2:
-                epd->print("60s");
+                getdisplay().print("60s");
                 break;
             case 3:
-                epd->print("300s");
+                getdisplay().print("300s");
                 break;
             default:
-                epd->print("1s");
+                getdisplay().print("1s");
                 break;
         }
     }
 
     void printVoltageSymbol(uint16_t x, uint16_t y, uint16_t color) {
-        epd->setFont(&Ubuntu_Bold16pt8b);
+        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-        epd->setCursor(x, y);
+        getdisplay().setCursor(x, y);
-        epd->print("V");
+        getdisplay().print("V");
-        epd->fillRect(x, y + 6, 22, 3, color);
+        getdisplay().fillRect(x, y + 6, 22, 3, color);
-        epd->fillRect(x, y + 11, 6, 3, color);
+        getdisplay().fillRect(x, y + 11, 6, 3, color);
-        epd->fillRect(x + 8, y + 11, 6, 3, color);
+        getdisplay().fillRect(x + 8, y + 11, 6, 3, color);
-        epd->fillRect(x + 16, y + 11, 6, 3, color);
+        getdisplay().fillRect(x + 16, y + 11, 6, 3, color);
     }
 
     int displayPage(PageData &pageData){
@@ -202,50 +193,50 @@ public:
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
         if (mode == 'D') {
             // Display mode digital
 
             // Show name
-            epd->setTextColor(commonData->fgcolor);
+            getdisplay().setTextColor(commonData->fgcolor);
-            epd->setFont(&Ubuntu_Bold32pt8b);
+            getdisplay().setFont(&Ubuntu_Bold32pt8b);
-            epd->setCursor(20, 100);
+            getdisplay().setCursor(20, 100);
-            epd->print(name1);                           // Value name
+            getdisplay().print(name1);                           // Value name
 
             #if defined BOARD_OBP40S3 && defined LIPO_ACCU_1200 && defined VOLTAGE_SENSOR
             // Show charge status
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(185, 100);
+            getdisplay().setCursor(185, 100);
             if(commonData->data.BatteryChargeStatus == true){
-                epd->print("Charge");
+                getdisplay().print("Charge");
             }
             else{
-                epd->print("Discharge");
+                getdisplay().print("Discharge");
             }
             #endif
 
             // Show unit
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(270, 100);
+            getdisplay().setCursor(270, 100);
-            epd->print("V");
+            getdisplay().print("V");
 
             // Show battery type
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(295, 100);
+            getdisplay().setCursor(295, 100);
             #ifdef BOARD_OBP60S3
-            epd->print(batType);
+            getdisplay().print(batType);
             #endif
             #if defined BOARD_OBP40S3 && defined LIPO_ACCU_1200 && defined VOLTAGE_SENSOR
-            epd->print("LiPo");
+            getdisplay().print("LiPo");
             #endif
 
             // Show average settings
             printAvg(average, 320, 84, true);
 
             // Reading bus data or using simulation data
-            epd->setFont(&DSEG7Classic_BoldItalic60pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic60pt7b);
-            epd->setCursor(20, 240);
+            getdisplay().setCursor(20, 240);
             if(simulation == true){
                 if(batVoltage == "12V"){
                     value1 = 12.0;
@@ -254,30 +245,30 @@ public:
                     value1 = 24.0;
                 }
                 value1 += float(random(0, 5)) / 10;         // Simulation data
-                epd->print(value1,1);
+                getdisplay().print(value1,1);
             }
             else{
                 // Check for valid real data, display also if hold values activated
                 if(valid1 == true || holdvalues == true){
                     // Resolution switching
                     if(value1 < 10){
-                        epd->print(value1,2);
+                        getdisplay().print(value1,2);
                     }
                     if(value1 >= 10 && value1 < 100){
-                        epd->print(value1,1);
+                        getdisplay().print(value1,1);
                     }
                     if(value1 >= 100){
-                        epd->print(value1,0);
+                        getdisplay().print(value1,0);
                     }
                 }
                 else{
-                epd->print("---");                       // Missing bus data
+                getdisplay().print("---");                       // Missing bus data
                 }
             }
 
             // Show trend indicator
             if(trend == true){
-                epd->fillRect(315, 183, 35, 4, commonData->fgcolor);   // Draw separator
+                getdisplay().fillRect(315, 183, 35, 4, commonData->fgcolor);   // Draw separator
                 if(int(raw * 10) > int(valueTrend * 10)){
                     displayTrendHigh(320, 174, 11, commonData->fgcolor);  // Show high indicator
                 }
@@ -298,9 +289,9 @@ public:
             std::vector<Point> pts;
 
             // Instrument
-            epd->drawCircleHelper(c.x, c.y, r + 2, 0x01, commonData->fgcolor);
+            getdisplay().drawCircleHelper(c.x, c.y, r + 2, 0x01, commonData->fgcolor);
-            epd->drawCircleHelper(c.x, c.y, r + 1, 0x01, commonData->fgcolor);
+            getdisplay().drawCircleHelper(c.x, c.y, r + 1, 0x01, commonData->fgcolor);
-            epd->drawCircleHelper(c.x, c.y, r    , 0x01, commonData->fgcolor);
+            getdisplay().drawCircleHelper(c.x, c.y, r    , 0x01, commonData->fgcolor);
 
             // Scale
             // angle to voltage scale mapping
@@ -313,7 +304,7 @@ public:
                 {c.x - r + 12, c.y + 1},
                 {c.x - r, c.y + 1}
             };
-            epd->setFont(&Ubuntu_Bold10pt8b);
+            getdisplay().setFont(&Ubuntu_Bold10pt8b);
             for (int angle = 3; angle < 90; angle += 3) {
                 if (angle % 15 == 0) {
                     fillPoly4(rotatePoints(c, pts, angle), commonData->fgcolor);
@@ -323,7 +314,7 @@ public:
                 else {
                     p1 = rotatePoint(c, {c.x - r, c.y}, angle);
                     p2 = rotatePoint(c, {c.x - r + 6, c.y}, angle);
-                    epd->drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
+                    getdisplay().drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
                 }
             }
 
@@ -363,31 +354,31 @@ public:
             fillPoly4(rotatePoints(c, pts, angle), commonData->fgcolor);
 
             // base
-            epd->fillCircle(c.x, c.y, 7, commonData->fgcolor);
+            getdisplay().fillCircle(c.x, c.y, 7, commonData->fgcolor);
-            epd->fillCircle(c.x, c.y, 4, commonData->bgcolor);
+            getdisplay().fillCircle(c.x, c.y, 4, commonData->bgcolor);
 
             // Symbol
             printVoltageSymbol(40, 60, commonData->fgcolor);
 
             // Additional information at right side
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(300, 60);
+            getdisplay().setCursor(300, 60);
-            epd->print("Source:");
+            getdisplay().print("Source:");
-            epd->setCursor(300, 80);
+            getdisplay().setCursor(300, 80);
-            epd->print(name1);
+            getdisplay().print(name1);
 
-            epd->setCursor(300, 110);
+            getdisplay().setCursor(300, 110);
-            epd->print("Type:");
+            getdisplay().print("Type:");
-            epd->setCursor(300, 130);
+            getdisplay().setCursor(300, 130);
-            epd->print(batType);
+            getdisplay().print(batType);
 
-            epd->setCursor(300, 160);
+            getdisplay().setCursor(300, 160);
-            epd->print("Avg:");
+            getdisplay().print("Avg:");
             printAvg(average, 300, 180, false);
 
             // FRAM indicator
             if (hasFRAM) {
-                epd->drawXBitmap(300, 240, fram_bits, icon_width, icon_height, commonData->fgcolor);
+                getdisplay().drawXBitmap(300, 240, fram_bits, icon_width, icon_height, commonData->fgcolor);
             }
 
         }

lib/obp60task/PageWhite.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -62,19 +61,19 @@ public:
 
         // Set display in partial refresh mode
         if (mode == 'W') {
-            epd->setFullWindow();
+            getdisplay().setFullWindow();
         } else {
-            epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+            getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
         }
 
         if (mode == 'L') {
-            epd->drawXBitmap(0, 0, OBP_400x300_bits, OBP_400x300_width, OBP_400x300_height, commonData->fgcolor);
+            getdisplay().drawXBitmap(0, 0, OBP_400x300_bits, OBP_400x300_width, OBP_400x300_height, commonData->fgcolor);
         } else if (mode == 'M') {
 #ifdef BOARD_OBP60S3
-            epd->drawXBitmap(0, 0, OBP60_400x300_bits, OBP60_400x300_width, OBP60_400x300_height, commonData->fgcolor);
+            getdisplay().drawXBitmap(0, 0, OBP60_400x300_bits, OBP60_400x300_width, OBP60_400x300_height, commonData->fgcolor);
 #endif
 #ifdef BOARD_OBP40S3
-            epd->drawXBitmap(0, 0, OBP40_400x300_bits, OBP40_400x300_width, OBP40_400x300_height, commonData->fgcolor);
+            getdisplay().drawXBitmap(0, 0, OBP40_400x300_bits, OBP40_400x300_width, OBP40_400x300_height, commonData->fgcolor);
 #endif
         }
 

lib/obp60task/PageWind.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -248,8 +247,8 @@ public:
         if(key == 1){               // Mode switch
             if(mode == 'N'){
                 mode = 'L';
-            } else if (mode == 'L') {
+        //    } else if (mode == 'L') {
-                mode = 'X';
+        //        mode = 'X';
             } else {
                 mode = 'N';
             }
@@ -362,51 +361,51 @@ public:
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
 
         if (mode == 'X') {
             // Original example code with scaling circle
 
             // Show values AWS/TWS
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(20, 50);
+            getdisplay().setCursor(20, 50);
-            epd->print(name1);                       // Value name
+            getdisplay().print(name1);                       // Value name
-            epd->print(": ");
+            getdisplay().print(": ");
             if(holdvalues == false){
-                epd->print(svalue1);                     // Value
+                getdisplay().print(svalue1);                     // Value
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(unit1);                       // Unit
+                getdisplay().print(unit1);                       // Unit
             }
             else{
-                epd->print(svalue1old);                  // Value old
+                getdisplay().print(svalue1old);                  // Value old
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(unit1old);                    // Unit old
+                getdisplay().print(unit1old);                    // Unit old
             }
 
             // Show values AWD/TWD
-            epd->setFont(&Ubuntu_Bold20pt8b);
+            getdisplay().setFont(&Ubuntu_Bold20pt8b);
-            epd->setCursor(20, 260);
+            getdisplay().setCursor(20, 260);
-            epd->print(name2);                       // Value name
+            getdisplay().print(name2);                       // Value name
-            epd->print(": ");
+            getdisplay().print(": ");
             if(holdvalues == false){
-                epd->print(svalue2);                     // Value
+                getdisplay().print(svalue2);                     // Value
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(unit2);                       // Unit
+                getdisplay().print(unit2);                       // Unit
             }
             else{
-                epd->print(svalue2old);                  // Value old
+                getdisplay().print(svalue2old);                  // Value old
-                epd->print(" ");
+                getdisplay().print(" ");
-                epd->print(unit2old);                    // Unit old
+                getdisplay().print(unit2old);                    // Unit old
             }
 
             Point c = {200, 145};
 
             // Draw instrument
-            epd->fillCircle(c.x, c.y, lp + 5, commonData->fgcolor);
+            getdisplay().fillCircle(c.x, c.y, lp + 5, commonData->fgcolor);
-            epd->fillCircle(c.x, c.y, lp + 1, commonData->bgcolor);
+            getdisplay().fillCircle(c.x, c.y, lp + 1, commonData->bgcolor);
 
             // Wind pointer
             if (bvalue2->valid or simulation) {
@@ -421,7 +420,7 @@ public:
                 };
                 fillPoly4(rotatePoints(c, pts, RadToDeg(value2)), commonData->fgcolor);
             } else {
-                epd->setFont(&Ubuntu_Bold12pt8b);
+                getdisplay().setFont(&Ubuntu_Bold12pt8b);
                 drawTextCenter(c.x, c.y, "no data");
             }
 
@@ -439,7 +438,7 @@ public:
             };
             int angle;
 
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
 
             // starbord
             // text with line
@@ -454,7 +453,7 @@ public:
             for (int i = 30; i < 138; i += 6) {
                  if (i % 15 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      epd->fillCircle(p.x, p.y, 2, commonData->fgcolor);
+                      getdisplay().fillCircle(p.x, p.y, 2, commonData->fgcolor);
                  }
             }
 
@@ -471,17 +470,17 @@ public:
             for (int i = 228; i < 330; i += 6) {
                  if (i % 15 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      epd->fillCircle(p.x, p.y, 2, commonData->fgcolor);
+                      getdisplay().fillCircle(p.x, p.y, 2, commonData->fgcolor);
                  }
             }
 
             // data source
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(8, 50);
+            getdisplay().setCursor(8, 50);
             if (source == 'A') {
-                epd->print("APP");
+                getdisplay().print("APP");
             } else {
-                epd->print("TRUE");
+                getdisplay().print("TRUE");
             }
 
             // Wind pointer (angle)
@@ -501,7 +500,7 @@ public:
                     alpha *= -1;
                 }
 
-                epd->fillCircle(c.x, c.y, 8, commonData->fgcolor);
+                getdisplay().fillCircle(c.x, c.y, 8, commonData->fgcolor);
                 pts = {
                     {c.x - 1, c.y - (r - 20)},
                     {c.x + 1, c.y - (r - 20)},
@@ -509,39 +508,39 @@ public:
                     {c.x - 6, c.y + 15}
                 };
                 fillPoly4(rotatePoints(c, pts, alpha), commonData->fgcolor);
-                epd->fillCircle(c.x, c.y, 6, commonData->bgcolor);
+                getdisplay().fillCircle(c.x, c.y, 6, commonData->bgcolor);
             } else {
-                epd->setFont(&Ubuntu_Bold12pt8b);
+                getdisplay().setFont(&Ubuntu_Bold12pt8b);
                 drawTextCenter(c.x, c.y, "no data");
             }
 
             // Wind speed as decimal number
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(150, 250);
+            getdisplay().setCursor(150, 250);
             if (holdvalues == false) {
-                epd->print(svalue1);
+                getdisplay().print(svalue1);
             } else {
-                epd->print(svalue1old);
+                getdisplay().print(svalue1old);
             }
             // unit
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(220, 265);
+            getdisplay().setCursor(220, 265);
-            epd->print("kts");
+            getdisplay().print("kts");
         }
         else {
             // Normal mode
 
             // data source
-            epd->setFont(&Ubuntu_Bold12pt8b);
+            getdisplay().setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(8, 50);
+            getdisplay().setCursor(8, 50);
             if (source == 'A') {
-                epd->print("APP");
+                getdisplay().print("APP");
             } else {
-                epd->print("TRUE");
+                getdisplay().print("TRUE");
             }
 
             // draw ship front symbol (as bitmap)
-            epd->drawXBitmap(140, 30, front_bits, front_width, front_height, commonData->fgcolor);
+            getdisplay().drawXBitmap(140, 30, front_bits, front_width, front_height, commonData->fgcolor);
 
             Point c = {200, 155};
             uint16_t r = 150;
@@ -566,7 +565,7 @@ public:
             for (int i = 30; i < 150; i += 10) {
                  if (i % 30 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      epd->fillCircle(p.x, p.y, 3, commonData->fgcolor);
+                      getdisplay().fillCircle(p.x, p.y, 3, commonData->fgcolor);
                  }
             }
 
@@ -583,27 +582,27 @@ public:
             for (int i = 210; i < 340; i += 10) {
                  if (i % 30 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      epd->fillCircle(p.x, p.y, 3, commonData->fgcolor);
+                      getdisplay().fillCircle(p.x, p.y, 3, commonData->fgcolor);
                  }
             }
 
             // Wind speed as decimal number
-            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-            epd->setCursor(150, 250);
+            getdisplay().setCursor(150, 250);
             if (holdvalues == false) {
-                epd->print(svalue1);
+                getdisplay().print(svalue1);
             } else {
-                epd->print(svalue1old);
+                getdisplay().print(svalue1old);
             }
             // unit
-            epd->setFont(&Ubuntu_Bold8pt8b);
+            getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(220, 265);
+            getdisplay().setCursor(220, 265);
-            epd->print("kts");
+            getdisplay().print("kts");
 
             // Wind pointer (angle)
             if (bvalue2->valid or simulation) {
                 float alpha = RadToDeg(value2);
-                epd->fillCircle(c.x, c.y, 8, commonData->fgcolor);
+                getdisplay().fillCircle(c.x, c.y, 8, commonData->fgcolor);
                 pts = {
                     {c.x - 1, c.y - (r - 20)},
                     {c.x + 1, c.y - (r - 20)},
@@ -611,9 +610,9 @@ public:
                     {c.x - 6, c.y + 15}
                 };
                 fillPoly4(rotatePoints(c, pts, alpha), commonData->fgcolor);
-                epd->fillCircle(c.x, c.y, 6, commonData->bgcolor);
+                getdisplay().fillCircle(c.x, c.y, 6, commonData->bgcolor);
             } else {
-                epd->setFont(&Ubuntu_Bold12pt8b);
+                getdisplay().setFont(&Ubuntu_Bold12pt8b);
                 drawTextCenter(c.x, c.y, "no data");
             }
 

lib/obp60task/PageWindPlot.cpp

@@ -1,80 +1,59 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
-#include "BoatDataCalibration.h"
-#include "OBP60Extensions.h"
-#include "OBPRingBuffer.h"
 #include "Pagedata.h"
-#include <vector>
+#include "OBP60Extensions.h"
-
+#include "OBPcharts.h"
-static const double radToDeg = 180.0 / M_PI; // Conversion factor from radians to degrees
-
-// Get maximum difference of last <amount> of TWD ringbuffer values to center chart
-int getRng(const RingBuffer<int16_t>& windDirHstry, int center, size_t amount)
-{
-    int minVal = windDirHstry.getMinVal();
-    size_t count = windDirHstry.getCurrentSize();
-    //    size_t capacity = windDirHstry.getCapacity();
-    //    size_t last = windDirHstry.getLastIdx();
-
-    if (windDirHstry.isEmpty() || amount <= 0) {
-        return minVal;
-    }
-    if (amount > count)
-        amount = count;
-
-    int value = 0;
-    int rng = 0;
-    int maxRng = minVal;
-    // Start from the newest value (last) and go backwards x times
-    for (size_t i = 0; i < amount; i++) {
-        //        value = windDirHstry.get(((last - i) % capacity + capacity) % capacity);
-        value = windDirHstry.get(count - 1 - i);
-
-        if (value == minVal) {
-            continue;
-        }
-
-        value = value / 1000.0 * radToDeg;
-        rng = abs(((value - center + 540) % 360) - 180);
-        if (rng > maxRng)
-            maxRng = rng;
-    }
-    if (maxRng > 180) {
-        maxRng = 180;
-    }
-
-    return maxRng;
-}
 
 // ****************************************************************
 class PageWindPlot : public Page {
 
+private:
+    GwLog* logger;
+
+    int width; // Screen width
+    int height; // Screen height
+
     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 apparent 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 showTWS = true; // Show TWS value in chart area
+    bool useSimuData;
+    String flashLED;
+    String backlightMode;
 
 public:
     PageWindPlot(CommonData& common)
     {
         commonData = &common;
-        common.logger->logDebug(GwLog::LOG, "Instantiate PageWindPlot");
+        logger = commonData->logger;
+        LOG_DEBUG(GwLog::LOG, "Instantiate PageWindPlot");
+
+        // Get config data
+        useSimuData = common.config->getBool(common.config->useSimuData);
+        // holdValues = common.config->getBool(common.config->holdvalues);
+        flashLED = common.config->getString(common.config->flashLED);
+        backlightMode = common.config->getString(common.config->backlight);
     }
 
     virtual void setupKeys()
     {
         Page::setupKeys();
-        //        commonData->keydata[0].label = "MODE";
+        commonData->keydata[0].label = "MODE";
+#if defined BOARD_OBP60S3
+        commonData->keydata[1].label = "SRC";
+        commonData->keydata[4].label = "INTV";
+#elif defined BOARD_OBP40S3
         commonData->keydata[1].label = "INTV";
-        commonData->keydata[4].label = "TWS";
+#endif
     }
 
     // Key functions
     virtual int handleKey(int key)
     {
-        // Set chart mode TWD | TWS -> to be implemented
+        // Set chart mode TWD | TWS
         if (key == 1) {
             if (chrtMode == 'D') {
                 chrtMode = 'S';
@@ -86,26 +65,32 @@ public:
             return 0; // Commit the key
         }
 
-        // Set interval for wind history chart update time
+#if defined BOARD_OBP60S3
+        // Set data source TRUE | APP
         if (key == 2) {
+            showTruW = !showTruW;
+            return 0; // Commit the key
+        }
+
+        // Set interval for wind history chart update time (interval)
+        if (key == 5) {
+#elif defined BOARD_OBP40S3
+        if (key == 2) {
+#endif
             if (dataIntv == 1) {
                 dataIntv = 2;
             } else if (dataIntv == 2) {
                 dataIntv = 3;
             } else if (dataIntv == 3) {
                 dataIntv = 4;
+            } else if (dataIntv == 4) {
+                dataIntv = 8;
             } else {
                 dataIntv = 1;
             }
             return 0; // Commit the key
         }
 
-        // Switch TWS on/off
-        if (key == 5) {
-            showTWS = !showTWS;
-            return 0; // Commit the key
-        }
-
         // Keylock function
         if (key == 11) { // Code for keylock
             commonData->keylock = !commonData->keylock;
@@ -114,107 +99,59 @@ public:
         return key;
     }
 
+    virtual void displayNew(PageData& pageData)
+    {
+#ifdef BOARD_OBP40S3
+        String wndSrc; // Wind source true/apparent wind - preselection for OBP40
+
+        wndSrc = commonData->config->getString("page" + String(pageData.pageNumber) + "wndsrc");
+        if (wndSrc == "True wind") {
+            showTruW = true;
+        } else {
+            showTruW = false; // Wind source is apparent wind
+        }
+        LOG_DEBUG(GwLog::LOG, "New PageWindPlot; wind source=%s", wndSrc);
+#endif
+        oldShowTruW = !showTruW; // makes wind source being initialized at initial page call
+
+        width = getdisplay().width(); // Screen width
+        height = getdisplay().height(); // Screen height
+    }
+
     int displayPage(PageData& pageData)
     {
         GwConfigHandler* config = commonData->config;
-        GwLog* logger = commonData->logger;
 
-        float twsValue; // TWS value in chart area
+        static RingBuffer<uint16_t>* wdHstry; // Wind direction data buffer
-        static String twdName, twdUnit; // TWD name and unit
+        static RingBuffer<uint16_t>* wsHstry; // Wind speed data buffer
-        static int updFreq; // Update frequency for TWD
+        static String wdName, wdFormat; // Wind direction name and format
-        static int16_t twdLowest, twdHighest; // TWD range
+        static String wsName, wsFormat; // Wind speed name and format
-        // static int16_t twdBufMinVal; // lowest possible twd buffer value; used for non-set data
 
-        // current boat data values; TWD only for validation test, TWS for display of current value
+        // Separate chart objects for true wind and apparent wind
-        const int numBoatData = 2;
+        static std::unique_ptr<Chart<uint16_t>> twdFlChart, awdFlChart; // chart object for wind direction chart, full size
-        GwApi::BoatValue* bvalue;
+        static std::unique_ptr<Chart<uint16_t>> twsFlChart, awsFlChart; // chart object for wind speed chart, full size
-        String BDataName[numBoatData];
+        static std::unique_ptr<Chart<uint16_t>> twdHfChart, awdHfChart; // chart object for wind direction chart, half size
-        double BDataValue[numBoatData];
+        static std::unique_ptr<Chart<uint16_t>> twsHfChart, awsHfChart; // chart object for wind speed chart, half size
-        bool BDataValid[numBoatData];
+        // Pointers to the currently active charts
-        String BDataText[numBoatData];
+        static Chart<uint16_t>* wdFlChart;
-        String BDataUnit[numBoatData];
+        static Chart<uint16_t>* wsFlChart;
-        String BDataFormat[numBoatData];
+        static Chart<uint16_t>* wdHfChart;
+        static Chart<uint16_t>* wsHfChart;
 
-        static bool isInitialized = false; // Flag to indicate that page is initialized
+        static GwApi::BoatValue* wdBVal = new GwApi::BoatValue("TWD"); // temp BoatValue for wind direction unit identification; required by OBP60Formater
-        static bool wndDataValid = false; // Flag to indicate if wind data is valid
+        static GwApi::BoatValue* wsBVal = new GwApi::BoatValue("TWS"); // temp BoatValue for wind speed unit identification; required by OBP60Formater */
-        static int numNoData; // Counter for multiple invalid data values in a row
+        double dfltRngWd = 60.0 * DEG_TO_RAD; // default range for course chart from min to max value in RAD
-        static bool simulation = false;
+        double dfltRngWs = 7.5; // default range for wind speed chart from min to max value in m/s
-        static bool holdValues = false;
 
-        static int width; // Screen width
+        const int numBoatData = 4;
-        static int height; // Screen height
+        GwApi::BoatValue* bvalue[numBoatData]; // current boat data values
-        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 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
-        static int bufStart; // 1st data value in buffer to show
-        int numAddedBufVals; // Number of values added to buffer since last display
-        size_t currIdx; // Current index in TWD history buffer
-        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 int wndCenter; // chart wind center value position
+        LOG_DEBUG(GwLog::LOG, "Display PageWindPlot");
-        static int wndLeft; // chart wind left value position
+        ulong pageTime = millis();
-        static int wndRight; // chart wind right value position
-        static int chrtRng; // Range of wind values from mid wind value to min/max wind value in degrees
-        int diffRng; // Difference between mid and current wind value
-        static const int dfltRng = 40; // Default range for chart
-        int midWndDir; // New value for wndCenter after chart start / shift
-        static int simTwd; // Simulation value for TWD
-        static float simTws; // Simulation value for TWS
 
-        int x, y; // x and y coordinates for drawing
+        // read boat data values
-        static int prevX, prevY; // Last x and y coordinates for drawing
-        static float chrtScl; // Scale for wind values in pixels per degree
-        int chrtVal; // Current wind value
-        static int chrtPrevVal; // Last wind value in chart area for check if value crosses 180 degree line
-
-        LOG_DEBUG(GwLog::LOG, "Display page WindPlot");
-
-        // Get config data
-        simulation = config->getBool(config->useSimuData);
-        holdValues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-
-        if (!isInitialized) {
-            width = epd->width();
-            height = epd->height();
-            xCenter = width / 2;
-            cHeight = height - yOffset - 22;
-            bufSize = pageData.boatHstry.twdHstry->getCapacity();
-            numNoData = 0;
-            simTwd = pageData.boatHstry.twdHstry->getLast() / 1000.0 * radToDeg;
-            simTws = 0;
-            twsValue = 0;
-            bufStart = 0;
-            oldDataIntv = 0;
-            numAddedBufVals, currIdx, lastIdx = 0;
-            lastAddedIdx = pageData.boatHstry.twdHstry->getLastIdx();
-            pageData.boatHstry.twdHstry->getMetaData(twdName, twdUnit, updFreq, twdLowest, twdHighest);
-            wndCenter = INT_MIN;
-            midWndDir = 0;
-            diffRng = dfltRng;
-            chrtRng = dfltRng;
-
-            isInitialized = true; // Set flag to indicate that page is now initialized
-        }
-
-        // 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];
+            bvalue[i] = 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)
@@ -223,257 +160,106 @@ public:
             setFlashLED(false);
         }
 
-        // Identify buffer size and buffer start position for chart
+        if (showTruW != oldShowTruW) {
-        count = pageData.boatHstry.twdHstry->getCurrentSize();
+            if (!twdFlChart) { // Create true wind charts if they don't exist
-        currIdx = pageData.boatHstry.twdHstry->getLastIdx();
-        numAddedBufVals = (currIdx - lastAddedIdx + bufSize) % bufSize; // Number of values added to buffer since last display
-        if (dataIntv != oldDataIntv || count == 1) {
-            // new data interval selected by user
-            intvBufSize = cHeight * dataIntv;
-            numWndVals = min(count, (cHeight - 60) * dataIntv);
-            bufStart = max(0, count - numWndVals);
-            lastAddedIdx = currIdx;
-            oldDataIntv = dataIntv;
-        } else {
-            numWndVals = numWndVals + numAddedBufVals;
-            lastAddedIdx = currIdx;
-            if (count == bufSize) {
-                bufStart = max(0, bufStart - numAddedBufVals);
-            }
-        }
-        LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Dataset: count: %d, TWD: %.0f, TWS: %.1f, TWD_valid? %d, intvBufSize: %d, numWndVals: %d, bufStart: %d, numAddedBufVals: %d, lastIdx: %d, old: %d, act: %d",
-            count, pageData.boatHstry.twdHstry->getLast() / 1000.0 * radToDeg, pageData.boatHstry.twsHstry->getLast() / 10.0 * 1.94384, BDataValid[0],
-            intvBufSize, numWndVals, bufStart, numAddedBufVals, pageData.boatHstry.twdHstry->getLastIdx(), oldDataIntv, dataIntv);
 
-        // Set wndCenter from 1st real buffer value
+                LOG_DEBUG(GwLog::DEBUG, "PageWindPlot: Creating true wind charts");
-        if (wndCenter == INT_MIN || (wndCenter == 0 && count == 1)) {
+                auto* twdHstry = pageData.boatHstry->hstryBufList.twdHstry;
-            midWndDir = pageData.boatHstry.twdHstry->getMid(numWndVals);
+                auto* twsHstry = pageData.boatHstry->hstryBufList.twsHstry;
-            if (midWndDir != INT16_MIN) {
+                // LOG_DEBUG(GwLog::DEBUG,"History Buffer addresses PageWindPlot: twdBuf: %p, twsBuf: %p", (void*)pageData.boatHstry->hstryBufList.twdHstry,
-                midWndDir = midWndDir / 1000.0 * radToDeg;
+                //     (void*)pageData.boatHstry->hstryBufList.twsHstry);
-                wndCenter = int((midWndDir + (midWndDir >= 0 ? 5 : -5)) / 10) * 10; // Set new center value; round to nearest 10 degree value
+
+                twdFlChart = std::unique_ptr<Chart<uint16_t>>(new Chart<uint16_t>(*twdHstry, 1, 0, dfltRngWd, *commonData, useSimuData));
+                twsFlChart = std::unique_ptr<Chart<uint16_t>>(new Chart<uint16_t>(*twsHstry, 0, 0, dfltRngWs, *commonData, useSimuData));
+                twdHfChart = std::unique_ptr<Chart<uint16_t>>(new Chart<uint16_t>(*twdHstry, 1, 1, dfltRngWd, *commonData, useSimuData));
+                twsHfChart = std::unique_ptr<Chart<uint16_t>>(new Chart<uint16_t>(*twsHstry, 1, 2, dfltRngWs, *commonData, useSimuData));
+                // twdHfChart = std::unique_ptr<Chart<uint16_t>>(new Chart<uint16_t>(*twdHstry, 0, 1, dfltRngWd, *commonData, useSimuData));
+                // twsHfChart = std::unique_ptr<Chart<uint16_t>>(new Chart<uint16_t>(*twsHstry, 0, 2, dfltRngWs, *commonData, useSimuData));
+                // LOG_DEBUG(GwLog::DEBUG, "PageWindPlot: twdHstry: %p, twsHstry: %p", (void*)twdHstry, (void*)twsHstry);
+            }
+
+            if (!awdFlChart) { // Create apparent wind charts if they don't exist
+                LOG_DEBUG(GwLog::DEBUG, "PageWindPlot: Creating apparent wind charts");
+                auto* awdHstry = pageData.boatHstry->hstryBufList.awdHstry;
+                auto* awsHstry = pageData.boatHstry->hstryBufList.awsHstry;
+
+                awdFlChart = std::unique_ptr<Chart<uint16_t>>(new Chart<uint16_t>(*awdHstry, 1, 0, dfltRngWd, *commonData, useSimuData));
+                awsFlChart = std::unique_ptr<Chart<uint16_t>>(new Chart<uint16_t>(*awsHstry, 0, 0, dfltRngWs, *commonData, useSimuData));
+                awdHfChart = std::unique_ptr<Chart<uint16_t>>(new Chart<uint16_t>(*awdHstry, 1, 1, dfltRngWd, *commonData, useSimuData));
+                awsHfChart = std::unique_ptr<Chart<uint16_t>>(new Chart<uint16_t>(*awsHstry, 1, 2, dfltRngWs, *commonData, useSimuData));
+            }
+            
+            // Switch active charts based on showTruW
+            if (showTruW) {
+                wdHstry = pageData.boatHstry->hstryBufList.twdHstry;
+                wsHstry = pageData.boatHstry->hstryBufList.twsHstry;
+                wdFlChart = twdFlChart.get();
+                wsFlChart = twsFlChart.get();
+                wdHfChart = twdHfChart.get();
+                wsHfChart = twsHfChart.get();
             } else {
-                wndCenter = 0;
+                wdHstry = pageData.boatHstry->hstryBufList.awdHstry;
+                wsHstry = pageData.boatHstry->hstryBufList.awsHstry;
+                wdFlChart = awdFlChart.get();
+                wsFlChart = awsFlChart.get();
+                wdHfChart = awdHfChart.get();
+                wsHfChart = awsHfChart.get();
             }
-            LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Range Init: count: %d, TWD: %.0f, wndCenter: %d, diffRng: %d, chrtRng: %d", count, pageData.boatHstry.twdHstry->getLast() / 1000.0 * radToDeg,
+            
-                wndCenter, diffRng, chrtRng);
+            wdHstry->getMetaData(wdName, wdFormat);
-        } else {
+            wsHstry->getMetaData(wsName, wsFormat);
-            // check and adjust range between left, center, and right chart limit
+            
-            diffRng = getRng(*pageData.boatHstry.twdHstry, wndCenter, numWndVals);
+            oldShowTruW = showTruW;
-            diffRng = (diffRng == INT16_MIN ? 0 : diffRng);
-            if (diffRng > chrtRng) {
-                chrtRng = int((diffRng + (diffRng >= 0 ? 9 : -1)) / 10) * 10; // Round up to next 10 degree value
-            } else if (diffRng + 10 < chrtRng) { // Reduce chart range for higher resolution if possible
-                chrtRng = max(dfltRng, int((diffRng + (diffRng >= 0 ? 9 : -1)) / 10) * 10);
         }
-        }
-        chrtScl = float(width) / float(chrtRng) / 2.0; // Chart scale: pixels per degree
-        wndLeft = wndCenter - chrtRng;
-        if (wndLeft < 0)
-            wndLeft += 360;
-        wndRight = (chrtRng < 180 ? wndCenter + chrtRng : wndCenter + chrtRng - 1);
-        if (wndRight >= 360)
-            wndRight -= 360;
 
         // Draw page
-        //***********************************************************************
+        //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, width, height); // Set partial update
+        getdisplay().setPartialWindow(0, 0, width, height); // Set partial update
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
-        // chart lines
+        if (chrtMode == 'D') {
-        epd->fillRect(0, yOffset, width, 2, commonData->fgcolor);
+            wdBVal->value = wdHstry->getLast();
-        epd->fillRect(xCenter, yOffset, 1, cHeight, commonData->fgcolor);
+            wdBVal->valid = wdBVal->value != wdHstry->getMaxVal();
+            wdFlChart->showChrt(dataIntv, *bvalue[0]);
 
-        // chart labels
+        } else if (chrtMode == 'S') {
-        char sWndLbl[4]; // char buffer for Wind angle label
+            wsBVal->value = wsHstry->getLast();
-        epd->setFont(&Ubuntu_Bold12pt8b);
+            wsBVal->valid = wsBVal->value != wsHstry->getMaxVal();
-        epd->setCursor(xCenter - 88, yOffset - 3);
+            wsFlChart->showChrt(dataIntv, *bvalue[1]);
-        epd->print("TWD"); // Wind data name
-        snprintf(sWndLbl, 4, "%03d", (wndCenter < 0) ? (wndCenter + 360) : wndCenter);
-        drawTextCenter(xCenter, yOffset - 11, sWndLbl);
-        epd->drawCircle(xCenter + 25, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
-        epd->drawCircle(xCenter + 25, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
-        epd->setCursor(1, yOffset - 3);
-        snprintf(sWndLbl, 4, "%03d", (wndLeft < 0) ? (wndLeft + 360) : wndLeft);
-        epd->print(sWndLbl); // Wind left value
-        epd->drawCircle(46, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
-        epd->drawCircle(46, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
-        epd->setCursor(width - 50, yOffset - 3);
-        snprintf(sWndLbl, 4, "%03d", (wndRight < 0) ? (wndRight + 360) : wndRight);
-        epd->print(sWndLbl); // Wind right value
-        epd->drawCircle(width - 5, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
-        epd->drawCircle(width - 5, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
 
-        if (pageData.boatHstry.twdHstry->getMax() == pageData.boatHstry.twdHstry->getMinVal()) {
+        } else if (chrtMode == 'B') {
-            // only <INT16_MIN> values in buffer -> no valid wind data available
+            wdBVal->value = wdHstry->getLast();
-            wndDataValid = false;
+            wdBVal->valid = wdBVal->value != wdHstry->getMaxVal();
-        } else if (!BDataValid[0]) {
+            wsBVal->value = wsHstry->getLast();
-            // currently no valid TWD data available
+            wsBVal->valid = wsBVal->value != wsHstry->getMaxVal();
-            numNoData++;
+            LOG_DEBUG(GwLog::DEBUG, "PageWindPlot showChrt: wsBVal.name: %s, format: %s, wsBVal.value: %.1f, valid: %d, address: %p", wsBVal->getName(), wsBVal->getFormat(), wsBVal->value,
-            wndDataValid = true;
+                wsBVal->valid, wsBVal);
-            if (numNoData > 3) {
+            wdHfChart->showChrt(dataIntv, *bvalue[0]);
-                // If more than 4 invalid values in a row, send message
+            wsHfChart->showChrt(dataIntv, *bvalue[1]);
-                wndDataValid = false;
-            }
-        } else {
-            numNoData = 0; // reset data error counter
-            wndDataValid = true; // At least some wind data available
-        }
-        // Draw wind values in chart
-        //***********************************************************************
-        if (wndDataValid) {
-            for (int i = 0; i < (numWndVals / dataIntv); i++) {
-                chrtVal = static_cast<int>(pageData.boatHstry.twdHstry->get(bufStart + (i * dataIntv))); // show the latest wind values in buffer; keep 1st value constant in a rolling buffer
-                if (chrtVal == INT16_MIN) {
-                    chrtPrevVal = INT16_MIN;
-                } else {
-                    chrtVal = static_cast<int>((chrtVal / 1000.0 * radToDeg) + 0.5); // Convert to degrees and round
-                    x = ((chrtVal - wndLeft + 360) % 360) * chrtScl;
-                    y = yOffset + cHeight - i; // Position in chart area
-
-//                    if (i >= (numWndVals / dataIntv) - 10)
-                    if (i >= (numWndVals / dataIntv) - 1)
-                        LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Chart: i: %d, chrtVal: %d, bufStart: %d, count: %d, linesToShow: %d", i, chrtVal, bufStart, count, (numWndVals / dataIntv));
-
-                    if ((i == 0) || (chrtPrevVal == INT16_MIN)) {
-                        // just a dot for 1st chart point or after some invalid values
-                        prevX = x;
-                        prevY = y;
-                    } else {
-                        // cross borders check; shift values to [-180..0..180]; when crossing borders, range is 2x 180 degrees
-                        int wndLeftDlt = -180 - ((wndLeft >= 180) ? (wndLeft - 360) : wndLeft);
-                        int chrtVal180 = ((chrtVal + wndLeftDlt + 180) % 360 + 360) % 360 - 180;
-                        int chrtPrevVal180 = ((chrtPrevVal + wndLeftDlt + 180) % 360 + 360) % 360 - 180;
-                        if (((chrtPrevVal180 >= -180) && (chrtPrevVal180 < -90) && (chrtVal180 > 90)) || ((chrtPrevVal180 <= 179) && (chrtPrevVal180 > 90) && chrtVal180 <= -90)) {
-                            // If current value crosses chart borders compared to previous value, split line
-                            int xSplit = (((chrtPrevVal180 > 0 ? wndRight : wndLeft) - wndLeft + 360) % 360) * chrtScl;
-                            epd->drawLine(prevX, prevY, xSplit, y, commonData->fgcolor);
-                            epd->drawLine(prevX, prevY - 1, ((xSplit != prevX) ? xSplit : xSplit - 1), ((xSplit != prevX) ? y - 1 : y), commonData->fgcolor);
-                            prevX = (((chrtVal180 > 0 ? wndRight : wndLeft) - wndLeft + 360) % 360) * chrtScl;
-                        }
-                    }
-
-                    // Draw line with 2 pixels width + make sure vertical line are drawn correctly
-                    epd->drawLine(prevX, prevY, x, y, commonData->fgcolor);
-                    epd->drawLine(prevX, prevY - 1, ((x != prevX) ? x : x - 1), ((x != prevX) ? y - 1 : y), commonData->fgcolor);
-                    chrtPrevVal = chrtVal;
-                    prevX = x;
-                    prevY = y;
-                }
-                // Reaching chart area top end
-                if (i >= (cHeight - 1)) {
-                    oldDataIntv = 0; // force reset of buffer start and number of values to show in next display loop
-
-                    int minWndDir = pageData.boatHstry.twdHstry->getMin(numWndVals) / 1000.0 * radToDeg;
-                    int maxWndDir = pageData.boatHstry.twdHstry->getMax(numWndVals) / 1000.0 * radToDeg;
-                    LOG_DEBUG(GwLog::DEBUG, "PageWindPlot FreeTop: Minimum: %d, Maximum: %d, OldwndCenter: %d", minWndDir, maxWndDir, wndCenter);
-//                    if ((minWndDir + 540 >= wndCenter + 540) || (maxWndDir + 540 <= wndCenter + 540)) {
-                    if (((minWndDir - wndCenter >= 0) && (minWndDir - wndCenter < 180)) || ((maxWndDir - wndCenter <= 0) && (maxWndDir - wndCenter >=180))) {
-                        // Check if all wind value are left or right of center value -> optimize chart range
-                        midWndDir = pageData.boatHstry.twdHstry->getMid(numWndVals) / 1000.0 * radToDeg;
-                        if (midWndDir != INT16_MIN) {
-                            wndCenter = int((midWndDir + (midWndDir >= 0 ? 5 : -5)) / 10) * 10; // Set new center value; round to nearest 10 degree value
-                        }
-                    }
-                    LOG_DEBUG(GwLog::DEBUG, "PageWindPlot FreeTop: cHeight: %d, bufStart: %d, numWndVals: %d, wndCenter: %d", cHeight, bufStart, numWndVals, wndCenter);
-                    break;
-                }
-            }
-
-        } else {
-            // No valid data available
-            LOG_DEBUG(GwLog::LOG, "PageWindPlot: No valid data available");
-            epd->setFont(&Ubuntu_Bold10pt8b);
-            epd->fillRect(xCenter - 33, height / 2 - 20, 66, 24, commonData->bgcolor); // Clear area for message
-            drawTextCenter(xCenter, height / 2 - 10, "No data");
-        }
-
-        // Print TWS value
-        if (showTWS) {
-            int currentZone;
-            static int lastZone = 0;
-            static bool flipTws = false;
-            int xPosTws;
-            static const int yPosTws = yOffset + 40;
-
-            twsValue = pageData.boatHstry.twsHstry->getLast() / 10.0 * 1.94384; // TWS value in knots
-
-            xPosTws = flipTws ? 20 : width - 138;
-            currentZone = (y >= yPosTws - 38) && (y <= yPosTws + 6) && (x >= xPosTws - 4) && (x <= xPosTws + 146) ? 1 : 0; // Define current zone for TWS value
-            if (currentZone != lastZone) {
-                // Only flip when x moves to a different zone
-                if ((y >= yPosTws - 38) && (y <= yPosTws + 6) && (x >= xPosTws - 4) && (x <= xPosTws + 146)) {
-                    flipTws = !flipTws;
-                    xPosTws = flipTws ? 20 : width - 145;
-                }
-            }
-            lastZone = currentZone;
-
-            epd->fillRect(xPosTws - 4, yPosTws - 38, 142, 44, commonData->bgcolor); // Clear area for TWS value
-            epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
-            epd->setCursor(xPosTws, yPosTws);
-            if (!BDataValid[1]) {
-                epd->print("--.-");
-            } else {
-                double dbl = BDataValue[1] * 3.6 / 1.852;
-                if (dbl < 10.0) {
-                    epd->printf("!%3.1f", dbl); // Value, round to 1 decimal
-                } else {
-                    epd->printf("%4.1f", dbl); // Value, round to 1 decimal
-                }
-            }
-            epd->setFont(&Ubuntu_Bold12pt8b);
-            epd->setCursor(xPosTws + 82, yPosTws - 14);
-//            epd->print("TWS"); // Name
-            epd->print(BDataName[1]); // Name
-            epd->setFont(&Ubuntu_Bold8pt8b);
-//            epd->setCursor(xPosTws + 78, yPosTws + 1);
-            epd->setCursor(xPosTws + 82, yPosTws + 1);
-//            epd->printf(" kn"); // Unit
-            epd->print(BDataUnit[1]); // Unit
-        }
-
-        // chart Y axis labels; print at last to overwrite potential chart lines in label area
-        int yPos;
-        int chrtLbl;
-        epd->setFont(&Ubuntu_Bold8pt8b);
-        for (int i = 1; i <= 3; i++) {
-            yPos = yOffset + (i * 60);
-            epd->fillRect(0, yPos, width, 1, commonData->fgcolor);
-            epd->fillRect(0, yPos - 8, 24, 16, commonData->bgcolor); // Clear small area to remove potential chart lines
-            epd->setCursor(1, yPos + 4);
-            if (count >= intvBufSize) {
-                // Calculate minute value for label
-                chrtLbl = ((i - 1 + (prevY < yOffset + 30)) * dataIntv) * -1; // change label if last data point is more than 30 lines (= seconds) from chart line
-            } else {
-                int j = 3 - i;
-                chrtLbl = (int((((numWndVals / dataIntv) - 50) * dataIntv / 60) + 1) - (j * dataIntv)) * -1; // 50 lines left below last chart line
-            }
-            epd->printf("%3d", chrtLbl); // Wind value label
         }
 
+        LOG_DEBUG(GwLog::LOG, "PageWindPlot: page time %ldms", millis() - pageTime);
         return PAGE_UPDATE;
-    };
+    }
 };
 
 static Page* createPage(CommonData& common)
 {
     return new PageWindPlot(common);
 }
-/**
+
- * with the code below we make this page known to the PageTask
+/* with the code below we make this page known to the PageTask
  * we give it a type (name) that can be selected in the config
  * we define which function is to be called
  * and we provide the number of user parameters we expect (0 here)
- * and will will provide the names of the fixed values we need
+ * and will will provide the names of the fixed values we need */
- */
 PageDescription registerPageWindPlot(
     "WindPlot", // Page name
     createPage, // Action
     0, // Number of bus values depends on selection in Web configuration
-    { "TWD", "TWS" }, // Bus values we need in the page
+    { "TWD", "TWS", "AWD", "AWS" }, // Bus values we need in the page
-//    {}, // Bus values we need in the page
     true // Show display header on/off
 );
 

lib/obp60task/PageWindRose.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -148,87 +147,87 @@ public:
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // Show values AWA
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 65);
+        getdisplay().setCursor(10, 65);
-        epd->print(svalue1);                     // Value
+        getdisplay().print(svalue1);                     // Value
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 95);
+        getdisplay().setCursor(10, 95);
-        epd->print(name1);                       // Name
+        getdisplay().print(name1);                       // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 115);
+        getdisplay().setCursor(10, 115);
-        epd->print(" ");
+        getdisplay().print(" ");
         if(holdvalues == false){
-            epd->print(unit1);                   // Unit
+            getdisplay().print(unit1);                   // Unit
         }
         else{
-            epd->print(unit1old);                // Unit
+            getdisplay().print(unit1old);                // Unit
         }
 
         // Horizintal separator left
-        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
 
         // Show values AWS
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 270);
+        getdisplay().setCursor(10, 270);
-        epd->print(svalue2);                     // Value
+        getdisplay().print(svalue2);                     // Value
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 220);
+        getdisplay().setCursor(10, 220);
-        epd->print(name2);                       // Name
+        getdisplay().print(name2);                       // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 190);
+        getdisplay().setCursor(10, 190);
-        epd->print(" ");
+        getdisplay().print(" ");
         if(holdvalues == false){
-            epd->print(unit2);                   // Unit
+            getdisplay().print(unit2);                   // Unit
         }
         else{
-            epd->print(unit2old);                // Unit
+            getdisplay().print(unit2old);                // Unit
         }
 
         // Show values TWD
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(295, 65);
+        getdisplay().setCursor(295, 65);
         if(valid3 == true){
-            epd->print(abs(value3 * 180 / PI), 0);   // Value
+            getdisplay().print(abs(value3 * 180 / PI), 0);   // Value
         }
         else{
-            epd->print("---");                   // Value
+            getdisplay().print("---");                   // Value
         }
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(335, 95);
+        getdisplay().setCursor(335, 95);
-        epd->print(name3);                       // Name
+        getdisplay().print(name3);                       // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(335, 115);
+        getdisplay().setCursor(335, 115);
-        epd->print(" ");
+        getdisplay().print(" ");
         if(holdvalues == false){
-            epd->print(unit3);                   // Unit
+            getdisplay().print(unit3);                   // Unit
         }
         else{
-            epd->print(unit3old);                // Unit
+            getdisplay().print(unit3old);                // Unit
         }
 
         // Horizintal separator right
-        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
+        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
 
         // Show values TWS
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(295, 270);
+        getdisplay().setCursor(295, 270);
-        epd->print(svalue4);                     // Value
+        getdisplay().print(svalue4);                     // Value
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(335, 220);
+        getdisplay().setCursor(335, 220);
-        epd->print(name4);                       // Name
+        getdisplay().print(name4);                       // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(335, 190);
+        getdisplay().setCursor(335, 190);
-        epd->print(" ");
+        getdisplay().print(" ");
         if(holdvalues == false){
-            epd->print(unit4);                   // Unit
+            getdisplay().print(unit4);                   // Unit
         }
         else{  
-            epd->print(unit4old);                // Unit
+            getdisplay().print(unit4old);                // Unit
         }
 
 //*******************************************************************************************
@@ -237,10 +236,10 @@ public:
         int rInstrument = 110;     // Radius of grafic instrument
         float pi = 3.141592;
 
-        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
-        epd->fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
+        getdisplay().fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
-        epd->fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
+        getdisplay().fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
 
         for(int i=0; i<360; i=i+10)
         {
@@ -268,17 +267,17 @@ public:
             // Print text centered on position x, y
             int16_t x1, y1;     // Return values of getTextBounds
             uint16_t w, h;      // Return values of getTextBounds
-            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            epd->setCursor(x-w/2, y+h/2);
+            getdisplay().setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                epd->setFont(&Ubuntu_Bold8pt8b);
+                getdisplay().setFont(&Ubuntu_Bold8pt8b);
-                epd->print(ii);
+                getdisplay().print(ii);
             }
 
             // Draw sub scale with dots
             float x1c = 200 + rInstrument*sin(i/180.0*pi);
             float y1c = 150 - rInstrument*cos(i/180.0*pi);
-            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
             float sinx=sin(i/180.0*pi);
             float cosx=cos(i/180.0*pi); 
 
@@ -289,10 +288,10 @@ public:
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),
                         200+(int)(cosx*xx2-sinx*yy2),150+(int)(sinx*xx2+cosx*yy2),commonData->fgcolor);
             }
@@ -309,7 +308,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument-15); 
-            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -319,43 +318,43 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument-15);
             float iy2 = -endwidth;
-            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
 
         // Center circle
-        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
 
 //*******************************************************************************************
 
         // Show values DBT
-        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-        epd->setCursor(160, 200);
+        getdisplay().setCursor(160, 200);
-        epd->print(svalue5);                     // Value
+        getdisplay().print(svalue5);                     // Value
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(190, 215);
+        getdisplay().setCursor(190, 215);
-        epd->print(" ");
+        getdisplay().print(" ");
         if(holdvalues == false){
-            epd->print(unit5);                   // Unit
+            getdisplay().print(unit5);                   // Unit
         }
         else{  
-            epd->print(unit5old);                // Unit
+            getdisplay().print(unit5old);                // Unit
         }
 
         // Show values STW
-        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-        epd->setCursor(160, 130);
+        getdisplay().setCursor(160, 130);
-        epd->print(svalue6);                     // Value
+        getdisplay().print(svalue6);                     // Value
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(190, 90);
+        getdisplay().setCursor(190, 90);
-        epd->print(" ");
+        getdisplay().print(" ");
         if(holdvalues == false){
-            epd->print(unit6);                   // Unit
+            getdisplay().print(unit6);                   // Unit
         }
         else{  
-            epd->print(unit6old);                // Unit
+            getdisplay().print(unit6old);                // Unit
         }
 
         return PAGE_UPDATE;

lib/obp60task/PageWindRoseFlex.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -8,15 +7,30 @@
 class PageWindRoseFlex : public Page
 {
 int16_t lp = 80;                    // Pointer length
+char source = 'A';		    // data source (A)pparent | (T)rue
 
 public:
     PageWindRoseFlex(CommonData &common){
         commonData = &common;
         common.logger->logDebug(GwLog::LOG,"Instantiate PageWindRoseFlex");
     }
+    virtual void setupKeys(){
+        Page::setupKeys();
+        commonData->keydata[1].label = "SRC";
+    }
 
     // Key functions
     virtual int handleKey(int key){
+	if(key == 2){ 
+	 // Code for set source 
+	    if(source == 'A'){ 
+		    source = 'T'; 
+	    } else { 
+		    source = 'A'; 
+	    } 
+	   } 
+	return key;               // Commit the key
+
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -41,6 +55,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);
@@ -49,14 +68,20 @@ public:
         String flashLED = config->getString(config->flashLED);
         String backlightMode = config->getString(config->backlight);
 
-        // Get boat values #1
+	GwApi::BoatValue *bvalue1; // Value 1 for angle
-        GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
+        GwApi::BoatValue *bvalue2; // Value 2 for speed
-        String name1 = xdrDelete(bvalue1->getName());   // Value name
+
+	// Get boat value for wind angle (AWA/TWA), shown by pointer
+        if (source == 'A') {
+            bvalue1 = pageData.values[4];
+        } else {
+            bvalue1 = pageData.values[6];
+        }
+        String name1 = bvalue1->getName().c_str();      // Value name
         name1 = name1.substring(0, 6);                  // String length limit for value name
         calibrationData.calibrateInstance(bvalue1, logger); // Check if boat data value is to be calibrated
         double value1 = bvalue1->value;                 // Value as double in SI unit
         bool valid1 = bvalue1->valid;                   // Valid information
-        value1 = formatValue(bvalue1, *commonData).value;// Format only nesaccery for simulation data for pointer
         String svalue1 = formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
         String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
 	if(valid1 == true){
@@ -64,13 +89,20 @@ public:
             unit1old = unit1;                           // Save old unit
         }
 
-        // Get boat values #2
+	// Get boat value for wind speed (AWS/TWS), shown in top left corner
-        GwApi::BoatValue *bvalue2 = pageData.values[1]; // Second element in list
+        if (source == 'A') {
-        String name2 = xdrDelete(bvalue2->getName());   // Value name
+            bvalue2 =pageData.values[5];
+        } else {
+            bvalue2 = pageData.values[7];
+        }
+        String name2 = bvalue2->getName().c_str();      // Value name
         name2 = name2.substring(0, 6);                  // String length limit for value name
         calibrationData.calibrateInstance(bvalue2, logger); // Check if boat data value is to be calibrated
         double value2 = bvalue2->value;                 // Value as double in SI unit
         bool valid2 = bvalue2->valid;                   // Valid information
+        if (simulation) {
+            value2 = 0.62731; // some random value
+        }
         String svalue2 = formatValue(bvalue2, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
         String unit2 = formatValue(bvalue2, *commonData).unit;        // Unit of value
 	if(valid2 == true){
@@ -78,10 +110,18 @@ public:
             unit2old = unit2;                           // Save old unit
         }
 
-        // Get boat values #3
+
-        GwApi::BoatValue *bvalue3 = pageData.values[2]; // Third element in list
+
+        // Get boat value for bottom left  corner
+        GwApi::BoatValue *bvalue3 = pageData.values[0]; 
         String name3 = xdrDelete(bvalue3->getName());   // Value name
         name3 = name3.substring(0, 6);                  // String length limit for value name
+        if (name3.length()>3){
+            name3font=Ubuntu_Bold8pt8b;
+        }
+        else{
+            name3font=Ubuntu_Bold12pt8b;
+        }
         calibrationData.calibrateInstance(bvalue3, logger); // Check if boat data value is to be calibrated
         double value3 = bvalue3->value;                 // Value as double in SI unit
         bool valid3 = bvalue3->valid;                   // Valid information 
@@ -92,10 +132,16 @@ public:
             unit3old = unit3;                           // Save old unit
         }
 
-        // Get boat values #4
+        // Get boat value  for top right corner
-        GwApi::BoatValue *bvalue4 = pageData.values[3]; // Fourth element in list
+        GwApi::BoatValue *bvalue4 = pageData.values[1]; 
         String name4 = xdrDelete(bvalue4->getName());      // Value name
         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 
@@ -106,10 +152,16 @@ public:
             unit4old = unit4;                           // Save old unit
         }
 
-        // Get boat values #5
+        // Get boat value bottom right corner
-        GwApi::BoatValue *bvalue5 = pageData.values[4]; // Fifth element in list
+        GwApi::BoatValue *bvalue5 = pageData.values[2]; 
         String name5 = xdrDelete(bvalue5->getName());      // Value name
         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 
@@ -120,10 +172,16 @@ public:
             unit5old = unit5;                           // Save old unit
         }
 
-        // Get boat values #5
+        // Get boat value for center (name is not displayed)
-        GwApi::BoatValue *bvalue6 = pageData.values[5]; // Sixth element in list
+        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 
@@ -134,6 +192,7 @@ public:
             unit6old = unit6;                           // Save old unit
         }
 
+
         // Optical warning by limit violation (unused)
         if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
@@ -148,88 +207,82 @@ public:
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
-        // Show value 2 at position of value 1 (top left)
+        // Show AWS or TWS top left
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 65);
+        getdisplay().setCursor(10, 65);
-        epd->print(svalue2);                     // Value
+        getdisplay().print(svalue2);                     // Value
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(10, 95);
+        getdisplay().setCursor(10, 95);
-        epd->print(name2);                       // Name
+        getdisplay().print(name2);                       // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 115);
+        getdisplay().setCursor(10, 115);
-        epd->print(" ");
+        getdisplay().print(" ");
         if(holdvalues == false){
-            epd->print(unit2);                   // Unit
+            getdisplay().print(unit2);                   // Unit
         }
         else{
-            epd->print(unit2old);                // Unit
+            getdisplay().print(unit2old);                // Unit
         }
 
         // Horizintal separator left
-        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
+        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
 
-        // Show value 3 at bottom left
+        // Show value 3 (=first user-configured parameter) at bottom left
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(10, 270);
+        getdisplay().setCursor(10, 270);
-        epd->print(svalue3);                     // Value
+        getdisplay().print(svalue3);                     // Value
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&name3font);
-        epd->setCursor(10, 220);
+        getdisplay().setCursor(10, 220);
-        epd->print(name3);                       // Name
+        getdisplay().print(name3);                       // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(10, 190);
+        getdisplay().setCursor(10, 190);
-        epd->print(" ");
+        getdisplay().print(" ");
         if(holdvalues == false){
-            epd->print(unit3);                   // Unit
+            getdisplay().print(unit3);                   // Unit
         }
         else{
-            epd->print(unit3old);                // Unit
+            getdisplay().print(unit3old);                // Unit
         }
 
-        // Show value 4 at top right
+        // Show value 4 (=second user-configured parameter) at top right
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(295, 65);
+        getdisplay().setCursor(295, 65); 
-        if(valid3 == true){
+        getdisplay().print(svalue4);     // Value
-           // epd->print(abs(value3 * 180 / M_PI), 0); // Value
+        getdisplay().setFont(&name4font);
-            epd->print(svalue4);     // Value
+        getdisplay().setCursor(325, 95);
-        }
+        getdisplay().print(name4);                       // Name
-        else{
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->print("---");                   // Value
+        getdisplay().setCursor(325, 115);
-        }
+        getdisplay().print(" ");
-        epd->setFont(&Ubuntu_Bold12pt8b);
-        epd->setCursor(335, 95);
-        epd->print(name4);                       // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(335, 115);
-        epd->print(" ");
         if(holdvalues == false){
-            epd->print(unit4);                   // Unit
+            getdisplay().print(unit4);                   // Unit
         }
         else{
-            epd->print(unit4old);                // Unit
+            getdisplay().print(unit4old);                // Unit
         }
 
         // Horizintal separator right
-        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
+        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
 
-        // Show value 5 at bottom right
+        // Show value 5 (=third user-configured parameter) at bottom right
-        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
-        epd->setCursor(295, 270);
+        getdisplay().setCursor(295, 270);
-        epd->print(svalue5);                     // Value
+        getdisplay().print(svalue5);                     // Value
-        epd->setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setFont(&name5font);
-        epd->setCursor(335, 220);
+        getdisplay().setCursor(325, 220);
-        epd->print(name5);                       // Name
+        getdisplay().print(name5);                       // Name
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(335, 190);
+        getdisplay().setCursor(325, 190);
-        epd->print(" ");
+        getdisplay().print(" ");
         if(holdvalues == false){
-            epd->print(unit5);                   // Unit
+            getdisplay().print(unit5);                   // Unit
         }
         else{
-            epd->print(unit5old);                // Unit
+            getdisplay().print(unit5old);                // Unit
         }
 
 
@@ -238,10 +291,10 @@ public:
         // Draw wind rose
         int rInstrument = 110;     // Radius of grafic instrument
 
-        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
-        epd->fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
+        getdisplay().fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
-        epd->fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
+        getdisplay().fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
 
         for(int i=0; i<360; i=i+10)
         {
@@ -268,17 +321,17 @@ public:
             // Print text centered on position x, y
             int16_t x1, y1;     // Return values of getTextBounds
             uint16_t w, h;      // Return values of getTextBounds
-            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            epd->setCursor(x-w/2, y+h/2);
+            getdisplay().setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                epd->setFont(&Ubuntu_Bold8pt8b);
+                getdisplay().setFont(&Ubuntu_Bold8pt8b);
-                epd->print(ii);
+                getdisplay().print(ii);
             }
 
             // Draw sub scale with dots
             float x1c = 200 + rInstrument*sin(i/180.0*M_PI);
             float y1c = 150 - rInstrument*cos(i/180.0*M_PI);
-            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
             float sinx=sin(i/180.0*M_PI);
             float cosx=cos(i/180.0*M_PI);
 
@@ -289,10 +342,10 @@ public:
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),
                         200+(int)(cosx*xx2-sinx*yy2),150+(int)(sinx*xx2+cosx*yy2),commonData->fgcolor);
             }
@@ -309,7 +362,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument-15);
-            epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                 200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                 200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2),commonData->fgcolor);
             // Inverted pointer
@@ -319,36 +372,57 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument-15);
             float iy2 = -endwidth;
-            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
 
         // Center circle
-        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 8, commonData->bgcolor);
-        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->fgcolor);
+        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->bgcolor);
+    	getdisplay().setFont(&Ubuntu_Bold10pt8b);
+    	if (source=='A'){
+		getdisplay().setCursor(193, 155);
+	}
+	else {
+		getdisplay().setCursor(195, 156);
+	}
+    	getdisplay().print({source}); 
+
 
 //*******************************************************************************************
 
-        // Show value6, so that it does not collide with the wind pointer
+	// Show value6 (=fourth user-configured parameter) 
-        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
 if ( cos(value1) > 0){ 
-            epd->setCursor(160, 200);
+    //pointer points upwards 
-            epd->print(svalue6);                     // Value
+    getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-            epd->setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setCursor(160, 200);
-            epd->setCursor(190, 215);
+    getdisplay().print(svalue6);                     // Value
-        } else{
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(160, 130);
+    getdisplay().setCursor(190, 215);
-            epd->print(svalue6);                     // Value
+    getdisplay().print(" ");
-            epd->setFont(&Ubuntu_Bold8pt8b);
-            epd->setCursor(190, 90);
-        }
-        epd->print(" ");
     if(holdvalues == false){
-            epd->print(unit6);                   // Unit
+        getdisplay().print(unit6);                   // Unit
     }
     else{  
-            epd->print(unit6old);                // Unit
+        getdisplay().print(unit6old);                // Unit
+    }
+}
+else{ 
+    // pointer points downwards
+    getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+    getdisplay().setCursor(160, 130);
+    getdisplay().print(svalue6);                     // Value
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setCursor(190, 90);
+    getdisplay().print(" ");
+    if(holdvalues == false){
+        getdisplay().print(unit6);                   // Unit
+    }
+    else{  
+        getdisplay().print(unit6old);                // Unit
+    }
 }
 
         return PAGE_UPDATE;
@@ -362,13 +436,14 @@ static Page *createPage(CommonData &common){
  * with the code below we make this page known to the PageTask
  * we give it a type (name) that can be selected in the config
  * we define which function is to be called
- * and we provide the number of user parameters we expect (0 here)
+ * and we provide the number of user parameters we expect (4 here)
  * and will will provide the names of the fixed values we need
  */
 PageDescription registerPageWindRoseFlex(
     "WindRoseFlex", // Page name
     createPage,     // Action
-    6,              // Number of bus values depends on selection in Web configuration; was zero
+    4,              // Number of bus values depends on selection in Web configuration
+    {"AWA", "AWS", "TWA", "TWS"},    // fixed  values we need in the page. They are inserted AFTER the web-configured values.	
     true            // Show display header on/off
 );
 

lib/obp60task/PageXTETrack.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -46,14 +45,14 @@ class PageXTETrack : public Page
        if (fill == true) {
            // no primitive for quadrangular object
            // we create it from 2 triangles
-           epd->fillTriangle(x0, y0, x1, y1, x3, y3, color);
+           getdisplay().fillTriangle(x0, y0, x1, y1, x3, y3, color);
-           epd->fillTriangle(x1, y1, x2, y2, x3, y3, color);
+           getdisplay().fillTriangle(x1, y1, x2, y2, x3, y3, color);
        } else {
            // draw outline
-           epd->drawLine(x0, y0, x1, y1, color);
+           getdisplay().drawLine(x0, y0, x1, y1, color);
-           epd->drawLine(x1, y1, x2, y2, color);
+           getdisplay().drawLine(x1, y1, x2, y2, color);
-           epd->drawLine(x2, y2, x3, y3, color);
+           getdisplay().drawLine(x2, y2, x3, y3, color);
-           epd->drawLine(x3, y3, x0, y0, color);
+           getdisplay().drawLine(x3, y3, x0, y0, color);
        }
     }
 
@@ -90,57 +89,57 @@ class PageXTETrack : public Page
         //***********************************************************
 
         // Set display in partial refresh mode
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
 
-        epd->setTextColor(commonData->fgcolor);
+        getdisplay().setTextColor(commonData->fgcolor);
 
         // descriptions
-        epd->setFont(&Ubuntu_Bold8pt8b);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(50, 188);
+        getdisplay().setCursor(50, 188);
-        epd->print("Cross-track error");
+        getdisplay().print("Cross-track error");
-        epd->setCursor(270, 188);
+        getdisplay().setCursor(270, 188);
-        epd->print("Track");
+        getdisplay().print("Track");
-        epd->setCursor(45, 275);
+        getdisplay().setCursor(45, 275);
-        epd->print("Distance to waypoint");
+        getdisplay().print("Distance to waypoint");
-        epd->setCursor(260, 275);
+        getdisplay().setCursor(260, 275);
-        epd->print("Bearing");
+        getdisplay().print("Bearing");
 
         // values
-        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
+        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
 
         int16_t  x, y;
         uint16_t w, h;
 
         GwApi::BoatValue *bv_xte = pageData.values[0]; // XTE
         String sval_xte = formatValue(bv_xte, *commonData).svalue;
-        epd->getTextBounds(sval_xte, 0, 0, &x, &y, &w, &h);
+        getdisplay().getTextBounds(sval_xte, 0, 0, &x, &y, &w, &h);
-        epd->setCursor(160-w, 170);
+        getdisplay().setCursor(160-w, 170);
-        epd->print(sval_xte);
+        getdisplay().print(sval_xte);
 
         GwApi::BoatValue *bv_cog = pageData.values[1]; // COG
         String sval_cog = formatValue(bv_cog, *commonData).svalue;
-        epd->getTextBounds(sval_cog, 0, 0, &x, &y, &w, &h);
+        getdisplay().getTextBounds(sval_cog, 0, 0, &x, &y, &w, &h);
-        epd->setCursor(360-w, 170);
+        getdisplay().setCursor(360-w, 170);
-        epd->print(sval_cog);
+        getdisplay().print(sval_cog);
 
         GwApi::BoatValue *bv_dtw = pageData.values[2]; // DTW
         String sval_dtw = formatValue(bv_dtw, *commonData).svalue;
-        epd->getTextBounds(sval_dtw, 0, 0, &x, &y, &w, &h);
+        getdisplay().getTextBounds(sval_dtw, 0, 0, &x, &y, &w, &h);
-        epd->setCursor(160-w, 257);
+        getdisplay().setCursor(160-w, 257);
-        epd->print(sval_dtw);
+        getdisplay().print(sval_dtw);
 
         GwApi::BoatValue *bv_btw = pageData.values[3]; // BTW
         String sval_btw = formatValue(bv_btw, *commonData).svalue;
-        epd->getTextBounds(sval_btw, 0, 0, &x, &y, &w, &h);
+        getdisplay().getTextBounds(sval_btw, 0, 0, &x, &y, &w, &h);
-        epd->setCursor(360-w, 257);
+        getdisplay().setCursor(360-w, 257);
-        epd->print(sval_btw);
+        getdisplay().print(sval_btw);
 
         bool valid = bv_cog->valid && bv_btw->valid;
 
         // XTETrack view
 
         // draw ship symbol (as bitmap)
-        epd->drawXBitmap(184, 68, ship_bits, ship_width, ship_height, commonData->fgcolor);
+        getdisplay().drawXBitmap(184, 68, ship_bits, ship_width, ship_height, commonData->fgcolor);
 
         // draw next waypoint name
         String sval_wpname = "no data";
@@ -149,13 +148,13 @@ class PageXTETrack : public Page
             sval_wpname = "Tonne 122";
         }
 
-        epd->setFont(&Ubuntu_Bold10pt8b);
+        getdisplay().setFont(&Ubuntu_Bold10pt8b);
-        epd->getTextBounds(sval_wpname, 0, 150, &x, &y, &w, &h);
+        getdisplay().getTextBounds(sval_wpname, 0, 150, &x, &y, &w, &h);
         // TODO if text don't fix use smaller font size.
         // if smallest size does not fit use 2 lines
         // last resort: clip with ellipsis
-        epd->setCursor(200 - w / 2, 60);
+        getdisplay().setCursor(200 - w / 2, 60);
-        epd->print(sval_wpname);
+        getdisplay().print(sval_wpname);
 
         // draw course segments
 

lib/obp60task/Pagedata.h

@@ -1,12 +1,9 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
 #pragma once
 #include <Arduino.h>
 #include "GwApi.h"
 #include <functional>
 #include <vector>
 #include "LedSpiTask.h"
-#include "OBPRingBuffer.h"
 #include "OBPDataOperations.h"
 
 #define MAX_PAGE_NUMBER 10    // Max number of pages for show data
@@ -14,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)
@@ -100,22 +98,17 @@ typedef struct{
     uint8_t length_sec; // seconds until alarm disappeares without user interaction
 } AlarmData;
 
-typedef struct{
-    int voltage = 0;
-} AvgData;
-
 typedef struct{
     GwApi::Status status;
-  GwLog *logger=NULL;
+    GwLog *logger = nullptr;
-  GwConfigHandler *config=NULL;
+    GwConfigHandler *config = nullptr;
     SensorData data;
     SunData sundata;
     TouchKeyData keydata[6];
     BacklightData backlight;
     AlarmData alarm;
-  AvgData avgdata;
+    GwApi::BoatValue *time = nullptr;
-  GwApi::BoatValue *time=NULL;
+    GwApi::BoatValue *date = nullptr;
-  GwApi::BoatValue *date=NULL;
     uint16_t fgcolor;
     uint16_t bgcolor;
     bool keylock = false;
@@ -126,12 +119,11 @@ typedef struct{
 class Page{
   protected:
     CommonData *commonData;
-    GwConfigHandler *config;
-    GwLog *logger;
   public:
     int refreshtime = 1000;
     virtual int displayPage(PageData &pageData)=0;
     virtual void displayNew(PageData &pageData){}
+    virtual void leavePage(PageData &pageData){}
     virtual void setupKeys() {
 #ifdef HARDWARE_V21
         commonData->keydata[0].label = "";
@@ -190,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
@@ -203,9 +195,10 @@ String formatLongitude(double lon);
 
 // Structure for formatted boat values
 typedef struct{
-  double value;
+  double value; // SI value of boat data value
-  String svalue;
+  double cvalue; // value converted to target unit
-  String unit;
+  String svalue; // value converted to target unit and formatted
+  String unit; // target value unit
 } FormattedData;
 
 // Formatter for boat values

lib/obp60task/README

@@ -1,82 +0,0 @@
-Development information
-=======================
-
-This file contains some hints concerning building the firmware as well as
-developing and debugging it.
-
-
-Git commands
-------------
-Some useful commands are
-
-git status
-git fetch upstream
-git diff --name-status upstream/master
-git checkout upstream/master platformio.ini
-
-# how to reset my Repo to match norbert's status
-
-git remote add upstream https://github.com/norbert-walter/esp32-nmea2000-obp60
-git fetch upstream
-git checkout master
-git reset --hard upstream/master  
-git push origin master --force
-
-
-New pages
----------
-To create a new page for OBP60 the following steps are necessary:
-
-  1. Create a page under /lib/obp60task/PageXXXX.cpp
-  2. Set page name in PageXXXX.cpp on file name
-  3. Register new page in /lib/obp60task/obp60task.cpp in function
-     'registerAllPages'
-  4. Add new page in /lib/obp60task/config.json for each page type or add 
-     new page to gen_set.py and run it to auto-generate the relevant 
-     section of config.json
-  5. Copy the changes in config.json to config_obp40.json and rename
-     strings accordingly. E.g. obp60 to obp40.
-
- 
-Using Gitpod
-------------
-
-Open web page:
-https://gitpod.io/#https://github.com/norbert-walter/esp32-nmea2000-obp60/tree/master/lib/obp60task
-
-Input in terminal:
-cd /workspace/esp32-nmea2000-obp60
-bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_installing_tools
-bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_obp60_s3
-bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_obp40_s3
-
-Compile result for OBP60:
-/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/bootloader.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/firmware.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/partitions.bin
-
-/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-all.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-dev<yyyymmdd>-all.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-dev<yyyymmdd>-update.bin
-
-/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-all.bin, ready to flash to offset 0x0000
-
-Compile result for OBP40 (CrowPanel 4.2):
-
-/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/bootloader.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/firmware.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/partitions.bin
-
-/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-all.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-dev<yyyymmdd>-all.bin
-/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-dev<yyyymmdd>-update.bin
-
-/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-all.bin, ready to flash to offset 0x0000
-
-
-Debugging tool
---------------
-
-log.txt = text file with error messages from terminal console
-
-tools/decoder.py -p ESP32S3 -t ~/.platformio/packages/toolchain-xtensa-esp32s3/ -e .pio/build/obp60_s3/firmware.elf log.txt

lib/obp60task/Using_Gitpod.txt

@@ -0,0 +1,38 @@
+Using Gitpod
+############
+
+Open web page:
+https://gitpod.io/#https://github.com/norbert-walter/esp32-nmea2000-obp60/tree/master/lib/obp60task
+
+Input in terminal:
+cd /workspace/esp32-nmea2000-obp60
+bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_installing_tools
+bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_obp60_s3
+bash /workspace/esp32-nmea2000-obp60/lib/obp60task/run_obp40_s3
+
+Compile result for OBP60
+########################
+
+/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/bootloader.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/firmware.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/partitions.bin
+
+/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-all.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-dev20231220-all.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-dev20231220-update.bin
+
+/workspace/esp32-nmea2000-obp60/.pio/build/obp60_s3/obp60_s3-all.bin, ready to flash to offset 0x0000
+
+Compile result for OBP40 (CrowPanel 4.2)
+########################################
+
+/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/bootloader.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/firmware.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/partitions.bin
+
+/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-all.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-dev20231220-all.bin
+/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-dev20231220-update.bin
+
+/workspace/esp32-nmea2000-obp60/.pio/build/obp40_s3/obp40_s3-all.bin, ready to flash to offset 0x0000
+

lib/obp60task/debugging.txt

@@ -0,0 +1,6 @@
+Debugging tool
+##############
+
+log.txt = text file with error messages from terminal console
+
+tools/decoder.py -p ESP32S3 -t ~/.platformio/packages/toolchain-xtensa-esp32s3/ -e .pio/build/obp60_s3/firmware.elf log.txt

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 };

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,13 +115,12 @@ 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}",
+                "category": category,
-                "capabilities": {device.lower(): "true"},
+                "capabilities": capabilities,
-                "condition": [
+                "condition": { 
-                    {f"page{page_no}type": page}
+                    f"page{page_no}type": [ p for p in pages if pagedata[p] >= field_no ]
-                    for page in pages
+                    ,"visiblePages": visiblepages
-                    if pagedata[page] >= field_no
+                }
-                ],
             }
             output.append(field_data)
 
@@ -133,14 +139,35 @@ def create_json(device, no_of_pages, pagedata):
                 {"l":"Fuel Gasoline (6)","v":"6"}
             ],
             "description": "Fluid type in tank",
-            "category": f"{device.upper()} Page {page_no}",
+            "category": category,
-            "capabilities": {
+            "capabilities": capabilities,
-                device.lower(): "true"
+            "condition": {
-            },
+                f"page{page_no}type": "Fluid",
-            "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",
+                    "Apparent 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():
@@ -149,13 +176,12 @@ def usage():
     print("Command line options")
     print(" -d --device     device name to use e.g. obp60")
     print(" -p --pages      number of pages to create")
-    print(" -m --merge      json with device config to merge to")
     print(" -h              show this help")
     print()
 
 if __name__ == '__main__':
     try:
-        options, remainder = getopt.getopt(sys.argv[1:], 'd:p:m:', ['device=','--pages=','--merge'])
+        options, remainder = getopt.getopt(sys.argv[1:], 'd:p:', ['device=','--pages='])
     except getopt.GetoptError as err:
         print(err)
         usage()
@@ -163,14 +189,11 @@ if __name__ == '__main__':
 
     device = "obp60"
     no_of_pages = 10
-    merge_json = None
     for opt, arg in options:
         if opt in ('-d', '--device'):
             device = arg
         elif opt in ('-p', '--pages'):
             no_of_pages = int(arg)
-        elif opt in ('-m', '--merge'):
-            merge_json = arg
         elif opt == '-h':
             usage()
             sys.exit(0)
@@ -179,12 +202,5 @@ if __name__ == '__main__':
     pagedata = detect_pages("obp60task.cpp")
 
     json_output = create_json(device, no_of_pages, pagedata)
-    if merge_json and os.path.isfile(merge_json):
-        with open(merge_json, 'r') as fh:
-            device_json = json.load(fh)
-        page_json = json.loads(json_output)
-        device_json.extend(page_json)
-        print(json.dumps(device_json, indent=4))
-    else:
     # print omitting first line containing [  of JSON array
     print(json_output[1:])

lib/obp60task/git_commands.txt

@@ -0,0 +1,12 @@
+git status
+git fetch upstream
+git diff --name-status upstream/master
+git checkout upstream/master platformio.ini
+
+# how to reset my Repo to match norbert'status
+
+git remote add upstream https://github.com/norbert-walter/esp32-nmea2000-obp60
+git fetch upstream
+git checkout master
+git reset --hard upstream/master  
+git push origin master --force

lib/obp60task/index.js

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

lib/obp60task/obp40.conf

@@ -1,807 +0,0 @@
-[DEFAULT]
-calibration_fields = AWA, AWS, COG, DBT, HDM, PRPOS, RPOS, SOG, STW, TWA, TWS, TWD, WTemp
-
-[deviceName]
-label = system name
-type = string
-default = OBP40
-description = system name, used for the access point and for services
-check = checkSystemName
-category = system
-
-[timeServer]
-label = time server
-type = string
-default = pool.ntp.org
-description = NTP time server. Use only one hostname or IP address
-category = wifi client
-capabilities = obp40:true
-
-[timeZone]
-label = Time Zone
-type = number
-default = 0.00
-description = Time zone [UTC -12...+14]
-check = checkMinMax
-min = -12.0
-max = 14.0
-category = OBP40 Settings
-capabilities = obp40:true
-
-[homeLAT]
-label = Home latitude
-type = number
-default = 0.00000
-description = Latitude of boat home location [-90.0...+90.0]
-check = checkMinMax
-min = -90.0
-max = 90.0
-category = OBP40 Settings
-capabilities = obp40:true
-
-[homeLON]
-label = Home longitude
-type = number
-default = 0.00000
-description = Longitude of boat home location [-180.0...+180.0]
-check = checkMinMax
-min = -180.0
-max = 180.0
-category = OBP40 Settings
-capabilities = obp40:true
-
-[draft]
-label = Boat Draft [m]
-type = number
-default = 0.00
-description = The draft of the boat [0...50m]
-check = checkMinMax
-min = 0.0
-max = 50.0
-category = OBP40 Settings
-capabilities = obp40:true
-
-[chainLength]
-label = Anchor Chain Length [m]
-type = number
-default = 0
-description = The length of the anchor chain [0...255m]
-check = checkMinMax
-min = 0
-max = 255
-category = OBP40 Settings
-capabilities = obp40:true
-
-[fuelTank]
-label = Fuel Tank [l]
-type = number
-default = 0
-description = Fuel tank capacity [0...5000l]
-check = checkMinMax
-min = 0
-max = 5000
-category = OBP40 Settings
-capabilities = obp40:true
-
-[fuelConsumption]
-label = Fuel Consuption [l/h]
-type = number
-default = 0.00
-description = Medium fuel consumption [0...1000l/h]
-check = checkMinMax
-min = 0.0
-max = 1000.0
-category = OBP40 Settings
-capabilities = obp40:true
-
-[waterTank]
-label = Water Tank [l]
-type = number
-default = 0
-description = Water tank capacity [0...5000l]
-check = checkMinMax
-min = 0
-max = 5000
-category = OBP40 Settings
-capabilities = obp40:true
-
-[wasteTank]
-label = Waste Tank [l]
-type = number
-default = 0
-description = Waste tank capacity [0...5000l]
-check = checkMinMax
-min = 0
-max = 5000
-category = OBP40 Settings
-capabilities = obp40:true
-
-[batteryVoltage]
-label = Battery Voltage [V]
-type = list
-default = 12V
-description = Battery Voltage [12V|24V]
-list = 12V, 24V
-category = OBP40 Settings
-capabilities = obp40:true
-
-[batteryType]
-label = Battery Type
-type = list
-default = Pb
-description = Type of battery [Pb|Gel|AGM|LiFePo4]
-list = Pb, Gel, AGM, LiFePo4
-category = OBP40 Settings
-capabilities = obp40:true
-
-[batteryCapacity]
-label = Battery Capacity [Ah]
-type = number
-default = 0.0
-description = Battery capacity [0...10000Ah]
-check = checkMinMax
-min = 0.0
-max = 10000.0
-category = OBP40 Settings
-capabilities = obp40:true
-
-[solarPower]
-label = Solar Power [W]
-type = number
-default = 0.0
-description = Solar power [0...10000W]
-check = checkMinMax
-min = 0.0
-max = 10000.0
-category = OBP40 Settings
-capabilities = obp40:true
-
-[genPower]
-label = Genarator Power [W]
-type = number
-default = 0.0
-description = Generator power [0...10000W]
-check = checkMinMax
-min = 0.0
-max = 10000.0
-category = OBP40 Settings
-capabilities = obp40:true
-
-[trackStep]
-label = angle [deg]
-type = number
-default = 3.0
-description = track step offset [1...12deg]
-check = checkMinMax
-min = 1.0
-max = 12.0
-category = OBP40 Settings
-capabilities = obp40:true
-
-[calcTrueWnds]
-label = Calculate True Wind
-type = boolean
-default = false
-description = If not available, calculate true wind data from appearant wind and other boat data
-category = OBP40 Settings
-capabilities = obp40:true
-
-[lengthFormat]
-label = Length Format
-type = list
-default = m
-description = Length format [m|ft]
-list = m, ft
-category = OBP40 Units
-capabilities = obp40:true
-
-[distanceFormat]
-label = Distance Format
-type = list
-default = nm
-description = Distance format [m|km|nm]
-list = m, km, nm
-category = OBP40 Units
-capabilities = obp40:true
-
-[speedFormat]
-label = Speed Format
-type = list
-default = kn
-description = Distance format [m/s|km/h|kn]
-list = m/s, km/h, kn
-category = OBP40 Units
-capabilities = obp40:true
-
-[windspeedFormat]
-label = Wind Speed Format
-type = list
-default = kn
-description = Wind speed format [m/s|km/h|kn|bft]
-list = m/s, km/h, kn, bft
-category = OBP40 Units
-capabilities = obp40:true
-
-[tempFormat]
-label = Temperature Format
-type = list
-default = C
-description = Temperature format [K|C|F]
-list = K, C, F
-category = OBP40 Units
-capabilities = obp40:true
-
-[dateFormat]
-label = Date Format
-type = list
-default = DE
-description = Date format [DE|GB|US|ISO] DE: 31.12.2022, GB: 31/12/2022, US: 12/31/2022, ISO: 2022-12-31
-list = DE, GB, US, ISO
-category = OBP40 Units
-capabilities = obp40:true
-
-[cpuSpeed]
-label = CPU Speed [MHz]
-type = list
-default = 160
-description = CPU speed in MHz [80|160|240]
-list = 80, 160, 240
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[useRTC]
-label = RTC Modul
-type = list
-default = off
-description = Use RTC module type [off|DS1388]
-list = off, DS1388
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[useGPS]
-label = GPS Sensor
-type = list
-default = off
-description = Use internal GPS module type [off|NEO-6M|NEO-M8N|ATGM336H]
-list = off, NEO-6M, NEO-M8N, ATGM336H
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[hdopAccuracy]
-label = HDOP Accuracy [m]
-type = number
-default = 20
-description = HDOP ccuracy in m for a valid GPS signal [1...50]
-check = checkMinMax
-min = 1
-max = 50
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[useEnvSensor]
-label = Env. Sensor
-type = list
-default = off
-description = Use internal or external environment sensor via I2C bus [off|BME280|BMP280|BMP180|BMP085|HTU21|SHT21]
-list = off, BME280, BMP280, BMP180, BMP085, HTU21, SHT21
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[usePowSensor1]
-label = Battery Sensor
-type = list
-default = off
-description = Use external power management sensor via I2C bus for battery [off|INA219|INA226|]
-list = off, INA219, INA226
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[shunt1]
-label = Battery Shunt
-type = list
-default = 10
-description = Shunt current value [10A|50A|100A|200A|300A|400A|500A]
-list = 10, 50, 100, 200, 300, 400, 500
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[usePowSensor2]
-label = Solar Sensor
-type = list
-default = off
-description = Use external power management sensor via I2C bus for solar panels [off|INA219|INA226|]
-list = off, INA219, INA226
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[shunt2]
-label = Solar Shunt
-type = list
-default = 10
-description = Shunt current value [10A|50A|100A|200A|300A|400A|500A]
-list = 10, 50, 100, 200, 300, 400, 500
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[usePowSensor3]
-label = Gen. Sensor
-type = list
-default = off
-description = Use external power management sensor via I2C bus for generator [off|INA219|INA226|]
-list = off, INA219, INA226
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[shunt3]
-label = Gen. Shunt
-type = list
-default = 10
-description = Shunt current value [10A|50A|100A|200A|300A|400A|500A] @ 75mV
-list = 10, 50, 100, 200, 300, 400, 500
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[useRotSensor]
-label = Rot. Sensor
-type = list
-default = off
-description = Use external rotation sensor via I2C bus [off|AS5600]
-list = off, AS5600
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[rotFunction]
-label = Rot. Function
-type = list
-default = off
-description = Function for rotation sensor [off|Rudder|Wind|Mast|Keel|Trim|Boom]
-list = off, Rudder, Wind, Mast, Keel, Trim, Boom
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[rotOffset]
-label = Rot. Offset
-type = number
-default = 0
-description = Offset for rotation sensor [-180°...+180°]
-check = checkMinMax
-min = -180
-max = 180
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[rollLimit]
-label = Roll Limit
-type = number
-default = 25
-description = Limit violation for roll angle [-90°...+90°]
-check = checkMinMax
-min = -90
-max = 90
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[rollOffset]
-label = Roll Offset
-type = number
-default = 0
-description = Roll offset angle [-45°...+45°]
-check = checkMinMax
-min = -45
-max = 45
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[pitchOffset]
-label = Pitch Offset
-type = number
-default = 0
-description = Pitch offset angle [-45°...+45°]
-check = checkMinMax
-min = -45
-max = 45
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[useTempSensor]
-label = Temp. Sensor
-type = boolean
-default = off
-description = Use max. 8 external 1Wire devices [off|DS18B20]
-list = off, DS18B20
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[useSDCard]
-label = SD Card
-type = boolean
-default = false
-description = Use internal SD card interface [off|on]
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[powerMode]
-label = Power Mode
-type = list
-default = Max Power
-description = Settings for power mode
-list = Max Power, Only 5.0V, Min Power
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[underVoltage]
-label = Undervoltage
-type = boolean
-default = false
-description = Switch off device if LiPo voltage drops below 3.65V [on|off]
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[useSimuData]
-label = Simulation Data
-type = boolean
-default = false
-description = Use simulation data when bus data are missing [on|off]
-category = OBP40 Hardware
-capabilities = obp40:true
-
-[tSensitivity]
-label = Touch Sensitivity [%%]
-type = number
-default = 100
-description = Touch sensitivity [0...100%%] for sensor buttons
-check = checkMinMax
-min = 0
-max = 100
-category = OBP40 Calibrations
-capabilities = obp40:false
-
-[vOffset]
-label = VSensor Offset
-type = number
-default = -1.00
-description = Offset for internal voltage sensor (ESP32)
-category = OBP40 Calibrations
-capabilities = obp40:true
-
-[vSlope]
-label = VSensor Slope
-type = number
-default = 1.00
-description = Slope for internal voltage sensor (ESP32)
-category = OBP40 Calibrations
-capabilities = obp40:true
-
-[calInstance1]
-label = Calibration Data Instance 1
-type = list
-default = ---
-description = Data instance for calibration
-list = ---, %(calibration_fields)s
-category = OBP40 Calibrations
-capabilities = obp40:true
-
-[calOffset1]
-label = Data Instance 1 Calibration Offset
-type = number
-default = 0.00
-description = Offset for data instance 1
-category = OBP40 Calibrations
-capabilities = obp40:true
-condition = calInstance1 IN %(calibration_fields)s
-
-[calSlope1]
-label = Data Instance 1 Calibration Slope
-type = number
-default = 1.00
-description = Slope for data instance 1
-category = OBP40 Calibrations
-capabilities = obp40:true
-condition = calInstance1 IN %(calibration_fields)s
-
-[calSmooth1]
-label = Data Instance 1 Smoothing
-type = number
-default = 0
-description = Smoothing factor [0..10]; 0 = no smoothing
-check = checkMinMax
-min = 0
-max = 10
-category = OBP40 Calibrations
-capabilities = obp40:true
-condition = calInstance1 IN %(calibration_fields)s
-
-[calInstance2]
-label = Calibration Data Instance 2
-type = list
-default = ---
-description = Data instance for calibration
-list = ---, %(calibration_fields)s
-category = OBP40 Calibrations
-capabilities = obp40:true
-
-[calOffset2]
-label = Data Instance 2 Calibration Offset
-type = number
-default = 0.00
-description = Offset for data instance 2
-category = OBP40 Calibrations
-capabilities = obp40:true
-condition = calInstance2 IN %(calibration_fields)s
-
-[calSlope2]
-label = Data Instance 2 Calibration Slope
-type = number
-default = 1.00
-description = Slope for data instance 2
-category = OBP40 Calibrations
-capabilities = obp40:true
-condition = calInstance2 IN %(calibration_fields)s
-
-[calSmooth2]
-label = Data Instance 2 Smoothing
-type = number
-default = 0
-description = Smoothing factor [0..10]; 0 = no smoothing
-check = checkMinMax
-min = 0
-max = 10
-category = OBP40 Calibrations
-capabilities = obp40:true
-condition = calInstance2 IN %(calibration_fields)s
-
-[calInstance3]
-label = Calibration Data Instance 3
-type = list
-default = ---
-description = Data instance for calibration
-list = ---, %(calibration_fields)s
-category = OBP40 Calibrations
-capabilities = obp40:true
-
-[calOffset3]
-label = Data Instance 3 Calibration Offset
-type = number
-default = 0.00
-description = Offset for data instance 3
-category = OBP40 Calibrations
-capabilities = obp40:true
-condition = calinstance3 IN %(calibration_fields)s
-
-[calSlope3]
-label = Data Instance 3 Calibration Slope
-type = number
-default = 1.00
-description = Slope for data instance 3
-category = OBP40 Calibrations
-capabilities = obp40:true
-condition = calinstance3 IN %(calibration_fields)s
-
-[calSmooth3]
-label = Data Instance 3 Smoothing
-type = number
-default = 0
-description = Smoothing factor [0..10]; 0 = no smoothing
-check = checkMinMax
-min = 0
-max = 10
-category = OBP40 Calibrations
-capabilities = obp40:true
-condition = calinstance3 IN %(calibration_fields)s
-
-[display]
-label = Display Mode
-type = list
-default = Logo + QR Code
-description = Settings for startup display
-list = White Screen, Logo, Logo + QR Code, Off
-category = OBP40 Display
-capabilities = obp40:true
-
-[displaycolor]
-label = Inverted Display Mode
-type = list
-default = Normal
-description = Invert display to white letters on black background [Normal|Inverse]
-list = Normal, Inverse
-category = OBP40 Display
-capabilities = obp40:true
-
-[statusLine]
-label = Status Line
-type = boolean
-default = true
-description = Show status line [on|off]
-category = OBP40 Display
-capabilities = obp40:true
-
-[timeSource]
-label = Status Time Source
-type = list
-default = GPS
-description = Data source for date and time display in status line [RTC|iRTC|GPS]
-dict =
-	iRTC:Internal real time clock (iRTC)
-	RTC:External real time clock (RTC)
-	GPS:External time via bus (GPS)
-category = OBP40 Display
-capabilities = obp40:true
-
-[refresh]
-label = Refresh
-type = boolean
-default = true
-description = Refresh e-paper display after each new page request to reduce ghost effects [on|off]
-category = OBP40 Display
-capabilities = obp40:true
-
-[fastRefresh]
-label = Fast Refresh
-type = boolean
-default = false
-description = Fast refresh for e-paper display [on|off]
-category = OBP40 Display
-capabilities = obp40:true
-
-[fullRefreshTime]
-label = Full Refresh Time [min]
-type = number
-default = 1
-description = E-Paper full refresh time all [1...10 min]
-check = checkMinMax
-min = 1
-max = 10
-category = OBP40 Display
-capabilities = obp40:true
-
-[holdvalues]
-label = Hold Values
-type = boolean
-default = false
-description = Retain old values when data stream stops [on|off]
-category = OBP40 Display
-capabilities = obp40:true
-
-[valueprecision]
-label = Display value precision
-type = list
-default = 2
-description = Maximum number of decimal places to display [1|2]
-list = 1, 2
-category = OBP40 Display
-capabilities = obp40:true
-
-[headerFormat]
-label = Header Format
-type = list
-default = TEXT
-description = Header format: Text or Symbols
-dict =
-	TEXT:Text
-	ICON:Symbols
-category = OBP40 Display
-capabilities = obp40:true
-
-[backlight]
-label = Backlight Mode
-type = list
-default = off
-description = Settings for automatic backlight mode
-list = Off, Control by Sun, Control by Bus, Control by Time, Control by Key, On
-category = OBP40 Display
-capabilities = obp40:false
-
-[blColor]
-label = Backlight Color
-type = list
-default = Red
-description = Backlight color
-list = Red, Orange, Yellow, Green, Blue, Aqua, Violet, White
-category = OBP40 Display
-capabilities = obp40:false
-
-[blBrightness]
-label = Brightness [%%]
-type = number
-default = 50
-description = Backlight brightness [20...100%%]
-check = checkMinMax
-min = 20
-max = 100
-category = OBP40 Display
-capabilities = obp40:false
-
-[flashLED]
-label = Flash LED Mode
-type = list
-default = Off
-description = Settings for flash LED
-list = Off, Bus Data, GPS Fix Lost, Limit Violation
-category = OBP40 Display
-capabilities = obp40:false
-
-[buzzerError]
-label = Buzzer Error
-type = boolean
-default = false
-description = Sound on error [on|off]
-category = OBP40 Buzzer
-capabilities = obp40:false
-
-[buzzerGps]
-label = Buzzer GPS Fix
-type = boolean
-default = false
-description = Sound on missing or lost GPS fix
-category = OBP40 Buzzer
-capabilities = obp40:false
-
-[buzzerLim]
-label = Buzzer by Limits
-type = boolean
-default = false
-description = Sound on limit violation
-category = OBP40 Buzzer
-capabilities = obp40:false
-
-[buzzerMode]
-label = Buzzer Mode
-type = list
-default = Off
-description = Settings for buzzer behaviour
-list = Off, Short Single Beep, Longer Single Beep, Beep until Confirmation
-category = OBP40 Buzzer
-capabilities = obp40:false
-
-[buzzerPower]
-label = Buzzer Power [%%]
-type = number
-default = 50
-description = Buzzer loudness [0...100%%]
-check = checkMinMax
-min = 0
-max = 100
-category = OBP40 Buzzer
-capabilities = obp40:false
-
-[visiblePages]
-label = Number of Pages
-type = number
-default = 10
-description = Number of visible data pages [1...10]
-check = checkMinMax
-min = 1
-max = 10
-category = OBP40 Pages
-capabilities = obp40:true
-
-[startPage]
-label = Start Page
-type = number
-default = 1
-description = First page number to display after device startup
-check = checkMinMax
-min = 1
-max = 10
-category = OBP40 Pages
-capabilities = obp40:true
-
-[systemPage]
-label = System Page
-type = boolean
-default = false
-description = Use wheel button for system page or direct deep sleep mode
-category = OBP40 Pages
-capabilities = obp40:true
-
-[imageFormat]
-label = Screenshot Format
-type = list
-default = PBM
-description = Graphics file format for screenshots [GIF|PBM|BMP]
-dict =
-	GIF:Compressed image (GIF)
-	PBM:Portable bitmap (PBM)
-	BMP:Windows bitmap (BMP)
-category = OBP40 Pages
-capabilities = obp40:true

lib/obp60task/obp60.conf

@@ -1,790 +0,0 @@
-[DEFAULT]
-calibration_fields = AWA, AWS, COG, DBT, HDM, PRPOS, RPOS, SOG, STW, TWA, TWS, TWD, WTemp
-
-[deviceName]
-label = system name
-type = string
-default = OBP60V2
-description = system name, used for the access point and for services
-check = checkSystemName
-category = system
-
-[timeServer]
-label = time server
-type = string
-default = pool.ntp.org
-description = NTP time server. Use only one hostname or IP address
-category = wifi client
-capabilities = obp60:true
-
-[timeZone]
-label = Time Zone
-type = number
-default = 0.00
-description = Time zone [UTC -12...+14]
-check = checkMinMax
-min = -12.0
-max = 14.0
-category = OBP60 Settings
-capabilities = obp60:true
-
-[homeLAT]
-label = Home latitude
-type = number
-default = 
-description = Latitude of boat home location [-90.0...+90.0]
-check = checkMinMax
-min = -90.0
-max = 90.0
-category = OBP60 Settings
-capabilities = obp60:true
-
-[homeLON]
-label = Home longitude
-type = number
-default = 
-description = Longitude of boat home location [-180.0...+180.0]
-check = checkMinMax
-min = -180.0
-max = 180.0
-category = OBP60 Settings
-capabilities = obp60:true
-
-[draft]
-label = Boat Draft [m]
-type = number
-default = 0.00
-description = The draft of the boat [0...50m]
-check = checkMinMax
-min = 0.0
-max = 50.0
-category = OBP60 Settings
-capabilities = obp60:true
-
-[chainLength]
-label = Anchor Chain Length [m]
-type = number
-default = 0
-description = The length of the anchor chain [0...255m]
-check = checkMinMax
-min = 0
-max = 255
-category = OBP60 Settings
-capabilities = obp60:true
-
-[fuelTank]
-label = Fuel Tank [l]
-type = number
-default = 0
-description = Fuel tank capacity [0...5000l]
-check = checkMinMax
-min = 0
-max = 5000
-category = OBP60 Settings
-capabilities = obp60:true
-
-[fuelConsumption]
-label = Fuel Consuption [l/h]
-type = number
-default = 0.00
-description = Medium fuel consumption [0...1000l/h]
-check = checkMinMax
-min = 0.0
-max = 1000.0
-category = OBP60 Settings
-capabilities = obp60:true
-
-[waterTank]
-label = Water Tank [l]
-type = number
-default = 0
-description = Water tank capacity [0...5000l]
-check = checkMinMax
-min = 0
-max = 5000
-category = OBP60 Settings
-capabilities = obp60:true
-
-[wasteTank]
-label = Waste Tank [l]
-type = number
-default = 0
-description = Waste tank capacity [0...5000l]
-check = checkMinMax
-min = 0
-max = 5000
-category = OBP60 Settings
-capabilities = obp60:true
-
-[batteryVoltage]
-label = Battery Voltage [V]
-type = list
-default = 12V
-description = Battery Voltage [12V|24V]
-list = 12V, 24V
-category = OBP60 Settings
-capabilities = obp60:true
-
-[batteryType]
-label = Battery Type
-type = list
-default = Pb
-description = Type of battery [Pb|Gel|AGM|LiFePo4]
-list = Pb, Gel, AGM, LiFePo4
-category = OBP60 Settings
-capabilities = obp60:true
-
-[batteryCapacity]
-label = Battery Capacity [Ah]
-type = number
-default = 0.0
-description = Battery capacity [0...10000Ah]
-check = checkMinMax
-min = 0.0
-max = 10000.0
-category = OBP60 Settings
-capabilities = obp60:true
-
-[solarPower]
-label = Solar Power [W]
-type = number
-default = 0.0
-description = Solar power [0...10000W]
-check = checkMinMax
-min = 0.0
-max = 10000.0
-category = OBP60 Settings
-capabilities = obp60:true
-
-[genPower]
-label = Genarator Power [W]
-type = number
-default = 0.0
-description = Generator power [0...10000W]
-check = checkMinMax
-min = 0.0
-max = 10000.0
-category = OBP60 Settings
-capabilities = obp60:true
-
-[trackStep]
-label = angle [deg]
-type = number
-default = 3.0
-description = track step offset [1...12deg]
-check = checkMinMax
-min = 1.0
-max = 12.0
-category = OBP60 Settings
-capabilities = obp60:true
-
-[calcTrueWnds]
-label = Calculate True Wind
-type = boolean
-default = false
-description = If not available, calculate true wind data from appearant wind and other boat data
-category = OBP60 Settings
-capabilities = obp60:true
-
-[lengthFormat]
-label = Length Format
-type = list
-default = m
-description = Length format [m|ft]
-list = m, ft
-category = OBP60 Units
-capabilities = obp60:true
-
-[distanceFormat]
-label = Distance Format
-type = list
-default = nm
-description = Distance format [m|km|nm]
-list = m, km, nm
-category = OBP60 Units
-capabilities = obp60:true
-
-[speedFormat]
-label = Speed Format
-type = list
-default = kn
-description = Distance format [m/s|km/h|kn]
-list = m/s, km/h, kn
-category = OBP60 Units
-capabilities = obp60:true
-
-[windspeedFormat]
-label = Wind Speed Format
-type = list
-default = kn
-description = Wind speed format [m/s|km/h|kn|bft]
-list = m/s, km/h, kn, bft
-category = OBP60 Units
-capabilities = obp60:true
-
-[tempFormat]
-label = Temperature Format
-type = list
-default = C
-description = Temperature format [K|C|F]
-list = K, C, F
-category = OBP60 Units
-capabilities = obp60:true
-
-[dateFormat]
-label = Date Format
-type = list
-default = DE
-description = Date format [DE|GB|US|ISO] DE: 31.12.2022, GB: 31/12/2022, US: 12/31/2022, ISO: 2022-12-31
-list = DE, GB, US, ISO
-category = OBP60 Units
-capabilities = obp60:true
-
-[cpuSpeed]
-label = CPU Speed [MHz]
-type = list
-default = 160
-description = CPU speed in MHz [80|160|240]
-list = 80, 160, 240
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[useRTC]
-label = RTC Modul
-type = list
-default = DS1388
-description = Use internal RTC module type [off|DS1388]
-list = off, DS1388
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[useGPS]
-label = GPS Sensor
-type = list
-default = ATGM336H
-description = Use internal GPS module type [off|NEO-6M|NEO-M8N|ATGM336H]
-list = off, NEO-6M, NEO-M8N, ATGM336H
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[hdopAccuracy]
-label = HDOP Accuracy [m]
-type = number
-default = 20
-description = HDOP ccuracy in m for a valid GPS signal [1...50]
-check = checkMinMax
-min = 1
-max = 50
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[useEnvSensor]
-label = Env. Sensor
-type = list
-default = BMP280
-description = Use internal or external environment sensor via I2C bus [off|BME280|BMP280|BMP180|BMP085|HTU21|SHT21]
-list = off, BME280, BMP280, BMP180, BMP085, HTU21, SHT21
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[usePowSensor1]
-label = Battery Sensor
-type = list
-default = off
-description = Use external power management sensor via I2C bus for battery [off|INA219|INA226|]
-list = off, INA219, INA226
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[shunt1]
-label = Battery Shunt
-type = list
-default = 10
-description = Shunt current value [10A|50A|100A|200A|300A|400A|500A]
-list = 10, 50, 100, 200, 300, 400, 500
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[usePowSensor2]
-label = Solar Sensor
-type = list
-default = off
-description = Use external power management sensor via I2C bus for solar panels [off|INA219|INA226|]
-list = off, INA219, INA226
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[shunt2]
-label = Solar Shunt
-type = list
-default = 10
-description = Shunt current value [10A|50A|100A|200A|300A|400A|500A]
-list = 10, 50, 100, 200, 300, 400, 500
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[usePowSensor3]
-label = Gen. Sensor
-type = list
-default = off
-description = Use external power management sensor via I2C bus for generator [off|INA219|INA226|]
-list = off, INA219, INA226
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[shunt3]
-label = Gen. Shunt
-type = list
-default = 10
-description = Shunt current value [10A|50A|100A|200A|300A|400A|500A] @ 75mV
-list = 10, 50, 100, 200, 300, 400, 500
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[useRotSensor]
-label = Rot. Sensor
-type = list
-default = off
-description = Use external rotation sensor via I2C bus [off|AS5600]
-list = off, AS5600
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[rotFunction]
-label = Rot. Function
-type = list
-default = off
-description = Function for rotation sensor [off|Rudder|Wind|Mast|Keel|Trim|Boom]
-list = off, Rudder, Wind, Mast, Keel, Trim, Boom
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[rotOffset]
-label = Rot. Offset
-type = number
-default = 0
-description = Offset for rotation sensor [-180°...+180°]
-check = checkMinMax
-min = -180
-max = 180
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[rollLimit]
-label = Roll Limit
-type = number
-default = 25
-description = Limit violation for roll angle [-90°...+90°]
-check = checkMinMax
-min = -90
-max = 90
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[rollOffset]
-label = Roll Offset
-type = number
-default = 0
-description = Roll offset angle [-45°...+45°]
-check = checkMinMax
-min = -45
-max = 45
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[pitchOffset]
-label = Pitch Offset
-type = number
-default = 0
-description = Pitch offset angle [-45°...+45°]
-check = checkMinMax
-min = -45
-max = 45
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[useTempSensor]
-label = Temp. Sensor
-type = boolean
-default = off
-description = Use max. 8 external 1Wire devices [off|DS18B20]
-list = off, DS18B20
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[powerMode]
-label = Power Mode
-type = list
-default = Max Power
-description = Settings for power mode
-list = Max Power, Only 5.0V, Min Power
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[underVoltage]
-label = Undervoltage
-type = boolean
-default = false
-description = Switch off device if voltage drops below 9V [on|off]
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[useSimuData]
-label = Simulation Data
-type = boolean
-default = false
-description = Use simulation data when bus data are missing [on|off]
-category = OBP60 Hardware
-capabilities = obp60:true
-
-[tSensitivity]
-label = Touch Sensitivity [%%]
-type = number
-default = 100
-description = Touch sensitivity [0...100%%] for sensor buttons
-check = checkMinMax
-min = 0
-max = 100
-category = OBP60 Calibrations
-capabilities = obp60:true
-
-[vOffset]
-label = VSensor Offset
-type = number
-default = -1.00
-description = Offset for internal voltage sensor (ESP32)
-category = OBP60 Calibrations
-capabilities = obp60:true
-
-[vSlope]
-label = VSensor Slope
-type = number
-default = 1.00
-description = Slope for internal voltage sensor (ESP32)
-category = OBP60 Calibrations
-capabilities = obp60:true
-
-[calInstance1]
-label = Calibration Data Instance 1
-type = list
-default = ---
-description = Data instance for calibration
-list = ---, %(calibration_fields)s
-category = OBP60 Calibrations
-capabilities = obp60:true
-
-[calOffset1]
-label = Data Instance 1 Calibration Offset
-type = number
-default = 0.00
-description = Offset for data instance 1
-category = OBP60 Calibrations
-capabilities = obp60:true
-condition = calInstance1 IN %(calibration_fields)s
-
-[calSlope1]
-label = Data Instance 1 Calibration Slope
-type = number
-default = 1.00
-description = Slope for data instance 1
-category = OBP60 Calibrations
-capabilities = obp60:true
-condition = calInstance1 IN %(calibration_fields)s
-
-[calSmooth1]
-label = Data Instance 1 Smoothing
-type = number
-default = 0
-description = Smoothing factor [0..10]; 0 = no smoothing
-check = checkMinMax
-min = 0
-max = 10
-category = OBP60 Calibrations
-capabilities = obp60:true
-condition = calInstance1 IN %(calibration_fields)s
-
-[calInstance2]
-label = Calibration Data Instance 2
-type = list
-default = ---
-description = Data instance for calibration
-list = ---, %(calibration_fields)s
-category = OBP60 Calibrations
-capabilities = obp60:true
-
-[calOffset2]
-label = Data Instance 2 Calibration Offset
-type = number
-default = 0.00
-description = Offset for data instance 2
-category = OBP60 Calibrations
-capabilities = obp60:true
-condition = calInstance2 IN %(calibration_fields)s
-
-[calSlope2]
-label = Data Instance 2 Calibration Slope
-type = number
-default = 1.00
-description = Slope for data instance 2
-category = OBP60 Calibrations
-capabilities = obp60:true
-condition = calInstance2 IN %(calibration_fields)s
-
-[calSmooth2]
-label = Data Instance 2 Smoothing
-type = number
-default = 0
-description = Smoothing factor [0..10]; 0 = no smoothing
-check = checkMinMax
-min = 0
-max = 10
-category = OBP60 Calibrations
-capabilities = obp60:true
-condition = calInstance2 IN %(calibration_fields)s
-
-[calInstance3]
-label = Calibration Data Instance 3
-type = list
-default = ---
-description = Data instance for calibration
-list = ---, %(calibration_fields)s
-category = OBP60 Calibrations
-capabilities = obp60:true
-
-[calOffset3]
-label = Data Instance 3 Calibration Offset
-type = number
-default = 0.00
-description = Offset for data instance 3
-category = OBP60 Calibrations
-capabilities = obp60:true
-condition = calinstance3 IN %(calibration_fields)s
-
-[calSlope3]
-label = Data Instance 3 Calibration Slope
-type = number
-default = 1.00
-description = Slope for data instance 3
-category = OBP60 Calibrations
-capabilities = obp60:true
-condition = calinstance3 IN %(calibration_fields)s
-
-[calSmooth3]
-label = Data Instance 3 Smoothing
-type = number
-default = 0
-description = Smoothing factor [0..10]; 0 = no smoothing
-check = checkMinMax
-min = 0
-max = 10
-category = OBP60 Calibrations
-capabilities = obp60:true
-condition = calinstance3 IN %(calibration_fields)s
-
-[display]
-label = Display Mode
-type = list
-default = Logo + QR Code
-description = Settings for startup display
-list = White Screen, Logo, Logo + QR Code, Off
-category = OBP60 Display
-capabilities = obp60:true
-
-[displaycolor]
-label = Inverted Display Mode
-type = list
-default = Normal
-description = Invert display to white letters on black background [Normal|Inverse]
-list = Normal, Inverse
-category = OBP60 Display
-capabilities = obp60:true
-
-[statusLine]
-label = Status Line
-type = boolean
-default = true
-description = Show status line [on|off]
-category = OBP60 Display
-capabilities = obp60:true
-
-[timeSource]
-label = Status Time Source
-type = list
-default = GPS
-description = Data source for date and time display in status line [RTC|GPS]
-dict =
-	RTC:Real time clock (RTC)
-	GPS:Time via bus (GPS)
-category = OBP60 Display
-capabilities = obp60:true
-
-[refresh]
-label = Refresh
-type = boolean
-default = true
-description = Refresh e-paper display after each new page request to reduce ghost effects [on|off]
-category = OBP60 Display
-capabilities = obp60:true
-
-[fastRefresh]
-label = Fast Refresh
-type = boolean
-default = false
-description = Fast refresh for e-paper display [on|off]
-category = OBP60 Display
-capabilities = obp60:true
-
-[fullRefreshTime]
-label = Full Refresh Time [min]
-type = number
-default = 1
-description = E-Paper full refresh time all [1...10 min]
-check = checkMinMax
-min = 1
-max = 10
-category = OBP60 Display
-capabilities = obp60:true
-
-[holdvalues]
-label = Hold Values
-type = boolean
-default = false
-description = Retain old values when data stream stops [on|off]
-category = OBP60 Display
-capabilities = obp60:true
-
-[valueprecision]
-label = Display value precision
-type = list
-default = 2
-description = Maximum number of decimal places to display [1|2]
-list = 1, 2
-category = OBP60 Display
-capabilities = obp60:true
-
-[headerFormat]
-label = Header Format
-type = list
-default = TEXT
-description = Header format: Text or Symbols
-dict =
-	TEXT:Text
-	ICON:Symbols
-category = OBP60 Pages
-capabilities = obp60:true
-
-[backlight]
-label = Backlight Mode
-type = list
-default = Control by Key
-description = Settings for automatic backlight mode
-list = Off, Control by Sun, Control by Bus, Control by Time, Control by Key, On
-category = OBP60 Display
-capabilities = obp60:true
-
-[blColor]
-label = Backlight Color
-type = list
-default = Red
-description = Backlight color
-list = Red, Orange, Yellow, Green, Blue, Aqua, Violet, White
-category = OBP60 Display
-capabilities = obp60:true
-
-[blBrightness]
-label = Brightness [%%]
-type = number
-default = 50
-description = Backlight brightness [20...100%%]
-check = checkMinMax
-min = 20
-max = 100
-category = OBP60 Display
-capabilities = obp60:true
-
-[flashLED]
-label = Flash LED Mode
-type = list
-default = Limit Violation
-description = Settings for flash LED
-list = Off, Bus Data, GPS Fix Lost, Limit Violation
-category = OBP60 Display
-capabilities = obp60:true
-
-[buzzerError]
-label = Buzzer Error
-type = boolean
-default = false
-description = Sound on error [on|off]
-category = OBP60 Buzzer
-capabilities = obp60:true
-
-[buzzerGps]
-label = Buzzer GPS Fix
-type = boolean
-default = false
-description = Sound on missing or lost GPS fix
-category = OBP60 Buzzer
-capabilities = obp60:true
-
-[buzzerLim]
-label = Buzzer by Limits
-type = boolean
-default = false
-description = Sound on limit violation
-category = OBP60 Buzzer
-capabilities = obp60:true
-
-[buzzerMode]
-label = Buzzer Mode
-type = list
-default = Off
-description = Settings for buzzer behaviour
-list = Off, Short Single Beep, Longer Single Beep, Beep until Confirmation
-category = OBP60 Buzzer
-capabilities = obp60:true
-
-[buzzerPower]
-label = Buzzer Power [%%]
-type = number
-default = 50
-description = Buzzer loudness [0...100%%]
-check = checkMinMax
-min = 0
-max = 100
-category = OBP60 Buzzer
-capabilities = obp60:true
-
-[visiblePages]
-label = Number of Pages
-type = number
-default = 10
-description = Number of visible data pages [1...10]
-check = checkMinMax
-min = 1
-max = 10
-category = OBP60 Pages
-capabilities = obp60:true
-
-[startPage]
-label = Start Page
-type = number
-default = 1
-description = First page number to display after device startup
-check = checkMinMax
-min = 1
-max = 10
-category = OBP60 Pages
-capabilities = obp60:true
-
-[imageFormat]
-label = Screenshot Format
-type = list
-default = PBM
-description = Graphics file format for screenshots [GIF|PBM|BMP]
-dict =
-	GIF:Compressed image (GIF)
-	PBM:Portable bitmap (PBM)
-	BMP:Windows bitmap (BMP)
-category = OBP60 Pages
-capabilities = obp60:true

lib/obp60task/obp60task.cpp

@@ -1,4 +1,3 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include "obp60task.h"
 #include "Pagedata.h"                   // Data exchange for pages
@@ -14,18 +13,17 @@
 #include "OBP60Extensions.h"            // Functions lib for extension board
 #include "OBP60Keypad.h"                // Functions for keypad
 #include "BoatDataCalibration.h"        // Functions lib for data instance calibration
-#include "OBPRingBuffer.h"              // Functions lib with ring buffer for history storage of some boat data
 #include "OBPDataOperations.h"          // Functions lib for data operations such as true wind calculation
 
 #ifdef BOARD_OBP40S3
 #include "driver/rtc_io.h"              // Needs for weakup from deep sleep
-#include <FS.h>                         // SD-Card access
-#include <SD.h>
 #include <SPI.h>
 #endif
 
 // Pictures
-#include "images/OBP_400x300.xbm"       // OBP Logo
+//#include GxEPD_BitmapExamples         // Example picture
+#include "MFD_OBP60_400x300_sw.h"       // MFD with logo
+#include "Logo_OBP_400x300_sw.h"        // OBP Logo
 #include "images/unknown.xbm"           // unknown page indicator
 #include "OBP60QRWiFi.h"                // Functions lib for WiFi QR code
 #include "OBPSensorTask.h"              // Functions lib for sensor data
@@ -42,45 +40,23 @@ void OBP60Init(GwApi *api){
     GwConfigHandler *config = api->getConfig();
 
     // Set a new device name and hidden the original name in the main config
-    String devicename = api->getConfig()->getConfigItem(api->getConfig()->deviceName,true)->asString();
+    String devicename = config->getConfigItem(config->deviceName, true)->asString();
-    api->getConfig()->setValue(GwConfigDefinitions::systemName, devicename, GwConfigInterface::ConfigType::HIDDEN);
+    config->setValue(GwConfigDefinitions::systemName, devicename, GwConfigInterface::ConfigType::HIDDEN);
 
-    api->getLogger()->logDebug(GwLog::LOG,"obp60init running");
+    logger->prefix = devicename + ":";
+    logger->logDebug(GwLog::LOG,"obp60init running");
 
     // Check I2C devices
 
+    // Init power
+    String powermode = config->getConfigItem(config->powerMode,true)->asString();
+    logger->logDebug(GwLog::DEBUG, "Power Mode is: %s", powermode.c_str());
+    powerInit(powermode);
+
     // Init hardware
     hardwareInit(api);
 
-    // Init power
-    String powermode = api->getConfig()->getConfigItem(api->getConfig()->powerMode,true)->asString();
-    api->getLogger()->logDebug(GwLog::DEBUG,"Power Mode is: %s", powermode.c_str());
-    powerInit(powermode);
-
 #ifdef BOARD_OBP40S3
-    bool sdcard = config->getBool(config->useSDCard);
-    if (sdcard) {
-        SPIClass SD_SPI = SPIClass(HSPI);
-        SD_SPI.begin(SD_SPI_CLK, SD_SPI_MISO, SD_SPI_MOSI);
-        if (SD.begin(SD_SPI_CS, SD_SPI, 80000000)) {
-            String sdtype = "unknown";
-            uint8_t cardType = SD.cardType();
-            switch (cardType) {
-                case CARD_MMC:
-                   sdtype = "MMC";
-                   break;
-                case CARD_SD:
-                   sdtype = "SDSC";
-                   break;
-                case CARD_SDHC:
-                   sdtype = "SDHC";
-                   break;
-            }
-            uint64_t cardSize = SD.cardSize() / (1024 * 1024);
-            LOG_DEBUG(GwLog::LOG,"SD card type %s of size %d MB detected", sdtype, cardSize);
-        }
-    }
-
     // Deep sleep wakeup configuration
     esp_sleep_enable_ext0_wakeup(OBP_WAKEWUP_PIN, 0);   // 1 = High, 0 = Low
     rtc_gpio_pullup_en(OBP_WAKEWUP_PIN);                // Activate pullup resistor
@@ -89,7 +65,7 @@ void OBP60Init(GwApi *api){
 
     // Settings for e-paper display
     String fastrefresh = api->getConfig()->getConfigItem(api->getConfig()->fastRefresh,true)->asString();
-    api->getLogger()->logDebug(GwLog::DEBUG,"Fast Refresh Mode is: %s", fastrefresh.c_str());
+    logger->logDebug(GwLog::DEBUG, "Fast Refresh Mode is: %s", fastrefresh.c_str());
     #ifdef DISPLAY_GDEY042T81
     if(fastrefresh == "true"){
         static const bool useFastFullUpdate = true;   // Enable fast full display update only for GDEY042T81
@@ -108,11 +84,11 @@ void OBP60Init(GwApi *api){
 
     // Get CPU speed
     int freq = getCpuFrequencyMhz();
-    api->getLogger()->logDebug(GwLog::LOG,"CPU speed at boot: %i MHz", freq);
+    logger->logDebug(GwLog::LOG,"CPU speed at boot: %i MHz", freq);
     
     // Settings for backlight
     String backlightMode = api->getConfig()->getConfigItem(api->getConfig()->backlight,true)->asString();
-    api->getLogger()->logDebug(GwLog::DEBUG,"Backlight Mode is: %s", backlightMode.c_str());
+    logger->logDebug(GwLog::DEBUG,"Backlight Mode is: %s", backlightMode.c_str());
     uint brightness = uint(api->getConfig()->getConfigItem(api->getConfig()->blBrightness,true)->asInt());
     String backlightColor = api->getConfig()->getConfigItem(api->getConfig()->blColor,true)->asString();
     if(String(backlightMode) == "On"){
@@ -127,7 +103,7 @@ void OBP60Init(GwApi *api){
 
     // Settings flash LED mode
     String ledMode = api->getConfig()->getConfigItem(api->getConfig()->flashLED,true)->asString();
-    api->getLogger()->logDebug(GwLog::DEBUG,"LED Mode is: %s", ledMode.c_str());
+    logger->logDebug(GwLog::DEBUG,"LED Mode is: %s", ledMode.c_str());
     if(String(ledMode) == "Off"){
         setBlinkingLED(false);
     }
@@ -145,8 +121,8 @@ void OBP60Init(GwApi *api){
 typedef struct {
         int page0=0;
         QueueHandle_t queue;
-        GwLog* logger = NULL;
+        GwLog* logger = nullptr;
-//        GwApi* api = NULL;
+//        GwApi* api = nullptr;
         uint sensitivity = 100;
         bool use_syspage = true;
     } MyData;
@@ -171,16 +147,9 @@ void keyboardTask(void *param){
     vTaskDelete(NULL);
 }
 
-class BoatValueList{
+// Scorgan: moved class declaration to header file <obp60task.h> to make class available to other functions
-    public:
+// --- Class BoatValueList --------------
-    static const int MAXVALUES=100;
+bool BoatValueList::addValueToList(GwApi::BoatValue *v){
-    //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...
@@ -193,7 +162,7 @@ class BoatValueList{
     return true;
 }
 //helper to ensure that each BoatValue is only queried once
-    GwApi::BoatValue *findValueOrCreate(String name){
+GwApi::BoatValue *BoatValueList::findValueOrCreate(String name){
     for (int i=0;i<numValues;i++){
         if (allBoatValues[i]->getName() == name) {
             return allBoatValues[i];
@@ -203,13 +172,12 @@ class BoatValueList{
     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;
@@ -292,49 +260,32 @@ void registerAllPages(PageList &list){
     list.add(&registerPageFluid);
     extern PageDescription registerPageSkyView;
     list.add(&registerPageSkyView);
-    extern PageDescription registerPageAnchor;
+    extern PageDescription registerPageNavigation;
-    list.add(&registerPageAnchor);
+    list.add(&registerPageNavigation);
-/*    extern PageDescription registerPageAIS;
+    extern PageDescription registerPageDigitalOut;
-    list.add(&registerPageAIS);
+    list.add(&registerPageDigitalOut);
-    extern PageDescription registerPageAutopilot;
-    list.add(&registerPageAutopilot);
-    extern PageDescription registerPageEPropulsion;
-    list.add(&registerPageEPropulsion); */
 }
 
 // Undervoltage detection for shutdown display
-void underVoltageDetection(GwApi *api, CommonData &common){
+void underVoltageError(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();
-    // Read supply voltage
-    #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
-    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
-        epd->setFullWindow();           // Set full Refresh
+    getdisplay().setFullWindow();           // Set full Refresh
-        //epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+    //getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-        epd->fillScreen(common.bgcolor);// Clear screen
+    getdisplay().fillScreen(common.bgcolor);// Clear screen
-        epd->setTextColor(common.fgcolor);
+    getdisplay().setTextColor(common.fgcolor);
-        epd->setFont(&Ubuntu_Bold20pt8b);
+    getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(65, 150);
+    getdisplay().setCursor(65, 150);
-        epd->print("Undervoltage");
+    getdisplay().print("Undervoltage");
-        epd->setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(65, 175);
+    getdisplay().setCursor(65, 175);
-        epd->print("Charge battery and restart system");
+    getdisplay().print("Charge battery and restart system");
-        epd->nextPage();                // Partial update
+    getdisplay().nextPage();                // Partial update
-        epd->powerOff();                // Display power off
+    getdisplay().powerOff();                // Display power off
     setPortPin(OBP_POWER_EPD, false);       // Power off ePaper display
     setPortPin(OBP_POWER_SD, false);        // Power off SD card
 #else
@@ -344,141 +295,34 @@ void underVoltageDetection(GwApi *api, CommonData &common){
     buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
     setPortPin(OBP_POWER_50, false);        // Power rail 5.0V Off
     // Shutdown EInk display
-        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-        epd->fillScreen(common.bgcolor);// Clear screen
+    getdisplay().fillScreen(common.bgcolor);// Clear screen
-        epd->setTextColor(common.fgcolor);
+    getdisplay().setTextColor(common.fgcolor);
-        epd->setFont(&Ubuntu_Bold20pt8b);
+    getdisplay().setFont(&Ubuntu_Bold20pt8b);
-        epd->setCursor(65, 150);
+    getdisplay().setCursor(65, 150);
-        epd->print("Undervoltage");
+    getdisplay().print("Undervoltage");
-        epd->setFont(&Ubuntu_Bold8pt8b);
+    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        epd->setCursor(65, 175);
+    getdisplay().setCursor(65, 175);
-        epd->print("To wake up repower system");
+    getdisplay().print("To wake up repower system");
-        epd->nextPage();                // Partial update
+    getdisplay().nextPage();                // Partial update
-        epd->powerOff();                // Display power off
+    getdisplay().powerOff();                // Display power off
 #endif
-        // Stop system
     while (true) {
-            esp_deep_sleep_start();             // Deep Sleep without weakup. Weakup only after power cycle (restart).
+        esp_deep_sleep_start(); // Deep Sleep without wakeup. Wakeup only after power cycle (restart).
-        }
     }
 }
 
-//bool addTrueWind(GwApi* api, BoatValueList* boatValues, double *twd, double *tws, double *twa) {
+inline bool underVoltageDetection(float voffset, float vslope) {
-bool addTrueWind(GwApi* api, BoatValueList* boatValues) {
+    // Read supply voltage
-    // Calculate true wind data and add to obp60task boat data list
+#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
-    double awaVal, awsVal, cogVal, stwVal, sogVal, hdtVal, hdmVal, varVal;
+    float minVoltage = 3.65;  // Absolut minimum volatge for 3,7V LiPo accu
-    double twd, tws, twa;
+#else
-    bool isCalculated = false;
+    float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.17) * 20;   // Vin = 1/20 for OBP60
-    const double DBL_MIN = std::numeric_limits<double>::lowest();
+    float minVoltage = MIN_VOLTAGE;
-
+#endif
-    GwApi::BoatValue *twdBVal = boatValues->findValueOrCreate("TWD");
+    float calVoltage = actVoltage * vslope + voffset;  // Calibration
-    GwApi::BoatValue *twsBVal = boatValues->findValueOrCreate("TWS");
+    return (calVoltage < minVoltage);
-    GwApi::BoatValue *twaBVal = boatValues->findValueOrCreate("TWA");
-    GwApi::BoatValue *awaBVal = boatValues->findValueOrCreate("AWA");
-    GwApi::BoatValue *awsBVal = boatValues->findValueOrCreate("AWS");
-    GwApi::BoatValue *cogBVal = boatValues->findValueOrCreate("COG");
-    GwApi::BoatValue *stwBVal = boatValues->findValueOrCreate("STW");
-    GwApi::BoatValue *sogBVal = boatValues->findValueOrCreate("SOG");
-    GwApi::BoatValue *hdtBVal = boatValues->findValueOrCreate("HDT");
-    GwApi::BoatValue *hdmBVal = boatValues->findValueOrCreate("HDM");
-    GwApi::BoatValue *varBVal = boatValues->findValueOrCreate("VAR");
-    awaVal = awaBVal->valid ? awaBVal->value : DBL_MIN;
-    awsVal = awsBVal->valid ? awsBVal->value : DBL_MIN;
-    cogVal = cogBVal->valid ? cogBVal->value : DBL_MIN;
-    stwVal = stwBVal->valid ? stwBVal->value : DBL_MIN;
-    sogVal = sogBVal->valid ? sogBVal->value : DBL_MIN;
-    hdtVal = hdtBVal->valid ? hdtBVal->value : DBL_MIN;
-    hdmVal = hdmBVal->valid ? hdmBVal->value : DBL_MIN;
-    varVal = varBVal->valid ? varBVal->value : DBL_MIN;
-    api->getLogger()->logDebug(GwLog::DEBUG,"obp60task addTrueWind: AWA %.1f, AWS %.1f, COG %.1f, STW %.1f, SOG %.1f, HDT %.1f, HDM %.1f, VAR %.1f", awaBVal->value * RAD_TO_DEG, awsBVal->value * 3.6 / 1.852,
-            cogBVal->value * RAD_TO_DEG, stwBVal->value * 3.6 / 1.852, sogBVal->value * 3.6 / 1.852, hdtBVal->value * RAD_TO_DEG, hdmBVal->value * RAD_TO_DEG, varBVal->value * RAD_TO_DEG);
-
-    isCalculated = WindUtils::calcTrueWind(&awaVal, &awsVal, &cogVal, &stwVal, &sogVal, &hdtVal, &hdmVal, &varVal, &twd, &tws, &twa);
-
-    if (isCalculated) { // Replace values only, if successfully calculated and not already available
-        if (!twdBVal->valid) {
-            twdBVal->value = twd;
-            twdBVal->valid = true;
-        }
-        if (!twsBVal->valid) {
-            twsBVal->value = tws;
-            twsBVal->valid = true;
-        }
-        if (!twaBVal->valid) {
-            twaBVal->value = twa;
-            twaBVal->valid = true;
-        }
-    }
-    api->getLogger()->logDebug(GwLog::DEBUG,"obp60task addTrueWind: TWD_Valid %d, isCalculated %d, TWD %.1f, TWA %.1f, TWS %.1f", twdBVal->valid, isCalculated, twdBVal->value * RAD_TO_DEG,
-        twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852);
-
-    return isCalculated;
-}
-
-void initHstryBuf(GwApi* api, BoatValueList* boatValues, tBoatHstryData hstryBufList) {
-    // Init history buffers for TWD, TWS
-
-    GwApi::BoatValue *calBVal; // temp variable just for data calibration -> we don't want to calibrate the original data here
-
-    int hstryUpdFreq = 1000; // Update frequency for history buffers in ms
-    int hstryMinVal = 0; // Minimum value for these history buffers
-    int twdHstryMax = 6283; // Max value for wind direction (TWD) in rad (0...2*PI), shifted by 1000 for 3 decimals
-    int twsHstryMax = 1000; // Max value for wind speed (TWS) in m/s, shifted by 10 for 1 decimal
-    // Initialize history buffers with meta data
-    hstryBufList.twdHstry->setMetaData("TWD", "formatCourse", hstryUpdFreq, hstryMinVal, twdHstryMax);
-    hstryBufList.twsHstry->setMetaData("TWS", "formatKnots", hstryUpdFreq, hstryMinVal, twsHstryMax);
-
-    GwApi::BoatValue *twdBVal = boatValues->findValueOrCreate(hstryBufList.twdHstry->getName());
-    GwApi::BoatValue *twsBVal = boatValues->findValueOrCreate(hstryBufList.twsHstry->getName());
-    GwApi::BoatValue *twaBVal = boatValues->findValueOrCreate("TWA");
-}
-
-void handleHstryBuf(GwApi* api, BoatValueList* boatValues, tBoatHstryData hstryBufList) {
-    // Handle history buffers for TWD, TWS
-
-    GwLog *logger = api->getLogger();
-
-    int16_t twdHstryMin = hstryBufList.twdHstry->getMinVal();
-    int16_t twdHstryMax = hstryBufList.twdHstry->getMaxVal();
-    int16_t twsHstryMin = hstryBufList.twsHstry->getMinVal();
-    int16_t twsHstryMax = hstryBufList.twsHstry->getMaxVal();
-    int16_t twdBuf, twsBuf;
-    GwApi::BoatValue *calBVal; // temp variable just for data calibration -> we don't want to calibrate the original data here
-
-    GwApi::BoatValue *twdBVal = boatValues->findValueOrCreate(hstryBufList.twdHstry->getName());
-    GwApi::BoatValue *twsBVal = boatValues->findValueOrCreate(hstryBufList.twsHstry->getName());
-    GwApi::BoatValue *twaBVal = boatValues->findValueOrCreate("TWA");
-
-    api->getLogger()->logDebug(GwLog::DEBUG,"obp60task handleHstryBuf: twdBVal: %.1f, twaBVal: %.1f, twsBVal: %.1f, TWD_isValid? %d", twdBVal->value * RAD_TO_DEG,
-        twaBVal->value * RAD_TO_DEG, twsBVal->value * 3.6 / 1.852, twdBVal->valid);
-    calBVal = new GwApi::BoatValue("TWD"); // temporary solution for calibration of history buffer values
-    calBVal->setFormat(twdBVal->getFormat());
-    if (twdBVal->valid) {
-        calBVal->value = twdBVal->value;
-        calBVal->valid = twdBVal->valid;
-        calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated
-        twdBuf = static_cast<int16_t>(std::round(calBVal->value * 1000));
-        if (twdBuf >= twdHstryMin && twdBuf <= twdHstryMax) {
-            hstryBufList.twdHstry->add(twdBuf);
-        }
-    }
-    delete calBVal;
-    calBVal = nullptr;
-
-    calBVal = new GwApi::BoatValue("TWS"); // temporary solution for calibration of history buffer values
-    calBVal->setFormat(twsBVal->getFormat());
-    if (twsBVal->valid) {
-        calBVal->value = twsBVal->value;
-        calBVal->valid = twsBVal->valid;
-        calibrationData.calibrateInstance(calBVal, logger); // Check if boat data value is to be calibrated
-        twsBuf = static_cast<int16_t>(std::round(calBVal->value * 10));
-        if (twsBuf >= twsHstryMin && twsBuf <= twsHstryMax) {
-            hstryBufList.twsHstry->add(twsBuf);
-        }
-    }
-    delete calBVal;
-    calBVal = nullptr;
 }
 
 // OBP60 Task
@@ -523,7 +367,6 @@ void OBP60Task(GwApi *api){
     String systemname = api->getConfig()->getConfigItem(api->getConfig()->systemName,true)->asString();
     String wifipass = api->getConfig()->getConfigItem(api->getConfig()->apPassword,true)->asString();
     bool refreshmode = api->getConfig()->getConfigItem(api->getConfig()->refresh,true)->asBoolean();
-    bool symbolmode = (config->getString(config->headerFormat) == "ICON");
     String fastrefresh = api->getConfig()->getConfigItem(api->getConfig()->fastRefresh,true)->asString();
     uint fullrefreshtime = uint(api->getConfig()->getConfigItem(api->getConfig()->fullRefreshTime,true)->asInt());
     #ifdef BOARD_OBP40S3
@@ -531,37 +374,37 @@ void OBP60Task(GwApi *api){
     #endif
 
     #ifdef DISPLAY_GDEY042T81
-        epd->init(115200, true, 2, false);  // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+        getdisplay().init(115200, true, 2, false);  // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
     #else
-        epd->init(115200);                  // Init for normal displays
+        getdisplay().init(115200);                  // Init for normal displays
     #endif
 
-    epd->setRotation(0);                 // Set display orientation (horizontal)
+    getdisplay().setRotation(0);                 // Set display orientation (horizontal)
-    epd->setFullWindow();                // Set full Refresh
+    getdisplay().setFullWindow();                // Set full Refresh
-    epd->firstPage();                    // set first page
+    getdisplay().firstPage();                    // set first page
-    epd->fillScreen(commonData.bgcolor);
+    getdisplay().fillScreen(commonData.bgcolor);
-    epd->setTextColor(commonData.fgcolor);
+    getdisplay().setTextColor(commonData.fgcolor);
-    epd->nextPage();                     // Full Refresh
+    getdisplay().nextPage();                     // Full Refresh
-    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-    epd->fillScreen(commonData.bgcolor);
+    getdisplay().fillScreen(commonData.bgcolor);
-    epd->nextPage();                     // Fast Refresh
+    getdisplay().nextPage();                     // Fast Refresh
-    epd->nextPage();                     // Fast Refresh
+    getdisplay().nextPage();                     // Fast Refresh
     if(String(displaymode) == "Logo + QR Code" || String(displaymode) == "Logo"){
-        epd->fillScreen(commonData.bgcolor);
+        getdisplay().fillScreen(commonData.bgcolor);
-        epd->drawXBitmap(0, 0, OBP_400x300_bits, OBP_400x300_width, OBP_400x300_height, commonData.fgcolor);
+        getdisplay().drawBitmap(0, 0, gImage_Logo_OBP_400x300_sw, getdisplay().width(), getdisplay().height(), commonData.fgcolor); // Draw start logo
-        epd->nextPage();                 // Fast Refresh
+        getdisplay().nextPage();                 // Fast Refresh
-        epd->nextPage();                 // Fast Refresh
+        getdisplay().nextPage();                 // Fast Refresh
         delay(SHOW_TIME);                        // Logo show time
         if(String(displaymode) == "Logo + QR Code"){
-            epd->fillScreen(commonData.bgcolor);
+            getdisplay().fillScreen(commonData.bgcolor);
             qrWiFi(systemname, wifipass, commonData.fgcolor, commonData.bgcolor);  // Show QR code for WiFi connection
-            epd->nextPage();             // Fast Refresh
+            getdisplay().nextPage();             // Fast Refresh
-            epd->nextPage();             // Fast Refresh
+            getdisplay().nextPage();             // Fast Refresh
             delay(SHOW_TIME);                    // QR code show time
         }
-        epd->fillScreen(commonData.bgcolor);
+        getdisplay().fillScreen(commonData.bgcolor);
-        epd->nextPage();                 // Fast Refresh
+        getdisplay().nextPage();                 // Fast Refresh
-        epd->nextPage();                 // Fast Refresh
+        getdisplay().nextPage();                 // Fast Refresh
     }
     
     // Init pages
@@ -592,14 +435,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 wind direction values; store 960 TWD values for 16 minutes history
-    RingBuffer<int16_t> twsHstry(960); // Circular buffer to store wind speed values (TWS)
-    tBoatHstryData hstryBufList = {&twdHstry, &twsHstry};
-
     //fill the page data from config
     numPages=config->getInt(config->visiblePages,1);
     if (numPages < 1) numPages=1;
@@ -620,6 +460,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++){
@@ -638,10 +479,8 @@ void OBP60Task(GwApi *api){
             LOG_DEBUG(GwLog::DEBUG,"added fixed value %s to page %d",value->getName().c_str(),i);
             pages[i].parameters.values.push_back(value); 
        }
-        if (pages[i].description->pageName == "WindPlot") {
        // Add boat history data to page parameters
-            pages[i].parameters.boatHstry = hstryBufList;
+       pages[i].parameters.boatHstry = &hstryBufList;
-        }
     }
     // add out of band system page (always available)
     Page *syspage = allPages.pages[0]->creator(commonData);
@@ -649,12 +488,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 simulation = api->getConfig()->getBool(api->getConfig()->useSimuData, false);
+    bool useSimuData = api->getConfig()->getBool(api->getConfig()->useSimuData, false);
 
     // Initialize history buffer for certain boat data
-    initHstryBuf(api, &boatValues, hstryBufList);
+    hstryBufList.init(&boatValues, logger);
 
     // Display screenshot handler for HTTP request
     // http://192.168.15.1/api/user/OBP60Task/screenshot
@@ -689,7 +528,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());
 
@@ -697,7 +538,7 @@ void OBP60Task(GwApi *api){
     double homelon = commonData.config->getString(commonData.config->homeLON).toDouble();
     bool homevalid = homelat >= -180.0 and homelat <= 180 and homelon >= -90.0 and homelon <= 90.0;
     if (homevalid) {
-        LOG_DEBUG(GwLog::LOG, "Home location set to %f : %f", homelat, homelon);
+        LOG_DEBUG(GwLog::LOG, "Home location set to lat=%f, lon=%f", homelat, homelon);
     } else {
         LOG_DEBUG(GwLog::LOG, "No valid home location found");
     }
@@ -731,6 +572,7 @@ void OBP60Task(GwApi *api){
     //####################################################################################
 
     bool systemPage = false;
+    bool systemPageNew = false;
     Page *currentPage;
     while (true){
         delay(100);     // Delay 100ms (loop time)
@@ -738,7 +580,10 @@ void OBP60Task(GwApi *api){
 
         // Undervoltage detection
         if (uvoltage == true) {
-            underVoltageDetection(api, commonData);
+            if (underVoltageDetection(voffset, vslope)) {
+                LOG_DEBUG(GwLog::ERROR, "Undervoltage detected, shutting down!");
+                underVoltageError(commonData);
+            }
         }
 
         // Set CPU speed after boot after 1min 
@@ -783,6 +628,7 @@ void OBP60Task(GwApi *api){
                     systemPage = true; // System page is out of band
                     syspage->setupKeys();
                     keyboardMessage = 0;
+                    systemPageNew = true;
                 }
                 else {
                     currentPage = pages[pageNumber].page;
@@ -868,27 +714,28 @@ void OBP60Task(GwApi *api){
                 }
             }
             
-            // Full display update afer a new selected page and 4s wait time
+            // Full display update afer a new selected page and 8s wait time
-            if(millis() > starttime4 + 4000 && delayedDisplayUpdate == true){
+            if(millis() > starttime4 + 8000 && delayedDisplayUpdate == true){
                 starttime1 = millis();
                 starttime2 = millis();
-                epd->setFullWindow();    // Set full update
+                getdisplay().setFullWindow();    // Set full update
                 if(fastrefresh == "true"){
-                    epd->nextPage();                     // Full update
+                    getdisplay().nextPage();                     // Full update
                 }
                 else{
-                    epd->fillScreen(commonData.fgcolor); // Clear display
+                    getdisplay().fillScreen(commonData.fgcolor); // Clear display
                     #ifdef DISPLAY_GDEY042T81
-                        epd->init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+                        getdisplay().hibernate();                  // Set display in hybenate mode
+                        getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
                     #else
-                        epd->init(115200);               // Init for normal displays
+                        getdisplay().init(115200);               // Init for normal displays
                     #endif
-                    epd->firstPage();                    // Full update
+                    getdisplay().firstPage();                    // Full update
-                    epd->nextPage();                     // Full update
+                    getdisplay().nextPage();                     // Full update
-//                    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+//                    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-//                    epd->fillScreen(commonData.bgcolor); // Clear display
+//                    getdisplay().fillScreen(commonData.bgcolor); // Clear display
-//                    epd->nextPage();                     // Partial update
+//                    getdisplay().nextPage();                     // Partial update
-//                    epd->nextPage();                     // Partial update
+//                    getdisplay().nextPage();                     // Partial update
                 }
                 delayedDisplayUpdate = false;
             }
@@ -899,23 +746,24 @@ void OBP60Task(GwApi *api){
                 starttime1 = millis();
                 starttime2 = millis();
                 LOG_DEBUG(GwLog::DEBUG,"E-Ink full refresh first 5 min");
-                epd->setFullWindow();    // Set full update
+                getdisplay().setFullWindow();    // Set full update
                 if(fastrefresh == "true"){
-                    epd->nextPage();                     // Full update
+                    getdisplay().nextPage();                     // Full update
                 }
                 else{
-                    epd->fillScreen(commonData.fgcolor); // Clear display
+                    getdisplay().fillScreen(commonData.fgcolor); // Clear display
                     #ifdef DISPLAY_GDEY042T81
-                        epd->init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+                        getdisplay().hibernate();                  // Set display in hybenate mode
+                        getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
                     #else
-                        epd->init(115200);               // Init for normal displays
+                        getdisplay().init(115200);               // Init for normal displays
                     #endif
-                    epd->firstPage();                    // Full update
+                    getdisplay().firstPage();                    // Full update
-                    epd->nextPage();                     // Full update
+                    getdisplay().nextPage();                     // Full update
-//                    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+//                    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-//                    epd->fillScreen(commonData.bgcolor); // Clear display
+//                    getdisplay().fillScreen(commonData.bgcolor); // Clear display
-//                    epd->nextPage();                     // Partial update
+//                    getdisplay().nextPage();                     // Partial update
-//                    epd->nextPage();                     // Partial update
+//                    getdisplay().nextPage();                     // Partial update
                 }
             }
 
@@ -923,23 +771,24 @@ void OBP60Task(GwApi *api){
             if(millis() > starttime2 + fullrefreshtime * 60 * 1000){
                 starttime2 = millis();
                 LOG_DEBUG(GwLog::DEBUG,"E-Ink full refresh");
-                epd->setFullWindow();    // Set full update
+                getdisplay().setFullWindow();    // Set full update
                 if(fastrefresh == "true"){
-                    epd->nextPage();                     // Full update
+                    getdisplay().nextPage();                     // Full update
                 }
                 else{
-                    epd->fillScreen(commonData.fgcolor); // Clear display
+                    getdisplay().fillScreen(commonData.fgcolor); // Clear display
                     #ifdef DISPLAY_GDEY042T81
-                        epd->init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+                        getdisplay().hibernate();                  // Set display in hybenate mode
+                        getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
                     #else
-                        epd->init(115200);               // Init for normal displays
+                        getdisplay().init(115200);               // Init for normal displays
                     #endif
-                    epd->firstPage();                    // Full update
+                    getdisplay().firstPage();                    // Full update
-                    epd->nextPage();                     // Full update
+                    getdisplay().nextPage();                     // Full update
-//                    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+//                    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-//                    epd->fillScreen(commonData.bgcolor); // Clear display
+//                    getdisplay().fillScreen(commonData.bgcolor); // Clear display
-//                    epd->nextPage();                     // Partial update
+//                    getdisplay().nextPage();                     // Partial update
-//                    epd->nextPage();                     // Partial update
+//                    getdisplay().nextPage();                     // Partial update
                 }
             }        
                 
@@ -959,42 +808,48 @@ 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
+                // Handle history buffers for certain boat data for windplot page and other usage
-                 handleHstryBuf(api, &boatValues, hstryBufList);
+                 hstryBufList.handleHstryBuf(useSimuData);
 
                 // Clear display
-                // epd->fillRect(0, 0, epd->width(), epd->height(), commonData.bgcolor);
+                // getdisplay().fillRect(0, 0, getdisplay().width(), getdisplay().height(), commonData.bgcolor);
-                epd->fillScreen(commonData.bgcolor);  // Clear display
+                getdisplay().fillScreen(commonData.bgcolor);  // Clear display
 
                 // Show header if enabled
                 if (pages[pageNumber].description && pages[pageNumber].description->header or systemPage){
                     // build header using commonData
-                    displayHeader(commonData, symbolmode, date, time, hdop);  // Show page header
+                    displayHeader(commonData, date, time, hdop);  // Show page header
                 }
 
                 // Call the particular page
                 if (systemPage) {
                     displayFooter(commonData);
                     PageData sysparams; // empty
+                    sysparams.api = api;
+                    if (systemPageNew) {
+                        syspage->displayNew(sysparams);
+                        systemPageNew = false;
+                    }
                     syspage->displayPage(sysparams);
                 }
                 else {
                     if (currentPage == NULL){
                         LOG_DEBUG(GwLog::ERROR,"page number %d not found", pageNumber);
                         // Error handling for missing page
-                        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+                        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-                        epd->fillScreen(commonData.bgcolor);  // Clear display
+                        getdisplay().fillScreen(commonData.bgcolor);  // Clear display
-                        epd->drawXBitmap(200 - unknown_width / 2, 150 - unknown_height / 2, unknown_bits, unknown_width, unknown_height, commonData.fgcolor);
+                        getdisplay().drawXBitmap(200 - unknown_width / 2, 150 - unknown_height / 2, unknown_bits, unknown_width, unknown_height, commonData.fgcolor);
-                        epd->setCursor(140, 250);
+                        getdisplay().setCursor(140, 250);
-                        epd->setFont(&Atari16px);
+                        getdisplay().setFont(&Atari16px);
-                        epd->print("Here be dragons!");
+                        getdisplay().print("Here be dragons!");
-                        epd->nextPage(); // Partial update (fast)
+                        getdisplay().nextPage(); // Partial update (fast)
                     }
                     else{
                         if (lastPage != pageNumber){
-                            if (hasFRAM) fram.write(FRAM_PAGE_NO, pageNumber); // remember page for device restart
+                            pages[lastPage].page->leavePage(pages[lastPage].parameters); // call page cleanup code
+                            if (hasFRAM) fram.write(FRAM_PAGE_NO, pageNumber); // remember new page for device restart
                             currentPage->setupKeys();
                             currentPage->displayNew(pages[pageNumber].parameters);
                             lastPage = pageNumber;
@@ -1010,10 +865,10 @@ void OBP60Task(GwApi *api){
                             displayAlarm(commonData);
                         }
                         if (ret & PAGE_UPDATE) {
-                            epd->nextPage(); // Partial update (fast)
+                            getdisplay().nextPage(); // Partial update (fast)
                         }
                         if (ret & PAGE_HIBERNATE) {
-                            epd->hibernate();
+                            getdisplay().hibernate();
                         }
                     }
 

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

lib/obp60task/platformio.ini

@@ -22,6 +22,8 @@ lib_deps =
     Wire
     SPI
     ESP32time
+    HTTPClient
+    WiFiClientSecure
     esphome/AsyncTCP-esphome@2.0.1
     robtillaart/PCF8574@0.3.9
     adafruit/Adafruit Unified Sensor @ 1.1.13
@@ -74,6 +76,8 @@ lib_deps =
     SPI
     SD
     ESP32time
+    HTTPClient
+    WiFiClientSecure
     esphome/AsyncTCP-esphome@2.0.1
     robtillaart/PCF8574@0.3.9
     adafruit/Adafruit Unified Sensor @ 1.1.13
@@ -99,8 +103,8 @@ build_flags=
     -D HARDWARE_V10                 #OBP40 hardware revision V1.0 SKU:DIE07300S V1.1 (CrowPanel 4.2)
     -D DISPLAY_GDEY042T81           #new E-Ink display from Good Display (Waveshare), R10 2.2 ohm - good (contast lost by shunshine)
     #-D DISPLAY_ZJY400300-042CAAMFGN #alternativ E-Ink display from ZZE Technology, R10 2.2 ohm - very good   
-    #-D LIPO_ACCU_1200               #Hardware extension, LiPo accu 3,7V 1200mAh
+    -D LIPO_ACCU_1200               #Hardware extension, LiPo accu 3,7V 1200mAh
-    #-D VOLTAGE_SENSOR               #Hardware extension, LiPo voltage sensor with two resistors
+    -D VOLTAGE_SENSOR               #Hardware extension, LiPo voltage sensor with two resistors
     ${env.build_flags}
 upload_port = /dev/ttyUSB0          #OBP40 download via external USB/Serail converter
 upload_protocol = esptool           #firmware upload via USB OTG seriell, by first upload need to set the ESP32-S3 in the upload mode with shortcut GND to Pin27

lib/obp60task/puff.c

@@ -0,0 +1,840 @@
+/*
+ * puff.c
+ * Copyright (C) 2002-2013 Mark Adler
+ * For conditions of distribution and use, see copyright notice in puff.h
+ * version 2.3, 21 Jan 2013
+ *
+ * puff.c is a simple inflate written to be an unambiguous way to specify the
+ * deflate format.  It is not written for speed but rather simplicity.  As a
+ * side benefit, this code might actually be useful when small code is more
+ * important than speed, such as bootstrap applications.  For typical deflate
+ * data, zlib's inflate() is about four times as fast as puff().  zlib's
+ * inflate compiles to around 20K on my machine, whereas puff.c compiles to
+ * around 4K on my machine (a PowerPC using GNU cc).  If the faster decode()
+ * function here is used, then puff() is only twice as slow as zlib's
+ * inflate().
+ *
+ * All dynamically allocated memory comes from the stack.  The stack required
+ * is less than 2K bytes.  This code is compatible with 16-bit int's and
+ * assumes that long's are at least 32 bits.  puff.c uses the short data type,
+ * assumed to be 16 bits, for arrays in order to conserve memory.  The code
+ * works whether integers are stored big endian or little endian.
+ *
+ * In the comments below are "Format notes" that describe the inflate process
+ * and document some of the less obvious aspects of the format.  This source
+ * code is meant to supplement RFC 1951, which formally describes the deflate
+ * format:
+ *
+ *    http://www.zlib.org/rfc-deflate.html
+ */
+
+/*
+ * Change history:
+ *
+ * 1.0  10 Feb 2002     - First version
+ * 1.1  17 Feb 2002     - Clarifications of some comments and notes
+ *                      - Update puff() dest and source pointers on negative
+ *                        errors to facilitate debugging deflators
+ *                      - Remove longest from struct huffman -- not needed
+ *                      - Simplify offs[] index in construct()
+ *                      - Add input size and checking, using longjmp() to
+ *                        maintain easy readability
+ *                      - Use short data type for large arrays
+ *                      - Use pointers instead of long to specify source and
+ *                        destination sizes to avoid arbitrary 4 GB limits
+ * 1.2  17 Mar 2002     - Add faster version of decode(), doubles speed (!),
+ *                        but leave simple version for readability
+ *                      - Make sure invalid distances detected if pointers
+ *                        are 16 bits
+ *                      - Fix fixed codes table error
+ *                      - Provide a scanning mode for determining size of
+ *                        uncompressed data
+ * 1.3  20 Mar 2002     - Go back to lengths for puff() parameters [Gailly]
+ *                      - Add a puff.h file for the interface
+ *                      - Add braces in puff() for else do [Gailly]
+ *                      - Use indexes instead of pointers for readability
+ * 1.4  31 Mar 2002     - Simplify construct() code set check
+ *                      - Fix some comments
+ *                      - Add FIXLCODES #define
+ * 1.5   6 Apr 2002     - Minor comment fixes
+ * 1.6   7 Aug 2002     - Minor format changes
+ * 1.7   3 Mar 2003     - Added test code for distribution
+ *                      - Added zlib-like license
+ * 1.8   9 Jan 2004     - Added some comments on no distance codes case
+ * 1.9  21 Feb 2008     - Fix bug on 16-bit integer architectures [Pohland]
+ *                      - Catch missing end-of-block symbol error
+ * 2.0  25 Jul 2008     - Add #define to permit distance too far back
+ *                      - Add option in TEST code for puff to write the data
+ *                      - Add option in TEST code to skip input bytes
+ *                      - Allow TEST code to read from piped stdin
+ * 2.1   4 Apr 2010     - Avoid variable initialization for happier compilers
+ *                      - Avoid unsigned comparisons for even happier compilers
+ * 2.2  25 Apr 2010     - Fix bug in variable initializations [Oberhumer]
+ *                      - Add const where appropriate [Oberhumer]
+ *                      - Split if's and ?'s for coverage testing
+ *                      - Break out test code to separate file
+ *                      - Move NIL to puff.h
+ *                      - Allow incomplete code only if single code length is 1
+ *                      - Add full code coverage test to Makefile
+ * 2.3  21 Jan 2013     - Check for invalid code length codes in dynamic blocks
+ */
+
+#include <setjmp.h>             /* for setjmp(), longjmp(), and jmp_buf */
+#include "puff.h"               /* prototype for puff() */
+
+#define local static            /* for local function definitions */
+
+/*
+ * Maximums for allocations and loops.  It is not useful to change these --
+ * they are fixed by the deflate format.
+ */
+#define MAXBITS 15              /* maximum bits in a code */
+#define MAXLCODES 286           /* maximum number of literal/length codes */
+#define MAXDCODES 30            /* maximum number of distance codes */
+#define MAXCODES (MAXLCODES+MAXDCODES)  /* maximum codes lengths to read */
+#define FIXLCODES 288           /* number of fixed literal/length codes */
+
+/* input and output state */
+struct state {
+    /* output state */
+    unsigned char *out;         /* output buffer */
+    unsigned long outlen;       /* available space at out */
+    unsigned long outcnt;       /* bytes written to out so far */
+
+    /* input state */
+    const unsigned char *in;    /* input buffer */
+    unsigned long inlen;        /* available input at in */
+    unsigned long incnt;        /* bytes read so far */
+    int bitbuf;                 /* bit buffer */
+    int bitcnt;                 /* number of bits in bit buffer */
+
+    /* input limit error return state for bits() and decode() */
+    jmp_buf env;
+};
+
+/*
+ * Return need bits from the input stream.  This always leaves less than
+ * eight bits in the buffer.  bits() works properly for need == 0.
+ *
+ * Format notes:
+ *
+ * - Bits are stored in bytes from the least significant bit to the most
+ *   significant bit.  Therefore bits are dropped from the bottom of the bit
+ *   buffer, using shift right, and new bytes are appended to the top of the
+ *   bit buffer, using shift left.
+ */
+local int bits(struct state *s, int need)
+{
+    long val;           /* bit accumulator (can use up to 20 bits) */
+
+    /* load at least need bits into val */
+    val = s->bitbuf;
+    while (s->bitcnt < need) {
+        if (s->incnt == s->inlen)
+            longjmp(s->env, 1);         /* out of input */
+        val |= (long)(s->in[s->incnt++]) << s->bitcnt;  /* load eight bits */
+        s->bitcnt += 8;
+    }
+
+    /* drop need bits and update buffer, always zero to seven bits left */
+    s->bitbuf = (int)(val >> need);
+    s->bitcnt -= need;
+
+    /* return need bits, zeroing the bits above that */
+    return (int)(val & ((1L << need) - 1));
+}
+
+/*
+ * Process a stored block.
+ *
+ * Format notes:
+ *
+ * - After the two-bit stored block type (00), the stored block length and
+ *   stored bytes are byte-aligned for fast copying.  Therefore any leftover
+ *   bits in the byte that has the last bit of the type, as many as seven, are
+ *   discarded.  The value of the discarded bits are not defined and should not
+ *   be checked against any expectation.
+ *
+ * - The second inverted copy of the stored block length does not have to be
+ *   checked, but it's probably a good idea to do so anyway.
+ *
+ * - A stored block can have zero length.  This is sometimes used to byte-align
+ *   subsets of the compressed data for random access or partial recovery.
+ */
+local int stored(struct state *s)
+{
+    unsigned len;       /* length of stored block */
+
+    /* discard leftover bits from current byte (assumes s->bitcnt < 8) */
+    s->bitbuf = 0;
+    s->bitcnt = 0;
+
+    /* get length and check against its one's complement */
+    if (s->incnt + 4 > s->inlen)
+        return 2;                               /* not enough input */
+    len = s->in[s->incnt++];
+    len |= s->in[s->incnt++] << 8;
+    if (s->in[s->incnt++] != (~len & 0xff) ||
+        s->in[s->incnt++] != ((~len >> 8) & 0xff))
+        return -2;                              /* didn't match complement! */
+
+    /* copy len bytes from in to out */
+    if (s->incnt + len > s->inlen)
+        return 2;                               /* not enough input */
+    if (s->out != NIL) {
+        if (s->outcnt + len > s->outlen)
+            return 1;                           /* not enough output space */
+        while (len--)
+            s->out[s->outcnt++] = s->in[s->incnt++];
+    }
+    else {                                      /* just scanning */
+        s->outcnt += len;
+        s->incnt += len;
+    }
+
+    /* done with a valid stored block */
+    return 0;
+}
+
+/*
+ * Huffman code decoding tables.  count[1..MAXBITS] is the number of symbols of
+ * each length, which for a canonical code are stepped through in order.
+ * symbol[] are the symbol values in canonical order, where the number of
+ * entries is the sum of the counts in count[].  The decoding process can be
+ * seen in the function decode() below.
+ */
+struct huffman {
+    short *count;       /* number of symbols of each length */
+    short *symbol;      /* canonically ordered symbols */
+};
+
+/*
+ * Decode a code from the stream s using huffman table h.  Return the symbol or
+ * a negative value if there is an error.  If all of the lengths are zero, i.e.
+ * an empty code, or if the code is incomplete and an invalid code is received,
+ * then -10 is returned after reading MAXBITS bits.
+ *
+ * Format notes:
+ *
+ * - The codes as stored in the compressed data are bit-reversed relative to
+ *   a simple integer ordering of codes of the same lengths.  Hence below the
+ *   bits are pulled from the compressed data one at a time and used to
+ *   build the code value reversed from what is in the stream in order to
+ *   permit simple integer comparisons for decoding.  A table-based decoding
+ *   scheme (as used in zlib) does not need to do this reversal.
+ *
+ * - The first code for the shortest length is all zeros.  Subsequent codes of
+ *   the same length are simply integer increments of the previous code.  When
+ *   moving up a length, a zero bit is appended to the code.  For a complete
+ *   code, the last code of the longest length will be all ones.
+ *
+ * - Incomplete codes are handled by this decoder, since they are permitted
+ *   in the deflate format.  See the format notes for fixed() and dynamic().
+ */
+#ifdef SLOW
+local int decode(struct state *s, const struct huffman *h)
+{
+    int len;            /* current number of bits in code */
+    int code;           /* len bits being decoded */
+    int first;          /* first code of length len */
+    int count;          /* number of codes of length len */
+    int index;          /* index of first code of length len in symbol table */
+
+    code = first = index = 0;
+    for (len = 1; len <= MAXBITS; len++) {
+        code |= bits(s, 1);             /* get next bit */
+        count = h->count[len];
+        if (code - count < first)       /* if length len, return symbol */
+            return h->symbol[index + (code - first)];
+        index += count;                 /* else update for next length */
+        first += count;
+        first <<= 1;
+        code <<= 1;
+    }
+    return -10;                         /* ran out of codes */
+}
+
+/*
+ * A faster version of decode() for real applications of this code.   It's not
+ * as readable, but it makes puff() twice as fast.  And it only makes the code
+ * a few percent larger.
+ */
+#else /* !SLOW */
+local int decode(struct state *s, const struct huffman *h)
+{
+    int len;            /* current number of bits in code */
+    int code;           /* len bits being decoded */
+    int first;          /* first code of length len */
+    int count;          /* number of codes of length len */
+    int index;          /* index of first code of length len in symbol table */
+    int bitbuf;         /* bits from stream */
+    int left;           /* bits left in next or left to process */
+    short *next;        /* next number of codes */
+
+    bitbuf = s->bitbuf;
+    left = s->bitcnt;
+    code = first = index = 0;
+    len = 1;
+    next = h->count + 1;
+    while (1) {
+        while (left--) {
+            code |= bitbuf & 1;
+            bitbuf >>= 1;
+            count = *next++;
+            if (code - count < first) { /* if length len, return symbol */
+                s->bitbuf = bitbuf;
+                s->bitcnt = (s->bitcnt - len) & 7;
+                return h->symbol[index + (code - first)];
+            }
+            index += count;             /* else update for next length */
+            first += count;
+            first <<= 1;
+            code <<= 1;
+            len++;
+        }
+        left = (MAXBITS+1) - len;
+        if (left == 0)
+            break;
+        if (s->incnt == s->inlen)
+            longjmp(s->env, 1);         /* out of input */
+        bitbuf = s->in[s->incnt++];
+        if (left > 8)
+            left = 8;
+    }
+    return -10;                         /* ran out of codes */
+}
+#endif /* SLOW */
+
+/*
+ * Given the list of code lengths length[0..n-1] representing a canonical
+ * Huffman code for n symbols, construct the tables required to decode those
+ * codes.  Those tables are the number of codes of each length, and the symbols
+ * sorted by length, retaining their original order within each length.  The
+ * return value is zero for a complete code set, negative for an over-
+ * subscribed code set, and positive for an incomplete code set.  The tables
+ * can be used if the return value is zero or positive, but they cannot be used
+ * if the return value is negative.  If the return value is zero, it is not
+ * possible for decode() using that table to return an error--any stream of
+ * enough bits will resolve to a symbol.  If the return value is positive, then
+ * it is possible for decode() using that table to return an error for received
+ * codes past the end of the incomplete lengths.
+ *
+ * Not used by decode(), but used for error checking, h->count[0] is the number
+ * of the n symbols not in the code.  So n - h->count[0] is the number of
+ * codes.  This is useful for checking for incomplete codes that have more than
+ * one symbol, which is an error in a dynamic block.
+ *
+ * Assumption: for all i in 0..n-1, 0 <= length[i] <= MAXBITS
+ * This is assured by the construction of the length arrays in dynamic() and
+ * fixed() and is not verified by construct().
+ *
+ * Format notes:
+ *
+ * - Permitted and expected examples of incomplete codes are one of the fixed
+ *   codes and any code with a single symbol which in deflate is coded as one
+ *   bit instead of zero bits.  See the format notes for fixed() and dynamic().
+ *
+ * - Within a given code length, the symbols are kept in ascending order for
+ *   the code bits definition.
+ */
+local int construct(struct huffman *h, const short *length, int n)
+{
+    int symbol;         /* current symbol when stepping through length[] */
+    int len;            /* current length when stepping through h->count[] */
+    int left;           /* number of possible codes left of current length */
+    short offs[MAXBITS+1];      /* offsets in symbol table for each length */
+
+    /* count number of codes of each length */
+    for (len = 0; len <= MAXBITS; len++)
+        h->count[len] = 0;
+    for (symbol = 0; symbol < n; symbol++)
+        (h->count[length[symbol]])++;   /* assumes lengths are within bounds */
+    if (h->count[0] == n)               /* no codes! */
+        return 0;                       /* complete, but decode() will fail */
+
+    /* check for an over-subscribed or incomplete set of lengths */
+    left = 1;                           /* one possible code of zero length */
+    for (len = 1; len <= MAXBITS; len++) {
+        left <<= 1;                     /* one more bit, double codes left */
+        left -= h->count[len];          /* deduct count from possible codes */
+        if (left < 0)
+            return left;                /* over-subscribed--return negative */
+    }                                   /* left > 0 means incomplete */
+
+    /* generate offsets into symbol table for each length for sorting */
+    offs[1] = 0;
+    for (len = 1; len < MAXBITS; len++)
+        offs[len + 1] = offs[len] + h->count[len];
+
+    /*
+     * put symbols in table sorted by length, by symbol order within each
+     * length
+     */
+    for (symbol = 0; symbol < n; symbol++)
+        if (length[symbol] != 0)
+            h->symbol[offs[length[symbol]]++] = symbol;
+
+    /* return zero for complete set, positive for incomplete set */
+    return left;
+}
+
+/*
+ * Decode literal/length and distance codes until an end-of-block code.
+ *
+ * Format notes:
+ *
+ * - Compressed data that is after the block type if fixed or after the code
+ *   description if dynamic is a combination of literals and length/distance
+ *   pairs terminated by and end-of-block code.  Literals are simply Huffman
+ *   coded bytes.  A length/distance pair is a coded length followed by a
+ *   coded distance to represent a string that occurs earlier in the
+ *   uncompressed data that occurs again at the current location.
+ *
+ * - Literals, lengths, and the end-of-block code are combined into a single
+ *   code of up to 286 symbols.  They are 256 literals (0..255), 29 length
+ *   symbols (257..285), and the end-of-block symbol (256).
+ *
+ * - There are 256 possible lengths (3..258), and so 29 symbols are not enough
+ *   to represent all of those.  Lengths 3..10 and 258 are in fact represented
+ *   by just a length symbol.  Lengths 11..257 are represented as a symbol and
+ *   some number of extra bits that are added as an integer to the base length
+ *   of the length symbol.  The number of extra bits is determined by the base
+ *   length symbol.  These are in the static arrays below, lens[] for the base
+ *   lengths and lext[] for the corresponding number of extra bits.
+ *
+ * - The reason that 258 gets its own symbol is that the longest length is used
+ *   often in highly redundant files.  Note that 258 can also be coded as the
+ *   base value 227 plus the maximum extra value of 31.  While a good deflate
+ *   should never do this, it is not an error, and should be decoded properly.
+ *
+ * - If a length is decoded, including its extra bits if any, then it is
+ *   followed a distance code.  There are up to 30 distance symbols.  Again
+ *   there are many more possible distances (1..32768), so extra bits are added
+ *   to a base value represented by the symbol.  The distances 1..4 get their
+ *   own symbol, but the rest require extra bits.  The base distances and
+ *   corresponding number of extra bits are below in the static arrays dist[]
+ *   and dext[].
+ *
+ * - Literal bytes are simply written to the output.  A length/distance pair is
+ *   an instruction to copy previously uncompressed bytes to the output.  The
+ *   copy is from distance bytes back in the output stream, copying for length
+ *   bytes.
+ *
+ * - Distances pointing before the beginning of the output data are not
+ *   permitted.
+ *
+ * - Overlapped copies, where the length is greater than the distance, are
+ *   allowed and common.  For example, a distance of one and a length of 258
+ *   simply copies the last byte 258 times.  A distance of four and a length of
+ *   twelve copies the last four bytes three times.  A simple forward copy
+ *   ignoring whether the length is greater than the distance or not implements
+ *   this correctly.  You should not use memcpy() since its behavior is not
+ *   defined for overlapped arrays.  You should not use memmove() or bcopy()
+ *   since though their behavior -is- defined for overlapping arrays, it is
+ *   defined to do the wrong thing in this case.
+ */
+local int codes(struct state *s,
+                const struct huffman *lencode,
+                const struct huffman *distcode)
+{
+    int symbol;         /* decoded symbol */
+    int len;            /* length for copy */
+    unsigned dist;      /* distance for copy */
+    static const short lens[29] = { /* Size base for length codes 257..285 */
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258};
+    static const short lext[29] = { /* Extra bits for length codes 257..285 */
+        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
+        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0};
+    static const short dists[30] = { /* Offset base for distance codes 0..29 */
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+        8193, 12289, 16385, 24577};
+    static const short dext[30] = { /* Extra bits for distance codes 0..29 */
+        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
+        7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
+        12, 12, 13, 13};
+
+    /* decode literals and length/distance pairs */
+    do {
+        symbol = decode(s, lencode);
+        if (symbol < 0)
+            return symbol;              /* invalid symbol */
+        if (symbol < 256) {             /* literal: symbol is the byte */
+            /* write out the literal */
+            if (s->out != NIL) {
+                if (s->outcnt == s->outlen)
+                    return 1;
+                s->out[s->outcnt] = symbol;
+            }
+            s->outcnt++;
+        }
+        else if (symbol > 256) {        /* length */
+            /* get and compute length */
+            symbol -= 257;
+            if (symbol >= 29)
+                return -10;             /* invalid fixed code */
+            len = lens[symbol] + bits(s, lext[symbol]);
+
+            /* get and check distance */
+            symbol = decode(s, distcode);
+            if (symbol < 0)
+                return symbol;          /* invalid symbol */
+            dist = dists[symbol] + bits(s, dext[symbol]);
+#ifndef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+            if (dist > s->outcnt)
+                return -11;     /* distance too far back */
+#endif
+
+            /* copy length bytes from distance bytes back */
+            if (s->out != NIL) {
+                if (s->outcnt + len > s->outlen)
+                    return 1;
+                while (len--) {
+                    s->out[s->outcnt] =
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                        dist > s->outcnt ?
+                            0 :
+#endif
+                            s->out[s->outcnt - dist];
+                    s->outcnt++;
+                }
+            }
+            else
+                s->outcnt += len;
+        }
+    } while (symbol != 256);            /* end of block symbol */
+
+    /* done with a valid fixed or dynamic block */
+    return 0;
+}
+
+/*
+ * Process a fixed codes block.
+ *
+ * Format notes:
+ *
+ * - This block type can be useful for compressing small amounts of data for
+ *   which the size of the code descriptions in a dynamic block exceeds the
+ *   benefit of custom codes for that block.  For fixed codes, no bits are
+ *   spent on code descriptions.  Instead the code lengths for literal/length
+ *   codes and distance codes are fixed.  The specific lengths for each symbol
+ *   can be seen in the "for" loops below.
+ *
+ * - The literal/length code is complete, but has two symbols that are invalid
+ *   and should result in an error if received.  This cannot be implemented
+ *   simply as an incomplete code since those two symbols are in the "middle"
+ *   of the code.  They are eight bits long and the longest literal/length\
+ *   code is nine bits.  Therefore the code must be constructed with those
+ *   symbols, and the invalid symbols must be detected after decoding.
+ *
+ * - The fixed distance codes also have two invalid symbols that should result
+ *   in an error if received.  Since all of the distance codes are the same
+ *   length, this can be implemented as an incomplete code.  Then the invalid
+ *   codes are detected while decoding.
+ */
+local int fixed(struct state *s)
+{
+    static int virgin = 1;
+    static short lencnt[MAXBITS+1], lensym[FIXLCODES];
+    static short distcnt[MAXBITS+1], distsym[MAXDCODES];
+    static struct huffman lencode, distcode;
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        int symbol;
+        short lengths[FIXLCODES];
+
+        /* construct lencode and distcode */
+        lencode.count = lencnt;
+        lencode.symbol = lensym;
+        distcode.count = distcnt;
+        distcode.symbol = distsym;
+
+        /* literal/length table */
+        for (symbol = 0; symbol < 144; symbol++)
+            lengths[symbol] = 8;
+        for (; symbol < 256; symbol++)
+            lengths[symbol] = 9;
+        for (; symbol < 280; symbol++)
+            lengths[symbol] = 7;
+        for (; symbol < FIXLCODES; symbol++)
+            lengths[symbol] = 8;
+        construct(&lencode, lengths, FIXLCODES);
+
+        /* distance table */
+        for (symbol = 0; symbol < MAXDCODES; symbol++)
+            lengths[symbol] = 5;
+        construct(&distcode, lengths, MAXDCODES);
+
+        /* do this just once */
+        virgin = 0;
+    }
+
+    /* decode data until end-of-block code */
+    return codes(s, &lencode, &distcode);
+}
+
+/*
+ * Process a dynamic codes block.
+ *
+ * Format notes:
+ *
+ * - A dynamic block starts with a description of the literal/length and
+ *   distance codes for that block.  New dynamic blocks allow the compressor to
+ *   rapidly adapt to changing data with new codes optimized for that data.
+ *
+ * - The codes used by the deflate format are "canonical", which means that
+ *   the actual bits of the codes are generated in an unambiguous way simply
+ *   from the number of bits in each code.  Therefore the code descriptions
+ *   are simply a list of code lengths for each symbol.
+ *
+ * - The code lengths are stored in order for the symbols, so lengths are
+ *   provided for each of the literal/length symbols, and for each of the
+ *   distance symbols.
+ *
+ * - If a symbol is not used in the block, this is represented by a zero as the
+ *   code length.  This does not mean a zero-length code, but rather that no
+ *   code should be created for this symbol.  There is no way in the deflate
+ *   format to represent a zero-length code.
+ *
+ * - The maximum number of bits in a code is 15, so the possible lengths for
+ *   any code are 1..15.
+ *
+ * - The fact that a length of zero is not permitted for a code has an
+ *   interesting consequence.  Normally if only one symbol is used for a given
+ *   code, then in fact that code could be represented with zero bits.  However
+ *   in deflate, that code has to be at least one bit.  So for example, if
+ *   only a single distance base symbol appears in a block, then it will be
+ *   represented by a single code of length one, in particular one 0 bit.  This
+ *   is an incomplete code, since if a 1 bit is received, it has no meaning,
+ *   and should result in an error.  So incomplete distance codes of one symbol
+ *   should be permitted, and the receipt of invalid codes should be handled.
+ *
+ * - It is also possible to have a single literal/length code, but that code
+ *   must be the end-of-block code, since every dynamic block has one.  This
+ *   is not the most efficient way to create an empty block (an empty fixed
+ *   block is fewer bits), but it is allowed by the format.  So incomplete
+ *   literal/length codes of one symbol should also be permitted.
+ *
+ * - If there are only literal codes and no lengths, then there are no distance
+ *   codes.  This is represented by one distance code with zero bits.
+ *
+ * - The list of up to 286 length/literal lengths and up to 30 distance lengths
+ *   are themselves compressed using Huffman codes and run-length encoding.  In
+ *   the list of code lengths, a 0 symbol means no code, a 1..15 symbol means
+ *   that length, and the symbols 16, 17, and 18 are run-length instructions.
+ *   Each of 16, 17, and 18 are followed by extra bits to define the length of
+ *   the run.  16 copies the last length 3 to 6 times.  17 represents 3 to 10
+ *   zero lengths, and 18 represents 11 to 138 zero lengths.  Unused symbols
+ *   are common, hence the special coding for zero lengths.
+ *
+ * - The symbols for 0..18 are Huffman coded, and so that code must be
+ *   described first.  This is simply a sequence of up to 19 three-bit values
+ *   representing no code (0) or the code length for that symbol (1..7).
+ *
+ * - A dynamic block starts with three fixed-size counts from which is computed
+ *   the number of literal/length code lengths, the number of distance code
+ *   lengths, and the number of code length code lengths (ok, you come up with
+ *   a better name!) in the code descriptions.  For the literal/length and
+ *   distance codes, lengths after those provided are considered zero, i.e. no
+ *   code.  The code length code lengths are received in a permuted order (see
+ *   the order[] array below) to make a short code length code length list more
+ *   likely.  As it turns out, very short and very long codes are less likely
+ *   to be seen in a dynamic code description, hence what may appear initially
+ *   to be a peculiar ordering.
+ *
+ * - Given the number of literal/length code lengths (nlen) and distance code
+ *   lengths (ndist), then they are treated as one long list of nlen + ndist
+ *   code lengths.  Therefore run-length coding can and often does cross the
+ *   boundary between the two sets of lengths.
+ *
+ * - So to summarize, the code description at the start of a dynamic block is
+ *   three counts for the number of code lengths for the literal/length codes,
+ *   the distance codes, and the code length codes.  This is followed by the
+ *   code length code lengths, three bits each.  This is used to construct the
+ *   code length code which is used to read the remainder of the lengths.  Then
+ *   the literal/length code lengths and distance lengths are read as a single
+ *   set of lengths using the code length codes.  Codes are constructed from
+ *   the resulting two sets of lengths, and then finally you can start
+ *   decoding actual compressed data in the block.
+ *
+ * - For reference, a "typical" size for the code description in a dynamic
+ *   block is around 80 bytes.
+ */
+local int dynamic(struct state *s)
+{
+    int nlen, ndist, ncode;             /* number of lengths in descriptor */
+    int index;                          /* index of lengths[] */
+    int err;                            /* construct() return value */
+    short lengths[MAXCODES];            /* descriptor code lengths */
+    short lencnt[MAXBITS+1], lensym[MAXLCODES];         /* lencode memory */
+    short distcnt[MAXBITS+1], distsym[MAXDCODES];       /* distcode memory */
+    struct huffman lencode, distcode;   /* length and distance codes */
+    static const short order[19] =      /* permutation of code length codes */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    /* construct lencode and distcode */
+    lencode.count = lencnt;
+    lencode.symbol = lensym;
+    distcode.count = distcnt;
+    distcode.symbol = distsym;
+
+    /* get number of lengths in each table, check lengths */
+    nlen = bits(s, 5) + 257;
+    ndist = bits(s, 5) + 1;
+    ncode = bits(s, 4) + 4;
+    if (nlen > MAXLCODES || ndist > MAXDCODES)
+        return -3;                      /* bad counts */
+
+    /* read code length code lengths (really), missing lengths are zero */
+    for (index = 0; index < ncode; index++)
+        lengths[order[index]] = bits(s, 3);
+    for (; index < 19; index++)
+        lengths[order[index]] = 0;
+
+    /* build huffman table for code lengths codes (use lencode temporarily) */
+    err = construct(&lencode, lengths, 19);
+    if (err != 0)               /* require complete code set here */
+        return -4;
+
+    /* read length/literal and distance code length tables */
+    index = 0;
+    while (index < nlen + ndist) {
+        int symbol;             /* decoded value */
+        int len;                /* last length to repeat */
+
+        symbol = decode(s, &lencode);
+        if (symbol < 0)
+            return symbol;          /* invalid symbol */
+        if (symbol < 16)                /* length in 0..15 */
+            lengths[index++] = symbol;
+        else {                          /* repeat instruction */
+            len = 0;                    /* assume repeating zeros */
+            if (symbol == 16) {         /* repeat last length 3..6 times */
+                if (index == 0)
+                    return -5;          /* no last length! */
+                len = lengths[index - 1];       /* last length */
+                symbol = 3 + bits(s, 2);
+            }
+            else if (symbol == 17)      /* repeat zero 3..10 times */
+                symbol = 3 + bits(s, 3);
+            else                        /* == 18, repeat zero 11..138 times */
+                symbol = 11 + bits(s, 7);
+            if (index + symbol > nlen + ndist)
+                return -6;              /* too many lengths! */
+            while (symbol--)            /* repeat last or zero symbol times */
+                lengths[index++] = len;
+        }
+    }
+
+    /* check for end-of-block code -- there better be one! */
+    if (lengths[256] == 0)
+        return -9;
+
+    /* build huffman table for literal/length codes */
+    err = construct(&lencode, lengths, nlen);
+    if (err && (err < 0 || nlen != lencode.count[0] + lencode.count[1]))
+        return -7;      /* incomplete code ok only for single length 1 code */
+
+    /* build huffman table for distance codes */
+    err = construct(&distcode, lengths + nlen, ndist);
+    if (err && (err < 0 || ndist != distcode.count[0] + distcode.count[1]))
+        return -8;      /* incomplete code ok only for single length 1 code */
+
+    /* decode data until end-of-block code */
+    return codes(s, &lencode, &distcode);
+}
+
+/*
+ * Inflate source to dest.  On return, destlen and sourcelen are updated to the
+ * size of the uncompressed data and the size of the deflate data respectively.
+ * On success, the return value of puff() is zero.  If there is an error in the
+ * source data, i.e. it is not in the deflate format, then a negative value is
+ * returned.  If there is not enough input available or there is not enough
+ * output space, then a positive error is returned.  In that case, destlen and
+ * sourcelen are not updated to facilitate retrying from the beginning with the
+ * provision of more input data or more output space.  In the case of invalid
+ * inflate data (a negative error), the dest and source pointers are updated to
+ * facilitate the debugging of deflators.
+ *
+ * puff() also has a mode to determine the size of the uncompressed output with
+ * no output written.  For this dest must be (unsigned char *)0.  In this case,
+ * the input value of *destlen is ignored, and on return *destlen is set to the
+ * size of the uncompressed output.
+ *
+ * The return codes are:
+ *
+ *   2:  available inflate data did not terminate
+ *   1:  output space exhausted before completing inflate
+ *   0:  successful inflate
+ *  -1:  invalid block type (type == 3)
+ *  -2:  stored block length did not match one's complement
+ *  -3:  dynamic block code description: too many length or distance codes
+ *  -4:  dynamic block code description: code lengths codes incomplete
+ *  -5:  dynamic block code description: repeat lengths with no first length
+ *  -6:  dynamic block code description: repeat more than specified lengths
+ *  -7:  dynamic block code description: invalid literal/length code lengths
+ *  -8:  dynamic block code description: invalid distance code lengths
+ *  -9:  dynamic block code description: missing end-of-block code
+ * -10:  invalid literal/length or distance code in fixed or dynamic block
+ * -11:  distance is too far back in fixed or dynamic block
+ *
+ * Format notes:
+ *
+ * - Three bits are read for each block to determine the kind of block and
+ *   whether or not it is the last block.  Then the block is decoded and the
+ *   process repeated if it was not the last block.
+ *
+ * - The leftover bits in the last byte of the deflate data after the last
+ *   block (if it was a fixed or dynamic block) are undefined and have no
+ *   expected values to check.
+ */
+int puff(unsigned char *dest,           /* pointer to destination pointer */
+         unsigned long *destlen,        /* amount of output space */
+         const unsigned char *source,   /* pointer to source data pointer */
+         unsigned long *sourcelen)      /* amount of input available */
+{
+    struct state s;             /* input/output state */
+    int last, type;             /* block information */
+    int err;                    /* return value */
+
+    /* initialize output state */
+    s.out = dest;
+    s.outlen = *destlen;                /* ignored if dest is NIL */
+    s.outcnt = 0;
+
+    /* initialize input state */
+    s.in = source;
+    s.inlen = *sourcelen;
+    s.incnt = 0;
+    s.bitbuf = 0;
+    s.bitcnt = 0;
+
+    /* return if bits() or decode() tries to read past available input */
+    if (setjmp(s.env) != 0)             /* if came back here via longjmp() */
+        err = 2;                        /* then skip do-loop, return error */
+    else {
+        /* process blocks until last block or error */
+        do {
+            last = bits(&s, 1);         /* one if last block */
+            type = bits(&s, 2);         /* block type 0..3 */
+            err = type == 0 ?
+                    stored(&s) :
+                    (type == 1 ?
+                        fixed(&s) :
+                        (type == 2 ?
+                            dynamic(&s) :
+                            -1));       /* type == 3, invalid */
+            if (err != 0)
+                break;                  /* return with error */
+        } while (!last);
+    }
+
+    /* update the lengths and return */
+    if (err <= 0) {
+        *destlen = s.outcnt;
+        *sourcelen = s.incnt;
+    }
+    return err;
+}

lib/obp60task/puff.h

@@ -0,0 +1,35 @@
+/* puff.h
+  Copyright (C) 2002-2013 Mark Adler, all rights reserved
+  version 2.3, 21 Jan 2013
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the author be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Mark Adler    madler@alumni.caltech.edu
+ */
+
+
+/*
+ * See puff.c for purpose and usage.
+ */
+#ifndef NIL
+#  define NIL ((unsigned char *)0)      /* for no output option */
+#endif
+
+int puff(unsigned char *dest,           /* pointer to destination pointer */
+         unsigned long *destlen,        /* amount of output space */
+         const unsigned char *source,   /* pointer to source data pointer */
+         unsigned long *sourcelen);     /* amount of input available */

lib/obp60task/utils/make_json.py

@@ -1,172 +0,0 @@
-#!/usr/bin/python
-
-"""
-Convert config file to JSON 
-
-The JSON contains array of single fields. There is no hierarchy.
-Fields are being grouped in GUI with "category".
-A group is shown if a minimum of one field is visible.
-
-Hints
-  capabilities is a dictionary 
-    field:[true | false]
-    optional comma separated multiple values
-
-"""
-
-import os
-import sys
-import getopt
-import configparser
-from io import StringIO
-from pyparsing import alphas, alphanums, Word, Literal, Combine, Group, Forward, ZeroOrMore, delimitedList
-
-__author__ = "Thomas Hooge"
-__copyright__ = "Copyleft 2025, all rights reversed"
-__version__ = "0.1"
-__email__ = "thomas@hoogi.de"
-__status__ = "Development"
-
-infile = None
-outfile = ""
-force = False # overwrite outfile
-
-# Variables for condition parsing
-fieldname = Combine(Word(alphas, exact=1) + Word(alphanums, max=15))
-fieldvalue = Word(alphanums, max=16)
-equals = Literal("=")
-in_op = Literal("IN")
-and_op = Literal("AND")
-or_op = Literal("OR")
-comparison = Group(fieldname + equals + fieldvalue) \
-           | Group(fieldname + in_op + delimitedList(fieldvalue))
-expr = Forward()
-expr <<= comparison + ZeroOrMore((and_op | or_op) + comparison)
-
-def parse_condition(condition):
-    try:
-        result = expr.parseString(condition, parseAll=True)
-    except Exception as e:
-        return ""
-    out = StringIO()
-    andlist = []
-    for token in result:
-        # list: field = value or field IN value [, value ...]
-        # str: AND, OR
-        # combine ANDs and output reaching OR
-        if type(token) == str:
-            if token == "OR":
-                andstr = ",\n".join(andlist)
-                out.write(f'\t\t{{ {andstr} }},\n')
-                andlist = []
-        else:
-            if token[1] == '=':
-                andlist.append(f'"{token[0]}": "{token[2]}"')
-            elif token[1] == 'IN':
-                n = len(token) - 2
-                if n == 1:
-                    # no list, write single value
-                    andlist.append(f'"{token[0]}": "{token[2]}"') 
-                else:
-                    # write list
-                    inlist = '", "'.join(token[2:])
-                    andlist.append(f'"{token[0]}": [ "{inlist}" ]\n')
-                
-    if len(andlist) > 0:
-        out.write("\t\t{{ {} }}".format(", ".join(andlist)))
-    return out.getvalue()
-
-def create_flist():
-    flist = []
-    for field in config.sections():
-        properties = [f'\t"name": "{field}"']
-        for prop, val in config.items(field):
-            if prop in ["label", "type", "default", "description", "category", "check"]:
-                properties.append(f'\t"{prop}": "{val}"')
-            elif prop == "capabilities":
-                # multiple values possible
-                capas = []
-                for capa in val.split(','):
-                    k, v = capa.split(':')
-                    capas.append(f'"{k.strip()}":"{v.strip()}"')
-                capalist = ','.join(capas)
-                properties.append(f'\t"{prop}": {{{capalist}}}')
-            elif prop in ("min", "max"):
-                properties.append(f'\t"{prop}": {val}')
-            elif prop == "list":
-                entries = '", "'.join([x.strip() for x in val.split(',')])
-                properties.append(f'\t"list": ["{entries}"]')
-            elif prop == "dict":
-                d = {}
-                for l in val.splitlines():
-                    if len(l) < 3:
-                        continue
-                    k, v = l.split(':')
-                    d[k.strip()] = v.strip()
-                lines = []
-                for k,v in d.items():
-                    lines.append(f'\t\t{{"l":"{v}","v":"{k}"}}')
-                entries = ",\n".join(lines)
-                properties.append(f'\t"list": [\n{entries}\n\t]')
-            elif prop == "condition":
-                jsoncond = parse_condition(val)
-                properties.append(f'\t"{prop}": [\n{jsoncond}\n\t]\n')
-            else:
-                pass # ignore unknown stuff
-        fieldprops = ",\n".join(properties)
-        flist.append(f'{{\n{fieldprops}\n}}')
-    return flist
-
-def usage():
-    print("{} v{}".format(os.path.basename(__file__), __version__))
-    print(__copyright__)
-    print()
-    print("Command line options")
-    print(" -c --config     config file name to use")
-    print(" -j --json       json file name to generate")
-    print(" -f              force overwrite of existing json file")
-    print(" -h              show this help")
-    print()
-
-if __name__ == '__main__': 
-    try:
-        options, remainder = getopt.getopt(sys.argv[1:], 'c:j:fh', ['config=', 'json='])
-    except getopt.GetoptError as e:
-        print(e)
-        sys.exit(1)
-    filename = None
-    for opt, arg in options:
-        if opt in ('-c', '--config'):
-            infile = arg
-        elif opt in ('-j', '--json'):
-            outfile = arg
-        elif opt == '-h':
-            usage()
-            sys.exit(0)
-        elif opt == '-f':
-            force = True
-    if not infile:
-        print("Error: config filename missing")
-        sys.exit(1)
-    if not os.path.isfile(infile):
-        print(f"Error: configuration file '{filename} not found'")
-        sys.exit(1)
-    if os.path.isfile(outfile) and not force:
-        print(f"Error: json file '{outfile}' already exists")
-        sys.exit(1)
-
-    config = configparser.ConfigParser()
-    ret = config.read(infile)
-    if len(ret) == 0:
-        print(f"ERROR: Config file '{infile}' not found")
-        sys.exit(1)
-
-    flist = create_flist()
-    out = "[\n{}\n]\n".format(",\n".join(flist))
-    if not outfile:
-        # print to console
-        print(out)
-    else:
-        # write to file
-        with open(outfile, "w") as fh:
-            fh.write(out)