Adapt barograph page to current code

extra_script.py

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

lib/api/GwApi.h

@@ -2,6 +2,7 @@
 #define _GWAPI_H
 #include "GwMessage.h"
 #include "N2kMsg.h"
+#include "Nmea2kTwai.h"
 #include "NMEA0183Msg.h"
 #include "GWConfig.h"
 #include "GwBoatData.h"
@@ -222,6 +223,7 @@ class GwApi{
          * accessing boat data must only be executed from within the main thread
          * you need to use the request pattern as shown in GwExampleTask.cpp
          */
+        virtual Nmea2kTwai *getNMEA2000()=0;
         virtual GwBoatData *getBoatData()=0;
         virtual ~GwApi(){}
 };

lib/boatData/GwBoatData.cpp

@@ -6,6 +6,7 @@
 #define GWTYPE_UINT32 2
 #define GWTYPE_UINT16 3
 #define GWTYPE_INT16 4
+#define GWTYPE_STRING 5
 #define GWTYPE_USER 100
 
 class GwBoatItemTypes
@@ -15,6 +16,7 @@ public:
     static int getType(const uint16_t &x) { return GWTYPE_UINT16; }
     static int getType(const int16_t &x) { return GWTYPE_INT16; }
     static int getType(const double &x) { return GWTYPE_DOUBLE; }
+    static int getType(const String &x) { return GWTYPE_STRING; }
     static int getType(const GwSatInfoList &x) { return GWTYPE_USER + 1; }
 };
 
@@ -252,6 +254,10 @@ static void writeToString(GwTextWriter *writer, const int16_t &value)
 {
     writer->writeInteger(value);
 }
+static void writeToString(GwTextWriter *writer, String value)
+{
+    writer->writeString(value.c_str());
+}
 static void writeToString(GwTextWriter *writer, GwSatInfoList &value)
 {
     writer->writeInteger(value.getNumSats());

lib/boatData/GwBoatData.h

@@ -58,6 +58,7 @@ class GwBoatItemBase{
         GWSC(formatRot);
         GWSC(formatDate);
         GWSC(formatTime);
+        GWSC(formatName);
     protected:
         int type;
         unsigned long lastSet=0;
@@ -120,7 +121,13 @@ template<class T> class GwBoatItem : public GwBoatItemBase{
             if (! isValid(millis())) return defaultv;
             return data;
         }
-        virtual double getDoubleValue(){return (double)data;}
+        virtual double getDoubleValue(){
+            if constexpr (std::is_same<T, String>::value) {
+                return 0.0; // TODO any better ideas?
+            } else {
+                return (double)data;
+            }
+        }
         virtual void fillString();
         virtual void toJsonDoc(GwJsonDocument *doc, unsigned long minTime);
         virtual int getLastSource(){return lastUpdateSource;}
@@ -235,6 +242,7 @@ class GwBoatData{
     GWBOATDATA(double,XTE,formatXte) // cross track error
     GWBOATDATA(double,WPLat,formatLatitude) // waypoint latitude
     GWBOATDATA(double,WPLon,formatLongitude) // waypoint longitude
+    GWBOATDATA(String,WPName,formatName) // waypoint name
     GWSPECBOATDATA(GwBoatDataSatList,SatInfo,GwSatInfoList::toType,formatFixed0);
     public:
         GwBoatData(GwLog *logger, GwConfigHandler *cfg);

lib/obp60task/BoatDataCalibration.cpp

@@ -38,7 +38,7 @@ void CalibrationDataList::readConfig(GwConfigHandler* config, GwLog* logger)
 
         instance = std::string(config->getString(calInstance, "---").c_str());
         if (instance == "---") {
-            LOG_DEBUG(GwLog::LOG, "no calibration data for instance no. %d", i + 1);
+            logger->logDebug(GwLog::LOG, "no calibration data for instance no. %d", i + 1);
             continue;
         }
         calibMap[instance] = { 0.0f, 1.0f, 1.0f, 0.0f, false };
@@ -101,10 +101,10 @@ 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(),
+        logger->logDebug(GwLog::LOG, "stored calibration data: %s, offset: %f, slope: %f, smoothing: %f", instance.c_str(),
             calibMap[instance].offset, calibMap[instance].slope, calibMap[instance].smooth);
     }
-    LOG_DEBUG(GwLog::LOG, "all calibration data read");
+    logger->logDebug(GwLog::LOG, "all calibration data read");
 }
 
 void CalibrationDataList::calibrateInstance(GwApi::BoatValue* boatDataValue, GwLog* logger)
@@ -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());
+        logger->logDebug(GwLog::DEBUG, "BoatDataCalibration: %s not found in calibration data list", instance.c_str());
         return;
     } else if (!boatDataValue->valid) { // no valid boat data value, so we don't want to apply calibration data
         calibMap[instance].isCalibrated = false;
@@ -127,7 +127,7 @@ void CalibrationDataList::calibrateInstance(GwApi::BoatValue* boatDataValue, GwL
         slope = calibMap[instance].slope;
         dataValue = boatDataValue->value;
         format = boatDataValue->getFormat().c_str();
-        LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: value: %f, format: %s", instance.c_str(), dataValue, format.c_str());
+        logger->logDebug(GwLog::DEBUG, "BoatDataCalibration: %s: value: %f, format: %s", instance.c_str(), dataValue, format.c_str());
 
         if (format == "formatWind") { // instance is of type angle
             dataValue = (dataValue * slope) + offset;
@@ -156,7 +156,7 @@ void CalibrationDataList::calibrateInstance(GwApi::BoatValue* boatDataValue, GwL
         calibrationData.smoothInstance(boatDataValue, logger); // smooth the boat data value
         calibMap[instance].value = boatDataValue->value; // store the calibrated + smoothed value in the list
 
-        LOG_DEBUG(GwLog::DEBUG, "BoatDataCalibration: %s: Offset: %f, Slope: %f, Result: %f", instance.c_str(), offset, slope, calibMap[instance].value);
+        logger->logDebug(GwLog::DEBUG, "BoatDataCalibration: %s: Offset: %f, Slope: %f, Result: %f", instance.c_str(), offset, slope, calibMap[instance].value);
     }
 }
 
@@ -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());
+        logger->logDebug(GwLog::DEBUG, "BoatDataCalibration: smooth factor for %s not found in calibration data list", instance.c_str());
         return;
     } else {
         smoothFactor = calibMap[instance].smooth;
@@ -185,7 +185,7 @@ 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);
+        logger->logDebug(GwLog::DEBUG, "BoatDataCalibration: %s: Smoothing factor: %f, Smoothed value: %f", instance.c_str(), smoothFactor, dataValue);
     }
 }
 

lib/obp60task/ConfigMenu.cpp

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

lib/obp60task/ConfigMenu.h

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

lib/obp60task/Create_new_pages.txt

@@ -1,6 +0,0 @@
-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/Graphics.cpp

@@ -0,0 +1,25 @@
+/*
+Generic graphics functions
+
+*/
+#include <math.h>
+#include "Graphics.h"
+
+Point rotatePoint(const Point& origin, const Point& p, double angle) {
+    // rotate poind around origin by degrees
+    Point rotated;
+    double phi = angle * M_PI / 180.0;
+    double dx = p.x - origin.x;
+    double dy = p.y - origin.y;
+    rotated.x = origin.x + cos(phi) * dx - sin(phi) * dy;
+    rotated.y = origin.y + sin(phi) * dx + cos(phi) * dy;
+    return rotated;
+}
+
+std::vector<Point> rotatePoints(const Point& origin, const std::vector<Point>& pts, double angle) {
+    std::vector<Point> rotatedPoints;
+    for (const auto& p : pts) {
+         rotatedPoints.push_back(rotatePoint(origin, p, angle));
+    }
+     return rotatedPoints;
+}

lib/obp60task/Graphics.h

@@ -0,0 +1,17 @@
+#pragma once
+#include <vector>
+
+struct Point {
+    double x;
+    double y;
+};
+
+struct Rect {
+    double x;
+    double y;
+    double w;
+    double h;
+};
+
+Point rotatePoint(const Point& origin, const Point& p, double angle);
+std::vector<Point> rotatePoints(const Point& origin, const std::vector<Point>& pts, double angle);

lib/obp60task/LedSpiTask.cpp

@@ -14,6 +14,30 @@ https://controllerstech.com/ws2812-leds-using-spi/
 
 */
 
+String Color::toHex() {
+    char hexColor[8];
+    sprintf(hexColor, "#%02X%02X%02X", r, g, b);
+    return String(hexColor);
+}
+
+String Color::toName() {
+    static std::map<int, String> const names = {
+        {0xff0000, "Red"},
+        {0x00ff00, "Green"},
+        {0x0000ff, "Blue",},
+        {0xff9900, "Orange"},
+        {0xffff00, "Yellow"},
+        {0x3366ff, "Aqua"},
+        {0xff0066, "Violet"},
+        {0xffffff, "White"}
+    };
+    int color = (r << 16) + (g << 8) + b;
+    auto it = names.find(color);
+    if (it == names.end()) {
+        return toHex();
+    }
+    return it->second;
+}
 
 static uint8_t mulcolor(uint8_t f1, uint8_t f2){
     uint16_t rt=f1;
@@ -59,12 +83,12 @@ static size_t ledsToBuffer(int numLeds,const Color *leds,uint8_t *buffer){
 bool prepareGpio(GwLog *logger, uint8_t pin){
     esp_err_t err=gpio_set_direction((gpio_num_t)pin,GPIO_MODE_OUTPUT);
     if (err != ESP_OK){
-        LOG_DEBUG(GwLog::ERROR,"unable to set gpio mode for %d: %d",pin,(int)err);
+        logger->logDebug(GwLog::ERROR, "unable to set gpio mode for %d: %d", pin, (int)err);
         return false;
     }
     err=gpio_set_level((gpio_num_t)pin,0);
     if (err != ESP_OK){
-        LOG_DEBUG(GwLog::ERROR,"unable to set gpio level for %d: %d",pin,(int)err);
+        logger->logDebug(GwLog::ERROR, "unable to set gpio level for %d: %d", pin, (int)err);
         return false;
     }
     return true;
@@ -90,8 +114,8 @@ bool prepareSpi(GwLog *logger,spi_host_device_t bus,spi_device_handle_t *device)
         };   
     esp_err_t err=spi_bus_initialize(bus,&buscfg,SPI_DMA_CH_AUTO);    
     if (err != ESP_OK){
-        LOG_DEBUG(GwLog::ERROR,"unable to initialize SPI bus %d,mosi=%d, error=%d",
+        logger->logDebug(GwLog::ERROR, "unable to initialize SPI bus %d,mosi=%d, error=%d",
-        (int)bus,-1,(int)err);
+            (int)bus, -1, (int)err);
         return false;
     }
     spi_device_interface_config_t devcfg = {
@@ -109,16 +133,16 @@ bool prepareSpi(GwLog *logger,spi_host_device_t bus,spi_device_handle_t *device)
         };
     err=spi_bus_add_device(bus,&devcfg,device);
     if (err != ESP_OK){
-        LOG_DEBUG(GwLog::ERROR,"unable to add device to SPI bus %d,mosi=%d, error=%d",
+        logger->logDebug(GwLog::ERROR, "unable to add device to SPI bus %d,mosi=%d, error=%d",
-        (int)bus,-1,(int)err);
+            (int)bus, -1, (int)err);
         return false;
     }
     //slightly speed up the transactions
     //as we are the only ones using the bus we can safely acquire it forever
     err=spi_device_acquire_bus(*device,portMAX_DELAY);
     if (err != ESP_OK){
-        LOG_DEBUG(GwLog::ERROR,"unable to acquire SPI bus %d,mosi=%d, error=%d",
+        logger->logDebug(GwLog::ERROR,"unable to acquire SPI bus %d,mosi=%d, error=%d",
-        (int)bus,-1,(int)err);
+            (int)bus, -1, (int)err);
         return false;
     }
     return true;
@@ -148,7 +172,7 @@ bool sendToLeds(GwLog *logger, uint8_t pin, int numLeds, Color *leds, spi_host_d
         buffer = (uint8_t *)heap_caps_malloc(bufferSize, MALLOC_CAP_DMA|MALLOC_CAP_32BIT);
         if (!buffer)
         {
-            LOG_DEBUG(GwLog::ERROR, "unable to allocate %d bytes of DMA buffer", (int)bufferSize);
+            logger->logDebug(GwLog::ERROR, "unable to allocate %d bytes of DMA buffer", (int)bufferSize);
             return false;
         }
     }
@@ -169,12 +193,12 @@ bool sendToLeds(GwLog *logger, uint8_t pin, int numLeds, Color *leds, spi_host_d
     int64_t end = esp_timer_get_time();
     if (ret != ESP_OK)
     {
-        LOG_DEBUG(GwLog::ERROR, "unable to send led data: %d", (int)ret);
+        logger->logDebug(GwLog::ERROR, "unable to send led data: %d", (int)ret);
         rv = false;
     }
     else
     {
-        LOG_DEBUG(GwLog::DEBUG, "successfully send led data for %d leds, %lld us", numLeds, end - now);
+        logger->logDebug(GwLog::DEBUG, "successfully send led data for %d leds, %lld us", numLeds, end - now);
     }
     if (ownsBuffer)
     {
@@ -187,10 +211,10 @@ bool sendToLeds(GwLog *logger, uint8_t pin, int numLeds, Color *leds, spi_host_d
 void handleSpiLeds(void *param){
     LedTaskData *taskData=(LedTaskData*)param;
     GwLog *logger=taskData->api->getLogger();
-    LOG_DEBUG(GwLog::ERROR,"spi led task initialized");
+    logger->logDebug(GwLog::ERROR, "spi led task initialized");
     spi_host_device_t bus=SPI3_HOST;
     bool spiValid=false;
-    LOG_DEBUG(GwLog::ERROR,"SpiLed task started");
+    LOG_DEBUG(GwLog::ERROR, "SpiLed task started");
     
     if (! prepareGpio(logger,OBP_FLASH_LED)){
         EXIT_TASK;
@@ -209,15 +233,15 @@ void handleSpiLeds(void *param){
         LedInterface newLeds=taskData->getLedData();
         if (first || current.backlightChanged(newLeds) || current.flasChanged(newLeds)){
             first=false;
-            LOG_DEBUG(GwLog::ERROR,"handle SPI leds");
+            logger->logDebug(GwLog::ERROR, "handle SPI leds");
             if (current.backlightChanged(newLeds) || first){
-                LOG_DEBUG(GwLog::ERROR,"setting backlight r=%02d,g=%02d,b=%02d",
+                logger->logDebug(GwLog::ERROR, "setting backlight r=%02d,g=%02d,b=%02d",
-                 newLeds.backlight[0].r,newLeds.backlight[0].g,newLeds.backlight[0].b);
+                    newLeds.backlight[0].r,newLeds.backlight[0].g,newLeds.backlight[0].b);
                 sendToLeds(logger,OBP_BACKLIGHT_LED,newLeds.backlightLen(),newLeds.backlight,bus,device);
             }
             if (current.flasChanged(newLeds) || first){
-                LOG_DEBUG(GwLog::ERROR,"setting flashr=%02d,g=%02d,b=%02d",
+                logger->logDebug(GwLog::ERROR, "setting flashr=%02d,g=%02d,b=%02d",
-                 newLeds.flash[0].r,newLeds.flash[0].g,newLeds.flash[0].b);
+                    newLeds.flash[0].r,newLeds.flash[0].g,newLeds.flash[0].b);
                 sendToLeds(logger,OBP_FLASH_LED,newLeds.flashLen(),newLeds.flash,bus,device);
             }
             current=newLeds;

lib/obp60task/LedSpiTask.h

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

lib/obp60task/Logo_OBP_400x300_sw.h

@@ -1,939 +0,0 @@
-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

@@ -1,939 +0,0 @@
-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/OBP60Extensions.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include <Arduino.h>
@@ -32,30 +33,20 @@
 #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
@@ -64,7 +55,14 @@ PCF8574 pcf8574_Out(PCF8574_I2C_ADDR1); // First digital output modul PCF8574 fr
 Adafruit_FRAM_I2C fram;
 bool hasFRAM = false;
 
+// SD Card
+#ifdef BOARD_OBP40S3
+sdmmc_card_t *sdcard;
+#endif
+bool hasSDCard = false;
+
 // Global vars
+bool heartbeat = false;         // Heartbeat indicator with two different states
 bool blinkingLED = false;       // Enable / disable blinking flash LED
 bool statusLED = false;         // Actual status of flash LED on/off
 bool statusBacklightLED = false;// Actual status of flash LED on/off
@@ -78,6 +76,9 @@ LedTaskData *ledTaskData=nullptr;
 
 void hardwareInit(GwApi *api)
 {
+    GwLog *logger = api->getLogger();
+    GwConfigHandler *config = api->getConfig();
+
     Wire.begin();
     // Init PCF8574 digital outputs
     Wire.setClock(I2C_SPEED);       // Set I2C clock on 10 kHz
@@ -87,7 +88,7 @@ void hardwareInit(GwApi *api)
     fram = Adafruit_FRAM_I2C();
     if (esp_reset_reason() ==  ESP_RST_POWERON) {
         // help initialize FRAM
-        api->getLogger()->logDebug(GwLog::LOG,"Delaying I2C init for 250ms due to cold boot");
+        logger->logDebug(GwLog::LOG, "Delaying I2C init for 250ms due to cold boot");
         delay(250);
     }
     // FRAM (e.g. MB85RC256V)
@@ -99,11 +100,88 @@ void hardwareInit(GwApi *api)
         // Boot counter
         uint8_t framcounter = fram.read(0x0000);
         fram.write(0x0000, framcounter+1);
-        api->getLogger()->logDebug(GwLog::LOG,"FRAM detected: 0x%04x/0x%04x (counter=%d)", manufacturerID, productID, framcounter);
+        logger->logDebug(GwLog::LOG, "FRAM detected: 0x%04x/0x%04x (counter=%d)", manufacturerID, productID, framcounter);
     }
     else {
         hasFRAM = false;
-        api->getLogger()->logDebug(GwLog::LOG,"NO FRAM detected");
+        logger->logDebug(GwLog::LOG, "NO FRAM detected");
+    }
+    // SD Card
+    hasSDCard = false;
+#ifdef BOARD_OBP40S3
+    if (config->getBool(config->useSDCard)) {
+        esp_err_t ret;
+        sdmmc_host_t host = SDSPI_HOST_DEFAULT();
+        host.slot = SPI3_HOST;
+        logger->logDebug(GwLog::DEBUG, "SDSPI_HOST: max_freq_khz=%d" , host.max_freq_khz);
+        spi_bus_config_t bus_cfg = {
+            .mosi_io_num = SD_SPI_MOSI,
+            .miso_io_num = SD_SPI_MISO,
+            .sclk_io_num = SD_SPI_CLK,
+            .quadwp_io_num = -1,
+            .quadhd_io_num = -1,
+            .max_transfer_sz = 4000,
+        };
+        ret = spi_bus_initialize((spi_host_device_t) host.slot, &bus_cfg, SDSPI_DEFAULT_DMA);
+        if (ret != ESP_OK) {
+            logger->logDebug(GwLog::ERROR, "Failed to initialize SPI bus for SD card");
+        } else {
+            sdspi_device_config_t slot_config = SDSPI_DEVICE_CONFIG_DEFAULT();
+            slot_config.gpio_cs = SD_SPI_CS;
+            slot_config.host_id = (spi_host_device_t) host.slot;
+            esp_vfs_fat_sdmmc_mount_config_t mount_config = {
+                .format_if_mount_failed = false,
+                .max_files = 5,
+                .allocation_unit_size = 16 * 1024
+            };
+            ret = esp_vfs_fat_sdspi_mount(MOUNT_POINT, &host, &slot_config, &mount_config, &sdcard);
+            if (ret != ESP_OK) {
+                if (ret == ESP_FAIL) {
+                    logger->logDebug(GwLog::ERROR, "Failed to mount SD card filesystem");
+                } else {
+                    // ret == 263 could be not powered up yet
+                    logger->logDebug(GwLog::ERROR, "Failed to initialize SD card (error #%d)", ret);
+                }
+            } else {
+                logger->logDebug(GwLog::LOG, "SD card filesystem mounted at '%s'", MOUNT_POINT);
+                hasSDCard = true;
+            }
+        }
+        if (hasSDCard) {
+            // read some stats
+            String features = "";
+            if (sdcard->is_mem) features += "MEM "; // Memory card
+            if (sdcard->is_sdio) features += "IO "; // IO Card
+            if (sdcard->is_mmc) features += "MMC "; // MMC Card
+            if (sdcard->is_ddr) features += "DDR ";
+            // if (sdcard->is_uhs1) features += "UHS-1 ";
+            // ext_csd. Extended information
+            // uint8_t rev, uint8_t power_class
+            logger->logDebug(GwLog::LOG, "SD card features: %s", features);
+            logger->logDebug(GwLog::LOG, "SD card size: %lluMB", ((uint64_t) sdcard->csd.capacity) * sdcard->csd.sector_size / (1024 * 1024));
+        }
+    }
+#endif
+}
+
+void powerInit(String powermode) {
+    // Max Power | Only 5.0V | Min Power
+    if (powermode == "Max Power" || powermode == "Only 5.0V") {
+#ifdef HARDWARE_V21
+        setPortPin(OBP_POWER_50, true); // Power on 5.0V rail
+#endif
+#ifdef BOARD_OBP40S3
+        setPortPin(OBP_POWER_EPD, true);// Power on ePaper display
+        setPortPin(OBP_POWER_SD, true); // Power on SD card
+#endif
+    } else { // Min Power
+#ifdef HARDWARE_V21
+        setPortPin(OBP_POWER_50, false); // Power off 5.0V rail
+#endif
+#ifdef BOARD_OBP40S3
+        setPortPin(OBP_POWER_EPD, false);// Power off ePaper display
+        setPortPin(OBP_POWER_SD, false); // Power off SD card
+#endif
     }
 }
 
@@ -134,17 +212,17 @@ void deepSleep(CommonData &common){
     setFlashLED(false);                     // Flash LED Off
     buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
     // Shutdown EInk display
-    getdisplay().setFullWindow();               // Set full Refresh
+    epd->setFullWindow();               // Set full Refresh
-    getdisplay().fillScreen(common.bgcolor);    // Clear screen
+    epd->fillScreen(common.bgcolor);    // Clear screen
-    getdisplay().setTextColor(common.fgcolor);
+    epd->setTextColor(common.fgcolor);
-    getdisplay().setFont(&Ubuntu_Bold20pt8b);
+    epd->setFont(&Ubuntu_Bold20pt8b);
-    getdisplay().setCursor(85, 150);
+    epd->setCursor(85, 150);
-    getdisplay().print("Sleep Mode");
+    epd->print("Sleep Mode");
-    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+    epd->setFont(&Ubuntu_Bold8pt8b);
-    getdisplay().setCursor(65, 175);
+    epd->setCursor(65, 175);
-    getdisplay().print("To wake up press key and wait 5s");
+    epd->print("To wake up press key and wait 5s");
-    getdisplay().nextPage();                // Update display contents
+    epd->nextPage();                // Update display contents
-    getdisplay().powerOff();                // Display power off
+    epd->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
@@ -158,18 +236,18 @@ void deepSleep(CommonData &common){
     setPortPin(OBP_BACKLIGHT_LED, false);   // Backlight Off
     setFlashLED(false);                     // Flash LED Off
     // Shutdown EInk display
-    getdisplay().setFullWindow();               // Set full Refresh
+    epd->setFullWindow();               // Set full Refresh
-    //getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+    //epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-    getdisplay().fillScreen(common.bgcolor);    // Clear screen
+    epd->fillScreen(common.bgcolor);    // Clear screen
-    getdisplay().setTextColor(common.fgcolor);
+    epd->setTextColor(common.fgcolor);
-    getdisplay().setFont(&Ubuntu_Bold20pt8b);
+    epd->setFont(&Ubuntu_Bold20pt8b);
-    getdisplay().setCursor(85, 150);
+    epd->setCursor(85, 150);
-    getdisplay().print("Sleep Mode");
+    epd->print("Sleep Mode");
-    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+    epd->setFont(&Ubuntu_Bold8pt8b);
-    getdisplay().setCursor(65, 175);
+    epd->setCursor(65, 175);
-    getdisplay().print("To wake up press wheel and wait 5s");
+    epd->print("To wake up press wheel and wait 5s");
-    getdisplay().nextPage();                // Partial update
+    epd->nextPage();                // Partial update
-    getdisplay().powerOff();                // Display power off
+    epd->powerOff();                // Display power off
     setPortPin(OBP_POWER_EPD, false);       // Power off ePaper display
     setPortPin(OBP_POWER_SD, false);        // Power off SD card
     // Stop system
@@ -214,31 +292,31 @@ void setBacklightLED(uint brightness, const Color &color){
     ledTaskData->setLedData(current);    
 }
 
-void toggleBacklightLED(uint brightness, const Color &color){
+void toggleBacklightLED(uint brightness, const Color &color) {
     if (ledTaskData == nullptr) return;
     statusBacklightLED = !statusBacklightLED;
-    Color nv=setBrightness(statusBacklightLED?color:COLOR_BLACK,brightness);
+    Color nv = setBrightness(statusBacklightLED ? color : COLOR_BLACK, brightness);
-    LedInterface current=ledTaskData->getLedData();
+    LedInterface current = ledTaskData->getLedData();
     current.setBacklight(nv);
     ledTaskData->setLedData(current); 
 }
 
-void setFlashLED(bool status){
+void setFlashLED(bool status) {
     if (ledTaskData == nullptr) return;
-    Color c=status?COLOR_RED:COLOR_BLACK;
+    Color c = status ? COLOR_RED : COLOR_BLACK;
-    LedInterface current=ledTaskData->getLedData();
+    LedInterface current = ledTaskData->getLedData();
     current.setFlash(c);
     ledTaskData->setLedData(current);
 }
 
-void blinkingFlashLED(){
+void blinkingFlashLED() {
-    if(blinkingLED == true){
+    if (blinkingLED == true) {
         statusLED = !statusLED;     // Toggle LED for each run
         setFlashLED(statusLED);
     }
 }
 
-void setBlinkingLED(bool status){
+void setBlinkingLED(bool status) {
     blinkingLED = status;
 }
 
@@ -276,28 +354,18 @@ String xdrDelete(String input){
     return input;
 }
 
-Point rotatePoint(const Point& origin, const Point& p, double angle) {
-    // rotate poind around origin by degrees
-    Point rotated;
-    double phi = angle * M_PI / 180.0;
-    double dx = p.x - origin.x;
-    double dy = p.y - origin.y;
-    rotated.x = origin.x + cos(phi) * dx - sin(phi) * dy;
-    rotated.y = origin.y + sin(phi) * dx + cos(phi) * dy;
-    return rotated;
-}
-
-std::vector<Point> rotatePoints(const Point& origin, const std::vector<Point>& pts, double angle) {
-    std::vector<Point> rotatedPoints;
-    for (const auto& p : pts) {
-         rotatedPoints.push_back(rotatePoint(origin, p, angle));
-    }
-     return rotatedPoints;
-}
-
 void fillPoly4(const std::vector<Point>& p4, uint16_t color) {
-    getdisplay().fillTriangle(p4[0].x, p4[0].y, p4[1].x, p4[1].y, p4[2].x, p4[2].y, color);
+    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[2].x, p4[2].y, p4[3].x, p4[3].y, color);
+    epd->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);
+    }
+    // close path
+    epd->drawLine(points[polysize-1].x, points[polysize-1].y, points[0].x, points[0].y, color);
 }
 
 // Split string into words, whitespace separated
@@ -347,34 +415,51 @@ 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;
-    getdisplay().getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
+    epd->getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
-    getdisplay().setCursor(cx - w / 2, cy + h / 2);
+    epd->setCursor(cx - w / 2, cy + h / 2);
-    getdisplay().print(text);
+    epd->print(text);
 }
 
 // Draw right aligned text
 void drawTextRalign(int16_t x, int16_t y, String text) {
     int16_t x1, y1;
     uint16_t w, h;
-    getdisplay().getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
+    epd->getTextBounds(text, 0, 150, &x1, &y1, &w, &h);
-    getdisplay().setCursor(x - w, y);
+    epd->setCursor(x - w, y);
-    getdisplay().print(text);
+    epd->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);
+        epd->setTextColor(bg);
+    } else {
+        if (border) {
+            epd->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);
+        }
+        epd->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);
+    epd->print(text);
+    epd->setTextColor(fg);
 }
 
 // Show a triangle for trend direction high (x, y is the left edge)
 void displayTrendHigh(int16_t x, int16_t y, uint16_t size, uint16_t color){
-    getdisplay().fillTriangle(x, y, x+size*2, y, x+size, y-size*2, color);
+    epd->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){
-    getdisplay().fillTriangle(x, y, x+size*2, y, x+size, y+size*2, color);
+    epd->fillTriangle(x, y, x+size*2, y, x+size, y+size*2, color);
 }
 
 // Show header informations
-void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop){
+void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop){
 
-    static bool heartbeat = false;
     static unsigned long usbRxOld = 0;
     static unsigned long usbTxOld = 0;
     static unsigned long serRxOld = 0;
@@ -386,31 +471,64 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
     static unsigned long n2kRxOld = 0;
     static unsigned long n2kTxOld = 0;
 
+    uint16_t symbol_x = 2;
+    static const uint16_t symbol_offset = 20;
+
     if(commonData.config->getBool(commonData.config->statusLine) == true){
 
         // Show status info
-        getdisplay().setTextColor(commonData.fgcolor);
+        epd->setTextColor(commonData.fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(0, 15);
+        epd->setCursor(0, 15);
-        if(commonData.status.wifiApOn){
+        if (commonData.status.wifiApOn) {
-        getdisplay().print(" AP ");
+            if (symbolmode) {
+                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){
-        getdisplay().print("TCP ");
+            if (symbolmode) {
+                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){
-        getdisplay().print("N2K ");
+            if (symbolmode) {
+                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){
-        getdisplay().print("183 ");
+            if (symbolmode) {
+                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){
-        getdisplay().print("USB ");
+            if (symbolmode) {
+                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){
-        getdisplay().print("GPS");
+            if (symbolmode) {
+                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;
@@ -427,26 +545,26 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
 #ifdef HARDWARE_V21
         // Display key lock status
         if (commonData.keylock) {
-            getdisplay().drawXBitmap(170, 1, lock_bits, icon_width, icon_height, commonData.fgcolor);
+            epd->drawXBitmap(170, 1, lock_bits, icon_width, icon_height, commonData.fgcolor);
         } else {
-            getdisplay().drawXBitmap(166, 1, swipe_bits, swipe_width, swipe_height, commonData.fgcolor);
+            epd->drawXBitmap(166, 1, swipe_bits, swipe_width, swipe_height, commonData.fgcolor);
         }
 #endif
 #ifdef LIPO_ACCU_1200
         if (commonData.data.BatteryChargeStatus == 1) {
-             getdisplay().drawXBitmap(170, 1, battery_loading_bits, battery_width, battery_height, commonData.fgcolor);
+             epd->drawXBitmap(170, 1, battery_loading_bits, battery_width, battery_height, commonData.fgcolor);
         } else {
 #ifdef VOLTAGE_SENSOR
             if (commonData.data.batteryLevelLiPo < 10) {
-                getdisplay().drawXBitmap(170, 1, battery_0_bits, battery_width, battery_height, commonData.fgcolor);
+                epd->drawXBitmap(170, 1, battery_0_bits, battery_width, battery_height, commonData.fgcolor);
             } else if (commonData.data.batteryLevelLiPo < 25) {
-                getdisplay().drawXBitmap(170, 1, battery_25_bits, battery_width, battery_height, commonData.fgcolor);
+                epd->drawXBitmap(170, 1, battery_25_bits, battery_width, battery_height, commonData.fgcolor);
             } else if (commonData.data.batteryLevelLiPo < 50) {
-                getdisplay().drawXBitmap(170, 1, battery_50_bits, battery_width, battery_height, commonData.fgcolor);
+                epd->drawXBitmap(170, 1, battery_50_bits, battery_width, battery_height, commonData.fgcolor);
             } else if (commonData.data.batteryLevelLiPo < 75) {
-                getdisplay().drawXBitmap(170, 1, battery_75_bits, battery_width, battery_height, commonData.fgcolor);
+                epd->drawXBitmap(170, 1, battery_75_bits, battery_width, battery_height, commonData.fgcolor);
             } else {
-                getdisplay().drawXBitmap(170, 1, battery_100_bits, battery_width, battery_height, commonData.fgcolor);
+                epd->drawXBitmap(170, 1, battery_100_bits, battery_width, battery_height, commonData.fgcolor);
             }
 #endif // VOLTAGE_SENSOR
         }
@@ -454,13 +572,13 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
 
         // Heartbeat as page number
         if (heartbeat) {
-            getdisplay().setTextColor(commonData.bgcolor);
+            epd->setTextColor(commonData.bgcolor);
-            getdisplay().fillRect(201, 0, 23, 19, commonData.fgcolor);
+            epd->fillRect(201, 0, 23, 19, commonData.fgcolor);
         } else {
-            getdisplay().setTextColor(commonData.fgcolor);
+            epd->setTextColor(commonData.fgcolor);
-            getdisplay().drawRect(201, 0, 23, 19, commonData.fgcolor);
+            epd->drawRect(201, 0, 23, 19, commonData.fgcolor);
         }
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
         drawTextCenter(211, 9, String(commonData.data.actpage));
         heartbeat = !heartbeat;
 
@@ -468,19 +586,19 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
         String fmttype = commonData.config->getString(commonData.config->dateFormat);
         String timesource = commonData.config->getString(commonData.config->timeSource);
         double tz = commonData.config->getString(commonData.config->timeZone).toDouble();
-        getdisplay().setTextColor(commonData.fgcolor);
+        epd->setTextColor(commonData.fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(230, 15);
+        epd->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);
-                getdisplay().print(formatTime('m', local_tm->tm_hour, local_tm->tm_min, 0));
+                epd->print(formatTime('m', local_tm->tm_hour, local_tm->tm_min, 0));
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(formatDate(fmttype, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
+                epd->print(formatDate(fmttype, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(tz == 0 ? "UTC" : "LOT");
+                epd->print(tz == 0 ? "UTC" : "LOT");
             } else {
                 drawTextRalign(396, 15, "RTC invalid");
             }
@@ -491,15 +609,15 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
                 String acttime = formatValue(time, commonData).svalue;
                 acttime = acttime.substring(0, 5);
                 String actdate = formatValue(date, commonData).svalue;
-                getdisplay().print(acttime);
+                epd->print(acttime);
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(actdate);
+                epd->print(actdate);
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(tz == 0 ? "UTC" : "LOT");
+                epd->print(tz == 0 ? "UTC" : "LOT");
             }
             else{
                 if(commonData.config->getBool(commonData.config->useSimuData) == true){
-                    getdisplay().print("12:00 01.01.2024 LOT");
+                    epd->print("12:00 01.01.2024 LOT");
                 }
                 else{
                     drawTextRalign(396, 15, "No GPS data");
@@ -507,15 +625,15 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
             }
         } // timesource == "GPS"
         else {
-            getdisplay().print("No time source");
+            epd->print("No time source");
         }
     }
 }
 
 void displayFooter(CommonData &commonData) {
 
-    getdisplay().setFont(&Atari16px);
+    epd->setFont(&Atari16px);
-    getdisplay().setTextColor(commonData.fgcolor);
+    epd->setTextColor(commonData.fgcolor);
 
 #ifdef HARDWARE_V21
     // Frame around key icon area
@@ -524,14 +642,14 @@ void displayFooter(CommonData &commonData) {
         const uint16_t top = 280;
         const uint16_t bottom = 299;
         // horizontal stub lines
-        getdisplay().drawLine(commonData.keydata[0].x, top, commonData.keydata[0].x+10, top, commonData.fgcolor);
+        epd->drawLine(commonData.keydata[0].x, top, commonData.keydata[0].x+10, top, commonData.fgcolor);
         for (int i = 1; i <= 5; i++) {
-            getdisplay().drawLine(commonData.keydata[i].x-10, top, commonData.keydata[i].x+10, top, commonData.fgcolor);
+            epd->drawLine(commonData.keydata[i].x-10, top, commonData.keydata[i].x+10, 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);
+        epd->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++) {
-            getdisplay().drawLine(commonData.keydata[i].x + commonData.keydata[i].w, top, commonData.keydata[i].x + commonData.keydata[i].w, bottom, commonData.fgcolor);
+            epd->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;
@@ -542,7 +660,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;
-                        getdisplay().drawXBitmap(x, y, iconmap[icon_name], icon_width, icon_height, commonData.fgcolor);
+                        epd->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;
@@ -557,8 +675,8 @@ void displayFooter(CommonData &commonData) {
             }
         }
     } else {
-        getdisplay().setCursor(65, 295);
+        epd->setCursor(65, 295);
-        getdisplay().print("Press 1 and 6 fast to unlock keys");
+        epd->print("Press 1 and 6 fast to unlock keys");
     }
 #endif
 #ifdef BOARD_OBP40S3
@@ -569,21 +687,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)) {
-            getdisplay().fillCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
+            epd->fillCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
         } else {
-            getdisplay().drawCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
+            epd->drawCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
         }
     }
     // key indicators
     // left side = top key "menu"
-    getdisplay().drawLine(0, 280, 10, 280, commonData.fgcolor);
+    epd->drawLine(0, 280, 10, 280, commonData.fgcolor);
-    getdisplay().drawLine(55, 280, 65, 280, commonData.fgcolor);
+    epd->drawLine(55, 280, 65, 280, commonData.fgcolor);
-    getdisplay().drawLine(65, 280, 65, 299, commonData.fgcolor);
+    epd->drawLine(65, 280, 65, 299, commonData.fgcolor);
     drawTextCenter(33, 291, commonData.keydata[0].label);
     // right side = bottom key "exit"
-    getdisplay().drawLine(390, 280, 399, 280, commonData.fgcolor);
+    epd->drawLine(390, 280, 399, 280, commonData.fgcolor);
-    getdisplay().drawLine(335, 280, 345, 280, commonData.fgcolor);
+    epd->drawLine(335, 280, 345, 280, commonData.fgcolor);
-    getdisplay().drawLine(335, 280, 335, 399, commonData.fgcolor);
+    epd->drawLine(335, 280, 335, 399, commonData.fgcolor);
     drawTextCenter(366, 291, commonData.keydata[1].label);
 #endif
 }
@@ -596,31 +714,31 @@ void displayAlarm(CommonData &commonData) {
     const uint16_t w = 300;
     const uint16_t h = 150;
 
-    getdisplay().setFont(&Atari16px);
+    epd->setFont(&Atari16px);
-    getdisplay().setTextColor(commonData.fgcolor);
+    epd->setTextColor(commonData.fgcolor);
 
     // overlay
-    getdisplay().drawRect(x, y, w, h, commonData.fgcolor);
+    epd->drawRect(x, y, w, h, commonData.fgcolor);
-    getdisplay().fillRect(x + 1, y + 1, w - 1, h - 1, commonData.bgcolor);
+    epd->fillRect(x + 1, y + 1, w - 1, h - 1, commonData.bgcolor);
-    getdisplay().drawRect(x + 3, y + 3, w - 5, h - 5, commonData.fgcolor);
+    epd->drawRect(x + 3, y + 3, w - 5, h - 5, commonData.fgcolor);
 
     // exclamation icon in left top corner
-    getdisplay().drawXBitmap(x + 16, y + 16, exclamation_bits, exclamation_width, exclamation_height, commonData.fgcolor);
+    epd->drawXBitmap(x + 16, y + 16, exclamation_bits, exclamation_width, exclamation_height, commonData.fgcolor);
 
     // title
-    getdisplay().setCursor(x + 64, y + 30);
+    epd->setCursor(x + 64, y + 30);
-    getdisplay().print("A L A R M");
+    epd->print("A L A R M");
-    getdisplay().setCursor(x + 64, y + 48);
+    epd->setCursor(x + 64, y + 48);
-    getdisplay().print("#" + commonData.alarm.id);
+    epd->print("#" + commonData.alarm.id);
-    getdisplay().print(" from ");
+    epd->print(" from ");
-    getdisplay().print(commonData.alarm.source);
+    epd->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) {
-        getdisplay().setCursor(x + 16, y + 80 + n);
+        epd->setCursor(x + 16, y + 80 + n);
-        getdisplay().print(l);
+        epd->print(l);
         n += 16;
         if (n > 64) {
             break;
@@ -713,20 +831,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);
-        getdisplay().fillRect(xb, yb, 100, 80, pcolor);
+        epd->fillRect(xb, yb, 100, 80, pcolor);
         if(percent < 99){
-            getdisplay().fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
+            epd->fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
         }
         // Plus pol 20x15
         int xp = xb + 20;
         int yp = yb - 15 + t;
-        getdisplay().fillRect(xp, yp, 20, 15, pcolor);
+        epd->fillRect(xp, yp, 20, 15, pcolor);
-        getdisplay().fillRect(xp+t, yp+t, 20-(2*t), 15-(2*t), bcolor);
+        epd->fillRect(xp+t, yp+t, 20-(2*t), 15-(2*t), bcolor);
         // Minus pol 20x15
         int xm = xb + 60;
         int ym = yb -15 + t;
-        getdisplay().fillRect(xm, ym, 20, 15, pcolor);
+        epd->fillRect(xm, ym, 20, 15, pcolor);
-        getdisplay().fillRect(xm+t, ym+t, 20-(2*t), 15-(2*t), bcolor);
+        epd->fillRect(xm+t, ym+t, 20-(2*t), 15-(2*t), bcolor);
 }
 
 // Solar graphic with fill level
@@ -738,17 +856,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);
-        getdisplay().fillRect(xb, yb, 100, 80, pcolor);
+        epd->fillRect(xb, yb, 100, 80, pcolor);
         if(percent < 99){
-            getdisplay().fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
+            epd->fillRect(xb+t, yb+t, 100-(2*t), level, bcolor);
         }
         // Draw horizontel lines
-        getdisplay().fillRect(xb, yb+28-t, 100, t, pcolor);
+        epd->fillRect(xb, yb+28-t, 100, t, pcolor);
-        getdisplay().fillRect(xb, yb+54-t, 100, t, pcolor);
+        epd->fillRect(xb, yb+54-t, 100, t, pcolor);
         // Draw vertical lines
-        getdisplay().fillRect(xb+19+t, yb, t, 80, pcolor);
+        epd->fillRect(xb+19+t, yb, t, 80, pcolor);
-        getdisplay().fillRect(xb+39+2*t, yb, t, 80, pcolor);
+        epd->fillRect(xb+39+2*t, yb, t, 80, pcolor);
-        getdisplay().fillRect(xb+59+3*t, yb, t, 80, pcolor);
+        epd->fillRect(xb+59+3*t, yb, t, 80, pcolor);
 
 }
 
@@ -760,13 +878,13 @@ void generatorGraphic(uint x, uint y, int pcolor, int bcolor){
         int t = 4;      // Line thickness
 
         // Generator corpus with radius 45
-        getdisplay().fillCircle(xb, yb, 45, pcolor);
+        epd->fillCircle(xb, yb, 45, pcolor);
-        getdisplay().fillCircle(xb, yb, 41, bcolor);
+        epd->fillCircle(xb, yb, 41, bcolor);
         // Insert G
-        getdisplay().setTextColor(pcolor);
+        epd->setTextColor(pcolor);
-        getdisplay().setFont(&Ubuntu_Bold32pt8b);
+        epd->setFont(&Ubuntu_Bold32pt8b);
-        getdisplay().setCursor(xb-22, yb+20);
+        epd->setCursor(xb-22, yb+20);
-        getdisplay().print("G");
+        epd->print("G");
 }
 
 // Function to handle HTTP image request
@@ -780,7 +898,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 = getdisplay().getBuffer(); // EPD framebuffer
+    uint8_t *fb = epd->getBuffer(); // EPD framebuffer
     std::vector<uint8_t> imageBuffer;       // image in webserver transferbuffer
     String mimetype;
 

lib/obp60task/OBP60Extensions.h

@@ -1,12 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #ifndef _OBP60EXTENSIONPORT_H
 #define _OBP60EXTENSIONPORT_H
 
 #include <Arduino.h>
 #include "OBP60Hardware.h"
 #include "LedSpiTask.h"
+#include "Graphics.h"
 #include <GxEPD2_BW.h>                  // E-paper lib V2
 #include <Adafruit_FRAM_I2C.h>          // I2C FRAM
 
+#ifdef BOARD_OBP40S3
+#include "esp_vfs_fat.h"
+#include "sdmmc_cmd.h"
+#define MOUNT_POINT "/sdcard"
+#endif
+
 // FRAM address reservations 32kB: 0x0000 - 0x7FFF
 // 0x0000 - 0x03ff: single variables
 #define FRAM_PAGE_NO 0x0002
@@ -15,6 +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
@@ -24,6 +33,12 @@
 
 extern Adafruit_FRAM_I2C fram;
 extern bool hasFRAM;
+extern bool hasSDCard;
+#ifdef BOARD_OBP40S3
+extern sdmmc_card_t *sdcard;
+#endif
+
+extern bool heartbeat;
 
 // Fonts declarations for display (#includes see OBP60Extensions.cpp)
 extern const GFXfont DSEG7Classic_BoldItalic16pt7b;
@@ -42,39 +57,33 @@ extern const GFXfont Atari16px;
 
 // Global functions
 #ifdef DISPLAY_GDEW042T2
-GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> & getdisplay();
+typedef GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> gxepd2display;
 #endif
-
 #ifdef DISPLAY_GDEY042T81
-GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> & getdisplay();
+typedef GxEPD2_BW<GxEPD2_420_GDEY042T81, GxEPD2_420_GDEY042T81::HEIGHT> gxepd2display;
 #endif
-
 #ifdef DISPLAY_GYE042A87
-GxEPD2_BW<GxEPD2_420_GYE042A87, GxEPD2_420_GYE042A87::HEIGHT> & getdisplay();
+typedef GxEPD2_BW<GxEPD2_420_GYE042A87, GxEPD2_420_GYE042A87::HEIGHT> gxepd2display;
 #endif
-
 #ifdef DISPLAY_SE0420NQ04
-GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> & getdisplay();
+typedef GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> gxepd2display;
 #endif
+extern gxepd2display *epd;
 
 // Page display return values
 #define PAGE_OK 0          // all ok, do nothing
 #define PAGE_UPDATE 1      // page wants display to update
 #define PAGE_HIBERNATE 2   // page wants displey to hibernate
 
-struct Point {
-    double x;
-    double y;
-};
-Point rotatePoint(const Point& origin, const Point& p, double angle);
-std::vector<Point> rotatePoints(const Point& origin, const std::vector<Point>& pts, double angle);
 void fillPoly4(const std::vector<Point>& p4, uint16_t color);
+void drawPoly(const std::vector<Point>& points, uint16_t color);
 
 void deepSleep(CommonData &common);
 
 uint8_t getLastPage();
 
 void hardwareInit(GwApi *api);
+void powerInit(String powermode);
 
 void setPortPin(uint pin, bool value);          // Set port pin for extension port
 
@@ -96,11 +105,12 @@ String xdrDelete(String input);                 // Delete xdr prefix from string
 
 void drawTextCenter(int16_t cx, int16_t cy, String text);
 void drawTextRalign(int16_t x, int16_t y, String text);
+void drawTextBoxed(Rect box, String text, uint16_t fg, uint16_t bg, bool inverted, bool border);
 
 void displayTrendHigh(int16_t x, int16_t y, uint16_t size, uint16_t color);
 void displayTrendLow(int16_t x, int16_t y, uint16_t size, uint16_t color);
 
-void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop); // Draw display header
+void displayHeader(CommonData &commonData, bool symbolmode, GwApi::BoatValue *date, GwApi::BoatValue *time, GwApi::BoatValue *hdop); // Draw display header
 void displayFooter(CommonData &commonData);
 void displayAlarm(CommonData &commonData);
 
@@ -148,24 +158,62 @@ static unsigned char fram_bits[] PROGMEM = {
    0xff, 0xff, 0xf8, 0x1f, 0xf8, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x1f,
    0xf8, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x1f };
 
-static unsigned char ap_bits[] PROGMEM = {
+// Header symbols
+
+static unsigned char ap_bits[] PROGMEM= {
    0xe0, 0x03, 0x18, 0x0c, 0x04, 0x10, 0xc2, 0x21, 0x30, 0x06, 0x08, 0x08,
    0xc0, 0x01, 0x20, 0x02, 0x00, 0x00, 0x80, 0x00, 0xc0, 0x01, 0xc0, 0x01,
    0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00 };
 
-static unsigned char dish_bits[] PROGMEM = {
+static unsigned char gps_bits[] PROGMEM = {
    0x3c, 0x00, 0x42, 0x18, 0xfa, 0x1b, 0x02, 0x04, 0x02, 0x0a, 0x02, 0x09,
    0x82, 0x08, 0x06, 0x0a, 0x0e, 0x1b, 0x9c, 0x2b, 0x38, 0x2b, 0x74, 0x20,
    0xec, 0x1f, 0x1c, 0x00, 0xf4, 0x00, 0xfe, 0x03 };
 
+static unsigned char nmea_bits[] PROGMEM = {
+   0x00, 0x00, 0x22, 0x21, 0x26, 0x33, 0x26, 0x33, 0x2a, 0x2d, 0x32, 0x2d,
+   0x32, 0x21, 0x22, 0x21, 0x00, 0x00, 0x3c, 0x0c, 0x04, 0x0c, 0x04, 0x12,
+   0x3c, 0x12, 0x04, 0x1e, 0x04, 0x21, 0x3c, 0x21 };
+
+static unsigned char n2k_bits[] PROGMEM = {
+   0xe0, 0x07, 0x18, 0x18, 0x04, 0x20, 0x02, 0x40, 0x32, 0x4c, 0x31, 0x8c,
+   0x01, 0x80, 0x81, 0x81, 0x81, 0x81, 0x01, 0x80, 0x31, 0x8c, 0x32, 0x4c,
+   0x02, 0x40, 0x04, 0x20, 0x98, 0x19, 0xe0, 0x07 };
+
+static unsigned char tcp_bits[] PROGMEM = {
+   0x00, 0x00, 0xe0, 0x03, 0x20, 0x02, 0x20, 0x02, 0x20, 0x02, 0xe0, 0x03,
+   0x80, 0x00, 0x80, 0x00, 0xff, 0xff, 0x08, 0x10, 0x08, 0x10, 0x3e, 0x7c,
+   0x22, 0x44, 0x22, 0x44, 0x22, 0x44, 0x3e, 0x7c };
+
+static unsigned char usb_bits[] PROGMEM = {
+   0x00, 0x00, 0x92, 0x39, 0x52, 0x4a, 0x52, 0x48, 0x92, 0x39, 0x12, 0x4a,
+   0x52, 0x4a, 0x8c, 0x39, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x1f, 0x04, 0x20,
+   0xf4, 0x2f, 0x04, 0x20, 0xf8, 0x1f, 0x00, 0x00 };
+
+static unsigned char sdcard_bits[] PROGMEM = {
+   0xf8, 0x07, 0x0c, 0x08, 0x04, 0x08, 0xc4, 0x09, 0x24, 0x1a, 0xe4, 0x13,
+   0x04, 0x20, 0x24, 0x21, 0xa4, 0x12, 0x44, 0x12, 0x04, 0x20, 0x04, 0x20,
+   0xc4, 0x23, 0x34, 0x2c, 0xd8, 0x1b, 0x00, 0x00 };
+
+static unsigned char bluetooth_bits[] PROGMEM = {
+   0x00, 0x00, 0x22, 0x21, 0x26, 0x33, 0x26, 0x33, 0x2a, 0x2d, 0x32, 0x2d,
+   0x32, 0x21, 0x22, 0x21, 0x00, 0x00, 0x3c, 0x0c, 0x04, 0x0c, 0x04, 0x12,
+   0x3c, 0x12, 0x04, 0x1e, 0x04, 0x21, 0x3c, 0x21 };
+
 static std::map<String, unsigned char *> iconmap = {
     {"LEFT", left_bits},
     {"RIGHT", right_bits},
     {"LOCK", lock_bits},
     {"PLUS", plus_bits},
     {"MINUS", minus_bits},
-    {"DISH", dish_bits},
+    {"GPS", gps_bits},
-    {"AP", ap_bits}
+    {"AP", ap_bits},
+    {"0183", nmea_bits},
+    {"N2K", n2k_bits},
+    {"TCP", tcp_bits},
+    {"USB", usb_bits},
+    {"SDCARD", sdcard_bits},
+    {"BLUE", bluetooth_bits}
 };
 
 // Battery

lib/obp60task/OBP60Formatter.cpp

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

lib/obp60task/OBP60Hardware.h

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

lib/obp60task/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)){
-        getdisplay().fillRect(box_x, box_y, box_s, box_s, fgcolor);
+        epd->fillRect(box_x, box_y, box_s, box_s, fgcolor);
       } else {
-        getdisplay().fillRect(box_x, box_y, box_s, box_s, bgcolor);
+        epd->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;
   }
-  getdisplay().setFont(&Ubuntu_Bold32pt8b);
+  epd->setFont(&Ubuntu_Bold32pt8b);
-  getdisplay().setTextColor(fgcolor);
+  epd->setTextColor(fgcolor);
-  getdisplay().setCursor(140, 285);
+  epd->setCursor(140, 285);
-  getdisplay().print("WiFi");
+  epd->print("WiFi");
-  getdisplay().nextPage();                 // Full Refresh
+  epd->nextPage();                 // Full Refresh
 }
 
 #endif

lib/obp60task/OBPSensorTask.cpp

@@ -90,16 +90,16 @@ void sensorTask(void *param){
     double voffset = (api->getConfig()->getConfigItem(api->getConfig()->vOffset,true)->asString()).toFloat();
     double vslope = (api->getConfig()->getConfigItem(api->getConfig()->vSlope,true)->asString()).toFloat();
     if(String(powsensor1) == "off"){
-        #ifdef VOLTAGE_SENSOR
+#ifdef VOLTAGE_SENSOR
         float rawVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.53) * 2;   // Vin = 1/2 for OBP40
-        #else
+#else
         float rawVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.17) * 20;   // Vin = 1/20 for OBP60    
-        #endif
+#endif
         sensors.batteryVoltage = rawVoltage * vslope + voffset; // Calibration
-        #ifdef LIPO_ACCU_1200
+#ifdef LIPO_ACCU_1200
         sensors.BatteryChargeStatus = 0;    // Set to discharging
         sensors.batteryLevelLiPo = 0;       // Level 0...100%
-        #endif
+#endif
         sensors.batteryCurrent = 0;
         sensors.batteryPower = 0;
         // Fill average arrays with start values
@@ -499,24 +499,24 @@ void sensorTask(void *param){
         if(millis() > starttime5 + 1000 && String(powsensor1) == "off"){
             starttime5 = millis();
             float rawVoltage = 0;       // Default value
-            #ifdef BOARD_OBP40S3
+#ifdef BOARD_OBP40S3
             sensors.batteryVoltage = 0; // If no sensor then zero voltage
-            #endif
+#endif
-            #if defined(BOARD_OBP40S3)  && defined(VOLTAGE_SENSOR)
+#if defined(BOARD_OBP40S3)  && defined(VOLTAGE_SENSOR)
             rawVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.53) * 2;   // Vin = 1/2 for OBP40
             sensors.batteryVoltage = rawVoltage * vslope + voffset; // Calibration
-            #endif
+#endif
-            #ifdef BOARD_OBP60S3
+#ifdef BOARD_OBP60S3
             rawVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.17) * 20;   // Vin = 1/20 for OBP60
             sensors.batteryVoltage = rawVoltage * vslope + voffset; // Calibration  
-            #endif
+#endif
             // Save new data in average array
             batV.reading(int(sensors.batteryVoltage * 100));
             // Calculate the average values for different time lines from integer values
             sensors.batteryVoltage10 = batV.getAvg(10) / 100.0;
             sensors.batteryVoltage60 = batV.getAvg(60) / 100.0;
             sensors.batteryVoltage300 = batV.getAvg(300) / 100.0;
-            #if BOARD_OBP40S3 && defined LIPO_ACCU_1200 && defined VOLTAGE_SENSOR
+#if BOARD_OBP40S3 && defined LIPO_ACCU_1200 && defined VOLTAGE_SENSOR
             // Polynomfit for LiPo capacity calculation for 3,7V LiPo accus, 0...100%
             sensors.batteryLevelLiPo = sensors.batteryVoltage60 * 203.8312 -738.1635;
             // Limiter
@@ -555,14 +555,14 @@ void sensorTask(void *param){
                 SetN2kDCBatStatus(N2kMsg, 10, sensors.batteryVoltage, N2kDoubleNA, N2kDoubleNA, 0);
                 api->sendN2kMessage(N2kMsg);
             }
-            #endif
+#endif
-            #ifdef BOARD_OBP60S3
+#ifdef BOARD_OBP60S3
             // Send to NMEA200 bus
             if(!isnan(sensors.batteryVoltage)){
                 SetN2kDCBatStatus(N2kMsg, 0, sensors.batteryVoltage, N2kDoubleNA, N2kDoubleNA, 1);
                 api->sendN2kMessage(N2kMsg);
             }
-            #endif
+#endif
         }
 
         // Send data from environment sensor all 2s

lib/obp60task/PageAIS.cpp

@@ -0,0 +1,175 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+
+#include "Pagedata.h"
+#include "OBP60Extensions.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
+
+  Feature possibilities
+    - switch between North up / Heading up
+
+*/
+
+class PageAIS : public Page
+{
+private:
+
+    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
+
+    void displayModeNormal(PageData &pageData) {
+
+        // TBD Boatvalues: ...
+
+        logger->logDebug(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) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageAIS");
+        alarm_range = 3;
+    }
+
+    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) {
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData){
+
+        // Logging boat values
+        logger->logDebug(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

@@ -0,0 +1,428 @@
+// 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:
+    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; 
+
+        logger->logDebug(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);
+            logger->logDebug(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) {
+                logger->logDebug(GwLog::ERROR, "Menu item not found: %d", i);
+            } else {
+                Rect r = menu->getItemRect(i);
+                bool inverted = (i == menu->getActiveIndex());
+                drawTextBoxed(r, itm->getLabel(), commonData->fgcolor, commonData->bgcolor, inverted, false);
+                if (inverted and editmode > 0) {
+                    // triangle as edit marker
+                    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) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageAnchor");
+
+        // preload configuration data
+        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){
+ #ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+   };
+
+    int displayPage(PageData &pageData){
+
+        // Logging boat values
+        logger->logDebug(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

@@ -0,0 +1,138 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+
+/*
+  Autopilot
+
+*/
+
+class PageAutopilot : public Page
+{
+private:
+    char mode = 'N'; // (N)ormal, (C)onfig
+
+    void displayModeNormal(PageData &pageData) {
+
+        // TBD Boatvalues: ...
+
+        logger->logDebug(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) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageAutopilot");
+    }
+
+    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){
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData){
+
+        // Logging boat values
+        logger->logDebug(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)
+    false           // Show display header on/off
+);
+
+#endif

lib/obp60task/PageBME280.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -5,13 +6,21 @@
 
 class PageBME280 : public Page
 {
-    public:
+private:
-    PageBME280(CommonData &common){
+    String tempformat;
-        commonData = &common;
+    String useenvsensor;
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageBME280");
+
+public:
+    PageBME280(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageBME280");
+
+        // Get config data
+        tempformat = config->getString(config->tempFormat);
+        useenvsensor = config->getString(config->useEnvSensor);
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -21,8 +30,6 @@ class PageBME280 : public Page
     }
 
     int displayPage(PageData &pageData){
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
 
         double value1 = 0;
         double value2 = 0;
@@ -31,13 +38,6 @@ class PageBME280 : public Page
         String svalue2 = "";
         String svalue3 = "";
         
-        // Get config data
-        String tempformat = config->getString(config->tempFormat);
-        bool simulation = config->getBool(config->useSimuData);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-        String useenvsensor = config->getString(config->useEnvSensor);
-        
         // Get sensor values #1
         String name1 = "Temp";                          // Value name
         name1 = name1.substring(0, 6);                  // String length limit for value name
@@ -99,82 +99,82 @@ class PageBME280 : public Page
         }
 
         // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageBME280, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3);
+        logger->logDebug(GwLog::LOG, "Drawing at PageBME280, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 55);
+        epd->setCursor(20, 55);
-        getdisplay().print(name1);                           // Page name
+        epd->print(name1);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 90);
+        epd->setCursor(20, 90);
-        getdisplay().print(unit1);                           // Unit
+        epd->print(unit1);                           // Unit
 
         // Switch font if format for any values
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(180, 90);
+        epd->setCursor(180, 90);
 
         // Show bus data
-        getdisplay().print(svalue1);                         // Real value as formated string
+        epd->print(svalue1);                         // Real value as formated string
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 145);
+        epd->setCursor(20, 145);
-        getdisplay().print(name2);                           // Page name
+        epd->print(name2);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 180);
+        epd->setCursor(20, 180);
-        getdisplay().print(unit2);                           // Unit
+        epd->print(unit2);                           // Unit
 
         // Switch font if format for any values
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(180, 180);
+        epd->setCursor(180, 180);
 
         // Show bus data
-        getdisplay().print(svalue2);                         // Real value as formated string
+        epd->print(svalue2);                         // Real value as formated string
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 235);
+        epd->setCursor(20, 235);
-        getdisplay().print(name3);                           // Page name
+        epd->print(name3);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 270);
+        epd->setCursor(20, 270);
-        getdisplay().print(unit3);                           // Unit
+        epd->print(unit3);                           // Unit
 
         // Switch font if format for any values
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(140, 270);
+        epd->setCursor(140, 270);
 
         // Show bus data
-        getdisplay().print(svalue3);                         // Real value as formated string
+        epd->print(svalue3);                         // Real value as formated string
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageBarograph.cpp

@@ -0,0 +1,238 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+
+/*
+ * Barograph WIP
+ *   - Zoom feature
+ *   - Saves data in FRAM if available
+ */
+
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+
+class PageBarograph : public Page
+{
+private:
+    bool keylock = false;
+    bool has_fram = false;
+    String flashLED;
+    String useenvsensor;
+
+    char source = 'I'; // (I)nternal, e(X)ternal
+    const int series[5] = {75, 150, 300, 600, 900};
+    const int zoom[5] = {1, 2, 3, 6, 12};
+    int zoomindex = 4;
+    uint16_t data[336] = {0}; // current data to display
+
+    // y-axis
+    uint16_t vmin;
+    uint16_t vmax;
+    uint16_t scalemin = 1000;
+    uint16_t scalemax = 1020;
+    uint16_t scalestep = 5;
+    int hist1 = 0;  // one hour trend
+    int hist3 = 0;  // three hours trend
+
+    long refresh = 0; // millis
+
+    void loadData() {
+        // Transfer data from history to page buffer,
+        // set y-axis according to data
+        int i = zoom[zoomindex];
+
+        // get min and max values of measured data
+        vmin = data[0];
+        vmax = data[0];
+        for (int x = 0; x < 336; x++) {
+            if (data[x] != 0) {
+                if (data[x] < vmin) {
+                    vmin = data[x];
+                } else if (data[x] > vmax) {
+                    vmax = data[x];
+                }
+            }
+        }
+
+        // calculate y-axis scale
+        uint16_t diff = vmax - vmin;
+        if (diff < 20) {
+            scalestep = 5;
+        } else if (diff < 40) {
+            scalestep = 10;
+        } else {
+            scalestep = 15;
+        }
+        scalemin = vmin - (vmin % scalestep);
+        scalemax = vmax + scalestep - (vmax % scalestep);
+
+        // TODO implement history buffer
+    };
+
+public:
+    PageBarograph(CommonData &common): Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageBarograph");
+
+        // Get config data
+        useenvsensor = config->getString(common.config->useEnvSensor);
+        // possible values for internal sensor
+        static std::vector<String> sensorList = {
+            "BME280", "BMP280", "BMP180", "BMP085", "HTU21", "SHT21"
+            };
+        if (std::find(sensorList.begin(), sensorList.end(), useenvsensor) != sensorList.end()) {
+            source = 'I';
+        } else {
+            // "off" means user external data if available
+            source = 'X';
+        }
+        //common.logger->logDebug(GwLog::LOG,"Source=%s (%s)", source, useenvsensor);
+        loadData(); // initial load
+    }
+
+    int handleKey(int key) {
+        if (key == 1) {
+            // zoom in
+            if (zoomindex > 0) {
+                zoomindex -= 1;
+            }
+            return 0;
+        }
+        if (key == 2) {
+            // zoom out
+            if (zoomindex < sizeof(zoom)) {
+                zoomindex += 1;
+            }
+            return 0;
+        }
+        if (key == 11) {
+            keylock = !keylock;
+            return 0;
+        }
+        return key;
+    }
+
+    void displayNew(PageData &pageData) {
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
+
+        // Logging boat values
+        logger->logDebug(GwLog::LOG, "Drawing at PageBarograph");
+
+        // Draw page
+        //***********************************************************
+
+        // Set display in partial refresh mode
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+
+        // Frames 
+        epd->fillRect(0, 75, 400, 2, commonData->fgcolor);  // fillRect: x, y, w, h
+        epd->fillRect(130, 20, 2, 55, commonData->fgcolor);
+        epd->fillRect(270, 20, 2, 55, commonData->fgcolor);
+        epd->fillRect(325, 20, 2, 55, commonData->fgcolor);
+
+        epd->setTextColor(commonData->fgcolor);
+
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        if (source == 'I') {
+            drawTextCenter(360, 40, useenvsensor);
+        } else {
+            drawTextCenter(360, 40, "ext.");
+        }
+
+        // Trend
+        drawTextCenter(295, 62, "0.0");
+
+        // Alarm placeholder
+        drawTextCenter(70, 62, "Alarm Off");
+
+        // Zoom
+        int datastep = series[zoomindex];
+        String fmt;
+        if (datastep > 120) {
+            if (datastep % 60 == 0) {
+                fmt = String(datastep / 60.0, 0) + " min";
+            } else {
+                fmt = String(datastep / 60.0, 1) + " min";
+            }
+        } else {
+            fmt = String(datastep) + " s";
+        }
+        drawTextCenter(360, 62, fmt);
+
+        // Current measurement
+        epd->setFont(&Ubuntu_Bold16pt8b);
+        drawTextCenter(200, 40, String(commonData->data.airPressure / 100, 1));
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        drawTextCenter(200, 62, "hPa"); // Unit
+
+        // Diagram
+        const int xstep = 48; // x-axis-grid
+        const int x0 = 350;   // origin
+        const int y0 = 270;
+        const int w = 7 * 48;
+        const int h = 180;
+
+        // epd->drawRect(x0 - w, y0 - h, w, h, commonData->fgcolor);
+
+        // x-axis are hours
+        for (int i = 1; i <= 6; i++) {
+            String label = String(-1 * zoom[zoomindex] * i);
+            epd->drawLine(x0 - i * xstep, y0, x0 - i * xstep, y0 - h, commonData->fgcolor);
+            drawTextCenter(x0 - i * xstep, y0 - 10, label);
+        }
+
+        // y-axis
+        epd->drawLine(x0 + 5, y0, x0 + 5, y0 - h, commonData->fgcolor);  // drawLine: x1, y1, x2, y2
+        epd->drawLine(x0 - w, y0, x0 - w, y0 - h, commonData->fgcolor);
+        epd->drawLine(x0 - w - 5, y0, x0 - w - 5, y0 - h, commonData->fgcolor);
+        epd->drawLine(x0, y0, x0, y0 - h, commonData->fgcolor);
+
+        int16_t dy = 9; // px for one hPa
+        int16_t y = y0;
+        int16_t ys = scalemin;
+        while (y >= y0 - h) {
+            if (y % scalestep == 0) {
+                // big step, show label and long line
+                epd->setCursor(x0 + 10, y + 5);
+                epd->print(String(ys));
+                epd->drawLine(x0 + 5, y, x0 - w - 5, y, commonData->fgcolor);
+            } else {
+                // small step, only short lines left and right
+                epd->drawLine(x0 + 5, y, x0, y, commonData->fgcolor);
+                epd->drawLine(x0 - w - 5, y, x0 - w, y, commonData->fgcolor);
+            }
+            y -= dy;
+            ys += 1;
+        }
+
+        return PAGE_UPDATE;
+    };
+};
+
+static Page* createPage(CommonData &common){
+    return new PageBarograph(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 registerPageBarograph(
+    "Barograph",    // Page name
+    createPage,     // Action
+    0,              // No bus values needed
+    true            // Show display header on/off
+);
+
+#endif

lib/obp60task/PageBattery.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -5,20 +6,25 @@
 
 class PageBattery : public Page
 {
+private:
+    String powsensor1;
     int average = 0; // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s
 
-    public:
+public:
-    PageBattery(CommonData &common){
+    PageBattery(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageBattery");
+        logger->logDebug(GwLog::LOG, "Instantiate PageBattery");
+
+        // Get config data
+        String powsensor1 = config->getString(config->usePowSensor1);
     }
 
-    virtual void setupKeys(){
+    void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "AVG";
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Change average
         if(key == 1){
             average ++;
@@ -34,9 +40,17 @@ class PageBattery : public Page
         return key;
     }
 
+    void displayNew(PageData &pageData) {
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
     int displayPage(PageData &pageData){
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
 
         // Old values for hold function
         double value1 = 0;
@@ -49,14 +63,6 @@ class PageBattery : public Page
         static String svalue3old = "";
         static String unit3old = "";
        
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        // bool simulation = config->getBool(config->useSimuData);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
-        String powsensor1 = config->getString(config->usePowSensor1);
-        bool simulation = config->getBool(config->useSimuData);
-        
         // Get voltage value
         String name1 = "VBat";                       // Value name
         if(String(powsensor1) == "INA219" || String(powsensor1) == "INA226"){
@@ -145,147 +151,141 @@ class PageBattery : public Page
         String svalue3 = String(value3);                // Formatted value as string including unit conversion and switching decimal places
         String unit3 = "W";                             // Unit of value
 
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
-        }
-
         // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageBattery, %s: %f, %s: %f, %s: %f, Avg: %d", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, average);
+        logger->logDebug(GwLog::LOG, "Drawing at PageBattery, %s: %f, %s: %f, %s: %f, Avg: %d", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, average);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
         // Show average settings
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
         switch (average) {
             case 0:
-                getdisplay().setCursor(60, 90);
+                epd->setCursor(60, 90);
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
-                getdisplay().setCursor(60, 180);
+                epd->setCursor(60, 180);
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
-                getdisplay().setCursor(60, 270);
+                epd->setCursor(60, 270);
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
                 break;
             case 1:
-                getdisplay().setCursor(60, 90);
+                epd->setCursor(60, 90);
-                getdisplay().print("Avg: 10s");
+                epd->print("Avg: 10s");
-                getdisplay().setCursor(60, 180);
+                epd->setCursor(60, 180);
-                getdisplay().print("Avg: 10s");
+                epd->print("Avg: 10s");
-                getdisplay().setCursor(60, 270);
+                epd->setCursor(60, 270);
-                getdisplay().print("Avg: 10s");
+                epd->print("Avg: 10s");
                 break;
             case 2:
-                getdisplay().setCursor(60, 90);
+                epd->setCursor(60, 90);
-                getdisplay().print("Avg: 60s");
+                epd->print("Avg: 60s");
-                getdisplay().setCursor(60, 180);
+                epd->setCursor(60, 180);
-                getdisplay().print("Avg: 60s");
+                epd->print("Avg: 60s");
-                getdisplay().setCursor(60, 270);
+                epd->setCursor(60, 270);
-                getdisplay().print("Avg: 60s");
+                epd->print("Avg: 60s");
                 break;
             case 3:
-                getdisplay().setCursor(60, 90);
+                epd->setCursor(60, 90);
-                getdisplay().print("Avg: 300s");
+                epd->print("Avg: 300s");
-                getdisplay().setCursor(60, 180);
+                epd->setCursor(60, 180);
-                getdisplay().print("Avg: 300s");
+                epd->print("Avg: 300s");
-                getdisplay().setCursor(60, 270);
+                epd->setCursor(60, 270);
-                getdisplay().print("Avg: 300s");
+                epd->print("Avg: 300s");
                 break;
             default:
-                getdisplay().setCursor(60, 90);
+                epd->setCursor(60, 90);
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
-                getdisplay().setCursor(60, 180);
+                epd->setCursor(60, 180);
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
-                getdisplay().setCursor(60, 270);
+                epd->setCursor(60, 270);
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
                 break;
         } 
 
         // ############### Value 1 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 55);
+        epd->setCursor(20, 55);
-        getdisplay().print(name1);                           // Value name
+        epd->print(name1);                           // Value name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 90);
+        epd->setCursor(20, 90);
-        getdisplay().print(unit1);                           // Unit
+        epd->print(unit1);                           // Unit
 
         // Show value
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(180, 90);
+        epd->setCursor(180, 90);
 
         // Show bus data
         if(String(powsensor1) != "off"){
-            getdisplay().print(value1,2);                    // Real value as formated string
+            epd->print(value1,2);                    // Real value as formated string
         }
         else{
-            getdisplay().print("---");                       // No sensor data (sensor is off)
+            epd->print("---");                       // No sensor data (sensor is off)
         }
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 145);
+        epd->setCursor(20, 145);
-        getdisplay().print(name2);                           // Value name
+        epd->print(name2);                           // Value name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 180);
+        epd->setCursor(20, 180);
-        getdisplay().print(unit2);                           // Unit
+        epd->print(unit2);                           // Unit
 
         // Show value
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(180, 180);
+        epd->setCursor(180, 180);
 
         // Show bus data
         if(String(powsensor1) != "off"){
-            getdisplay().print(value2,1);                    // Real value as formated string
+            epd->print(value2,1);                    // Real value as formated string
         }
         else{
-            getdisplay().print("---");                       // No sensor data (sensor is off)
+            epd->print("---");                       // No sensor data (sensor is off)
         }
 
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 235);
+        epd->setCursor(20, 235);
-        getdisplay().print(name3);                           // Value name
+        epd->print(name3);                           // Value name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 270);
+        epd->setCursor(20, 270);
-        getdisplay().print(unit3);                           // Unit
+        epd->print(unit3);                           // Unit
 
         // Show value
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(180, 270);
+        epd->setCursor(180, 270);
 
         // Show bus data
         if(String(powsensor1) != "off"){
-            getdisplay().print(value3,1);                    // Real value as formated string
+            epd->print(value3,1);                    // Real value as formated string
         }
         else{
-            getdisplay().print("---");                       // No sensor data (sensor is off)
+            epd->print("---");                       // No sensor data (sensor is off)
         }
 
         return PAGE_UPDATE;

lib/obp60task/PageBattery2.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,23 +7,34 @@
 
 class PageBattery2 : public Page
 {
-bool init = false;                  // Marker for init done
+private:
-int average = 0;                    // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s
+    String batVoltage;
-bool trend = true;                  // Trend indicator [0|1], 0=off, 1=on
+    int batCapacity;
-double raw = 0;
+    String batType;
+    String powerSensor;
+    bool init = false;  // Marker for init done
+    int 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
+    double raw = 0;
 
 public:
-    PageBattery2(CommonData &common){
+    PageBattery2(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageBattery2");
+        logger->logDebug(GwLog::LOG, "Instantiate PageBattery2");
+
+        // Get config data
+        batVoltage = config->getString(config->batteryVoltage);
+        batCapacity = config->getInt(config->batteryCapacity);
+        batType = config->getString(config->batteryType);
+        powerSensor = config->getString(config->usePowSensor1);
     }
 
-    virtual void setupKeys(){
+    void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "AVG";
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
          // Change average
         if(key == 1){
             average ++;
@@ -44,11 +56,7 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData)
+    int displayPage(PageData &pageData) {
-    {
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
-
         // Polynominal coefficients second order for battery energy level calculation
         // index 0 = Pb, 1 = Gel, 2 = AGM, 3 = LiFePo4
         float x0[4] = {+3082.5178, +1656.1571, +1316.8766, +14986.9336};    // Offset
@@ -57,16 +65,6 @@ public:
         int batPercentage = 0;      // Battery level
         float batRange = 0;         // Range in hours
         
-        // Get config data
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String batVoltage = config->getString(config->batteryVoltage);
-        int batCapacity = config->getInt(config->batteryCapacity);
-        String batType = config->getString(config->batteryType);
-        String backlightMode = config->getString(config->backlight);
-        String powerSensor = config->getString(config->usePowSensor1);
-
         double value1 = 0;  // Battery voltage
         double value2 = 0;  // Battery current
         double value3 = 0;  // Battery power consumption
@@ -142,149 +140,133 @@ public:
         if(batRange > 99) batRange = 99;
 
         // Optical warning by limit violation
-        if(String(flashLED) == "Limit Violation"){
+        if (flashLED == "Limit Violation") {
-            // Limits for Pb battery
+            bool violation = false;
-            if(String(batType) == "Pb" && (raw < 11.8 || raw > 14.8)){
+            if (batType == "Pb") {
+                violation = (raw < 11.8 || raw > 14.8);
+            } else if (batType == "Gel") {
+                violation = (raw < 11.8 || raw > 14.4);
+            } else if (batType == "AGM") {
+                violation = (raw < 11.8 || raw > 14.7);
+            } else if (batType == "LiFePo4") {
+                violation = (raw < 12.0 || raw > 14.6);
+            }
+            if (violation) {
                 setBlinkingLED(true);
-            }
+            } else {
-            if(String(batType) == "Pb" && (raw >= 11.8 && raw <= 14.8)){
-                setBlinkingLED(false);
-                setFlashLED(false);
-            }
-            // Limits for Gel battery
-            if(String(batType) == "Gel" && (raw < 11.8 || raw > 14.4)){
-                setBlinkingLED(true);
-            }
-            if(String(batType) == "Gel" && (raw >= 11.8 && raw <= 14.4)){
-                setBlinkingLED(false);
-                setFlashLED(false);
-            }
-            // Limits for AGM battery
-            if(String(batType) == "AGM" && (raw < 11.8 || raw > 14.7)){
-                setBlinkingLED(true);
-            }
-            if(String(batType) == "AGM" && (raw >= 11.8 && raw <= 14.7)){
-                setBlinkingLED(false);
-                setFlashLED(false);
-            }
-            // Limits for LiFePo4 battery
-            if(String(batType) == "LiFePo4" && (raw < 12.0 || raw > 14.6)){
-                setBlinkingLED(true);
-            }
-            if(String(batType) == "LiFePo4" && (raw >= 12.0 && raw <= 14.6)){
                 setBlinkingLED(false);
                 setFlashLED(false);
             }
         }
         
         // Logging voltage value
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageBattery2, Type:%s %s:=%f", batType.c_str(), name1.c_str(), raw);
+        logger->logDebug(GwLog::LOG, "Drawing at PageBattery2, Type:%s %s:=%f", batType.c_str(), name1.c_str(), raw);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(10, 65);
+        epd->setCursor(10, 65);
-        getdisplay().print("Bat.");
+        epd->print("Bat.");
 
          // Show battery type
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(90, 65);
+        epd->setCursor(90, 65);
-        getdisplay().print(batType);
+        epd->print(batType);
 
         // Show voltage type
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 140);
+        epd->setCursor(10, 140);
         int bvoltage = 0;
         if(String(batVoltage) == "12V") bvoltage = 12;
         else bvoltage = 24;
-        getdisplay().print(bvoltage);
+        epd->print(bvoltage);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("V");
+        epd->print("V");
 
         // Show battery capacity
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 200);
+        epd->setCursor(10, 200);
-        if(batCapacity <= 999) getdisplay().print(batCapacity, 0);
+        if(batCapacity <= 999) epd->print(batCapacity, 0);
-        if(batCapacity > 999) getdisplay().print(float(batCapacity/1000.0), 1);
+        if(batCapacity > 999) epd->print(float(batCapacity/1000.0), 1);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        if(batCapacity <= 999) getdisplay().print("Ah");
+        if(batCapacity <= 999) epd->print("Ah");
-        if(batCapacity > 999) getdisplay().print("kAh");
+        if(batCapacity > 999) epd->print("kAh");
 
         // Show info
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 235);
+        epd->setCursor(10, 235);
-        getdisplay().print("Installed");
+        epd->print("Installed");
-        getdisplay().setCursor(10, 255);
+        epd->setCursor(10, 255);
-        getdisplay().print("Battery Type");
+        epd->print("Battery Type");
 
         // Show battery with fill level
         batteryGraphic(150, 45, batPercentage, commonData->fgcolor, commonData->bgcolor);
 
         // Show average settings
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(150, 145);
+        epd->setCursor(150, 145);
         switch (average) {
             case 0:
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
                 break;
             case 1:
-                getdisplay().print("Avg: 10s");
+                epd->print("Avg: 10s");
                 break;
             case 2:
-                getdisplay().print("Avg: 60s");
+                epd->print("Avg: 60s");
                 break;
             case 3:
-                getdisplay().print("Avg: 300s");
+                epd->print("Avg: 300s");
                 break;
             default:
-                getdisplay().print("Avg: 1s");
+                epd->print("Avg: 1s");
                 break;
         } 
 
         // Show fill level in percent
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(150, 200);
+        epd->setCursor(150, 200);
-        getdisplay().print(batPercentage);
+        epd->print(batPercentage);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("%");
+        epd->print("%");
 
         // Show time to full discharge
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(150, 260);
+        epd->setCursor(150, 260);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(batRange < 9.9) getdisplay().print(batRange, 1);
+            if(batRange < 9.9) epd->print(batRange, 1);
-            else getdisplay().print(batRange, 0);
+            else epd->print(batRange, 0);
         }
-        else  getdisplay().print("--");
+        else  epd->print("--");
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("h");
+        epd->print("h");
 
         // Show sensor type info
         String i2cAddr = "";
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(270, 60);
+        epd->setCursor(270, 60);
-        if(powerSensor == "off") getdisplay().print("Internal");
+        if(powerSensor == "off") epd->print("Internal");
         if(powerSensor == "INA219"){
-            getdisplay().print("INA219");
+            epd->print("INA219");
         }
         if(powerSensor == "INA226"){
-            getdisplay().print("INA226");
+            epd->print("INA226");
             i2cAddr = " (0x" + String(INA226_I2C_ADDR1, HEX) + ")";
         }
-        getdisplay().print(i2cAddr);
+        epd->print(i2cAddr);
-        getdisplay().setCursor(270, 80);
+        epd->setCursor(270, 80);
-        getdisplay().print("Sensor Modul");
+        epd->print("Sensor Modul");
 
         // Reading bus data or using simulation data
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 140);
+        epd->setCursor(260, 140);
         if(simulation == true){
             if(batVoltage == "12V"){
                 value1 = 12.0;
@@ -293,46 +275,46 @@ public:
                 value1 = 24.0;
             }
             value1 += float(random(0, 5)) / 10;         // Simulation data
-            getdisplay().print(value1,1);
+            epd->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) getdisplay().print(value1, 2);
+                if(value1 <= 9.9) epd->print(value1, 2);
-                if(value1 > 9.9 && value1 <= 99.9)getdisplay().print(value1, 1);
+                if(value1 > 9.9 && value1 <= 99.9)epd->print(value1, 1);
-                if(value1 > 99.9) getdisplay().print(value1, 0);
+                if(value1 > 99.9) epd->print(value1, 0);
             }
             else{
-            getdisplay().print("---");                       // Missing bus data
+            epd->print("---");                       // Missing bus data
             }
         }
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("V");
+        epd->print("V");
 
         // Show actual current in A
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 200);
+        epd->setCursor(260, 200);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(value2 <= 9.9) getdisplay().print(value2, 2);
+            if(value2 <= 9.9) epd->print(value2, 2);
-            if(value2 > 9.9 && value2 <= 99.9)getdisplay().print(value2, 1);
+            if(value2 > 9.9 && value2 <= 99.9)epd->print(value2, 1);
-            if(value2 > 99.9) getdisplay().print(value2, 0);
+            if(value2 > 99.9) epd->print(value2, 0);
         }
-        else  getdisplay().print("---");
+        else  epd->print("---");
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("A");
+        epd->print("A");
 
         // Show actual consumption in W
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 260);
+        epd->setCursor(260, 260);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(value3 <= 9.9) getdisplay().print(value3, 2);
+            if(value3 <= 9.9) epd->print(value3, 2);
-            if(value3 > 9.9 && value3 <= 99.9)getdisplay().print(value3, 1);
+            if(value3 > 9.9 && value3 <= 99.9)epd->print(value3, 1);
-            if(value3 > 99.9) getdisplay().print(value3, 0);
+            if(value3 > 99.9) epd->print(value3, 0);
         }
-        else  getdisplay().print("---");
+        else  epd->print("---");
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("W");
+        epd->print("W");
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageClock.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -16,30 +17,41 @@
 
 class PageClock : public Page
 {
-bool simulation = false;
+private:
-int simtime;
+    String dateformat;
-bool keylock = false;
+    int simtime;
-char source = 'R';  // time source (R)TC | (G)PS | (N)TP
+    bool keylock = false;
-char mode = 'A';    // display mode (A)nalog | (D)igital | race (T)imer
+    char source = 'R';  // time source (R)TC | (G)PS | (N)TP
-char tz = 'L';      // time zone (L)ocal | (U)TC
+    char mode = 'A';    // display mode (A)nalog | (D)igital | race (T)imer
-double timezone = 0; // there are timezones with non int offsets, e.g. 5.5 or 5.75
+    char tz = 'L';      // time zone (L)ocal | (U)TC
-double homelat;
+    double timezone = 0; // there are timezones with non int offsets, e.g. 5.5 or 5.75
-double homelon;
+    double homelat;
-bool homevalid = false; // homelat and homelon are valid
+    double homelon;
+    bool homevalid = false; // homelat and homelon are valid
 
-    public:
+public:
-    PageClock(CommonData &common){
+    PageClock(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageClock");
+        logger->logDebug(GwLog::LOG, "Instantiate PageClock");
-        simulation = common.config->getBool(common.config->useSimuData);
+
-        timezone = common.config->getString(common.config->timeZone).toDouble();
+        // Get config data
-        homelat = common.config->getString(common.config->homeLAT).toDouble();
+        dateformat = config->getString(config->dateFormat);
-        homelon = common.config->getString(common.config->homeLON).toDouble();
+        timezone = config->getString(config->timeZone).toDouble();
+        homelat = config->getString(config->homeLAT).toDouble();
+        homelon = config->getString(config->homeLON).toDouble();
         homevalid = homelat >= -180.0 and homelat <= 180 and homelon >= -90.0 and homelon <= 90.0;
         simtime = 38160; // time value 11:36
+
+#ifdef BOARD_OBP60S3
+        // WIP time source
+        String use_rtc = config->getString(config->useRTC);
+        if (use_rtc == "off") {
+            source = 'G';
+        }
+#endif
     }
 
-    virtual void setupKeys(){
+    void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "SRC";
         commonData->keydata[1].label = "MODE";
@@ -47,7 +59,7 @@ bool homevalid = false; // homelat and homelon are valid
     }
 
     // Key functions
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Time source
         if (key == 1) {
             if (source == 'G') {
@@ -85,10 +97,17 @@ bool homevalid = false; // homelat and homelon are valid
         return key;
     }
 
-    int displayPage(PageData &pageData)
+    void displayNew(PageData &pageData) {
-    {
+#ifdef BOARD_OBP60S3
-        GwConfigHandler *config = commonData->config;
+        // Clear optical warning
-        GwLog *logger = commonData->logger;
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         static String svalue1old = "";
         static String unit1old = "";
@@ -100,16 +119,10 @@ bool homevalid = false; // homelat and homelon are valid
         static String svalue5old = "";
         static String svalue6old = "";
 
-        double value1 = 0;
+        double value1 = 0; // GPS time
-        double value2 = 0;
+        double value2 = 0; // GPS date FIXME date defined as uint32_t!
-        double value3 = 0;
+        double value3 = 0; // HDOP
-
+        bool gpsvalid = false;
-        // Get config data
-        String lengthformat = config->getString(config->lengthFormat);
-        String dateformat = config->getString(config->dateFormat);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String backlightMode = config->getString(config->backlight);
 
         // Get boat values for GPS time
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
@@ -155,6 +168,9 @@ bool homevalid = false; // homelat and homelon are valid
             unit3old = unit3;                           // Save old unit
         }
 
+        // GPS date and time are valid and can be used
+        gpsvalid = (valid1 && valid2 && valid3);
+
         // Optical warning by limit violation (unused)
         if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
@@ -163,108 +179,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", name1.c_str(), value1, name2.c_str(), value2);
+        logger->logDebug(GwLog::LOG, "Drawing at PageClock, %s:%f,  %s:%f, %s:%f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         time_t tv = mktime(&commonData->data.rtcTime) + timezone * 3600;
         struct tm *local_tm = localtime(&tv);
 
         // Show values GPS date
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 65);
+        epd->setCursor(10, 65);
         if (holdvalues == false) {
             if (source == 'G') {
                  // GPS value
-                 getdisplay().print(svalue2);
+                 epd->print(svalue2);
             } else if (commonData->data.rtcValid) {
                 // RTC value
                  if (tz == 'L') {
-                     getdisplay().print(formatDate(dateformat, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
+                     epd->print(formatDate(dateformat, local_tm->tm_year + 1900, local_tm->tm_mon + 1, local_tm->tm_mday));
                  }
                  else {
-                     getdisplay().print(formatDate(dateformat, commonData->data.rtcTime.tm_year + 1900, commonData->data.rtcTime.tm_mon + 1, commonData->data.rtcTime.tm_mday));
+                     epd->print(formatDate(dateformat, commonData->data.rtcTime.tm_year + 1900, commonData->data.rtcTime.tm_mon + 1, commonData->data.rtcTime.tm_mday));
                  }
             } else {
-                getdisplay().print("---");
+                epd->print("---");
             }
         } else {
-            getdisplay().print(svalue2old);
+            epd->print(svalue2old);
         }
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 95);
+        epd->setCursor(10, 95);
-        getdisplay().print("Date");                          // Name
+        epd->print("Date");                          // Name
 
         // Horizintal separator left
-        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
+        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
 
         // Show values GPS time
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 250);
+        epd->setCursor(10, 250);
         if (holdvalues == false) {
             if (source == 'G') {
-                getdisplay().print(svalue1); // Value
+                epd->print(svalue1); // Value
             }
             else if (commonData->data.rtcValid) {
                  if (tz == 'L') {
-                      getdisplay().print(formatTime('s', local_tm->tm_hour, local_tm->tm_min, local_tm->tm_sec));
+                      epd->print(formatTime('s', local_tm->tm_hour, local_tm->tm_min, local_tm->tm_sec));
                  }
                  else {
-                      getdisplay().print(formatTime('s', commonData->data.rtcTime.tm_hour, commonData->data.rtcTime.tm_min, commonData->data.rtcTime.tm_sec));
+                      epd->print(formatTime('s', commonData->data.rtcTime.tm_hour, commonData->data.rtcTime.tm_min, commonData->data.rtcTime.tm_sec));
                  }
             } else {
-                getdisplay().print("---");
+                epd->print("---");
             }
         }
         else {
-             getdisplay().print(svalue1old);
+             epd->print(svalue1old);
         }
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 220);
+        epd->setCursor(10, 220);
-        getdisplay().print("Time");                          // Name
+        epd->print("Time");                          // Name
 
         // Show values sunrise
         String sunrise = "---";
-        if ((valid1 and valid2 and valid3 == true) or (homevalid and commonData->data.rtcValid)) {
+        if (((source == 'G') and gpsvalid) or (homevalid and commonData->data.rtcValid)) {
             sunrise = String(commonData->sundata.sunriseHour) + ":" + String(commonData->sundata.sunriseMinute + 100).substring(1);
             svalue5old = sunrise;
         } else if (simulation) {
             sunrise = String("06:42");
         }
 
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 65);
+        epd->setCursor(335, 65);
-        if(holdvalues == false) getdisplay().print(sunrise); // Value
+        if(holdvalues == false) epd->print(sunrise); // Value
-        else getdisplay().print(svalue5old);
+        else epd->print(svalue5old);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 95);
+        epd->setCursor(335, 95);
-        getdisplay().print("SunR");                          // Name
+        epd->print("SunR");                          // Name
 
         // Horizintal separator right
-        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
+        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
 
         // Show values sunset
         String sunset = "---";
-        if ((valid1 and valid2 and valid3 == true) or (homevalid and commonData->data.rtcValid)) {
+        if (((source == 'G') and gpsvalid) or (homevalid and commonData->data.rtcValid)) {
             sunset = String(commonData->sundata.sunsetHour) + ":" +  String(commonData->sundata.sunsetMinute + 100).substring(1);
             svalue6old = sunset;
         } else if (simulation) {
             sunset = String("21:03");
         }
 
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 250);
+        epd->setCursor(335, 250);
-        if(holdvalues == false) getdisplay().print(sunset);  // Value
+        if(holdvalues == false) epd->print(sunset);  // Value
-        else getdisplay().print(svalue6old);
+        else epd->print(svalue6old);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 220);
+        epd->setCursor(335, 220);
-        getdisplay().print("SunS");                          // Name
+        epd->print("SunS");                          // Name
 
 //*******************************************************************************************
 
@@ -272,8 +288,8 @@ bool homevalid = false; // homelat and homelon are valid
         int rInstrument = 110;     // Radius of clock
         float pi = 3.141592;
 
-        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
 
         for(int i=0; i<360; i=i+1)
         {
@@ -301,11 +317,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
-            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            getdisplay().setCursor(x-w/2, y+h/2);
+            epd->setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                getdisplay().setFont(&Ubuntu_Bold12pt8b);
+                epd->setFont(&Ubuntu_Bold12pt8b);
-                getdisplay().print(ii);
+                epd->print(ii);
             }
 
             // Draw sub scale with dots
@@ -314,7 +330,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);
-                getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+                epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
                 sinx=sin(i/180.0*pi);
                 cosx=cos(i/180.0*pi);
              }
@@ -326,31 +342,31 @@ bool homevalid = false; // homelat and homelon are valid
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),
                         200+(int)(cosx*xx2-sinx*yy2),150+(int)(sinx*xx2+cosx*yy2),commonData->fgcolor);
             }
         }
 
         // Print Unit in clock
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(175, 110);
+        epd->setCursor(175, 110);
         if(holdvalues == false){
-            getdisplay().print(tz == 'L' ? "LOT" : "UTC");
+            epd->print(tz == 'L' ? "LOT" : "UTC");
         }
         else{
-            getdisplay().print(unit2old); // date unit
+            epd->print(unit2old); // date unit
         }
 
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(185, 190);
+        epd->setCursor(185, 190);
         if (source == 'G') {
-            getdisplay().print("GPS");
+            epd->print("GPS");
         } else {
-            getdisplay().print("RTC");
+            epd->print("RTC");
         }
 
         // Clock values
@@ -380,7 +396,7 @@ bool homevalid = false; // homelat and homelon are valid
         if (hour > 12) {
             hour -= 12.0;
         }
-        LOG_DEBUG(GwLog::DEBUG,"... PageClock, value1: %f hour: %f minute:%f", value1, hour, minute);
+        logger->logDebug(GwLog::DEBUG, "... PageClock, value1: %f hour: %f minute:%f", value1, hour, minute);
 
         // Draw hour pointer
         float startwidth = 8;       // Start width of pointer
@@ -393,7 +409,7 @@ bool homevalid = false; // homelat and homelon are valid
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument * 0.5);
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->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
@@ -403,7 +419,7 @@ bool homevalid = false; // homelat and homelon are valid
             float ix2 = -endwidth;
             float iy1 = -(rInstrument * 0.5);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->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);
         }
@@ -419,7 +435,7 @@ bool homevalid = false; // homelat and homelon are valid
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument - 15);
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->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
@@ -429,14 +445,14 @@ bool homevalid = false; // homelat and homelon are valid
             float ix2 = -endwidth;
             float iy1 = -(rInstrument - 15);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
 
         // Center circle
-        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
+        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
+        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageCompass.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -24,58 +25,58 @@ const float Compass_LineDelta = 8.0;// compass band: 1deg = 5 Pixels, 10deg = 50
 
 class PageCompass : public Page
 {
+private:
     int WhichDataCompass = ShowHDM; 
     int WhichDataDisplay = ShowHDM; 
 
-    public:
+public:
-    PageCompass(CommonData &common){
+    PageCompass(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageCompass");
+        logger->logDebug(GwLog::LOG, "Instantiate PageCompass");
     }
 
-    virtual void setupKeys(){
+    void setupKeys(){
         Page::setupKeys();
         commonData->keydata[0].label = "CMP";
         commonData->keydata[1].label = "SRC";
-   }
+    }
     
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Code for keylock
-   
+        if (key == 1) {
-        if ( key == 1 ) {
             WhichDataCompass += 1;
             if ( WhichDataCompass > ShowCOG)
                  WhichDataCompass = ShowHDM;
            return 0;
-            }
+        }
-      if ( key == 2 ) {
+        if (key == 2) {
             WhichDataDisplay += 1;
-            if ( WhichDataDisplay > ShowDBS)
+            if (WhichDataDisplay > ShowDBS)
                  WhichDataDisplay = ShowHDM;
-             }
+        }
-
+        if (key == 11) {
-        if(key == 11){
             commonData->keylock = !commonData->keylock;
             return 0;                   // Commit the key
         }
         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") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         // Old values for hold function
         static String OldDataText[HowManyValues] = {"", "", "","", "", ""};
         static String OldDataUnits[HowManyValues] = {"", "", "","", "", ""};
 
-        // 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);
-        
         GwApi::BoatValue *bvalue;
         String DataName[HowManyValues];
         double DataValue[HowManyValues];
@@ -95,13 +96,7 @@ class PageCompass : public Page
             DataValue[i] = TheFormattedData.value;  // Value as double in SI unit
             DataValid[i] = bvalue->valid;
             DataFormat[i] = bvalue->getFormat();    // Unit of value
-            LOG_DEBUG(GwLog::LOG,"Drawing at PageCompass: %d %s %f %s %s",  i,  DataName[i], DataValue[i], DataFormat[i], DataText[i] );
+            logger->logDebug(GwLog::LOG, "Drawing at PageCompass: %d %s %f %s %s",  i,  DataName[i], DataValue[i], DataFormat[i], DataText[i] );
-        }
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
         }
 
         if (bvalue == NULL) return PAGE_OK; // WTF why this statement?
@@ -109,27 +104,27 @@ class PageCompass : public Page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // Horizontal line 2 pix top & bottom
         // Print data on top half
-        getdisplay().fillRect(0, 130, 400, 2, commonData->fgcolor); 
+        epd->fillRect(0, 130, 400, 2, commonData->fgcolor); 
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(10, 70);
+        epd->setCursor(10, 70);
-        getdisplay().print(DataName[WhichDataDisplay]);                         // Page name
+        epd->print(DataName[WhichDataDisplay]);                         // Page name
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 120);
+        epd->setCursor(10, 120);
-        getdisplay().print(DataUnits[WhichDataDisplay]); 
+        epd->print(DataUnits[WhichDataDisplay]); 
-        getdisplay().setCursor(190, 120);
+        epd->setCursor(190, 120);
-        getdisplay().setFont(&DSEG7Classic_BoldItalic42pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic42pt7b);
   
         if(holdvalues == false){
-            getdisplay().print(DataText[WhichDataDisplay]);                     // Real value as formated string
+            epd->print(DataText[WhichDataDisplay]);                     // Real value as formated string
         }
         else{
-            getdisplay().print(OldDataText[WhichDataDisplay]);                  // Old value as formated string
+            epd->print(OldDataText[WhichDataDisplay]);                  // Old value as formated string
         }
         if(DataValid[WhichDataDisplay] == true){
             OldDataText[WhichDataDisplay] = DataText[WhichDataDisplay];         // Save the old value
@@ -148,14 +143,14 @@ class PageCompass : public Page
         char buffer[bsize+1];
         buffer[0]=0;              
 
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(10, Compass_Y0-60);
+        epd->setCursor(10, Compass_Y0-60);
-        getdisplay().print(DataName[WhichDataCompass]);                         // Page name
+        epd->print(DataName[WhichDataCompass]);                         // Page name
  
      
         // Draw compass base line and pointer
-        getdisplay().fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);            
+        epd->fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);            
-        getdisplay().fillTriangle(Compass_X0,Compass_Y0-40,Compass_X0-10,Compass_Y0-80,Compass_X0+10,Compass_Y0-80,commonData->fgcolor);
+        epd->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;
@@ -164,7 +159,7 @@ class PageCompass : public Page
             else
                     x1 = Compass_X0 - 20 * ( i + 1 );
 
-            getdisplay().fillRect(x1, Compass_Y0 -55, 10, 6, commonData->fgcolor);            
+            epd->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
@@ -174,28 +169,28 @@ class PageCompass : public Page
         for ( int i = 0; i <=4; i++ ){
                 int x0;
                 x0 = Compass_X0 + Delta_X + 2 * i * 5 * Compass_LineDelta;
-                getdisplay().fillRect(x0-2, Compass_Y0 - 2 * Compass_LineLength, 5, 2 * Compass_LineLength, commonData->fgcolor);
+                epd->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;
-                getdisplay().fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
+                epd->fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
 
                 x0 = Compass_X0 + Delta_X - 2 * i * 5 * Compass_LineDelta;
-                getdisplay().fillRect(x0-2, Compass_Y0 - 2 * Compass_LineLength, 5, 2 * Compass_LineLength, commonData->fgcolor);
+                epd->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;
-                getdisplay().fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
+                epd->fillRect(x0-1, Compass_Y0 - Compass_LineLength, 3, Compass_LineLength, commonData->fgcolor);
             }
 
-        getdisplay().fillRect(0, Compass_Y0, 400, 3, commonData->fgcolor);
+        epd->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;
-        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
 
         do {
-                getdisplay().setCursor(x0 - 40, Compass_Y0 + 40);
+                epd->setCursor(x0 - 40, Compass_Y0 + 40);
                 snprintf(buffer,bsize,"%03.0f", AngleToDisplay);
-                getdisplay().print(buffer);
+                epd->print(buffer);
                 AngleToDisplay += 20;
                 if ( AngleToDisplay >= 360.0 )
                     AngleToDisplay -= 360.0;
@@ -208,7 +203,7 @@ class PageCompass : public Page
 
         x0 = Compass_X0 + Delta_X + 4 * 5 * Compass_LineDelta;
         do {
-            getdisplay().setCursor(x0 - 40, Compass_Y0 + 40);
+            epd->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 )
@@ -218,7 +213,7 @@ class PageCompass : public Page
             else if ( ( x0 - 40 )  >  325 ) 
                 buffer[2] = 0;
                 
-            getdisplay().print(buffer);             
+            epd->print(buffer);             
 
             AngleToDisplay -= 20;
             if ( AngleToDisplay < 0 )
@@ -230,8 +225,8 @@ class PageCompass : public Page
         // x_test += 2;
 
         // snprintf(buffer,bsize,"%03d", x_test);
-        // getdisplay().setCursor(x_test, Compass_Y0 - 60);
+        // epd->setCursor(x_test, Compass_Y0 - 60);
-        // getdisplay().print(buffer);
+        // epd->print(buffer);
         // if ( x_test > 390)
         //     x_test = 320;
 

lib/obp60task/PageDST810.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -5,13 +6,19 @@
 
 class PageDST810 : public Page
 {
+private:
+    String lengthformat;
+
 public:
-    PageDST810(CommonData &common){
+    PageDST810(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageDST810");
+        logger->logDebug(GwLog::LOG, "Instantiate PageDST810");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -20,9 +27,7 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    int displayPage(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
 
         // Old values for hold function
         static String svalue1old = "";
@@ -34,13 +39,6 @@ public:
         static String svalue4old = "";
         static String unit4old = "";
 
-        // 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);
-        
         // Get boat values #1
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
         String name1 = xdrDelete(bvalue1->getName());   // Value name
@@ -85,43 +83,43 @@ public:
 
         // Logging boat values
         if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageDST810, %s: %f, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4);
+        logger->logDebug(GwLog::LOG, "Drawing at PageDST810, %s: %f, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 55);
+        epd->setCursor(20, 55);
-        getdisplay().print("Depth");                         // Page name
+        epd->print("Depth");                         // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 90);
+        epd->setCursor(20, 90);
         if(holdvalues == false){
-            getdisplay().print(unit1);                       // Unit
+            epd->print(unit1);                       // Unit
         }
         else{
-            getdisplay().print(unit1old);
+            epd->print(unit1old);
         }
 
         // Set font
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(180, 90);
+        epd->setCursor(180, 90);
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue1);                                     // Real value as formated string
+            epd->print(svalue1);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue1old);                                  // Old value as formated string
+            epd->print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -131,35 +129,35 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 145);
+        epd->setCursor(20, 145);
-        getdisplay().print("Speed");                         // Page name
+        epd->print("Speed");                         // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 180);
+        epd->setCursor(20, 180);
         if(holdvalues == false){
-            getdisplay().print(unit2);                       // Unit
+            epd->print(unit2);                       // Unit
         }
         else{
-            getdisplay().print(unit2old);
+            epd->print(unit2old);
         }
 
         // Setfont
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-        getdisplay().setCursor(180, 180);
+        epd->setCursor(180, 180);
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue2);                                     // Real value as formated string
+            epd->print(svalue2);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue2old);                                  // Old value as formated string
+            epd->print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
@@ -169,35 +167,35 @@ public:
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 220);
+        epd->setCursor(20, 220);
-        getdisplay().print("Log");                           // Page name
+        epd->print("Log");                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(20, 240);
+        epd->setCursor(20, 240);
         if(holdvalues == false){
-            getdisplay().print(unit3);                       // Unit
+            epd->print(unit3);                       // Unit
         }
         else{
-            getdisplay().print(unit3old);
+            epd->print(unit3old);
         }
 
         // Set font
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(80, 270);
+        epd->setCursor(80, 270);
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue3);                                     // Real value as formated string
+            epd->print(svalue3);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue3old);                                  // Old value as formated string
+            epd->print(svalue3old);                                  // Old value as formated string
         }
         if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value
@@ -207,35 +205,35 @@ public:
         // ############### Vertical Line ################
 
         // Vertical line 3 pix
-        getdisplay().fillRect(200, 195, 3, 75, commonData->fgcolor);
+        epd->fillRect(200, 195, 3, 75, commonData->fgcolor);
 
         // ############### Value 4 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(220, 220);
+        epd->setCursor(220, 220);
-        getdisplay().print("Temp");                           // Page name
+        epd->print("Temp");                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(220, 240);
+        epd->setCursor(220, 240);
         if(holdvalues == false){
-            getdisplay().print(unit4);                       // Unit
+            epd->print(unit4);                       // Unit
         }
         else{
-            getdisplay().print(unit4old);
+            epd->print(unit4old);
         }
 
         // Set font
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(280, 270);
+        epd->setCursor(280, 270);
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue4);                                     // Real value as formated string
+            epd->print(svalue4);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue4old);                                  // Old value as formated string
+            epd->print(svalue4old);                                  // Old value as formated string
         }
         if(valid4 == true){
             svalue4old = svalue4;                                       // Save the old value

lib/obp60task/PageEPropulsion.cpp

@@ -0,0 +1,137 @@
+// 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:
+    char mode = 'N'; // (N)ormal, (C)onfig
+
+    void displayModeNormal(PageData &pageData) {
+
+        // TBD Boatvalues: ...
+
+        logger->logDebug(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) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG,"Instantiate PageEPropulsion");
+    }
+
+    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){
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData){
+
+        // Logging boat values
+        logger->logDebug(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,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -66,25 +67,22 @@ static unsigned char fish_bits[] = {
 
 class PageFluid : public Page
 {
-    bool simulation = false;
+private:
     double simgoto;
     double simval;
     double simstep;
-    bool holdvalues = false;
     int fluidtype;
 
-    public:
+public:
-    PageFluid(CommonData &common){
+    PageFluid(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageFluid");
+        logger->logDebug(GwLog::LOG, "Instantiate PageFluid");
-        simulation = common.config->getBool(common.config->useSimuData);
-        holdvalues = common.config->getBool(common.config->holdvalues);
         simval = double(random(0, 100));
         simgoto = double(random(0, 100));
         simstep = (simgoto - simval) / 20.0;
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -93,27 +91,22 @@ class PageFluid : public Page
         return key;
     }
 
-    virtual void displayNew(PageData &pageData){
+    void displayNew(PageData &pageData) {
-        fluidtype = commonData->config->getInt("page" + String(pageData.pageNumber) + "fluid", 0);
+        fluidtype = config->getInt("page" + String(pageData.pageNumber) + "fluid", 0);
-        commonData->logger->logDebug(GwLog::LOG,"New PageFluid: fluidtype=%d", fluidtype);
+        logger->logDebug(GwLog::LOG, "New PageFluid: fluidtype=%d", fluidtype);
-    }
+#ifdef BOARD_OBP60S3
-
+        // Clear optical warning
-    int displayPage(PageData &pageData){
+        if (flashLED == "Limit Violation") {
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
-
-        // Old values for hold function
-        static double value1old;
-
-        // Get config data
-        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);
         }
+#endif
+    }
+
+    int displayPage(PageData &pageData) {
+
+        // Old values for hold function
+        static double value1old;
 
         GwApi::BoatValue *bvalue1 = pageData.values[0];
         String name1 = bvalue1->getName();
@@ -132,23 +125,23 @@ class PageFluid : public Page
         }
 
         // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageFluid: value=%f", bvalue1->value);
+        logger->logDebug(GwLog::LOG, "Drawing at PageFluid: value=%f", bvalue1->value);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height());
+        epd->setPartialWindow(0, 0, epd->width(), epd->height());
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // descriptions
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 60);
+        epd->setCursor(20, 60);
-        getdisplay().print("Fluid");
+        epd->print("Fluid");
 
-        getdisplay().setCursor(300, 60);
+        epd->setCursor(300, 60);
-        getdisplay().print(xdrDelete(name1).substring(0, 6));
+        epd->print(xdrDelete(name1).substring(0, 6));
 
         // analog instrument
         // scale from -120 to 120
@@ -158,11 +151,11 @@ class PageFluid : public Page
         uint8_t r = 110;
 
         // circular frame
-        getdisplay().drawCircle(c.x, c.y, r+5, commonData->fgcolor);
+        epd->drawCircle(c.x, c.y, r+5, commonData->fgcolor);
-        getdisplay().fillCircle(c.x, c.y, r+2, commonData->fgcolor);
+        epd->fillCircle(c.x, c.y, r+2, commonData->fgcolor);
-        getdisplay().fillCircle(c.x, c.y, r-1, commonData->bgcolor);
+        epd->fillCircle(c.x, c.y, r-1, commonData->bgcolor);
         // center of pointer as dot 
-        getdisplay().fillCircle(c.x, c.y, 8, commonData->fgcolor);
+        epd->fillCircle(c.x, c.y, 8, commonData->fgcolor);
 
         // value down centered
         char buffer[6];
@@ -176,32 +169,32 @@ class PageFluid : public Page
         // draw symbol (as bitmap)
         switch (fluidtype) {
             case 0:
-                getdisplay().drawXBitmap(c.x-8, c.y-50, fuel_bits, fuel_width, fuel_height, commonData->fgcolor);
+                epd->drawXBitmap(c.x-8, c.y-50, fuel_bits, fuel_width, fuel_height, commonData->fgcolor);
                 break;
             case 1:
-                getdisplay().drawXBitmap(c.x-8, c.y-50, water_bits, water_width, water_height, commonData->fgcolor);
+                epd->drawXBitmap(c.x-8, c.y-50, water_bits, water_width, water_height, commonData->fgcolor);
                 break;
             case 2: // gray water no symbol yet
-                // getdisplay().drawXBitmap(c.x-8, c.y-50, gray_bits, gray_width, gray_height, commonData->fgcolor);
+                // epd->drawXBitmap(c.x-8, c.y-50, gray_bits, gray_width, gray_height, commonData->fgcolor);
                 break;
             case 3:
-                getdisplay().drawXBitmap(c.x-8, c.y-50, fish_bits, fish_width, fish_height, commonData->fgcolor);
+                epd->drawXBitmap(c.x-8, c.y-50, fish_bits, fish_width, fish_height, commonData->fgcolor);
                 break;
             case 4:
-                getdisplay().drawXBitmap(c.x-8, c.y-50, oil_bits, oil_width, oil_height, commonData->fgcolor);
+                epd->drawXBitmap(c.x-8, c.y-50, oil_bits, oil_width, oil_height, commonData->fgcolor);
                 break;
             case 5:
-                getdisplay().drawXBitmap(c.x-8, c.y-50, waste_bits, waste_width, waste_height, commonData->fgcolor);
+                epd->drawXBitmap(c.x-8, c.y-50, waste_bits, waste_width, waste_height, commonData->fgcolor);
                 break;
             case 6:
-                getdisplay().drawXBitmap(c.x-8, c.y-50, gasoline_bits, gasoline_width, gasoline_height, commonData->fgcolor);
+                epd->drawXBitmap(c.x-8, c.y-50, gasoline_bits, gasoline_width, gasoline_height, commonData->fgcolor);
                 break;
         }
 
         Point p, pr;
 
         // scale texts
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
         p = {c.x, c.y - r + 30};
         drawTextCenter(p.x, p.y, "1/2");
         pr = rotatePoint(c, p, -60);
@@ -210,7 +203,7 @@ class PageFluid : public Page
         drawTextCenter(pr.x, pr.y, "3/4");
 
         // empty and full
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->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);
@@ -236,7 +229,7 @@ class PageFluid : public Page
                 continue;
             }
             p = rotatePoint(c, {c.x, c.y - r + 10}, angle);
-            getdisplay().fillCircle(p.x, p.y, 3, commonData->fgcolor);
+            epd->fillCircle(p.x, p.y, 3, commonData->fgcolor);
         }
 
         // pointer
@@ -249,7 +242,7 @@ class PageFluid : public Page
             };
             fillPoly4(rotatePoints(c, pts, -120 + fluidlevel * 2.4), commonData->fgcolor);
             // Pointer axis is white
-            getdisplay().fillCircle(c.x, c.y, 6, commonData->bgcolor);
+            epd->fillCircle(c.x, c.y, 6, commonData->bgcolor);
         }
  
         return PAGE_UPDATE;

lib/obp60task/PageFourValues.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,13 +7,19 @@
 
 class PageFourValues : public Page
 {
-    public:
+private:
-    PageFourValues(CommonData &common){
+    String lengthformat;
-        commonData = &common;
+
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageFourValues");
+public:
+    PageFourValues(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageFourValues");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -21,9 +28,17 @@ class PageFourValues : public Page
         return key;
     }
 
+    void displayNew(PageData &pageData) {
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
     int displayPage(PageData &pageData){
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
 
         // Old values for hold function
         static String svalue1old = "";
@@ -35,13 +50,6 @@ class PageFourValues : public Page
         static String svalue4old = "";
         static String unit4old = "";
        
-        // 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);
-        
         // Get boat values #1
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
         String name1 = xdrDelete(bvalue1->getName());   // Value name
@@ -82,61 +90,55 @@ class PageFourValues : public Page
         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
 
-        // 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 PageFourValues, %s: %f, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4);
+        logger->logDebug(GwLog::LOG, "Drawing at PageFourValues, %s: %f, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(20, 45);
+        epd->setCursor(20, 45);
-        getdisplay().print(name1);                           // Page name
+        epd->print(name1);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(20, 65);
+        epd->setCursor(20, 65);
         if(holdvalues == false){
-            getdisplay().print(unit1);                       // Unit
+            epd->print(unit1);                       // Unit
         }
         else{
-            getdisplay().print(unit1old);
+            epd->print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(120, 55);
+            epd->setCursor(120, 55);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(150, 58);
+            epd->setCursor(150, 58);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(180, 65);
+            epd->setCursor(180, 65);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue1);                                     // Real value as formated string
+            epd->print(svalue1);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue1old);                                  // Old value as formated string
+            epd->print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -146,45 +148,45 @@ class PageFourValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 80, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 80, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(20, 113);
+        epd->setCursor(20, 113);
-        getdisplay().print(name2);                           // Page name
+        epd->print(name2);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(20, 133);
+        epd->setCursor(20, 133);
         if(holdvalues == false){
-            getdisplay().print(unit2);                       // Unit
+            epd->print(unit2);                       // Unit
         }
         else{
-            getdisplay().print(unit2old);
+            epd->print(unit2old);
         }
 
         // Switch font if format for any values
         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(120, 123);
+            epd->setCursor(120, 123);
         }
         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(150, 123);
+            epd->setCursor(150, 123);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(180, 133);
+            epd->setCursor(180, 133);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue2);                                     // Real value as formated string
+            epd->print(svalue2);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue2old);                                  // Old value as formated string
+            epd->print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
@@ -194,45 +196,45 @@ class PageFourValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 146, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 146, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(20, 181);
+        epd->setCursor(20, 181);
-        getdisplay().print(name3);                           // Page name
+        epd->print(name3);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(20, 201);
+        epd->setCursor(20, 201);
         if(holdvalues == false){
-            getdisplay().print(unit3);                       // Unit
+            epd->print(unit3);                       // Unit
         }
         else{
-            getdisplay().print(unit3old);
+            epd->print(unit3old);
         }
 
         // Switch font if format for any values
         if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(120, 191);
+            epd->setCursor(120, 191);
         }
         else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(150, 191);
+            epd->setCursor(150, 191);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(180, 201);
+            epd->setCursor(180, 201);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue3);                                     // Real value as formated string
+            epd->print(svalue3);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue3old);                                  // Old value as formated string
+            epd->print(svalue3old);                                  // Old value as formated string
         }
         if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value
@@ -242,45 +244,45 @@ class PageFourValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 214, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 214, 400, 3, commonData->fgcolor);
 
         // ############### Value 4 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(20, 249);
+        epd->setCursor(20, 249);
-        getdisplay().print(name4);                           // Page name
+        epd->print(name4);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(20, 269);
+        epd->setCursor(20, 269);
         if(holdvalues == false){
-            getdisplay().print(unit4);                       // Unit
+            epd->print(unit4);                       // Unit
         }
         else{
-            getdisplay().print(unit4old);
+            epd->print(unit4old);
         }
 
         // Switch font if format for any values
         if(bvalue4->getFormat() == "formatLatitude" || bvalue4->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(120, 259);
+            epd->setCursor(120, 259);
         }
         else if(bvalue4->getFormat() == "formatTime" || bvalue4->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(150, 259);
+            epd->setCursor(150, 259);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(180, 269);
+            epd->setCursor(180, 269);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue4);                                     // Real value as formated string
+            epd->print(svalue4);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue4old);                                  // Old value as formated string
+            epd->print(svalue4old);                                  // Old value as formated string
         }
         if(valid4 == true){
             svalue4old = svalue4;                                       // Save the old value
@@ -289,8 +291,15 @@ class PageFourValues : public Page
 
         return PAGE_UPDATE;
     };
+
+    void leavePage(PageData &pageData) {
+        logger->logDebug(GwLog::LOG, "Leaving PageFourvalues");
+    }
+
 };
 
+
+
 static Page *createPage(CommonData &common){
     return new PageFourValues(common);
 }/**

lib/obp60task/PageFourValues2.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,13 +7,19 @@
 
 class PageFourValues2 : public Page
 {
-    public:
+private:
-    PageFourValues2(CommonData &common){
+    String lengthformat;
-        commonData = &common;
+
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageFourValues2");
+public:
+    PageFourValues2(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageFourValues2");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;         // Toggle keylock
@@ -21,9 +28,17 @@ class PageFourValues2 : public Page
         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") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         // Old values for hold function
         static String svalue1old = "";
@@ -35,13 +50,6 @@ class PageFourValues2 : public Page
         static String svalue4old = "";
         static String unit4old = "";
        
-        // 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);
-        
         // Get boat values #1
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
         String name1 = xdrDelete(bvalue1->getName());   // Value name
@@ -82,61 +90,55 @@ class PageFourValues2 : public Page
         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
 
-        // 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 PageFourValues2, %s: %f, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4);
+        logger->logDebug(GwLog::LOG, "Drawing at PageFourValues2, %s: %f, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3, name4.c_str(), value4);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // ############### Value 1 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 55);
+        epd->setCursor(20, 55);
-        getdisplay().print(name1);                           // Page name
+        epd->print(name1);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 90);
+        epd->setCursor(20, 90);
         if(holdvalues == false){
-            getdisplay().print(unit1);                       // Unit
+            epd->print(unit1);                       // Unit
         }
         else{
-            getdisplay().print(unit1old);
+            epd->print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(100, 90);
+            epd->setCursor(100, 90);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(180, 77);
+            epd->setCursor(180, 77);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-            getdisplay().setCursor(180, 90);
+            epd->setCursor(180, 90);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue1);                                     // Real value as formated string
+            epd->print(svalue1);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue1old);                                  // Old value as formated string
+            epd->print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -146,45 +148,45 @@ class PageFourValues2 : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 145);
+        epd->setCursor(20, 145);
-        getdisplay().print(name2);                           // Page name
+        epd->print(name2);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 180);
+        epd->setCursor(20, 180);
         if(holdvalues == false){
-            getdisplay().print(unit2);                       // Unit
+            epd->print(unit2);                       // Unit
         }
         else{
-            getdisplay().print(unit2old);
+            epd->print(unit2old);
         }
 
         // Switch font if format for any values
         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(100, 180);
+            epd->setCursor(100, 180);
         }
         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(180, 158);
+            epd->setCursor(180, 158);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-            getdisplay().setCursor(180, 180);
+            epd->setCursor(180, 180);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue2);                                     // Real value as formated string
+            epd->print(svalue2);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue2old);                                  // Old value as formated string
+            epd->print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
@@ -194,45 +196,45 @@ class PageFourValues2 : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 220);
+        epd->setCursor(20, 220);
-        getdisplay().print(name3);                           // Page name
+        epd->print(name3);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(20, 240);
+        epd->setCursor(20, 240);
         if(holdvalues == false){
-            getdisplay().print(unit3);                       // Unit
+            epd->print(unit3);                       // Unit
         }
         else{
-            getdisplay().print(unit3old);
+            epd->print(unit3old);
         }
 
         // Switch font if format for any values
         if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(50, 240);
+            epd->setCursor(50, 240);
         }
         else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(100, 240);
+            epd->setCursor(100, 240);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(80, 270);
+            epd->setCursor(80, 270);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue3);                                     // Real value as formated string
+            epd->print(svalue3);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue3old);                                  // Old value as formated string
+            epd->print(svalue3old);                                  // Old value as formated string
         }
         if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value
@@ -242,45 +244,45 @@ class PageFourValues2 : public Page
         // ############### Vertical Line ################
 
         // Vertical line 3 pix
-        getdisplay().fillRect(200, 195, 3, 75, commonData->fgcolor);
+        epd->fillRect(200, 195, 3, 75, commonData->fgcolor);
 
         // ############### Value 4 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(220, 220);
+        epd->setCursor(220, 220);
-        getdisplay().print(name4);                           // Page name
+        epd->print(name4);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(220, 240);
+        epd->setCursor(220, 240);
         if(holdvalues == false){
-            getdisplay().print(unit4);                       // Unit
+            epd->print(unit4);                       // Unit
         }
         else{
-            getdisplay().print(unit4old);
+            epd->print(unit4old);
         }
 
         // Switch font if format for any values
         if(bvalue4->getFormat() == "formatLatitude" || bvalue4->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(250, 240);
+            epd->setCursor(250, 240);
         }
         else if(bvalue4->getFormat() == "formatTime" || bvalue4->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(300, 240);
+            epd->setCursor(300, 240);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(280, 270);
+            epd->setCursor(280, 270);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue4);                                     // Real value as formated string
+            epd->print(svalue4);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue4old);                                  // Old value as formated string
+            epd->print(svalue4old);                                  // Old value as formated string
         }
         if(valid4 == true){
             svalue4old = svalue4;                                       // Save the old value

lib/obp60task/PageGenerator.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,12 +7,23 @@
 
 class PageGenerator : public Page
 {
+private:
+    String batVoltage;
+    int genPower;
+    String powerSensor;
+
 public:
-    PageGenerator(CommonData &common){
+    PageGenerator(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageGenerator");
+        logger->logDebug(GwLog::LOG, "Instantiate PageGenerator");
+
+        // Get config data
+        batVoltage = config->getString(config->batteryVoltage);
+        genPower = config->getInt(config->genPower);
+        powerSensor = config->getString(config->usePowSensor3);
     }
-    virtual int handleKey(int key){
+
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -20,19 +32,7 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData)
+    int displayPage(PageData &pageData) {
-    {
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
-        
-        // Get config data
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String batVoltage = config->getString(config->batteryVoltage);
-        int genPower = config->getInt(config->genPower);
-        String backlightMode = config->getString(config->backlight);
-        String powerSensor = config->getString(config->usePowSensor3);
         
         double value1 = 0;  // Solar voltage
         double value2 = 0;  // Solar current
@@ -60,100 +60,95 @@ public:
         bool valid1 = true;
 
         // Optical warning by limit violation
-        if(String(flashLED) == "Limit Violation"){
+        if (flashLED == "Limit Violation") {
-            // Over voltage
+            // Over voltage?
-            if(value1 > 14.8 && batVoltage == "12V"){
+            if (batVoltage == "12V") {
-                setBlinkingLED(true);
+                setBlinkingLED(value1 > 14.8);
-            }
+            } else if (batVoltage == "24V") {
-            if(value1 <= 14.8 && batVoltage == "12V"){
+                setBlinkingLED(value1 > 29.6);
-                setBlinkingLED(false);
+            } else {
-            }
-            if(value1 > 29.6 && batVoltage == "24V"){
-                setBlinkingLED(true);
-            }
-            if(value1 <= 29.6 && batVoltage == "24V"){
                 setBlinkingLED(false);
             }
         }
 
         // Logging voltage value
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageGenerator, Type:%iW %s:=%f", genPower, name1.c_str(), value1);
+        logger->logDebug(GwLog::LOG, "Drawing at PageGenerator, Type:%iW %s:=%f", genPower, name1.c_str(), value1);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(10, 65);
+        epd->setCursor(10, 65);
-        getdisplay().print("Power");
+        epd->print("Power");
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(12, 82);
+        epd->setCursor(12, 82);
-        getdisplay().print("Generator");
+        epd->print("Generator");
 
         // Show voltage type
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 140);
+        epd->setCursor(10, 140);
         int bvoltage = 0;
         if(String(batVoltage) == "12V") bvoltage = 12;
         else bvoltage = 24;
-        getdisplay().print(bvoltage);
+        epd->print(bvoltage);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("V");
+        epd->print("V");
 
         // Show solar power
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 200);
+        epd->setCursor(10, 200);
-        if(genPower <= 999) getdisplay().print(genPower, 0);
+        if(genPower <= 999) epd->print(genPower, 0);
-        if(genPower > 999) getdisplay().print(float(genPower/1000.0), 1);
+        if(genPower > 999) epd->print(float(genPower/1000.0), 1);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        if(genPower <= 999) getdisplay().print("W");
+        if(genPower <= 999) epd->print("W");
-        if(genPower > 999) getdisplay().print("kW");
+        if(genPower > 999) epd->print("kW");
 
         // Show info
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 235);
+        epd->setCursor(10, 235);
-        getdisplay().print("Installed");
+        epd->print("Installed");
-        getdisplay().setCursor(10, 255);
+        epd->setCursor(10, 255);
-        getdisplay().print("Power Modul");
+        epd->print("Power Modul");
 
         // Show generator
         generatorGraphic(200, 95, commonData->fgcolor, commonData->bgcolor);
 
         // Show load level in percent
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(150, 200);
+        epd->setCursor(150, 200);
-        getdisplay().print(genPercentage);
+        epd->print(genPercentage);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("%");
+        epd->print("%");
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(150, 235);
+        epd->setCursor(150, 235);
-        getdisplay().print("Load");
+        epd->print("Load");
 
         // Show sensor type info
         String i2cAddr = "";
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(270, 60);
+        epd->setCursor(270, 60);
-        if(powerSensor == "off") getdisplay().print("Internal");
+        if(powerSensor == "off") epd->print("Internal");
         if(powerSensor == "INA219"){
-            getdisplay().print("INA219");
+            epd->print("INA219");
             i2cAddr = " (0x" + String(INA219_I2C_ADDR3, HEX) + ")";
         }
         if(powerSensor == "INA226"){
-            getdisplay().print("INA226");
+            epd->print("INA226");
             i2cAddr = " (0x" + String(INA226_I2C_ADDR3, HEX) + ")";
         }
-        getdisplay().print(i2cAddr);
+        epd->print(i2cAddr);
-        getdisplay().setCursor(270, 80);
+        epd->setCursor(270, 80);
-        getdisplay().print("Sensor Modul");
+        epd->print("Sensor Modul");
 
         // Reading bus data or using simulation data
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 140);
+        epd->setCursor(260, 140);
         if(simulation == true){
             if(batVoltage == "12V"){
                 value1 = 12.0;
@@ -162,46 +157,46 @@ public:
                 value1 = 24.0;
             }
             value1 += float(random(0, 5)) / 10;         // Simulation data
-            getdisplay().print(value1,1);
+            epd->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) getdisplay().print(value1, 2);
+                if(value1 <= 9.9) epd->print(value1, 2);
-                if(value1 > 9.9 && value1 <= 99.9)getdisplay().print(value1, 1);
+                if(value1 > 9.9 && value1 <= 99.9)epd->print(value1, 1);
-                if(value1 > 99.9) getdisplay().print(value1, 0);
+                if(value1 > 99.9) epd->print(value1, 0);
             }
             else{
-            getdisplay().print("---");                       // Missing bus data
+            epd->print("---");                       // Missing bus data
             }
         }
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("V");
+        epd->print("V");
 
         // Show actual current in A
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 200);
+        epd->setCursor(260, 200);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(value2 <= 9.9) getdisplay().print(value2, 2);
+            if(value2 <= 9.9) epd->print(value2, 2);
-            if(value2 > 9.9 && value2 <= 99.9)getdisplay().print(value2, 1);
+            if(value2 > 9.9 && value2 <= 99.9)epd->print(value2, 1);
-            if(value2 > 99.9) getdisplay().print(value2, 0);
+            if(value2 > 99.9) epd->print(value2, 0);
         }
-        else  getdisplay().print("---");
+        else  epd->print("---");
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("A");
+        epd->print("A");
 
         // Show actual consumption in W
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 260);
+        epd->setCursor(260, 260);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(value3 <= 9.9) getdisplay().print(value3, 2);
+            if(value3 <= 9.9) epd->print(value3, 2);
-            if(value3 > 9.9 && value3 <= 99.9)getdisplay().print(value3, 1);
+            if(value3 > 9.9 && value3 <= 99.9)epd->print(value3, 1);
-            if(value3 > 99.9) getdisplay().print(value3, 0);
+            if(value3 > 99.9) epd->print(value3, 0);
         }
-        else  getdisplay().print("---");
+        else  epd->print("---");
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("W");
+        epd->print("W");
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageKeelPosition.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -5,14 +6,24 @@
 
 class PageKeelPosition : public Page
 {
+private:
+    String lengthformat;
+    String rotsensor;
+    String rotfunction;
+
 public:
-    PageKeelPosition(CommonData &common){
+    PageKeelPosition(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageKeelPosition");
+        logger->logDebug(GwLog::LOG, "Instantiate PageKeelPosition");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
+        rotsensor = config->getString(config->useRotSensor);
+        rotfunction = config->getString(config->rotFunction);
     }
 
     // Key functions
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -21,23 +32,21 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData)
+    void displayNew(PageData &pageData) {
-    {
+#ifdef BOARD_OBP60S3
-        GwConfigHandler *config = commonData->config;
+        // Clear optical warning
-        GwLog *logger = commonData->logger;
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         double value1 = 0;
         double value1old = 0;
 
-        // 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 rotsensor = config->getString(config->useRotSensor);
-        String rotfunction = config->getString(config->rotFunction);
-
         // Get boat values for Keel position
         bool valid1 = commonData->data.validRotAngle;    // Valid information 
         if(simulation == false && rotsensor == "AS5600" && rotfunction == "Keel"){
@@ -55,20 +64,14 @@ public:
             value1old = value1;   	                    // Save old value
         }
 
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
-        }
-
         // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageKeelPosition, Keel:%f", value1);
+        logger->logDebug(GwLog::LOG, "Drawing at PageKeelPosition, Keel:%f", value1);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
 //*******************************************************************************************
         
@@ -76,9 +79,9 @@ public:
         int rInstrument = 110;     // Radius of KeelPosition
         float pi = 3.141592;
 
-        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);       // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);       // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);        // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);        // Outer circle
-        getdisplay().fillRect(0, 30, 400, 122, commonData->bgcolor);                    // Delete half top circle
+        epd->fillRect(0, 30, 400, 122, commonData->bgcolor);                    // Delete half top circle
 
         for(int i=90; i<=270; i=i+10)
         {
@@ -105,17 +108,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
-            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            getdisplay().setCursor(x-w/2, y+h/2);
+            epd->setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                getdisplay().setFont(&Ubuntu_Bold8pt8b);
+                epd->setFont(&Ubuntu_Bold8pt8b);
-                getdisplay().print(ii);
+                epd->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);
-            getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
             float sinx=sin(i/180.0*pi);
             float cosx=cos(i/180.0*pi); 
 
@@ -126,10 +129,10 @@ public:
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                epd->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);
             }
@@ -163,7 +166,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument * 0.6); 
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->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
@@ -173,36 +176,36 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument * 0.6);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->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
-            getdisplay().fillCircle(200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2), 5, commonData->fgcolor);
+            epd->fillCircle(200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2), 5, commonData->fgcolor);
         }
 
         // Center circle
-        getdisplay().fillCircle(200, 140, startwidth + 22, commonData->bgcolor);
+        epd->fillCircle(200, 140, startwidth + 22, commonData->bgcolor);
-        getdisplay().fillCircle(200, 140, startwidth + 20, commonData->fgcolor);      // Boat circle
+        epd->fillCircle(200, 140, startwidth + 20, commonData->fgcolor);      // Boat circle
-        getdisplay().fillRect(200 - 30, 140 - 30, 2 * 30, 30, commonData->bgcolor);   // Delete half top of boat circle
+        epd->fillRect(200 - 30, 140 - 30, 2 * 30, 30, commonData->bgcolor);   // Delete half top of boat circle
-        getdisplay().fillRect(150, 150, 100, 4, commonData->fgcolor);                 // Water line
+        epd->fillRect(150, 150, 100, 4, commonData->fgcolor);                 // Water line
 
         // Print label
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(100, 70);
+        epd->setCursor(100, 70);
-        getdisplay().print("Keel Position");                 // Label
+        epd->print("Keel Position");                 // Label
 
         if((rotsensor == "AS5600" && rotfunction == "Keel" && (valid1 == true || holdvalues == true)) || simulation == true){
             // Print Unit of keel position
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(175, 110);
+            epd->setCursor(175, 110);
-            getdisplay().print(unit1);                       // Unit
+            epd->print(unit1);                       // Unit
         }
         else{
             // Print Unit of keel position
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(145, 110);
+            epd->setCursor(145, 110);
-            getdisplay().print("No sensor data");            // Info missing sensor
+            epd->print("No sensor data");            // Info missing sensor
         }
 
         return PAGE_UPDATE;

lib/obp60task/PageOneValue.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,13 +7,19 @@
 
 class PageOneValue : public Page
 {
-    public:
+private:
-    PageOneValue(CommonData &common){
+    String lengthformat;
-        commonData = &common;
+
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageOneValue");
+public:
+    PageOneValue(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageOneValue");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -21,20 +28,22 @@ class PageOneValue : public Page
         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") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         // Old values for hold function
         static String svalue1old = "";
         static String unit1old = "";
 
-        // 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);
         
         // Get boat values
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
@@ -46,58 +55,52 @@ class PageOneValue : public Page
         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
 
-        // 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 PageOneValue, %s: %f", name1.c_str(), value1);
+        logger->logDebug(GwLog::LOG, "Drawing at PageOneValue, %s: %f", name1.c_str(), value1);
 
         // Draw page
         //***********************************************************
 
         /// Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
         // Show name
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold32pt8b);
+        epd->setFont(&Ubuntu_Bold32pt8b);
-        getdisplay().setCursor(20, 100);
+        epd->setCursor(20, 100);
-        getdisplay().print(name1);                           // Page name
+        epd->print(name1);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(270, 100);
+        epd->setCursor(270, 100);
         if(holdvalues == false){
-            getdisplay().print(unit1);                       // Unit
+            epd->print(unit1);                       // Unit
         }
         else{
-            getdisplay().print(unit1old);
+            epd->print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(20, 180);
+            epd->setCursor(20, 180);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold32pt8b);
+            epd->setFont(&Ubuntu_Bold32pt8b);
-            getdisplay().setCursor(20, 200);
+            epd->setCursor(20, 200);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic60pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic60pt7b);
-            getdisplay().setCursor(20, 240);
+            epd->setCursor(20, 240);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue1);                                     // Real value as formated string
+            epd->print(svalue1);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue1old);                                  // Old value as formated string
+            epd->print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value

lib/obp60task/PageRollPitch.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -5,14 +6,30 @@
 
 class PageRollPitch : public Page
 {
+private:
+    String lengthformat;
+    int rolllimit;
+    String roffset;
+    double rolloffset;
+    String poffset;
+    double pitchoffset;
+
 public:
-    PageRollPitch(CommonData &common){
+    PageRollPitch(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageRollPitch");
+        logger->logDebug(GwLog::LOG, "Instantiate PageRollPitch");
+
+        // Get config data
+        String lengthformat = config->getString(config->lengthFormat);
+        rolllimit = config->getInt(config->rollLimit);
+        roffset = config->getString(config->rollOffset);
+        rolloffset = roffset.toFloat() / 360 * (2 * M_PI);
+        poffset = config->getString(config->pitchOffset);
+        pitchoffset = poffset.toFloat() / 360 * (2 * M_PI);
     }
 
     // Key functions
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -21,9 +38,7 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    int displayPage(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
 
         double value1 = 0;
         double value2 = 0;
@@ -32,19 +47,6 @@ public:
         String svalue2 = "";
         String svalue2old = "";
 
-
-        // 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);
-        int rolllimit = config->getInt(config->rollLimit);
-        String roffset = config->getString(config->rollOffset);
-        double rolloffset = roffset.toFloat()/360*(2*M_PI);
-        String poffset = config->getString(config->pitchOffset);
-        double pitchoffset = poffset.toFloat()/360*(2*M_PI);
-
         // Get boat values for roll
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (xdrRoll)
         String name1 = xdrDelete(bvalue1->getName());   // Value name
@@ -97,71 +99,70 @@ public:
         }
 
         // Optical warning by limit violation
-        if(String(flashLED) == "Limit Violation"){
+        if (flashLED == "Limit Violation") {
             // Limits for roll
-            if(value1*360/(2*M_PI) >= -1*rolllimit && value1*360/(2*M_PI) <= rolllimit){
+            if (value1*360/(2*M_PI) >= -1*rolllimit && value1*360/(2*M_PI) <= rolllimit) {
                 setBlinkingLED(false);
                 setFlashLED(false);
-            }
+            } else {
-            else{
                 setBlinkingLED(true);
             } 
         }
 
         // Logging boat values
         if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageRollPitch, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
+        logger->logDebug(GwLog::LOG, "Drawing at PageRollPitch, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // Show roll limit
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 65);
+        epd->setCursor(10, 65);
-        getdisplay().print(rolllimit);                   // Value
+        epd->print(rolllimit);                   // Value
-        //getdisplay().print(svalue1);                   // Value
+        //epd->print(svalue1);                   // Value
 
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 95);
+        epd->setCursor(10, 95);
-        getdisplay().print("Limit");                     // Name
+        epd->print("Limit");                     // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 115);
+        epd->setCursor(10, 115);
-        getdisplay().print("DEG");
+        epd->print("DEG");
 
         // Horizintal separator left
-        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
+        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
 
         // Show roll value
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 270);
+        epd->setCursor(10, 270);
-        if(holdvalues == false) getdisplay().print(svalue1); // Value
+        if(holdvalues == false) epd->print(svalue1); // Value
-        else getdisplay().print(svalue1old);
+        else epd->print(svalue1old);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 220);
+        epd->setCursor(10, 220);
-        getdisplay().print(name1);                           // Name
+        epd->print(name1);                           // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 190);
+        epd->setCursor(10, 190);
-        getdisplay().print("Deg");
+        epd->print("Deg");
 
         // Horizintal separator right
-        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
+        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
 
         // Show pitch value
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(295, 270);
+        epd->setCursor(295, 270);
-        if(holdvalues == false) getdisplay().print(svalue2); // Value
+        if(holdvalues == false) epd->print(svalue2); // Value
-        else getdisplay().print(svalue2old);
+        else epd->print(svalue2old);
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 220);
+        epd->setCursor(335, 220);
-        getdisplay().print(name2);                           // Name
+        epd->print(name2);                           // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 190);
+        epd->setCursor(335, 190);
-        getdisplay().print("Deg");
+        epd->print("Deg");
 
 //*******************************************************************************************
 
@@ -169,8 +170,8 @@ public:
         int rInstrument = 100;     // Radius of instrument
         float pi = 3.141592;
 
-        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
 
         for(int i=0; i<360; i=i+10)
         {
@@ -194,17 +195,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
-                getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+                epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-                getdisplay().setCursor(x-w/2, y+h/2);
+                epd->setCursor(x-w/2, y+h/2);
                 if(i % 20 == 0){
-                    getdisplay().setFont(&Ubuntu_Bold8pt8b);
+                    epd->setFont(&Ubuntu_Bold8pt8b);
-                    getdisplay().print(ii);
+                    epd->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);
-                getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+                epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
                 float sinx=sin(i/180.0*M_PI);
                 float cosx=cos(i/180.0*M_PI);
 
@@ -215,10 +216,10 @@ public:
                     float xx2 = +dx;
                     float yy1 =  -(rInstrument-10);
                     float yy2 =  -(rInstrument+10);
-                    getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                    epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                             200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                             200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                    getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                    epd->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);
                 }
@@ -239,7 +240,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument * 0.7);
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->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
@@ -249,28 +250,28 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument * 0.7);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->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
-            getdisplay().fillCircle(200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2), 5, commonData->fgcolor);
+            epd->fillCircle(200+(int)(cosx*0-sinx*yy2),150+(int)(sinx*0+cosx*yy2), 5, commonData->fgcolor);
         }
 
         // Center circle
-        getdisplay().fillCircle(200, 150, startwidth + 22, commonData->bgcolor);
+        epd->fillCircle(200, 150, startwidth + 22, commonData->bgcolor);
-        getdisplay().fillCircle(200, 150, startwidth + 20, commonData->fgcolor);      // Boat circle
+        epd->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);
-        getdisplay().fillTriangle(x0, y0, x1, y1, x2, y2, commonData->bgcolor);          // Clear half top side of boat circle (right triangle)
+        epd->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);
-        getdisplay().fillTriangle(x0, y0, x1, y1, x2, y2, commonData->bgcolor);          // Clear half top side of boat circle (left triangle)
+        epd->fillTriangle(x0, y0, x1, y1, x2, y2, commonData->bgcolor);          // Clear half top side of boat circle (left triangle)
-        getdisplay().fillRect(150, 160, 100, 4, commonData->fgcolor);                 // Water line
+        epd->fillRect(150, 160, 100, 4, commonData->fgcolor);                 // Water line
 
         // Draw roll pointer
         startwidth = 4;     // Start width of pointer
@@ -283,7 +284,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument - 15);
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->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
@@ -293,15 +294,15 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument - 15);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->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
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(145, 200);
+            epd->setCursor(145, 200);
-            getdisplay().print("No sensor data");            // Info missing sensor
+            epd->print("No sensor data");            // Info missing sensor
         }
 
         return PAGE_UPDATE;

lib/obp60task/PageRudderPosition.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,14 +7,20 @@
 
 class PageRudderPosition : public Page
 {
+private:
+    String lengthformat;
+
 public:
-    PageRudderPosition(CommonData &common){
+    PageRudderPosition(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Show PageRudderPosition");
+        logger->logDebug(GwLog::LOG, "Instantiate PageRudderPosition");
+
+        // Get config data
+        String lengthformat = config->getString(config->lengthFormat);
     }
 
     // Key functions
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -22,21 +29,22 @@ public:
         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") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+   int displayPage(PageData &pageData) {
 
         static String unit1old = "";
         double value1 = 0.1;
         double value1old = 0.1;
 
-        // 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);
-
         // Get boat values for rudder position
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list
         String name1 = bvalue1->getName().c_str();      // Value name
@@ -47,44 +55,37 @@ public:
         String svalue1 = formatValue(bvalue1, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
         String unit1 = formatValue(bvalue1, *commonData).unit;        // Unit of value
 
-        if(valid1 == true){
+        if (valid1 == true) {
             value1old = value1;   	                    // Save old value
             unit1old = unit1;                           // Save old unit
         } else {
-            if(simulation == true){
+            if (simulation == true) {
-                value1 = (3 + float(random(0, 50)) / 10.0)/360*2*PI;
+                value1 = (3 + float(random(0, 50)) / 10.0) / 360 * 2 * M_PI;
                 unit1 = "Deg";
-            }
+            } else {
-            else{
                 value1 = 0;
             }
         }
 
-        // 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 PageRudderPosition, %s:%f", name1.c_str(), value1);
+        logger->logDebug(GwLog::LOG, "Drawing at PageRudderPosition, %s:%f", name1.c_str(), value1);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
 //*******************************************************************************************
         
         // Draw RudderPosition
         int rInstrument = 110;     // Radius of RudderPosition
-        float pi = 3.141592;
+        const float pi = 3.141592;
 
-        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);        // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);        // Outer circle
-        getdisplay().fillRect(0, 30, 400, 122, commonData->bgcolor);                      // Delete half top circle
+        epd->fillRect(0, 30, 400, 122, commonData->bgcolor);                      // Delete half top circle
 
         for(int i=90; i<=270; i=i+10)
         {
@@ -92,51 +93,50 @@ public:
             float x = 200 + (rInstrument-30)*sin(i/180.0*pi);  //  x-coordinate dots
             float y = 150 - (rInstrument-30)*cos(i/180.0*pi);  //  y-coordinate cots 
             const char *ii = " ";
-            switch (i)
+            switch (i) {
-            {
+                case 0: ii=" "; break;      // Use a blank for a empty scale value
-            case 0: ii=" "; break;      // Use a blank for a empty scale value
+                case 30 : ii=" "; break;
-            case 30 : ii=" "; break;
+                case 60 : ii=" "; break;
-            case 60 : ii=" "; break;
+                case 90 : ii="45"; break;
-            case 90 : ii="45"; break;
+                case 120 : ii="30"; break;
-            case 120 : ii="30"; break;
+                case 150 : ii="15"; break;
-            case 150 : ii="15"; break;
+                case 180 : ii="0"; break;
-            case 180 : ii="0"; break;
+                case 210 : ii="15"; break;
-            case 210 : ii="15"; break;
+                case 240 : ii="30"; break;
-            case 240 : ii="30"; break;
+                case 270 : ii="45"; break;
-            case 270 : ii="45"; break;
+                case 300 : ii=" "; break;
-            case 300 : ii=" "; break;
+                case 330 : ii=" "; break;
-            case 330 : ii=" "; break;
+                default: break;
-            default: break;
             }
 
             // Print text centered on position x, y
             int16_t x1, y1;     // Return values of getTextBounds
             uint16_t w, h;      // Return values of getTextBounds
-            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            getdisplay().setCursor(x-w/2, y+h/2);
+            epd->setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                getdisplay().setFont(&Ubuntu_Bold8pt8b);
+                epd->setFont(&Ubuntu_Bold8pt8b);
-                getdisplay().print(ii);
+                epd->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);
-            getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
             float sinx=sin(i/180.0*pi);
             float cosx=cos(i/180.0*pi); 
 
             // Draw sub scale with lines (two triangles)
             if(i % 30 == 0){
-                float dx=2;   // Line thickness = 2*dx+1
+                float dx = 2;   // Line thickness = 2*dx+1
                 float xx1 = -dx;
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                epd->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);
             }
@@ -144,28 +144,28 @@ public:
         }
 
         // Print label
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(80, 70);
+        epd->setCursor(80, 70);
-        getdisplay().print("Rudder Position");               // Label
+        epd->print("Rudder Position");               // Label
 
         // Print Unit in RudderPosition
         if(valid1 == true || simulation == true){
             if(holdvalues == false){
-                getdisplay().setFont(&Ubuntu_Bold12pt8b);
+                epd->setFont(&Ubuntu_Bold12pt8b);
-                getdisplay().setCursor(175, 110);
+                epd->setCursor(175, 110);
-                getdisplay().print(unit1);                   // Unit
+                epd->print(unit1);                   // Unit
             }
             else{
-                getdisplay().setFont(&Ubuntu_Bold12pt8b);
+                epd->setFont(&Ubuntu_Bold12pt8b);
-                getdisplay().setCursor(175, 110);
+                epd->setCursor(175, 110);
-                getdisplay().print(unit1old);                // Unit
+                epd->print(unit1old);                // Unit
             }
         }
         else{
             // Print Unit of keel position
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(145, 110);
+            epd->setCursor(145, 110);
-            getdisplay().print("No sensor data");            // Info missing sensor
+            epd->print("No sensor data");            // Info missing sensor
             }
 
         // Calculate rudder position
@@ -188,7 +188,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument * 0.5); 
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->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
@@ -198,14 +198,14 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument * 0.5);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
 
         // Center circle
-        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
+        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
+        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageSixValues.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -14,13 +15,13 @@ const int HowManyValues = 6;
 
 class PageSixValues : public Page
 {
-    public:
+public:
-    PageSixValues(CommonData &common){
+    PageSixValues(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageSixValues");
+        logger->logDebug(GwLog::LOG, "Instantiate PageSixValues");
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -29,130 +30,131 @@ class PageSixValues : public Page
         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") {
-         
+            setBlinkingLED(false);
-            // Old values for hold function
+            setFlashLED(false);
-            static String OldDataText[HowManyValues] = {"", "", "", "", "", ""};
+        }
-            static String OldDataUnits[HowManyValues] = {"", "", "", "", "", ""};
+#endif
-    
-            // 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);
-            
-            GwApi::BoatValue *bvalue;
-            String DataName[HowManyValues];
-            double DataValue[HowManyValues];
-            bool DataValid[HowManyValues];
-            String DataText[HowManyValues];
-            String DataUnits[HowManyValues];
-            String DataFormat[HowManyValues];
-    
-            for (int i = 0; i < HowManyValues; i++){
-                bvalue = pageData.values[i];
-                DataName[i] = xdrDelete(bvalue->getName());
-                DataName[i] = DataName[i].substring(0, 6);                  // String length limit for value name
-                calibrationData.calibrateInstance(bvalue, logger);          // Check if boat data value is to be calibrated
-                DataValue[i] = bvalue->value;                 // Value as double in SI unit
-                DataValid[i] = bvalue->valid;
-                DataText[i] = formatValue(bvalue, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
-                DataUnits[i] = formatValue(bvalue, *commonData).unit;   
-                DataFormat[i] = bvalue->getFormat();     // Unit of value
-            }
-    
-            // Optical warning by limit violation (unused)
-            if(String(flashLED) == "Limit Violation"){
-                setBlinkingLED(false);
-                setFlashLED(false); 
-            }
-    
-            if (bvalue == NULL) return PAGE_OK; // WTF why this statement?
-           
-            // Draw page
-            //***********************************************************
-    
-            // Set display in partial refresh mode
-            getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-            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
-                    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;
-                    int x0 = SixValues_x1 + j * SixValues_DeltaX;
-                    int y0 = SixValues_y1 + i * SixValues_DeltaY;
-                    LOG_DEBUG(GwLog::LOG,"Drawing at PageSixValue: %d %s %f %s",  ValueIndex,  DataName[ValueIndex], DataValue[ValueIndex], DataFormat[ValueIndex] );
-    
-           // Show name
-                    getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                    getdisplay().setCursor(x0, y0+25);
-                    getdisplay().print(DataName[ValueIndex]);                           // Page name
-    
-            // Show unit
-                    getdisplay().setFont(&Ubuntu_Bold8pt8b);
-                    getdisplay().setCursor(x0, y0+72);
-                    if(holdvalues == false){
-                        getdisplay().print(DataUnits[ValueIndex]);                       // Unit
-                        }
-                    else{
-                        getdisplay().print(OldDataUnits[ValueIndex]);
-                        }
-    
-            // Switch font if format for any values
-                    if(DataFormat[ValueIndex] == "formatLatitude" || DataFormat[ValueIndex] == "formatLongitude"){
-                        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-                        getdisplay().setCursor(x0+10, y0+60);
-                        }
-                    else if(DataFormat[ValueIndex] == "formatTime" || DataFormat[ValueIndex] == "formatDate"){
-                        getdisplay().setFont(&Ubuntu_Bold16pt8b);
-                        getdisplay().setCursor(x0+20,y0+55);
-                        } 
-            // pressure in hPa          
-                    else if(DataFormat[ValueIndex] == "formatXdr:P:P"){
-                        getdisplay().setFont(&DSEG7Classic_BoldItalic26pt7b);
-                        getdisplay().setCursor(x0+5, y0+70);
-                     }
-            // RPM
-                     else if(DataFormat[ValueIndex] == "formatXdr:T:R"){
-                        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
-                        getdisplay().setCursor(x0+25, y0+70);
-                     }
-                    else{
-                        getdisplay().setFont(&DSEG7Classic_BoldItalic26pt7b);
-                        if ( DataText[ValueIndex][0] == '-' )
-                            getdisplay().setCursor(x0+25, y0+70);
-                        else
-                            getdisplay().setCursor(x0+65, y0+70);
-                        }
-    
-            // Show bus data
-                    if(holdvalues == false){
-                        getdisplay().print(DataText[ValueIndex]);                                     // Real value as formated string
-                        }
-                    else{
-                        getdisplay().print(OldDataText[ValueIndex]);                                  // Old value as formated string
-                        }
-                    if(DataValid[ValueIndex] == true){
-                        OldDataText[ValueIndex] = DataText[ValueIndex];                                       // Save the old value
-                        OldDataUnits[ValueIndex] = DataUnits[ValueIndex];                                           // Save the old unit
-                        }
-                }
-                   // Vertical line 3 pix
-            getdisplay().fillRect(SixValues_x1+SixValues_DeltaX-8, SixValues_y1+i*SixValues_DeltaY, 3, SixValues_DeltaY, commonData->fgcolor);
-            }
-    
-            return PAGE_UPDATE;
-        };
-    
     };
+
+    int displayPage(PageData &pageData) {
+         
+        // Old values for hold function
+        static String OldDataText[HowManyValues] = {"", "", "", "", "", ""};
+        static String OldDataUnits[HowManyValues] = {"", "", "", "", "", ""};
+    
+        // 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);
+            
+        GwApi::BoatValue *bvalue;
+        String DataName[HowManyValues];
+        double DataValue[HowManyValues];
+        bool DataValid[HowManyValues];
+        String DataText[HowManyValues];
+        String DataUnits[HowManyValues];
+        String DataFormat[HowManyValues];
+    
+        for (int i = 0; i < HowManyValues; i++){
+            bvalue = pageData.values[i];
+            DataName[i] = xdrDelete(bvalue->getName());
+            DataName[i] = DataName[i].substring(0, 6);                  // String length limit for value name
+            calibrationData.calibrateInstance(bvalue, logger);          // Check if boat data value is to be calibrated
+            DataValue[i] = bvalue->value;                 // Value as double in SI unit
+            DataValid[i] = bvalue->valid;
+            DataText[i] = formatValue(bvalue, *commonData).svalue;    // Formatted value as string including unit conversion and switching decimal places
+            DataUnits[i] = formatValue(bvalue, *commonData).unit;   
+            DataFormat[i] = bvalue->getFormat();     // Unit of value
+        }
+    
+        if (bvalue == NULL) return PAGE_OK; // WTF why this statement?
+           
+        // Draw page
+        //***********************************************************
+
+        // Set display in partial refresh mode
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+        epd->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);
+            }
+            for (int j = 0; j < 2; j++) {
+                int ValueIndex = i * 2 + j;
+                int x0 = SixValues_x1 + j * SixValues_DeltaX;
+                int y0 = SixValues_y1 + i * SixValues_DeltaY;
+                LOG_DEBUG(GwLog::LOG, "Drawing at PageSixValue: %d %s %f %s",  ValueIndex,  DataName[ValueIndex], DataValue[ValueIndex], DataFormat[ValueIndex]);
+    
+                // Show name
+                epd->setFont(&Ubuntu_Bold12pt8b);
+                epd->setCursor(x0, y0+25);
+                epd->print(DataName[ValueIndex]);                           // Page name
+    
+                // Show unit
+                epd->setFont(&Ubuntu_Bold8pt8b);
+                epd->setCursor(x0, y0+72);
+                if (holdvalues == false) {
+                    epd->print(DataUnits[ValueIndex]);                       // Unit
+                } else {
+                    epd->print(OldDataUnits[ValueIndex]);
+                }
+    
+                // Switch font if format for any values
+                if (DataFormat[ValueIndex] == "formatLatitude" || DataFormat[ValueIndex] == "formatLongitude") {
+                    epd->setFont(&Ubuntu_Bold12pt8b);
+                    epd->setCursor(x0+10, y0+60);
+                } 
+                else if (DataFormat[ValueIndex] == "formatTime" || DataFormat[ValueIndex] == "formatDate") {
+                    epd->setFont(&Ubuntu_Bold16pt8b);
+                    epd->setCursor(x0+20,y0+55);
+                } 
+                 // pressure in hPa          
+                else if (DataFormat[ValueIndex] == "formatXdr:P:P") {
+                    epd->setFont(&DSEG7Classic_BoldItalic26pt7b);
+                    epd->setCursor(x0+5, y0+70);
+                }
+                // RPM
+                else if (DataFormat[ValueIndex] == "formatXdr:T:R") {
+                    epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
+                    epd->setCursor(x0+25, y0+70);
+                }
+                else {
+                    epd->setFont(&DSEG7Classic_BoldItalic26pt7b);
+                    if (DataText[ValueIndex][0] == '-' ) {
+                        epd->setCursor(x0+25, y0+70);
+                    } else {
+                        epd->setCursor(x0+65, y0+70);
+                    }
+                }
+    
+                // Show bus data
+                if (holdvalues == false) {
+                    epd->print(DataText[ValueIndex]); // Real value as formated string
+                } else{
+                    epd->print(OldDataText[ValueIndex]); // Old value as formated string
+                }
+                if (DataValid[ValueIndex] == true) {
+                    OldDataText[ValueIndex] = DataText[ValueIndex];                                       // Save the old value
+                    OldDataUnits[ValueIndex] = DataUnits[ValueIndex];                                           // Save the old unit
+                }
+            } // for j
+            // Vertical line 3 pix
+            epd->fillRect(SixValues_x1+SixValues_DeltaX-8, SixValues_y1+i*SixValues_DeltaY, 3, SixValues_DeltaY, commonData->fgcolor);
+        } // for i
+    
+        return PAGE_UPDATE;
+    };
+    
+};
+
 static Page *createPage(CommonData &common){
     return new PageSixValues(common);
 }/**

lib/obp60task/PageSkyView.cpp

@@ -0,0 +1,151 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+
+/*
+ * SkyView / Satellites
+ */
+
+class PageSkyView : public Page
+{
+public:
+    PageSkyView(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageSkyView");
+    }
+
+    int handleKey(int key){
+        // Code for keylock
+        if(key == 11){
+            commonData->keylock = !commonData->keylock;
+            return 0;                   // Commit the key
+        }
+        return key;
+    }
+
+    void displayNew(PageData &pageData) {
+#ifdef BOARD_OBP60S3
+        // Clear optical warning
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
+
+        // Logging boat values
+        logger->logDebug(GwLog::LOG, "Drawing at PageSkyView");
+
+        // Draw page
+        //***********************************************************
+
+        // Set display in partial refresh mode
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
+
+        // current position
+        epd->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 r1 = r / 2;
+
+        epd->fillCircle(c.x, c.y, r, commonData->bgcolor);
+        epd->drawCircle(c.x, c.y, r + 1, commonData->fgcolor);
+        epd->drawCircle(c.x, c.y, r + 2, 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);
+        epd->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);
+        p1 = rotatePoint(c, p, -45);
+        p2 = rotatePoint(c, p, -45 + 180);
+        epd->drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
+
+        // directions 
+
+        int16_t  x1, y1;
+        uint16_t w, h;
+        epd->setFont(&Ubuntu_Bold12pt8b);
+
+		epd->getTextBounds("N", 0, 150, &x1, &y1, &w, &h);
+        epd->setCursor(c.x - w / 2, c.y - r + h + 2);
+        epd->print("N");
+
+		epd->getTextBounds("S", 0, 150, &x1, &y1, &w, &h);
+        epd->setCursor(c.x - w / 2, c.y + r - 2);
+        epd->print("S");
+
+		epd->getTextBounds("E", 0, 150, &x1, &y1, &w, &h);
+        epd->setCursor(c.x + r - w - 2, c.y + h / 2);
+        epd->print("E");
+        
+		epd->getTextBounds("W", 0, 150, &x1, &y1, &w, &h);
+        epd->setCursor(c.x - r + 2 , c.y + h / 2);
+        epd->print("W");
+
+        // satellites
+
+
+        // Signal / Noise bars
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        epd->setCursor(325, 34);
+        epd->print("SNR");
+        epd->drawRect(270, 20, 125, 257, commonData->fgcolor);
+        for (int i = 0; i < 12; i++) {
+            uint16_t y = 29 + (i + 1) * 20;
+            epd->setCursor(276, y);
+            char buffer[3];
+            snprintf(buffer, 3, "%02d", i+1);
+            epd->print(String(buffer));
+            epd->drawRect(305, y-12, 85, 14, commonData->fgcolor);
+        }
+
+        return PAGE_UPDATE;
+    };
+};
+
+static Page* createPage(CommonData &common){
+    return new PageSkyView(common);
+}
+
+/**
+ * with the code below we make this page known to the PageTask
+ * we give it a type (name) that can be selected in the config
+ * we define which function is to be called
+ * and we provide the number of user parameters we expect
+ * this will be number of BoatValue pointers in pageData.values
+ */
+PageDescription registerPageSkyView(
+    "SkyView",              // Page name
+    createPage,             // Action
+    0,                      // Number of bus values depends on selection in Web configuration
+    {"LAT", "LON", "HDOP"}, // Bus values we need in the page
+    true                    // Show display header on/off
+);
+
+#endif

lib/obp60task/PageSolar.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,12 +7,23 @@
 
 class PageSolar : public Page
 {
+private:
+    String batVoltage;
+    int solPower;
+    String powerSensor;
+
 public:
-    PageSolar(CommonData &common){
+    PageSolar(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageSolar");
+        logger->logDebug(GwLog::LOG, "Instantiate PageSolar");
+
+        // Get config data
+        String batVoltage = config->getString(config->batteryVoltage);
+        int solPower = config->getInt(config->solarPower);
+        String powerSensor = config->getString(config->usePowSensor2);
     }
-    virtual int handleKey(int key){
+
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -20,18 +32,7 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData){
+    int displayPage(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
-        
-        // Get config data
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String batVoltage = config->getString(config->batteryVoltage);
-        int solPower = config->getInt(config->solarPower);
-        String backlightMode = config->getString(config->backlight);
-        String powerSensor = config->getString(config->usePowSensor2);
         
         double value1 = 0;  // Solar voltage
         double value2 = 0;  // Solar current
@@ -59,97 +60,92 @@ public:
         bool valid1 = true;
 
         // Optical warning by limit violation      
-        if(String(flashLED) == "Limit Violation"){
+        if (flashLED == "Limit Violation") {
-            // Over voltage
+            // Over voltage?
-            if(value1 > 14.8 && batVoltage == "12V"){
+            if (batVoltage == "12V") {
-                setBlinkingLED(true);
+                setBlinkingLED(value1 > 14.8);
-            }
+            } else if (batVoltage == "24V") {
-            if(value1 <= 14.8 && batVoltage == "12V"){
+                setBlinkingLED(value1 > 29.6);
-                setBlinkingLED(false);
+            } else {
-            }
-            if(value1 > 29.6 && batVoltage == "24V"){
-                setBlinkingLED(true);
-            }
-            if(value1 <= 29.6 && batVoltage == "24V"){
                 setBlinkingLED(false);
             }
         }
         
         // Logging voltage value
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageSolar, Type:%iW %s:=%f", solPower, name1.c_str(), value1);
+        logger->logDebug(GwLog::LOG, "Drawing at PageSolar, Type:%iW %s:=%f", solPower, name1.c_str(), value1);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(10, 65);
+        epd->setCursor(10, 65);
-        getdisplay().print("Solar");
+        epd->print("Solar");
 
         // Show voltage type
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 140);
+        epd->setCursor(10, 140);
         int bvoltage = 0;
         if(String(batVoltage) == "12V") bvoltage = 12;
         else bvoltage = 24;
-        getdisplay().print(bvoltage);
+        epd->print(bvoltage);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("V");
+        epd->print("V");
 
         // Show solar power
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 200);
+        epd->setCursor(10, 200);
-        if(solPower <= 999) getdisplay().print(solPower, 0);
+        if(solPower <= 999) epd->print(solPower, 0);
-        if(solPower > 999) getdisplay().print(float(solPower/1000.0), 1);
+        if(solPower > 999) epd->print(float(solPower/1000.0), 1);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        if(solPower <= 999) getdisplay().print("W");
+        if(solPower <= 999) epd->print("W");
-        if(solPower > 999) getdisplay().print("kW");
+        if(solPower > 999) epd->print("kW");
 
         // Show info
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 235);
+        epd->setCursor(10, 235);
-        getdisplay().print("Installed");
+        epd->print("Installed");
-        getdisplay().setCursor(10, 255);
+        epd->setCursor(10, 255);
-        getdisplay().print("Solar Modul");
+        epd->print("Solar Modul");
 
         // Show solar panel
         solarGraphic(150, 45, commonData->fgcolor, commonData->bgcolor);
 
         // Show load level in percent
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(150, 200);
+        epd->setCursor(150, 200);
-        getdisplay().print(solPercentage);
+        epd->print(solPercentage);
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("%");
+        epd->print("%");
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(150, 235);
+        epd->setCursor(150, 235);
-        getdisplay().print("Load");
+        epd->print("Load");
 
         // Show sensor type info
         String i2cAddr = "";
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(270, 60);
+        epd->setCursor(270, 60);
-        if(powerSensor == "off") getdisplay().print("Internal");
+        if(powerSensor == "off") epd->print("Internal");
         if(powerSensor == "INA219"){
-            getdisplay().print("INA219");
+            epd->print("INA219");
             i2cAddr = " (0x" + String(INA219_I2C_ADDR2, HEX) + ")";
         }
         if(powerSensor == "INA226"){
-            getdisplay().print("INA226");
+            epd->print("INA226");
             i2cAddr = " (0x" + String(INA226_I2C_ADDR2, HEX) + ")";
         }
-        getdisplay().print(i2cAddr);
+        epd->print(i2cAddr);
-        getdisplay().setCursor(270, 80);
+        epd->setCursor(270, 80);
-        getdisplay().print("Sensor Modul");
+        epd->print("Sensor Modul");
 
         // Reading bus data or using simulation data
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 140);
+        epd->setCursor(260, 140);
         if(simulation == true){
             if(batVoltage == "12V"){
                 value1 = 12.0;
@@ -158,46 +154,46 @@ public:
                 value1 = 24.0;
             }
             value1 += float(random(0, 5)) / 10;         // Simulation data
-            getdisplay().print(value1,1);
+            epd->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) getdisplay().print(value1, 2);
+                if(value1 <= 9.9) epd->print(value1, 2);
-                if(value1 > 9.9 && value1 <= 99.9)getdisplay().print(value1, 1);
+                if(value1 > 9.9 && value1 <= 99.9)epd->print(value1, 1);
-                if(value1 > 99.9) getdisplay().print(value1, 0);
+                if(value1 > 99.9) epd->print(value1, 0);
             }
             else{
-            getdisplay().print("---");                       // Missing bus data
+            epd->print("---");                       // Missing bus data
             }
         }
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("V");
+        epd->print("V");
 
         // Show actual current in A
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 200);
+        epd->setCursor(260, 200);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(value2 <= 9.9) getdisplay().print(value2, 2);
+            if(value2 <= 9.9) epd->print(value2, 2);
-            if(value2 > 9.9 && value2 <= 99.9)getdisplay().print(value2, 1);
+            if(value2 > 9.9 && value2 <= 99.9)epd->print(value2, 1);
-            if(value2 > 99.9) getdisplay().print(value2, 0);
+            if(value2 > 99.9) epd->print(value2, 0);
         }
-        else  getdisplay().print("---");
+        else  epd->print("---");
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("A");
+        epd->print("A");
 
         // Show actual consumption in W
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(260, 260);
+        epd->setCursor(260, 260);
         if((powerSensor == "INA219" || powerSensor == "INA226") && simulation == false){
-            if(value3 <= 9.9) getdisplay().print(value3, 2);
+            if(value3 <= 9.9) epd->print(value3, 2);
-            if(value3 > 9.9 && value3 <= 99.9)getdisplay().print(value3, 1);
+            if(value3 > 9.9 && value3 <= 99.9)epd->print(value3, 1);
-            if(value3 > 99.9) getdisplay().print(value3, 0);
+            if(value3 > 99.9) epd->print(value3, 0);
         }
-        else  getdisplay().print("---");
+        else  epd->print("---");
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().print("W");
+        epd->print("W");
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageSystem.cpp

@@ -1,14 +1,38 @@
+// 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. 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);
+ */
+
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
+#include "ConfigMenu.h"
 #include "images/logo64.xbm"
 #include <esp32/clk.h>
 #include "qrcode.h"
+#include "Nmea2kTwai.h"
 
 #ifdef BOARD_OBP40S3
-#include <SD.h>
+#include "dirent.h"
-#include <FS.h>
 #endif
 
 #define STRINGIZE_IMPL(x) #x
@@ -19,64 +43,531 @@
 #define DISPLAYINFO STRINGIZE(EPDTYPE)
 #define GXEPD2INFO STRINGIZE(GXEPD2VERS)
 
-/*
- * Special system page, called directly with fast key sequence 5,4
- * Out of normal page order.
- * Consists of some sub-pages with following content:
- *   1. Hard and software information
- *   2. System settings
- *   3. NMEA2000 device list
- */
-
 class PageSystem : public Page
 {
-uint64_t chipid;
+private:
-bool simulation;
+    // NVRAM config options
-bool sdcard;
+    String flashLED;
-String buzzer_mode;
-uint8_t buzzer_power;
-String cpuspeed;
-String rtc_module;
-String gps_module;
-String env_module;
 
-String batt_sensor;
+    // Generic data access
-String solar_sensor;
-String gen_sensor;
-String rot_sensor;
-double homelat;
-double homelon;
 
-char mode = 'N'; // (N)ormal, (S)ettings, (D)evice list, (C)ard
+    uint64_t chipid;
+    bool use_sdcard;
+    String buzzer_mode;
+    uint8_t buzzer_power;
+    String cpuspeed;
+    String rtc_module;
+    String gps_module;
+    String env_module;
 
-public:
+    String batt_sensor;
-    PageSystem(CommonData &common){
+    String solar_sensor;
-        commonData = &common;
+    String gen_sensor;
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageSystem");
+    String rot_sensor;
-        if (hasFRAM) {
+    double homelat;
-            mode = fram.read(FRAM_SYSTEM_MODE);
+    double homelon;
+
+    Nmea2kTwai *NMEA2000;
+
+    char mode = 'N'; // (N)ormal, (S)ettings, (C)onfiguration, (D)evice list, c(A)rd
+    int8_t editmode = -1; // marker for menu/edit/set function
+
+    ConfigMenu *menu;
+
+    void incMode() {
+        if (mode == 'N') {        // Normal
+            mode = 'S';
+        } else if (mode == 'S') { // Settings
+            mode = 'C';
+        } else if (mode == 'C') { // Config
+            mode = 'D';
+        } else if (mode == 'D') { // Device list
+            if (hasSDCard) {
+                mode = 'A';       // SD-Card
+            } else {
+                mode = 'N';
+            }
+        } else {
+            mode = 'N';
         }
-        chipid = ESP.getEfuseMac();
+        if (hasFRAM) fram.write(FRAM_SYSTEM_MODE, mode);
-        simulation = common.config->getBool(common.config->useSimuData);
-#ifdef BOARD_OBP40S3
-        sdcard = common.config->getBool(common.config->useSDCard);
-#endif
-        buzzer_mode = common.config->getString(common.config->buzzerMode);
-        buzzer_mode.toLowerCase();
-        buzzer_power = common.config->getInt(common.config->buzzerPower);
-        cpuspeed = common.config->getString(common.config->cpuSpeed);
-        env_module = common.config->getString(common.config->useEnvSensor);
-        rtc_module = common.config->getString(common.config->useRTC);
-        gps_module = common.config->getString(common.config->useGPS);
-        batt_sensor = common.config->getString(common.config->usePowSensor1);
-        solar_sensor = common.config->getString(common.config->usePowSensor2);
-        gen_sensor = common.config->getString(common.config->usePowSensor3);
-        rot_sensor = common.config->getString(common.config->useRotSensor);
-        homelat = common.config->getString(common.config->homeLAT).toDouble();
-        homelon = common.config->getString(common.config->homeLON).toDouble();
     }
 
-    virtual void setupKeys(){
+    void decMode() {
+        if (mode == 'N') {
+            if (hasSDCard) {
+                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';
+        }
+        if (hasFRAM) fram.write(FRAM_SYSTEM_MODE, mode);
+    }
+
+    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 (hasSDCard) {
+            uint64_t cardsize = ((uint64_t) sdcard->csd.capacity) * sdcard->csd.sector_size / (1024 * 1024);
+            epd->printf("%llu MB", cardsize);
+            if (!use_sdcard) {
+                epd->print(" (disabled)");
+            }
+        } else {
+            epd->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";
+            }
+        }
+        epd->setCursor(8, y0 + 80);
+        epd->print("Uptime:");
+        epd->setCursor(90, y0 + 80);
+        epd->print(uptime);
+        epd->print(uptime_unit);
+
+        // 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) {
+                logger->logDebug(GwLog::ERROR, "Menu item not found: %d", i);
+            } else {
+                Rect r = menu->getItemRect(i);
+                bool inverted = (i == menu->getActiveIndex());
+                drawTextBoxed(r, itm->getLabel(), commonData->fgcolor, commonData->bgcolor, inverted, false);
+                if (inverted and editmode > 0) {
+                    // triangle as edit marker
+                    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...");
+#ifdef BOARD_OBP60S3
+            // This mode should not be callable by devices without card hardware
+            // In case of accidential reaching this, display a friendly message
+            epd->print("This mode is not indended to be reached!\n");
+            epd->print("There's nothing to see here. Move on.");
+#endif
+#ifdef BOARD_OBP40S3
+        /* TODO identify card as OBP-Card:
+        magic.dat
+        version.dat
+        readme.txt
+        IMAGES/
+        CHARTS/
+        LOGS/
+        DATA/
+        */
+
+        // Simple test for one file in root
+        epd->setCursor(x0, y0 + 32);
+        String file_test = MOUNT_POINT "/IMG/icon-settings2.pbm";
+        logger->logDebug(GwLog::LOG, "Testfile: %s", file_test.c_str());
+        struct stat st;
+        if (stat(file_test.c_str(), &st) == 0) {
+            epd->printf("File %s exists", file_test.c_str());
+        } else {
+            epd->printf("File %s not found", file_test.c_str());
+        }
+
+        // Root directory check
+        DIR* dir = opendir(MOUNT_POINT);
+        if (dir != NULL) {
+            logger->logDebug(GwLog::LOG, "Root directory: %s", MOUNT_POINT);
+            struct dirent* entry;
+            while ((entry = readdir(dir)) != NULL) {
+                logger->logDebug(GwLog::LOG, "    %s type %d", entry->d_name, entry->d_type);
+                // type 1 is file
+                // type 2 is dir
+            }
+            closedir(dir);
+        } else {
+            logger->logDebug(GwLog::LOG, "Failed to open root directory");
+        }
+
+        // try to load example pbm file 
+        // TODO create PBM load function in imglib
+        String filepath = MOUNT_POINT "/IMG/icon-settings2.pbm";
+        const char* file_img = filepath.c_str();
+        FILE* fh = fopen(file_img, "r");
+        if (fh != NULL) {
+            logger->logDebug(GwLog::LOG, "Open file for reading: %s", file_img);
+
+            char magic[3];
+            char buffer[80];
+
+            // 2 Byte Magic: P1=ASCII, P4=Binary
+            fgets(magic, sizeof(magic), fh);
+            if (strcmp(magic, "P1") != 0) {
+                logger->logDebug(GwLog::LOG, "Not a valid PBM file of type P1 (%s)", magic);
+            } else {
+                uint16_t width = 0;
+                uint16_t height = 0;
+                while (fgets(buffer, sizeof(buffer), fh)) {
+                     // logger->logDebug(GwLog::LOG, "%s", buffer);
+                     if (buffer[0] == '#') {
+                         continue; // skip comment
+                     }
+                     if (sscanf(buffer, "%d %d", &width, &height) == 2) {
+                         break;
+                     }
+                }
+                logger->logDebug(GwLog::LOG, "Image: %dx%d", width, height);
+            }
+
+            /*size_t bytesRead = fread(buffer, sizeof(char), sizeof(buffer) - 1, fh);
+            buffer[bytesRead] = '\0';  // Null-terminate the string
+            if (bytesRead > 0) {
+                logger->logDebug(GwLog::LOG, "Read %d bytes", bytesRead);
+                logger->logDebug(GwLog::LOG, ">%s<", buffer);
+            } */
+
+            /*  WIP
+            // Read pixel data and pack into the buffer
+            for (int i = 0; i < width * height; i++) {
+                int pixel;
+                fscanf(file, "%d", &pixel);
+
+                // Calculate the byte index and bit position
+                int byteIndex = i / 8;
+                int bitPosition = 7 - (i % 8); // Store MSB first
+
+                // Set the corresponding bit in the byte
+                if (pixel == 1) {
+                    buffer[byteIndex] |= (1 << bitPosition);
+                }
+            }
+            */
+
+            fclose(fh);
+            // epd->drawXBitmap(20, 200, buffer, width, height, commonData.fgcolor);
+        }
+#endif
+    }
+
+    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));
+
+        epd->setCursor(20, 140);
+        epd->printf("N2k source address: %d", NMEA2000->GetN2kSource());
+
+    }
+
+   void storeConfig() {
+       menu->storeValues();
+   }
+
+public:
+    PageSystem(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageSystem");
+        if (hasFRAM) {
+            mode = fram.read(FRAM_SYSTEM_MODE);
+            logger->logDebug(GwLog::LOG, "Loaded mode '%c' from FRAM", mode);
+        }
+        flashLED = config->getString(config->flashLED);
+
+        chipid = ESP.getEfuseMac();
+#ifdef BOARD_OBP40S3
+        use_sdcard = config->getBool(config->useSDCard);
+#endif
+        buzzer_mode = config->getString(config->buzzerMode);
+        buzzer_mode.toLowerCase();
+        buzzer_power = config->getInt(config->buzzerPower);
+        cpuspeed = config->getString(config->cpuSpeed);
+        env_module = config->getString(config->useEnvSensor);
+        rtc_module = config->getString(config->useRTC);
+        gps_module = config->getString(config->useGPS);
+        batt_sensor = config->getString(config->usePowSensor1);
+        solar_sensor = config->getString(config->usePowSensor2);
+        gen_sensor = config->getString(config->usePowSensor3);
+        rot_sensor = config->getString(config->useRotSensor);
+        homelat = config->getString(config->homeLAT).toDouble();
+        homelon = config->getString(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");
+
+        // Create info-file if not exists
+        // TODO
+
+    }
+
+    void setupKeys() {
         commonData->keydata[0].label = "EXIT";
         commonData->keydata[1].label = "MODE";
         commonData->keydata[2].label = "";
@@ -85,25 +576,12 @@ 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");
+        logger->logDebug(GwLog::LOG, "System keyboard handler");
         if (key == 2) {
-            if (mode == 'N') {
+            incMode();
-                mode = 'S';
-            } else if (mode == 'S') {
-                mode = 'D';
-            } else if (mode == 'D') {
-                if (sdcard) {
-                    mode = 'C';
-                } else {
-                    mode = 'N';
-                }
-            } else {
-                mode = 'N';
-            }
-            if (hasFRAM) fram.write(FRAM_SYSTEM_MODE, mode);
             return 0;
         }
 #ifdef BOARD_OBP60S3
@@ -117,7 +595,8 @@ public:
         }
         // standby / deep sleep
         if (key == 5) {
-           deepSleep(*commonData);
+            logger->logDebug(GwLog::LOG, "System going into deep sleep mode...");
+            deepSleep(*commonData);
         }
         // Code for keylock
         if (key == 11) {
@@ -126,12 +605,18 @@ public:
         }
 #endif
 #ifdef BOARD_OBP40S3
-        // grab cursor keys to disable page navigation
+        // use cursor keys for local mode navigation
-        if (key == 9 or key == 10) {
+        if (key == 9) {
+            incMode();
+            return 0;
+        }
+        if (key == 10) {
+            decMode();
             return 0;
         }
         // standby / deep sleep
         if (key == 12) {
+            logger->logDebug(GwLog::LOG, "System going into deep sleep mode...");
             deepSleep(*commonData);
         }
 #endif
@@ -155,7 +640,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)) {
-                    getdisplay().fillRect(x, y, s, s, commonData->fgcolor);
+                    epd->fillRect(x, y, s, s, commonData->fgcolor);
                 }
                 x += s;
             }
@@ -164,233 +649,48 @@ public:
         }
     }
 
-    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);
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
             setFlashLED(false);
         }
+#endif
+        // Get references from API
+        logger->logDebug(GwLog::LOG, "New page display: PageSystem");
+        NMEA2000 = pageData.api->getNMEA2000();
+    };
 
-        // Logging boat values
+    int displayPage(PageData &pageData) {
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageSystem");
 
-        // Draw page
+        // Logging page information
-        //***********************************************************
+        logger->logDebug(GwLog::LOG, "Drawing at PageSystem, Mode=%c", mode);
-
-        uint16_t x0 = 8;  // left column
-        uint16_t y0 = 48; // data table starts here
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height());
 
-        if (mode == 'N') {
+        // call current system page
-
+        switch (mode) {
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            case 'N':
-            getdisplay().setCursor(8, 48);
+                displayModeNormal();
-            getdisplay().print("System Information");
+                break;
-
+            case 'S':
-            getdisplay().drawXBitmap(320, 25, logo64_bits, logo64_width, logo64_height, commonData->fgcolor);
+                displayModeSettings();
-
+                break;
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            case 'C':
-            y0 = 155;
+                displayModeConfig();
-
+                break;
-            char ssid[13];
+            case 'A':
-            snprintf(ssid, 13, "%04X%08X", (uint16_t)(chipid >> 32), (uint32_t)chipid);
+                displayModeSDCard();
-            displayBarcode(String(ssid), 320, 200, 2);
+                break;
-            getdisplay().setCursor(8, 70);
+            case 'D':
-            getdisplay().print(String("MCUDEVICE-") + String(ssid));
+                displayModeDevicelist();
-
+                break;
-            getdisplay().setCursor(8, 95);
-            getdisplay().print("Firmware version: ");
-            getdisplay().setCursor(150, 95);
-            getdisplay().print(VERSINFO);
-
-            getdisplay().setCursor(8, 113);
-            getdisplay().print("Board version: ");
-            getdisplay().setCursor(150, 113);
-            getdisplay().print(BOARDINFO);
-            getdisplay().print(String(" HW ") + String(PCBINFO));
-
-            getdisplay().setCursor(8, 131);
-            getdisplay().print("Display version: ");
-            getdisplay().setCursor(150, 131);
-            getdisplay().print(DISPLAYINFO);
-            getdisplay().print("; GxEPD2 v");
-            getdisplay().print(GXEPD2INFO);
-
-            getdisplay().setCursor(8, 265);
-#ifdef BOARD_OBP60S3
-            getdisplay().print("Press STBY to enter deep sleep mode");
-#endif
-#ifdef BOARD_OBP40S3
-            getdisplay().print("Press wheel to enter deep sleep mode");
-#endif
-
-            // Flash memory size
-            uint32_t flash_size = ESP.getFlashChipSize();
-            getdisplay().setCursor(8, y0);
-            getdisplay().print("FLASH:");
-            getdisplay().setCursor(90, y0);
-            getdisplay().print(String(flash_size / 1024) + String(" kB"));
-
-            // PSRAM memory size
-            uint32_t psram_size = ESP.getPsramSize();
-            getdisplay().setCursor(8, y0 + 16);
-            getdisplay().print("PSRAM:");
-            getdisplay().setCursor(90, y0 + 16);
-            getdisplay().print(String(psram_size / 1024) + String(" kB"));
-
-            // FRAM available / status
-            getdisplay().setCursor(8, y0 + 32);
-            getdisplay().print("FRAM:");
-            getdisplay().setCursor(90, y0 + 32);
-            getdisplay().print(hasFRAM ? "available" : "not found");
-
-#ifdef BOARD_OBP40S3
-            // SD-Card
-            getdisplay().setCursor(8, y0 + 48);
-            getdisplay().print("SD-Card:");
-            getdisplay().setCursor(90, y0 + 48);
-            if (sdcard) {
-                uint64_t cardsize = SD.cardSize() / (1024 * 1024);
-                getdisplay().print(String(cardsize) + String(" MB"));
-            } else {
-                getdisplay().print("off");
-            }
-#endif
-
-            // CPU speed config / active
-            getdisplay().setCursor(202, y0);
-            getdisplay().print("CPU speed:");
-            getdisplay().setCursor(300, y0);
-            getdisplay().print(cpuspeed);
-            getdisplay().print(" / ");
-            int cpu_freq = esp_clk_cpu_freq() / 1000000;
-            getdisplay().print(String(cpu_freq));
-
-            // total RAM free
-            int Heap_free = esp_get_free_heap_size();
-            getdisplay().setCursor(202, y0 + 16);
-            getdisplay().print("Total free:");
-            getdisplay().setCursor(300, y0 + 16);
-            getdisplay().print(String(Heap_free));
-
-            // RAM free for task
-            int RAM_free = uxTaskGetStackHighWaterMark(NULL);
-            getdisplay().setCursor(202, y0 + 32);
-            getdisplay().print("Task free:");
-            getdisplay().setCursor(300, y0 + 32);
-            getdisplay().print(String(RAM_free));
-
-        } 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);
-            getdisplay().print("Work in progress...");
-
-
-        } 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
-        getdisplay().nextPage();    // Partial update (fast)
+        epd->nextPage();    // Partial update (fast)
         return PAGE_OK;
     };
 };

lib/obp60task/PageThreeValues.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,13 +7,19 @@
 
 class PageThreeValues : public Page
 {
-    public:
+private:
-    PageThreeValues(CommonData &common){
+    String lengthformat;
-        commonData = &common;
+
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageThreeValue");
+public:
+    PageThreeValues(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageThreeValue");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -21,9 +28,17 @@ class PageThreeValues : public Page
         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") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         // Old values for hold function
         static String svalue1old = "";
@@ -33,13 +48,6 @@ class PageThreeValues : public Page
         static String svalue3old = "";
         static String unit3old = "";
 
-        // 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);
-        
         // Get boat values #1
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
         String name1 = xdrDelete(bvalue1->getName());   // Value name
@@ -70,60 +78,54 @@ class PageThreeValues : public Page
         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
 
-        // 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 PageThreeValues, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3);
+        logger->logDebug(GwLog::LOG, "Drawing at PageThreeValues, %s: %f, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2, name3.c_str(), value3);
 
         // Draw page
         //***********************************************************
 
         /// Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
         // ############### Value 1 ################
 
         // Show name
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 55);
+        epd->setCursor(20, 55);
-        getdisplay().print(name1);                           // Page name
+        epd->print(name1);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 90);
+        epd->setCursor(20, 90);
         if(holdvalues == false){
-            getdisplay().print(unit1);                       // Unit
+            epd->print(unit1);                       // Unit
         }
         else{
-            getdisplay().print(unit1old);
+            epd->print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(50, 90);
+            epd->setCursor(50, 90);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(170, 68);
+            epd->setCursor(170, 68);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-            getdisplay().setCursor(180, 90);
+            epd->setCursor(180, 90);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue1);                                     // Real value as formated string
+            epd->print(svalue1);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue1old);                                  // Old value as formated string
+            epd->print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -133,45 +135,45 @@ class PageThreeValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 105, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 105, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 145);
+        epd->setCursor(20, 145);
-        getdisplay().print(name2);                           // Page name
+        epd->print(name2);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 180);
+        epd->setCursor(20, 180);
         if(holdvalues == false){
-            getdisplay().print(unit2);                       // Unit
+            epd->print(unit2);                       // Unit
         }
         else{
-            getdisplay().print(unit2old);
+            epd->print(unit2old);
         }
 
         // Switch font if format for any values
         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(50, 180);
+            epd->setCursor(50, 180);
         }
         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(170, 158);
+            epd->setCursor(170, 158);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-            getdisplay().setCursor(180, 180);
+            epd->setCursor(180, 180);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue2);                                     // Real value as formated string
+            epd->print(svalue2);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue2old);                                  // Old value as formated string
+            epd->print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value
@@ -181,45 +183,45 @@ class PageThreeValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 195, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 195, 400, 3, commonData->fgcolor);
 
         // ############### Value 3 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 235);
+        epd->setCursor(20, 235);
-        getdisplay().print(name3);                           // Page name
+        epd->print(name3);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 270);
+        epd->setCursor(20, 270);
         if(holdvalues == false){
-            getdisplay().print(unit3);                       // Unit
+            epd->print(unit3);                       // Unit
         }
         else{
-            getdisplay().print(unit3old);
+            epd->print(unit3old);
         }
 
         // Switch font if format for any values
         if(bvalue3->getFormat() == "formatLatitude" || bvalue3->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(50, 270);
+            epd->setCursor(50, 270);
         }
         else if(bvalue3->getFormat() == "formatTime" || bvalue3->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(170, 248);
+            epd->setCursor(170, 248);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic30pt7b);
-            getdisplay().setCursor(180, 270);
+            epd->setCursor(180, 270);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue3);                                     // Real value as formated string
+            epd->print(svalue3);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue3old);                                  // Old value as formated string
+            epd->print(svalue3old);                                  // Old value as formated string
         }
         if(valid3 == true){
             svalue3old = svalue3;                                       // Save the old value

lib/obp60task/PageTwoValues.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,13 +7,19 @@
 
 class PageTwoValues : public Page
 {
-    public:
+private:
-    PageTwoValues(CommonData &common){
+    String lengthformat;
-        commonData = &common;
+
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageTwoValue");
+public:
+    PageTwoValues(CommonData &common) : Page(common)
+    {
+        logger->logDebug(GwLog::LOG, "Instantiate PageTwoValue");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key){
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -21,9 +28,17 @@ class PageTwoValues : public Page
         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") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         // Old values for hold function
         static String svalue1old = "";
@@ -31,12 +46,6 @@ class PageTwoValues : public Page
         static String svalue2old = "";
         static String unit2old = "";
 
-        // 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);
         
         // Get boat values #1
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
@@ -58,60 +67,54 @@ class PageTwoValues : public Page
         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
 
-        // 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 PageTwoValues, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2);
+        logger->logDebug(GwLog::LOG, "Drawing at PageTwoValues, %s: %f, %s: %f", name1.c_str(), value1, name2.c_str(), value2);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
         // ############### Value 1 ################
 
         // Show name
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 80);
+        epd->setCursor(20, 80);
-        getdisplay().print(name1);                           // Page name
+        epd->print(name1);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 130);
+        epd->setCursor(20, 130);
         if(holdvalues == false){
-            getdisplay().print(unit1);                       // Unit
+            epd->print(unit1);                       // Unit
         }
         else{
-            getdisplay().print(unit1old);
+            epd->print(unit1old);
         }
 
         // Switch font if format for any values
         if(bvalue1->getFormat() == "formatLatitude" || bvalue1->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(50, 130);
+            epd->setCursor(50, 130);
         }
         else if(bvalue1->getFormat() == "formatTime" || bvalue1->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(170, 105);
+            epd->setCursor(170, 105);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic42pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic42pt7b);
-            getdisplay().setCursor(180, 130);
+            epd->setCursor(180, 130);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue1);                                     // Real value as formated string
+            epd->print(svalue1);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue1old);                                  // Old value as formated string
+            epd->print(svalue1old);                                  // Old value as formated string
         }
         if(valid1 == true){
             svalue1old = svalue1;                                       // Save the old value
@@ -121,45 +124,45 @@ class PageTwoValues : public Page
         // ############### Horizontal Line ################
 
         // Horizontal line 3 pix
-        getdisplay().fillRect(0, 145, 400, 3, commonData->fgcolor);
+        epd->fillRect(0, 145, 400, 3, commonData->fgcolor);
 
         // ############### Value 2 ################
 
         // Show name
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(20, 190);
+        epd->setCursor(20, 190);
-        getdisplay().print(name2);                           // Page name
+        epd->print(name2);                           // Page name
 
         // Show unit
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(20, 240);
+        epd->setCursor(20, 240);
         if(holdvalues == false){
-            getdisplay().print(unit2);                       // Unit
+            epd->print(unit2);                       // Unit
         }
         else{
-            getdisplay().print(unit2old);
+            epd->print(unit2old);
         }
 
         // Switch font if format for any values
         if(bvalue2->getFormat() == "formatLatitude" || bvalue2->getFormat() == "formatLongitude"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(50, 240);
+            epd->setCursor(50, 240);
         }
         else if(bvalue2->getFormat() == "formatTime" || bvalue2->getFormat() == "formatDate"){
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(170, 215);
+            epd->setCursor(170, 215);
         }
         else{
-            getdisplay().setFont(&DSEG7Classic_BoldItalic42pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic42pt7b);
-            getdisplay().setCursor(180, 240);
+            epd->setCursor(180, 240);
         }
 
         // Show bus data
         if(holdvalues == false){
-            getdisplay().print(svalue2);                                     // Real value as formated string
+            epd->print(svalue2);                                     // Real value as formated string
         }
         else{
-            getdisplay().print(svalue2old);                                  // Old value as formated string
+            epd->print(svalue2old);                                  // Old value as formated string
         }
         if(valid2 == true){
             svalue2old = svalue2;                                       // Save the old value

lib/obp60task/PageVoltage.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,16 +7,24 @@
 
 class PageVoltage : public Page
 {
-bool init = false;                  // Marker for init done
+private:
-uint8_t average = 0;                // Average type [0...3], 0=off, 1=10s, 2=60s, 3=300s
+    String batVoltage;
-bool trend = true;                  // Trend indicator [0|1], 0=off, 1=on
+    String batType;
-double raw = 0;
+    bool init = false;                  // Marker for init done
-char mode = 'D';                    // display mode (A)nalog | (D)igital
+    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
+    double raw = 0;
+    char mode = 'D';                    // display mode (A)nalog | (D)igital
 
 public:
-    PageVoltage(CommonData &common){
+    PageVoltage(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageVoltage");
+        logger->logDebug(GwLog::LOG, "Instantiate PageVoltage");
+
+        // Get config data
+        batVoltage = config->getString(config->batteryVoltage);
+        batType = config->getString(config->batteryType);
+
         if (hasFRAM) {
             average = fram.read(FRAM_VOLTAGE_AVG);
             trend = fram.read(FRAM_VOLTAGE_TREND);
@@ -23,14 +32,18 @@ public:
         }
     }
 
-    virtual void setupKeys(){
+    ~PageVoltage(){
+	    logger->logDebug(GwLog::LOG, "Destroy PageVoltage");
+	}
+
+    void setupKeys() {
         Page::setupKeys();
         commonData->keydata[0].label = "AVG";
         commonData->keydata[1].label = "MODE";
         commonData->keydata[4].label = "TRD";
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
          // Change average
         if(key == 1){
             average ++;
@@ -66,51 +79,41 @@ public:
     }
 
     void printAvg(int avg, uint16_t x, uint16_t y, bool prefix) {
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(x, y);
+        epd->setCursor(x, y);
         if (prefix) {
-            getdisplay().print("Avg: ");
+            epd->print("Avg: ");
         }
         switch (average) {
             case 0:
-                getdisplay().print("1s");
+                epd->print("1s");
                 break;
             case 1:
-                getdisplay().print("10s");
+                epd->print("10s");
                 break;
             case 2:
-                getdisplay().print("60s");
+                epd->print("60s");
                 break;
             case 3:
-                getdisplay().print("300s");
+                epd->print("300s");
                 break;
             default:
-                getdisplay().print("1s");
+                epd->print("1s");
                 break;
         }
     }
 
     void printVoltageSymbol(uint16_t x, uint16_t y, uint16_t color) {
-        getdisplay().setFont(&Ubuntu_Bold16pt8b);
+        epd->setFont(&Ubuntu_Bold16pt8b);
-        getdisplay().setCursor(x, y);
+        epd->setCursor(x, y);
-        getdisplay().print("V");
+        epd->print("V");
-        getdisplay().fillRect(x, y + 6, 22, 3, color);
+        epd->fillRect(x, y + 6, 22, 3, color);
-        getdisplay().fillRect(x, y + 11, 6, 3, color);
+        epd->fillRect(x, y + 11, 6, 3, color);
-        getdisplay().fillRect(x + 8, y + 11, 6, 3, color);
+        epd->fillRect(x + 8, y + 11, 6, 3, color);
-        getdisplay().fillRect(x + 16, y + 11, 6, 3, color);
+        epd->fillRect(x + 16, y + 11, 6, 3, color);
     }
 
-    int displayPage(PageData &pageData){
+    int displayPage(PageData &pageData) {
-        GwConfigHandler *config = commonData->config;
-        GwLog *logger = commonData->logger;
-        
-        // Get config data
-        bool simulation = config->getBool(config->useSimuData);
-        bool holdvalues = config->getBool(config->holdvalues);
-        String flashLED = config->getString(config->flashLED);
-        String batVoltage = config->getString(config->batteryVoltage);
-        String batType = config->getString(config->batteryType);
-        String backlightMode = config->getString(config->backlight);
 
         double value1 = 0;
         double valueTrend = 0;  // Average over 10 values
@@ -151,92 +154,76 @@ public:
         bool valid1 = true;
 
         // Optical warning by limit violation
-        if(String(flashLED) == "Limit Violation"){
+        if (flashLED == "Limit Violation") {
-            // Limits for Pb battery
+            bool violation = false;
-            if(String(batType) == "Pb" && (raw < 11.8 || raw > 14.8)){
+            if (batType == "Pb") {
+                violation = (raw < 11.8 || raw > 14.8);
+            } else if (batType == "Gel") {
+                violation = (raw < 11.8 || raw > 14.4);
+            } else if (batType == "AGM") {
+                violation = (raw < 11.8 || raw > 14.7);
+            } else if (batType == "LiFePo4") {
+                violation = (raw < 12.0 || raw > 14.6);
+            }
+            if (violation) {
                 setBlinkingLED(true);
-            }
+            } else {
-            if(String(batType) == "Pb" && (raw >= 11.8 && raw <= 14.8)){
-                setBlinkingLED(false);
-                setFlashLED(false);
-            }
-            // Limits for Gel battery
-            if(String(batType) == "Gel" && (raw < 11.8 || raw > 14.4)){
-                setBlinkingLED(true);
-            }
-            if(String(batType) == "Gel" && (raw >= 11.8 && raw <= 14.4)){
-                setBlinkingLED(false);
-                setFlashLED(false);
-            }
-            // Limits for AGM battery
-            if(String(batType) == "AGM" && (raw < 11.8 || raw > 14.7)){
-                setBlinkingLED(true);
-            }
-            if(String(batType) == "AGM" && (raw >= 11.8 && raw <= 14.7)){
-                setBlinkingLED(false);
-                setFlashLED(false);
-            }
-            // Limits for LiFePo4 battery
-            if(String(batType) == "LiFePo4" && (raw < 12.0 || raw > 14.6)){
-                setBlinkingLED(true);
-            }
-            if(String(batType) == "LiFePo4" && (raw >= 12.0 && raw <= 14.6)){
                 setBlinkingLED(false);
                 setFlashLED(false);
             }
         }
 
         // Logging voltage value
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageVoltage, Type:%s %s:=%f", batType, name1.c_str(), raw);
+        logger->logDebug(GwLog::LOG, "Drawing at PageVoltage, Type:%s %s:=%f", batType, name1.c_str(), raw);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
         if (mode == 'D') {
             // Display mode digital
 
             // Show name
-            getdisplay().setTextColor(commonData->fgcolor);
+            epd->setTextColor(commonData->fgcolor);
-            getdisplay().setFont(&Ubuntu_Bold32pt8b);
+            epd->setFont(&Ubuntu_Bold32pt8b);
-            getdisplay().setCursor(20, 100);
+            epd->setCursor(20, 100);
-            getdisplay().print(name1);                           // Value name
+            epd->print(name1);                           // Value name
 
-            #if defined BOARD_OBP40S3 && defined LIPO_ACCU_1200 && defined VOLTAGE_SENSOR
+#if defined BOARD_OBP40S3 && defined LIPO_ACCU_1200 && defined VOLTAGE_SENSOR
             // Show charge status
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(185, 100);
+            epd->setCursor(185, 100);
             if(commonData->data.BatteryChargeStatus == true){
-                getdisplay().print("Charge");
+                epd->print("Charge");
             }
             else{
-                getdisplay().print("Discharge");
+                epd->print("Discharge");
             }
-            #endif
+#endif
 
             // Show unit
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(270, 100);
+            epd->setCursor(270, 100);
-            getdisplay().print("V");
+            epd->print("V");
 
             // Show battery type
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(295, 100);
+            epd->setCursor(295, 100);
-            #ifdef BOARD_OBP60S3
+#ifdef BOARD_OBP60S3
-            getdisplay().print(batType);
+            epd->print(batType);
-            #endif
+#endif
-            #if defined BOARD_OBP40S3 && defined LIPO_ACCU_1200 && defined VOLTAGE_SENSOR
+#if defined BOARD_OBP40S3 && defined LIPO_ACCU_1200 && defined VOLTAGE_SENSOR
-            getdisplay().print("LiPo");
+            epd->print("LiPo");
-            #endif
+#endif
 
             // Show average settings
             printAvg(average, 320, 84, true);
 
             // Reading bus data or using simulation data
-            getdisplay().setFont(&DSEG7Classic_BoldItalic60pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic60pt7b);
-            getdisplay().setCursor(20, 240);
+            epd->setCursor(20, 240);
             if(simulation == true){
                 if(batVoltage == "12V"){
                     value1 = 12.0;
@@ -245,30 +232,30 @@ public:
                     value1 = 24.0;
                 }
                 value1 += float(random(0, 5)) / 10;         // Simulation data
-                getdisplay().print(value1,1);
+                epd->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){
-                        getdisplay().print(value1,2);
+                        epd->print(value1,2);
                     }
                     if(value1 >= 10 && value1 < 100){
-                        getdisplay().print(value1,1);
+                        epd->print(value1,1);
                     }
                     if(value1 >= 100){
-                        getdisplay().print(value1,0);
+                        epd->print(value1,0);
                     }
                 }
                 else{
-                getdisplay().print("---");                       // Missing bus data
+                epd->print("---");                       // Missing bus data
                 }
             }
 
             // Show trend indicator
             if(trend == true){
-                getdisplay().fillRect(315, 183, 35, 4, commonData->fgcolor);   // Draw separator
+                epd->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
                 }
@@ -289,9 +276,9 @@ public:
             std::vector<Point> pts;
 
             // Instrument
-            getdisplay().drawCircleHelper(c.x, c.y, r + 2, 0x01, commonData->fgcolor);
+            epd->drawCircleHelper(c.x, c.y, r + 2, 0x01, commonData->fgcolor);
-            getdisplay().drawCircleHelper(c.x, c.y, r + 1, 0x01, commonData->fgcolor);
+            epd->drawCircleHelper(c.x, c.y, r + 1, 0x01, commonData->fgcolor);
-            getdisplay().drawCircleHelper(c.x, c.y, r    , 0x01, commonData->fgcolor);
+            epd->drawCircleHelper(c.x, c.y, r    , 0x01, commonData->fgcolor);
 
             // Scale
             // angle to voltage scale mapping
@@ -304,7 +291,7 @@ public:
                 {c.x - r + 12, c.y + 1},
                 {c.x - r, c.y + 1}
             };
-            getdisplay().setFont(&Ubuntu_Bold10pt8b);
+            epd->setFont(&Ubuntu_Bold10pt8b);
             for (int angle = 3; angle < 90; angle += 3) {
                 if (angle % 15 == 0) {
                     fillPoly4(rotatePoints(c, pts, angle), commonData->fgcolor);
@@ -314,7 +301,7 @@ public:
                 else {
                     p1 = rotatePoint(c, {c.x - r, c.y}, angle);
                     p2 = rotatePoint(c, {c.x - r + 6, c.y}, angle);
-                    getdisplay().drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
+                    epd->drawLine(p1.x, p1.y, p2.x, p2.y, commonData->fgcolor);
                 }
             }
 
@@ -354,31 +341,31 @@ public:
             fillPoly4(rotatePoints(c, pts, angle), commonData->fgcolor);
 
             // base
-            getdisplay().fillCircle(c.x, c.y, 7, commonData->fgcolor);
+            epd->fillCircle(c.x, c.y, 7, commonData->fgcolor);
-            getdisplay().fillCircle(c.x, c.y, 4, commonData->bgcolor);
+            epd->fillCircle(c.x, c.y, 4, commonData->bgcolor);
 
             // Symbol
             printVoltageSymbol(40, 60, commonData->fgcolor);
 
             // Additional information at right side
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(300, 60);
+            epd->setCursor(300, 60);
-            getdisplay().print("Source:");
+            epd->print("Source:");
-            getdisplay().setCursor(300, 80);
+            epd->setCursor(300, 80);
-            getdisplay().print(name1);
+            epd->print(name1);
 
-            getdisplay().setCursor(300, 110);
+            epd->setCursor(300, 110);
-            getdisplay().print("Type:");
+            epd->print("Type:");
-            getdisplay().setCursor(300, 130);
+            epd->setCursor(300, 130);
-            getdisplay().print(batType);
+            epd->print(batType);
 
-            getdisplay().setCursor(300, 160);
+            epd->setCursor(300, 160);
-            getdisplay().print("Avg:");
+            epd->print("Avg:");
             printAvg(average, 300, 180, false);
 
             // FRAM indicator
             if (hasFRAM) {
-                getdisplay().drawXBitmap(300, 240, fram_bits, icon_width, icon_height, commonData->fgcolor);
+                epd->drawXBitmap(300, 240, fram_bits, icon_width, icon_height, commonData->fgcolor);
             }
 
         }

lib/obp60task/PageWhite.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -13,16 +14,17 @@
 
 class PageWhite : public Page
 {
-char mode = 'W';  // display mode (W)hite | (L)ogo | (M)FD logo
+private:
+    char mode = 'W';  // display mode (W)hite | (L)ogo | (M)FD logo
 
 public:
-    PageWhite(CommonData &common){
+    PageWhite(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageWhite");
+        logger->logDebug(GwLog::LOG, "Instantiate PageWhite");
         refreshtime = 15000;
     }
 
-    virtual int handleKey(int key) {
+    int handleKey(int key) {
          // Change display mode
         if (key == 1) {
             if (mode == 'W') {
@@ -37,21 +39,20 @@ public:
         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);
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
             setFlashLED(false);
         }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageWhite");
+        logger->logDebug(GwLog::LOG, "Drawing at PageWhite");
 
         // Draw page
         //***********************************************************
@@ -61,19 +62,19 @@ public:
 
         // Set display in partial refresh mode
         if (mode == 'W') {
-            getdisplay().setFullWindow();
+            epd->setFullWindow();
         } else {
-            getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+            epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
         }
 
         if (mode == 'L') {
-            getdisplay().drawXBitmap(0, 0, OBP_400x300_bits, OBP_400x300_width, OBP_400x300_height, commonData->fgcolor);
+            epd->drawXBitmap(0, 0, OBP_400x300_bits, OBP_400x300_width, OBP_400x300_height, commonData->fgcolor);
         } else if (mode == 'M') {
 #ifdef BOARD_OBP60S3
-            getdisplay().drawXBitmap(0, 0, OBP60_400x300_bits, OBP60_400x300_width, OBP60_400x300_height, commonData->fgcolor);
+            epd->drawXBitmap(0, 0, OBP60_400x300_bits, OBP60_400x300_width, OBP60_400x300_height, commonData->fgcolor);
 #endif
 #ifdef BOARD_OBP40S3
-            getdisplay().drawXBitmap(0, 0, OBP40_400x300_bits, OBP40_400x300_width, OBP40_400x300_height, commonData->fgcolor);
+            epd->drawXBitmap(0, 0, OBP40_400x300_bits, OBP40_400x300_width, OBP40_400x300_height, commonData->fgcolor);
 #endif
         }
 

lib/obp60task/PageWind.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -214,15 +215,21 @@ static unsigned char front_bits[] PROGMEM = {
 
 class PageWind : public Page
 {
-bool keylock = false;               // Keylock
+private:
-int8_t lp = 80;                     // Pointer length
+    String lengthformat;
-char mode = 'N';                    // page mode (N)ormal | (L)ens | e(X)ample
+    bool keylock = false;   // Keylock
-char source = 'A';                  // data source (A)pparent | (T)rue
+    int8_t lp = 80;         // Pointer length
+    char mode = 'N';        // page mode (N)ormal | (L)ens | e(X)ample
+    char source = 'A';      // data source (A)pparent | (T)rue
 
 public:
-    PageWind(CommonData &common){
+    PageWind(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageWind");
+        logger->logDebug(GwLog::LOG, "Instantiate PageWind");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
+
         if (hasFRAM) {
             lp = fram.read(FRAM_WIND_SIZE);
             source = fram.read(FRAM_WIND_SRC);
@@ -230,7 +237,7 @@ public:
         }
     }
 
-    virtual void setupKeys(){
+    void setupKeys() {
         Page::setupKeys();
         commonData->keydata[0].label = "MODE";
         if (mode == 'X') {
@@ -242,7 +249,7 @@ public:
     }
 
     // Key functions
-    virtual int handleKey(int key){
+    int handleKey(int key) {
 
         if(key == 1){               // Mode switch
             if(mode == 'N'){
@@ -296,23 +303,23 @@ public:
         return key;
     }
 
-    int displayPage(PageData &pageData)
+    void displayNew(PageData &pageData) {
-    {
+#ifdef BOARD_OBP60S3
-        GwConfigHandler *config = commonData->config;
+        // Clear optical warning
-        GwLog *logger = commonData->logger;
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         static String svalue1old = "";
         static String unit1old = "";
         static String svalue2old = "";
         static String unit2old = "";
 
-        // 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);
-
         GwApi::BoatValue *bvalue1; // Value 1 for speed on top
         GwApi::BoatValue *bvalue2; // Value 2 for angle on bottom
 
@@ -347,65 +354,59 @@ public:
         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
 
-        // 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 PageWind, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
+        logger->logDebug(GwLog::LOG, "Drawing at PageWind, %s:%f,  %s:%f", name1.c_str(), value1, name2.c_str(), value2);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
 
         if (mode == 'X') {
             // Original example code with scaling circle
 
             // Show values AWS/TWS
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(20, 50);
+            epd->setCursor(20, 50);
-            getdisplay().print(name1);                       // Value name
+            epd->print(name1);                       // Value name
-            getdisplay().print(": ");
+            epd->print(": ");
             if(holdvalues == false){
-                getdisplay().print(svalue1);                     // Value
+                epd->print(svalue1);                     // Value
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(unit1);                       // Unit
+                epd->print(unit1);                       // Unit
             }
             else{
-                getdisplay().print(svalue1old);                  // Value old
+                epd->print(svalue1old);                  // Value old
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(unit1old);                    // Unit old
+                epd->print(unit1old);                    // Unit old
             }
 
             // Show values AWD/TWD
-            getdisplay().setFont(&Ubuntu_Bold20pt8b);
+            epd->setFont(&Ubuntu_Bold20pt8b);
-            getdisplay().setCursor(20, 260);
+            epd->setCursor(20, 260);
-            getdisplay().print(name2);                       // Value name
+            epd->print(name2);                       // Value name
-            getdisplay().print(": ");
+            epd->print(": ");
             if(holdvalues == false){
-                getdisplay().print(svalue2);                     // Value
+                epd->print(svalue2);                     // Value
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(unit2);                       // Unit
+                epd->print(unit2);                       // Unit
             }
             else{
-                getdisplay().print(svalue2old);                  // Value old
+                epd->print(svalue2old);                  // Value old
-                getdisplay().print(" ");
+                epd->print(" ");
-                getdisplay().print(unit2old);                    // Unit old
+                epd->print(unit2old);                    // Unit old
             }
 
             Point c = {200, 145};
 
             // Draw instrument
-            getdisplay().fillCircle(c.x, c.y, lp + 5, commonData->fgcolor);
+            epd->fillCircle(c.x, c.y, lp + 5, commonData->fgcolor);
-            getdisplay().fillCircle(c.x, c.y, lp + 1, commonData->bgcolor);
+            epd->fillCircle(c.x, c.y, lp + 1, commonData->bgcolor);
 
             // Wind pointer
             if (bvalue2->valid or simulation) {
@@ -420,7 +421,7 @@ public:
                 };
                 fillPoly4(rotatePoints(c, pts, RadToDeg(value2)), commonData->fgcolor);
             } else {
-                getdisplay().setFont(&Ubuntu_Bold12pt8b);
+                epd->setFont(&Ubuntu_Bold12pt8b);
                 drawTextCenter(c.x, c.y, "no data");
             }
 
@@ -438,7 +439,7 @@ public:
             };
             int angle;
 
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
 
             // starbord
             // text with line
@@ -453,7 +454,7 @@ public:
             for (int i = 30; i < 138; i += 6) {
                  if (i % 15 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      getdisplay().fillCircle(p.x, p.y, 2, commonData->fgcolor);
+                      epd->fillCircle(p.x, p.y, 2, commonData->fgcolor);
                  }
             }
 
@@ -470,17 +471,17 @@ public:
             for (int i = 228; i < 330; i += 6) {
                  if (i % 15 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      getdisplay().fillCircle(p.x, p.y, 2, commonData->fgcolor);
+                      epd->fillCircle(p.x, p.y, 2, commonData->fgcolor);
                  }
             }
 
             // data source
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(8, 50);
+            epd->setCursor(8, 50);
             if (source == 'A') {
-                getdisplay().print("APP");
+                epd->print("APP");
             } else {
-                getdisplay().print("TRUE");
+                epd->print("TRUE");
             }
 
             // Wind pointer (angle)
@@ -500,7 +501,7 @@ public:
                     alpha *= -1;
                 }
 
-                getdisplay().fillCircle(c.x, c.y, 8, commonData->fgcolor);
+                epd->fillCircle(c.x, c.y, 8, commonData->fgcolor);
                 pts = {
                     {c.x - 1, c.y - (r - 20)},
                     {c.x + 1, c.y - (r - 20)},
@@ -508,39 +509,39 @@ public:
                     {c.x - 6, c.y + 15}
                 };
                 fillPoly4(rotatePoints(c, pts, alpha), commonData->fgcolor);
-                getdisplay().fillCircle(c.x, c.y, 6, commonData->bgcolor);
+                epd->fillCircle(c.x, c.y, 6, commonData->bgcolor);
             } else {
-                getdisplay().setFont(&Ubuntu_Bold12pt8b);
+                epd->setFont(&Ubuntu_Bold12pt8b);
                 drawTextCenter(c.x, c.y, "no data");
             }
 
             // Wind speed as decimal number
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(150, 250);
+            epd->setCursor(150, 250);
             if (holdvalues == false) {
-                getdisplay().print(svalue1);
+                epd->print(svalue1);
             } else {
-                getdisplay().print(svalue1old);
+                epd->print(svalue1old);
             }
             // unit
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(220, 265);
+            epd->setCursor(220, 265);
-            getdisplay().print("kts");
+            epd->print("kts");
         }
         else {
             // Normal mode
 
             // data source
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(8, 50);
+            epd->setCursor(8, 50);
             if (source == 'A') {
-                getdisplay().print("APP");
+                epd->print("APP");
             } else {
-                getdisplay().print("TRUE");
+                epd->print("TRUE");
             }
 
             // draw ship front symbol (as bitmap)
-            getdisplay().drawXBitmap(140, 30, front_bits, front_width, front_height, commonData->fgcolor);
+            epd->drawXBitmap(140, 30, front_bits, front_width, front_height, commonData->fgcolor);
 
             Point c = {200, 155};
             uint16_t r = 150;
@@ -565,7 +566,7 @@ public:
             for (int i = 30; i < 150; i += 10) {
                  if (i % 30 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      getdisplay().fillCircle(p.x, p.y, 3, commonData->fgcolor);
+                      epd->fillCircle(p.x, p.y, 3, commonData->fgcolor);
                  }
             }
 
@@ -582,27 +583,27 @@ public:
             for (int i = 210; i < 340; i += 10) {
                  if (i % 30 != 0) {
                       p = rotatePoint(c, {c.x, c.y - r + 5}, i);
-                      getdisplay().fillCircle(p.x, p.y, 3, commonData->fgcolor);
+                      epd->fillCircle(p.x, p.y, 3, commonData->fgcolor);
                  }
             }
 
             // Wind speed as decimal number
-            getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-            getdisplay().setCursor(150, 250);
+            epd->setCursor(150, 250);
             if (holdvalues == false) {
-                getdisplay().print(svalue1);
+                epd->print(svalue1);
             } else {
-                getdisplay().print(svalue1old);
+                epd->print(svalue1old);
             }
             // unit
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(220, 265);
+            epd->setCursor(220, 265);
-            getdisplay().print("kts");
+            epd->print("kts");
 
             // Wind pointer (angle)
             if (bvalue2->valid or simulation) {
                 float alpha = RadToDeg(value2);
-                getdisplay().fillCircle(c.x, c.y, 8, commonData->fgcolor);
+                epd->fillCircle(c.x, c.y, 8, commonData->fgcolor);
                 pts = {
                     {c.x - 1, c.y - (r - 20)},
                     {c.x + 1, c.y - (r - 20)},
@@ -610,9 +611,9 @@ public:
                     {c.x - 6, c.y + 15}
                 };
                 fillPoly4(rotatePoints(c, pts, alpha), commonData->fgcolor);
-                getdisplay().fillCircle(c.x, c.y, 6, commonData->bgcolor);
+                epd->fillCircle(c.x, c.y, 6, commonData->bgcolor);
             } else {
-                getdisplay().setFont(&Ubuntu_Bold12pt8b);
+                epd->setFont(&Ubuntu_Bold12pt8b);
                 drawTextCenter(c.x, c.y, "no data");
             }
 

lib/obp60task/PageWindPlot.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "BoatDataCalibration.h"
@@ -48,7 +49,7 @@ int getRng(const RingBuffer<int16_t>& windDirHstry, int center, size_t amount)
 
 // ****************************************************************
 class PageWindPlot : public Page {
-
+private:
     bool keylock = false; // Keylock
     char chrtMode = 'D'; // Chart mode: 'D' for TWD, 'S' for TWS, 'B' for both
     int dataIntv = 1; // Update interval for wind history chart:
@@ -56,14 +57,12 @@ class PageWindPlot : public Page {
     bool showTWS = true; // Show TWS value in chart area
 
 public:
-    PageWindPlot(CommonData& common)
+    PageWindPlot(CommonData& common) : Page(common)
     {
-        commonData = &common;
+        logger->logDebug(GwLog::LOG, "Instantiate PageWindPlot");
-        common.logger->logDebug(GwLog::LOG, "Instantiate PageWindPlot");
     }
 
-    virtual void setupKeys()
+    void setupKeys() {
-    {
         Page::setupKeys();
         //        commonData->keydata[0].label = "MODE";
         commonData->keydata[1].label = "INTV";
@@ -71,8 +70,7 @@ public:
     }
 
     // Key functions
-    virtual int handleKey(int key)
+    int handleKey(int key) {
-    {
         // Set chart mode TWD | TWS -> to be implemented
         if (key == 1) {
             if (chrtMode == 'D') {
@@ -113,10 +111,17 @@ public:
         return key;
     }
 
-    int displayPage(PageData& pageData)
+    void displayNew(PageData &pageData) {
-    {
+#ifdef BOARD_OBP60S3
-        GwConfigHandler* config = commonData->config;
+        // Clear optical warning
-        GwLog* logger = commonData->logger;
+        if (flashLED == "Limit Violation") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData& pageData) {
 
         float twsValue; // TWS value in chart area
         static String twdName, twdUnit; // TWD name and unit
@@ -137,8 +142,6 @@ public:
         static bool isInitialized = false; // Flag to indicate that page is initialized
         static bool wndDataValid = false; // Flag to indicate if wind data is valid
         static int numNoData; // Counter for multiple invalid data values in a row
-        static bool simulation = false;
-        static bool holdValues = false;
 
         static int width; // Screen width
         static int height; // Screen height
@@ -172,17 +175,11 @@ public:
         int chrtVal; // Current wind value
         static int chrtPrevVal; // Last wind value in chart area for check if value crosses 180 degree line
 
-        LOG_DEBUG(GwLog::LOG, "Display page WindPlot");
+        logger->logDebug(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 = getdisplay().width();
+            width = epd->width();
-            height = getdisplay().height();
+            height = epd->height();
             xCenter = width / 2;
             cHeight = height - yOffset - 22;
             bufSize = pageData.boatHstry.twdHstry->getCapacity();
@@ -240,7 +237,7 @@ public:
                 bufStart = max(0, bufStart - numAddedBufVals);
             }
         }
-        LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Dataset: count: %d, TWD: %.0f, TWS: %.1f, TWD_valid? %d, intvBufSize: %d, numWndVals: %d, bufStart: %d, numAddedBufVals: %d, lastIdx: %d, old: %d, act: %d",
+        logger->logDebug(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);
 
@@ -253,7 +250,7 @@ public:
             } else {
                 wndCenter = 0;
             }
-            LOG_DEBUG(GwLog::DEBUG, "PageWindPlot Range Init: count: %d, TWD: %.0f, wndCenter: %d, diffRng: %d, chrtRng: %d", count, pageData.boatHstry.twdHstry->getLast() / 1000.0 * radToDeg,
+            logger->logDebug(GwLog::DEBUG, "PageWindPlot Range Init: count: %d, TWD: %.0f, wndCenter: %d, diffRng: %d, chrtRng: %d", count, pageData.boatHstry.twdHstry->getLast() / 1000.0 * radToDeg,
                 wndCenter, diffRng, chrtRng);
         } else {
             // check and adjust range between left, center, and right chart limit
@@ -277,32 +274,32 @@ public:
         //***********************************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, width, height); // Set partial update
+        epd->setPartialWindow(0, 0, width, height); // Set partial update
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // chart lines
-        getdisplay().fillRect(0, yOffset, width, 2, commonData->fgcolor);
+        epd->fillRect(0, yOffset, width, 2, commonData->fgcolor);
-        getdisplay().fillRect(xCenter, yOffset, 1, cHeight, commonData->fgcolor);
+        epd->fillRect(xCenter, yOffset, 1, cHeight, commonData->fgcolor);
 
         // chart labels
         char sWndLbl[4]; // char buffer for Wind angle label
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(xCenter - 88, yOffset - 3);
+        epd->setCursor(xCenter - 88, yOffset - 3);
-        getdisplay().print("TWD"); // Wind data name
+        epd->print("TWD"); // Wind data name
         snprintf(sWndLbl, 4, "%03d", (wndCenter < 0) ? (wndCenter + 360) : wndCenter);
         drawTextCenter(xCenter, yOffset - 11, sWndLbl);
-        getdisplay().drawCircle(xCenter + 25, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
+        epd->drawCircle(xCenter + 25, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
-        getdisplay().drawCircle(xCenter + 25, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
+        epd->drawCircle(xCenter + 25, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
-        getdisplay().setCursor(1, yOffset - 3);
+        epd->setCursor(1, yOffset - 3);
         snprintf(sWndLbl, 4, "%03d", (wndLeft < 0) ? (wndLeft + 360) : wndLeft);
-        getdisplay().print(sWndLbl); // Wind left value
+        epd->print(sWndLbl); // Wind left value
-        getdisplay().drawCircle(46, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
+        epd->drawCircle(46, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
-        getdisplay().drawCircle(46, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
+        epd->drawCircle(46, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
-        getdisplay().setCursor(width - 50, yOffset - 3);
+        epd->setCursor(width - 50, yOffset - 3);
         snprintf(sWndLbl, 4, "%03d", (wndRight < 0) ? (wndRight + 360) : wndRight);
-        getdisplay().print(sWndLbl); // Wind right value
+        epd->print(sWndLbl); // Wind right value
-        getdisplay().drawCircle(width - 5, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
+        epd->drawCircle(width - 5, yOffset - 17, 2, commonData->fgcolor); // <degree> symbol
-        getdisplay().drawCircle(width - 5, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
+        epd->drawCircle(width - 5, yOffset - 17, 3, commonData->fgcolor); // <degree> symbol
 
         if (pageData.boatHstry.twdHstry->getMax() == pageData.boatHstry.twdHstry->getMinVal()) {
             // only <INT16_MIN> values in buffer -> no valid wind data available
@@ -333,7 +330,7 @@ public:
 
 //                    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));
+                        logger->logDebug(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
@@ -347,15 +344,15 @@ public:
                         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;
-                            getdisplay().drawLine(prevX, prevY, xSplit, y, commonData->fgcolor);
+                            epd->drawLine(prevX, prevY, xSplit, y, commonData->fgcolor);
-                            getdisplay().drawLine(prevX, prevY - 1, ((xSplit != prevX) ? xSplit : xSplit - 1), ((xSplit != prevX) ? y - 1 : 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
-                    getdisplay().drawLine(prevX, prevY, x, y, commonData->fgcolor);
+                    epd->drawLine(prevX, prevY, x, y, commonData->fgcolor);
-                    getdisplay().drawLine(prevX, prevY - 1, ((x != prevX) ? x : x - 1), ((x != prevX) ? y - 1 : 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;
@@ -366,7 +363,7 @@ public:
 
                     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);
+                    logger->logDebug(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
@@ -375,16 +372,16 @@ public:
                             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);
+                    logger->logDebug(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");
+            logger->logDebug(GwLog::LOG, "PageWindPlot: No valid data available");
-            getdisplay().setFont(&Ubuntu_Bold10pt8b);
+            epd->setFont(&Ubuntu_Bold10pt8b);
-            getdisplay().fillRect(xCenter - 33, height / 2 - 20, 66, 24, commonData->bgcolor); // Clear area for message
+            epd->fillRect(xCenter - 33, height / 2 - 20, 66, 24, commonData->bgcolor); // Clear area for message
             drawTextCenter(xCenter, height / 2 - 10, "No data");
         }
 
@@ -409,39 +406,39 @@ public:
             }
             lastZone = currentZone;
 
-            getdisplay().fillRect(xPosTws - 4, yPosTws - 38, 142, 44, commonData->bgcolor); // Clear area for TWS value
+            epd->fillRect(xPosTws - 4, yPosTws - 38, 142, 44, commonData->bgcolor); // Clear area for TWS value
-            getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+            epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
-            getdisplay().setCursor(xPosTws, yPosTws);
+            epd->setCursor(xPosTws, yPosTws);
             if (!BDataValid[1]) {
-                getdisplay().print("--.-");
+                epd->print("--.-");
             } else {
                 double dbl = BDataValue[1] * 3.6 / 1.852;
                 if (dbl < 10.0) {
-                    getdisplay().printf("!%3.1f", dbl); // Value, round to 1 decimal
+                    epd->printf("!%3.1f", dbl); // Value, round to 1 decimal
                 } else {
-                    getdisplay().printf("%4.1f", dbl); // Value, round to 1 decimal
+                    epd->printf("%4.1f", dbl); // Value, round to 1 decimal
                 }
             }
-            getdisplay().setFont(&Ubuntu_Bold12pt8b);
+            epd->setFont(&Ubuntu_Bold12pt8b);
-            getdisplay().setCursor(xPosTws + 82, yPosTws - 14);
+            epd->setCursor(xPosTws + 82, yPosTws - 14);
-//            getdisplay().print("TWS"); // Name
+//            epd->print("TWS"); // Name
-            getdisplay().print(BDataName[1]); // Name
+            epd->print(BDataName[1]); // Name
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-//            getdisplay().setCursor(xPosTws + 78, yPosTws + 1);
+//            epd->setCursor(xPosTws + 78, yPosTws + 1);
-            getdisplay().setCursor(xPosTws + 82, yPosTws + 1);
+            epd->setCursor(xPosTws + 82, yPosTws + 1);
-//            getdisplay().printf(" kn"); // Unit
+//            epd->printf(" kn"); // Unit
-            getdisplay().print(BDataUnit[1]); // 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;
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
         for (int i = 1; i <= 3; i++) {
             yPos = yOffset + (i * 60);
-            getdisplay().fillRect(0, yPos, width, 1, commonData->fgcolor);
+            epd->fillRect(0, yPos, width, 1, commonData->fgcolor);
-            getdisplay().fillRect(0, yPos - 8, 24, 16, commonData->bgcolor); // Clear small area to remove potential chart lines
+            epd->fillRect(0, yPos - 8, 24, 16, commonData->bgcolor); // Clear small area to remove potential chart lines
-            getdisplay().setCursor(1, yPos + 4);
+            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
@@ -449,7 +446,7 @@ public:
                 int j = 3 - i;
                 chrtLbl = (int((((numWndVals / dataIntv) - 50) * dataIntv / 60) + 1) - (j * dataIntv)) * -1; // 50 lines left below last chart line
             }
-            getdisplay().printf("%3d", chrtLbl); // Wind value label
+            epd->printf("%3d", chrtLbl); // Wind value label
         }
 
         return PAGE_UPDATE;

lib/obp60task/PageWindRose.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,16 +7,21 @@
 
 class PageWindRose : public Page
 {
-int16_t lp = 80;                    // Pointer length
+private:
+    String lengthformat;
+    int16_t lp = 80; // Pointer length
 
 public:
-    PageWindRose(CommonData &common){
+    PageWindRose(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageWindRose");
+        logger->logDebug(GwLog::LOG, "Instantiate PageWindRose");
+
+        // Get config data
+        String lengthformat = config->getString(config->lengthFormat);
     }
 
     // Key functions
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -24,9 +30,17 @@ public:
         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") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         static String svalue1old = "";
         static String unit1old = "";
@@ -41,13 +55,6 @@ public:
         static String svalue6old = "";
         static String unit6old = "";
 
-        // 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);
-
         // Get boat value for AWA
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
         String name1 = xdrDelete(bvalue1->getName());   // Value name
@@ -133,102 +140,76 @@ public:
             unit6old = unit6;                           // Save old unit
         }
 
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
-        }
-
         // Logging boat values
         if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageWindRose, %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);
+        logger->logDebug(GwLog::LOG, "Drawing at PageWindRose, %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);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // Show values AWA
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 65);
+        epd->setCursor(10, 65);
-        getdisplay().print(svalue1);                     // Value
+        epd->print(svalue1);                     // Value
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 95);
+        epd->setCursor(10, 95);
-        getdisplay().print(name1);                       // Name
+        epd->print(name1);                       // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 115);
+        epd->setCursor(10, 115);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? unit1old : unit1);
-            getdisplay().print(unit1);                   // Unit
-        }
-        else{
-            getdisplay().print(unit1old);                // Unit
-        }
 
         // Horizintal separator left
-        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
+        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
 
         // Show values AWS
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 270);
+        epd->setCursor(10, 270);
-        getdisplay().print(svalue2);                     // Value
+        epd->print(svalue2);                     // Value
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 220);
+        epd->setCursor(10, 220);
-        getdisplay().print(name2);                       // Name
+        epd->print(name2);                       // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 190);
+        epd->setCursor(10, 190);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? unit2old : unit2);
-            getdisplay().print(unit2);                   // Unit
-        }
-        else{
-            getdisplay().print(unit2old);                // Unit
-        }
 
         // Show values TWD
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(295, 65);
+        epd->setCursor(295, 65);
         if(valid3 == true){
-            getdisplay().print(abs(value3 * 180 / PI), 0);   // Value
+            epd->print(abs(value3 * 180 / PI), 0);   // Value
         }
         else{
-            getdisplay().print("---");                   // Value
+            epd->print("---");                   // Value
-        }
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 95);
-        getdisplay().print(name3);                       // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 115);
-        getdisplay().print(" ");
-        if(holdvalues == false){
-            getdisplay().print(unit3);                   // Unit
-        }
-        else{
-            getdisplay().print(unit3old);                // Unit
         }
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(335, 95);
+        epd->print(name3);                       // Name
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        epd->setCursor(335, 115);
+        epd->print(" ");
+        epd->print(holdvalues ? unit3old : unit3);
 
         // Horizintal separator right
-        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
+        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
 
         // Show values TWS
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(295, 270);
+        epd->setCursor(295, 270);
-        getdisplay().print(svalue4);                     // Value
+        epd->print(svalue4);                     // Value
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 220);
+        epd->setCursor(335, 220);
-        getdisplay().print(name4);                       // Name
+        epd->print(name4);                       // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 190);
+        epd->setCursor(335, 190);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? unit4old : unit4);
-            getdisplay().print(unit4);                   // Unit
-        }
-        else{  
-            getdisplay().print(unit4old);                // Unit
-        }
 
 //*******************************************************************************************
         
@@ -236,10 +217,10 @@ public:
         int rInstrument = 110;     // Radius of grafic instrument
         float pi = 3.141592;
 
-        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
+        epd->fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
-        getdisplay().fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
+        epd->fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
 
         for(int i=0; i<360; i=i+10)
         {
@@ -247,37 +228,36 @@ public:
             float x = 200 + (rInstrument-30)*sin(i/180.0*pi);  //  x-coordinate dots
             float y = 150 - (rInstrument-30)*cos(i/180.0*pi);  //  y-coordinate cots
             const char *ii = "";
-            switch (i)
+            switch (i) {
-{
+                case 0: ii="0"; break;
-            case 0: ii="0"; break;
+                case 30 : ii="30"; break;
-            case 30 : ii="30"; break;
+                case 60 : ii="60"; break;
-            case 60 : ii="60"; break;
+                case 90 : ii="90"; break;
-            case 90 : ii="90"; break;
+                case 120 : ii="120"; break;
-            case 120 : ii="120"; break;
+                case 150 : ii="150"; break;
-            case 150 : ii="150"; break;
+                case 180 : ii="180"; break;
-            case 180 : ii="180"; break;
+                case 210 : ii="210"; break;
-            case 210 : ii="210"; break;
+                case 240 : ii="240"; break;
-            case 240 : ii="240"; break;
+                case 270 : ii="270"; break;
-            case 270 : ii="270"; break;
+                case 300 : ii="300"; break;
-            case 300 : ii="300"; break;
+                case 330 : ii="330"; break;
-            case 330 : ii="330"; break;
+                default: break;
-            default: break;
             }
 
             // Print text centered on position x, y
             int16_t x1, y1;     // Return values of getTextBounds
             uint16_t w, h;      // Return values of getTextBounds
-            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            getdisplay().setCursor(x-w/2, y+h/2);
+            epd->setCursor(x-w/2, y+h/2);
-            if(i % 30 == 0){
+            if (i % 30 == 0) {
-                getdisplay().setFont(&Ubuntu_Bold8pt8b);
+                epd->setFont(&Ubuntu_Bold8pt8b);
-                getdisplay().print(ii);
+                epd->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);
-            getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
             float sinx=sin(i/180.0*pi);
             float cosx=cos(i/180.0*pi); 
 
@@ -288,10 +268,10 @@ public:
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                epd->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);
             }
@@ -308,7 +288,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument-15); 
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->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
@@ -318,44 +298,34 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument-15);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
 
         // Center circle
-        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
+        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
+        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
 
 //*******************************************************************************************
 
         // Show values DBT
-        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
-        getdisplay().setCursor(160, 200);
+        epd->setCursor(160, 200);
-        getdisplay().print(svalue5);                     // Value
+        epd->print(svalue5);                     // Value
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(190, 215);
+        epd->setCursor(190, 215);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? unit5old : unit5);
-            getdisplay().print(unit5);                   // Unit
-        }
-        else{  
-            getdisplay().print(unit5old);                // Unit
-        }
 
         // Show values STW
-        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
-        getdisplay().setCursor(160, 130);
+        epd->setCursor(160, 130);
-        getdisplay().print(svalue6);                     // Value
+        epd->print(svalue6);                     // Value
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(190, 90);
+        epd->setCursor(190, 90);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? unit6old : unit6);
-            getdisplay().print(unit6);                   // Unit
-        }
-        else{  
-            getdisplay().print(unit6old);                // Unit
-        }
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageWindRoseFlex.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -6,16 +7,21 @@
 
 class PageWindRoseFlex : public Page
 {
-int16_t lp = 80;                    // Pointer length
+private:
+    String lengthformat;
+    int16_t lp = 80; // Pointer length
 
 public:
-    PageWindRoseFlex(CommonData &common){
+    PageWindRoseFlex(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageWindRoseFlex");
+        logger->logDebug(GwLog::LOG, "Instantiate PageWindRoseFlex");
+
+        // Get config data
+        lengthformat = config->getString(config->lengthFormat);
     }
 
     // Key functions
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -24,9 +30,17 @@ public:
         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") {
+            setBlinkingLED(false);
+            setFlashLED(false);
+        }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         static String svalue1old = "";
         static String unit1old = "";
@@ -41,13 +55,6 @@ public:
         static String svalue6old = "";
         static String unit6old = "";
 
-        // 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);
-
         // Get boat values #1
         GwApi::BoatValue *bvalue1 = pageData.values[0]; // First element in list (only one value by PageOneValue)
         String name1 = xdrDelete(bvalue1->getName());   // Value name
@@ -133,114 +140,89 @@ public:
             unit6old = unit6;                           // Save old unit
         }
 
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false);
-        }
-
         // Logging boat values
         if (bvalue1 == NULL) return PAGE_OK; // WTF why this statement?
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageWindRoseFlex, %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);
+        logger->logDebug(GwLog::LOG, "Drawing at PageWindRoseFlex, %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);
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // Show value 2 at position of value 1 (top left)
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 65);
+        epd->setCursor(10, 65);
-        getdisplay().print(svalue2);                     // Value
+        epd->print(svalue2);                     // Value
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 95);
+        epd->setCursor(10, 95);
-        getdisplay().print(name2);                       // Name
+        epd->print(name2);                       // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 115);
+        epd->setCursor(10, 115);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? unit2old : unit2);
-            getdisplay().print(unit2);                   // Unit
-        }
-        else{
-            getdisplay().print(unit2old);                // Unit
-        }
 
         // Horizintal separator left
-        getdisplay().fillRect(0, 149, 60, 3, commonData->fgcolor);
+        epd->fillRect(0, 149, 60, 3, commonData->fgcolor);
 
         // Show value 3 at bottom left
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(10, 270);
+        epd->setCursor(10, 270);
-        getdisplay().print(svalue3);                     // Value
+        epd->print(svalue3);                     // Value
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(10, 220);
+        epd->setCursor(10, 220);
-        getdisplay().print(name3);                       // Name
+        epd->print(name3);                       // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(10, 190);
+        epd->setCursor(10, 190);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? unit3old : unit3);
-            getdisplay().print(unit3);                   // Unit
+
-        }
-        else{
-            getdisplay().print(unit3old);                // Unit
-        }
 
         // Show value 4 at top right
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(295, 65);
+        epd->setCursor(295, 65);
         if(valid3 == true){
-           // getdisplay().print(abs(value3 * 180 / M_PI), 0); // Value
+           // epd->print(abs(value3 * 180 / M_PI), 0); // Value
-            getdisplay().print(svalue4);     // Value
+            epd->print(svalue4);     // Value
         }
         else{
-            getdisplay().print("---");                   // Value
+            epd->print("---");                   // Value
-        }
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 95);
-        getdisplay().print(name4);                       // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 115);
-        getdisplay().print(" ");
-        if(holdvalues == false){
-            getdisplay().print(unit4);                   // Unit
-        }
-        else{
-            getdisplay().print(unit4old);                // Unit
         }
+        epd->setFont(&Ubuntu_Bold12pt8b);
+        epd->setCursor(335, 95);
+        epd->print(name4);                       // Name
+        epd->setFont(&Ubuntu_Bold8pt8b);
+        epd->setCursor(335, 115);
+        epd->print(" ");
+        epd->print(holdvalues ? unit4old : unit4);
+
 
         // Horizintal separator right
-        getdisplay().fillRect(340, 149, 80, 3, commonData->fgcolor);
+        epd->fillRect(340, 149, 80, 3, commonData->fgcolor);
 
         // Show value 5 at bottom right
-        getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic20pt7b);
-        getdisplay().setCursor(295, 270);
+        epd->setCursor(295, 270);
-        getdisplay().print(svalue5);                     // Value
+        epd->print(svalue5);                     // Value
-        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        epd->setFont(&Ubuntu_Bold12pt8b);
-        getdisplay().setCursor(335, 220);
+        epd->setCursor(335, 220);
-        getdisplay().print(name5);                       // Name
+        epd->print(name5);                       // Name
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(335, 190);
+        epd->setCursor(335, 190);
-        getdisplay().print(" ");
+        epd->print(" ");
-        if(holdvalues == false){
+        epd->print(holdvalues ? unit5old : unit5);
-            getdisplay().print(unit5);                   // Unit
-        }
-        else{
-            getdisplay().print(unit5old);                // Unit
-        }
-
 
 //*******************************************************************************************
 
         // Draw wind rose
         int rInstrument = 110;     // Radius of grafic instrument
 
-        getdisplay().fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 10, commonData->fgcolor);    // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
+        epd->fillCircle(200, 150, rInstrument + 7, commonData->bgcolor);     // Outer circle
-        getdisplay().fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
+        epd->fillCircle(200, 150, rInstrument - 10, commonData->fgcolor);    // Inner circle
-        getdisplay().fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
+        epd->fillCircle(200, 150, rInstrument - 13, commonData->bgcolor);    // Inner circle
 
         for(int i=0; i<360; i=i+10)
         {
@@ -267,17 +249,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
-            getdisplay().getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
+            epd->getTextBounds(ii, int(x), int(y), &x1, &y1, &w, &h); // Calc width of new string
-            getdisplay().setCursor(x-w/2, y+h/2);
+            epd->setCursor(x-w/2, y+h/2);
             if(i % 30 == 0){
-                getdisplay().setFont(&Ubuntu_Bold8pt8b);
+                epd->setFont(&Ubuntu_Bold8pt8b);
-                getdisplay().print(ii);
+                epd->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);
-            getdisplay().fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
+            epd->fillCircle((int)x1c, (int)y1c, 2, commonData->fgcolor);
             float sinx=sin(i/180.0*M_PI);
             float cosx=cos(i/180.0*M_PI);
 
@@ -288,10 +270,10 @@ public:
                 float xx2 = +dx;
                 float yy1 =  -(rInstrument-10);
                 float yy2 =  -(rInstrument+10);
-                getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+                epd->fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
                         200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
                         200+(int)(cosx*xx1-sinx*yy2),150+(int)(sinx*xx1+cosx*yy2),commonData->fgcolor);
-                getdisplay().fillTriangle(200+(int)(cosx*xx2-sinx*yy1),150+(int)(sinx*xx2+cosx*yy1),
+                epd->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);
             }
@@ -308,7 +290,7 @@ public:
             float xx2 = startwidth;
             float yy1 = -startwidth;
             float yy2 = -(rInstrument-15);
-            getdisplay().fillTriangle(200+(int)(cosx*xx1-sinx*yy1),150+(int)(sinx*xx1+cosx*yy1),
+            epd->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
@@ -318,37 +300,32 @@ public:
             float ix2 = -endwidth;
             float iy1 = -(rInstrument-15);
             float iy2 = -endwidth;
-            getdisplay().fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
+            epd->fillTriangle(200+(int)(cosx*ix1-sinx*iy1),150+(int)(sinx*ix1+cosx*iy1),
                 200+(int)(cosx*ix2-sinx*iy1),150+(int)(sinx*ix2+cosx*iy1),
                 200+(int)(cosx*0-sinx*iy2),150+(int)(sinx*0+cosx*iy2),commonData->fgcolor);
         }
 
         // Center circle
-        getdisplay().fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
+        epd->fillCircle(200, 150, startwidth + 6, commonData->bgcolor);
-        getdisplay().fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
+        epd->fillCircle(200, 150, startwidth + 4, commonData->fgcolor);
 
 //*******************************************************************************************
 
         // Show value6, so that it does not collide with the wind pointer
-        getdisplay().setFont(&DSEG7Classic_BoldItalic16pt7b);
+        epd->setFont(&DSEG7Classic_BoldItalic16pt7b);
         if (cos(value1) > 0){
-            getdisplay().setCursor(160, 200);
+            epd->setCursor(160, 200);
-            getdisplay().print(svalue6);                     // Value
+            epd->print(svalue6);                     // Value
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(190, 215);
+            epd->setCursor(190, 215);
         } else{
-            getdisplay().setCursor(160, 130);
+            epd->setCursor(160, 130);
-            getdisplay().print(svalue6);                     // Value
+            epd->print(svalue6);                     // Value
-            getdisplay().setFont(&Ubuntu_Bold8pt8b);
+            epd->setFont(&Ubuntu_Bold8pt8b);
-            getdisplay().setCursor(190, 90);
+            epd->setCursor(190, 90);
-        }
-        getdisplay().print(" ");
-        if(holdvalues == false){
-            getdisplay().print(unit6);                   // Unit
-        }
-        else{
-            getdisplay().print(unit6old);                // Unit
         }
+        epd->print(" ");
+        epd->print(holdvalues ? unit6old : unit6);
 
         return PAGE_UPDATE;
     };

lib/obp60task/PageXTETrack.cpp

@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 
 #include "Pagedata.h"
@@ -28,15 +29,18 @@ static unsigned char ship_bits[] PROGMEM = {
 
 class PageXTETrack : public Page
 {
-    bool simulation = false;
+private:
-    bool holdvalues = false;
+    String trackStep;
+    double seg_step;
 
-    public:
+public:
-    PageXTETrack(CommonData &common){
+    PageXTETrack(CommonData &common) : Page(common)
-        commonData = &common;
+    {
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageXTETrack");
+        logger->logDebug(GwLog::LOG, "Instantiate PageXTETrack");
-        simulation = common.config->getBool(common.config->useSimuData);
+
-        holdvalues = common.config->getBool(common.config->holdvalues);
+        // Get config data
+        String trackStep = config->getString(config->trackStep);
+        seg_step = trackStep.toDouble() * M_PI / 180;
     }
 
     void drawSegment(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1,
@@ -45,18 +49,18 @@ class PageXTETrack : public Page
        if (fill == true) {
            // no primitive for quadrangular object
            // we create it from 2 triangles
-           getdisplay().fillTriangle(x0, y0, x1, y1, x3, y3, color);
+           epd->fillTriangle(x0, y0, x1, y1, x3, y3, color);
-           getdisplay().fillTriangle(x1, y1, x2, y2, x3, y3, color);
+           epd->fillTriangle(x1, y1, x2, y2, x3, y3, color);
        } else {
            // draw outline
-           getdisplay().drawLine(x0, y0, x1, y1, color);
+           epd->drawLine(x0, y0, x1, y1, color);
-           getdisplay().drawLine(x1, y1, x2, y2, color);
+           epd->drawLine(x1, y1, x2, y2, color);
-           getdisplay().drawLine(x2, y2, x3, y3, color);
+           epd->drawLine(x2, y2, x3, y3, color);
-           getdisplay().drawLine(x3, y3, x0, y0, color);
+           epd->drawLine(x3, y3, x0, y0, color);
        }
     }
 
-    virtual int handleKey(int key){
+    int handleKey(int key) {
         // Code for keylock
         if(key == 11){
             commonData->keylock = !commonData->keylock;
@@ -65,81 +69,76 @@ class PageXTETrack : public Page
         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 backlightMode = config->getString(config->backlight);
-
-        String trackStep = config->getString(config->trackStep);
-        double seg_step = trackStep.toFloat() * PI / 180;
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
             setBlinkingLED(false);
             setFlashLED(false);
         }
+#endif
+    };
+
+    int displayPage(PageData &pageData) {
 
         // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageXTETrack");
+        logger->logDebug(GwLog::LOG, "Drawing at PageXTETrack");
 
         // Draw page
         //***********************************************************
 
         // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
 
-        getdisplay().setTextColor(commonData->fgcolor);
+        epd->setTextColor(commonData->fgcolor);
 
         // descriptions
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(50, 188);
+        epd->setCursor(50, 188);
-        getdisplay().print("Cross-track error");
+        epd->print("Cross-track error");
-        getdisplay().setCursor(270, 188);
+        epd->setCursor(270, 188);
-        getdisplay().print("Track");
+        epd->print("Track");
-        getdisplay().setCursor(45, 275);
+        epd->setCursor(45, 275);
-        getdisplay().print("Distance to waypoint");
+        epd->print("Distance to waypoint");
-        getdisplay().setCursor(260, 275);
+        epd->setCursor(260, 275);
-        getdisplay().print("Bearing");
+        epd->print("Bearing");
 
         // values
-        getdisplay().setFont(&DSEG7Classic_BoldItalic30pt7b);
+        epd->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;
-        getdisplay().getTextBounds(sval_xte, 0, 0, &x, &y, &w, &h);
+        epd->getTextBounds(sval_xte, 0, 0, &x, &y, &w, &h);
-        getdisplay().setCursor(160-w, 170);
+        epd->setCursor(160-w, 170);
-        getdisplay().print(sval_xte);
+        epd->print(sval_xte);
 
         GwApi::BoatValue *bv_cog = pageData.values[1]; // COG
         String sval_cog = formatValue(bv_cog, *commonData).svalue;
-        getdisplay().getTextBounds(sval_cog, 0, 0, &x, &y, &w, &h);
+        epd->getTextBounds(sval_cog, 0, 0, &x, &y, &w, &h);
-        getdisplay().setCursor(360-w, 170);
+        epd->setCursor(360-w, 170);
-        getdisplay().print(sval_cog);
+        epd->print(sval_cog);
 
         GwApi::BoatValue *bv_dtw = pageData.values[2]; // DTW
         String sval_dtw = formatValue(bv_dtw, *commonData).svalue;
-        getdisplay().getTextBounds(sval_dtw, 0, 0, &x, &y, &w, &h);
+        epd->getTextBounds(sval_dtw, 0, 0, &x, &y, &w, &h);
-        getdisplay().setCursor(160-w, 257);
+        epd->setCursor(160-w, 257);
-        getdisplay().print(sval_dtw);
+        epd->print(sval_dtw);
 
         GwApi::BoatValue *bv_btw = pageData.values[3]; // BTW
         String sval_btw = formatValue(bv_btw, *commonData).svalue;
-        getdisplay().getTextBounds(sval_btw, 0, 0, &x, &y, &w, &h);
+        epd->getTextBounds(sval_btw, 0, 0, &x, &y, &w, &h);
-        getdisplay().setCursor(360-w, 257);
+        epd->setCursor(360-w, 257);
-        getdisplay().print(sval_btw);
+        epd->print(sval_btw);
 
         bool valid = bv_cog->valid && bv_btw->valid;
 
         // XTETrack view
 
         // draw ship symbol (as bitmap)
-        getdisplay().drawXBitmap(184, 68, ship_bits, ship_width, ship_height, commonData->fgcolor);
+        epd->drawXBitmap(184, 68, ship_bits, ship_width, ship_height, commonData->fgcolor);
 
         // draw next waypoint name
         String sval_wpname = "no data";
@@ -148,13 +147,13 @@ class PageXTETrack : public Page
             sval_wpname = "Tonne 122";
         }
 
-        getdisplay().setFont(&Ubuntu_Bold10pt8b);
+        epd->setFont(&Ubuntu_Bold10pt8b);
-        getdisplay().getTextBounds(sval_wpname, 0, 150, &x, &y, &w, &h);
+        epd->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
-        getdisplay().setCursor(200 - w / 2, 60);
+        epd->setCursor(200 - w / 2, 60);
-        getdisplay().print(sval_wpname);
+        epd->print(sval_wpname);
 
         // draw course segments
 

lib/obp60task/Pagedata.h

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 #include <Arduino.h>
 #include "GwApi.h"
@@ -12,6 +14,7 @@
 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
@@ -98,6 +101,10 @@ 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;
@@ -107,6 +114,7 @@ typedef struct{
   TouchKeyData keydata[6];
   BacklightData backlight;
   AlarmData alarm;
+  AvgData avgdata;
   GwApi::BoatValue *time=NULL;
   GwApi::BoatValue *date=NULL;
   uint16_t fgcolor;
@@ -117,12 +125,29 @@ typedef struct{
 
 //a base class that all pages must inherit from
 class Page{
-  protected:
+protected:
     CommonData *commonData;
-  public:
+    GwConfigHandler *config;
+    GwLog *logger;
+    bool simulation = false;
+    bool holdvalues = false;
+    String flashLED;
+    String backlightMode;
+public:
+    Page(CommonData &common) {
+        commonData = &common;
+        config = commonData->config;
+        logger = commonData->logger;
+        // preload generic configuration data
+        simulation = config->getBool(config->useSimuData);
+        holdvalues = config->getBool(config->holdvalues);
+        flashLED = config->getString(config->flashLED);
+        backlightMode = config->getString(config->backlight);
+    }
     int refreshtime = 1000;
     virtual int displayPage(PageData &pageData)=0;
     virtual void displayNew(PageData &pageData){}
+    virtual void leavePage(PageData &pageData){}
     virtual void setupKeys() {
 #ifdef HARDWARE_V21
         commonData->keydata[0].label = "";

lib/obp60task/README

@@ -0,0 +1,95 @@
+Development information
+=======================
+
+This file contains some hints concerning building the firmware as well as
+developing and debugging it.
+
+Coding style
+------------
+WIP
+Please format your new code the same as already existing code.
+Preprocessor directives go to column zero.
+
+
+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. You can use a simple
+     page e.g. PageOneValue.cpp as template
+  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 use  gen_set.py to auto-generate the relevant section of
+     config.json. For further information on that  read the comments
+     in gen_set.py.
+  5. Copy the changes in config.json to config_obp40.json and rename
+     strings accordingly. E.g. obp60 to obp40.
+
+Using Gitpod
+------------
+
+Warning: You have to register with 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
+
+Compilation issues
+------------------
+? Error while linking: "undefined reference to `registerPageXXX'"
+: Check if the required page is enabled for current board/environment: #if defined ...
+
+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/TODO

@@ -0,0 +1,17 @@
+- fix unstable accesspoint availability
+
+- page refresh after page change and not connected to key codes
+
+- config: getFloat, getDouble
+
+- dseg7 font to new version
+
+- new pages: ais, autopilot, epropulsion
+
+- automate config.json generation with extra_task.py
+
+- extend boatdata: ais, waypoints, alarms
+
+- page clock: sunrise / sunset in local time or UTC
+
+- implement alerts

lib/obp60task/Using_Gitpod.txt

@@ -1,38 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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/extra_task.py

@@ -28,3 +28,4 @@ except:
 env["CPPDEFINES"].extend([("BOARD", env["BOARD"]), ("EPDTYPE", epdtype), ("PCBVERS", pcbvers), ("GXEPD2VERS", gxepd2vers)])
 
 print("added hardware info to CPPDEFINES")
+print("friendly board name is '{}'".format(env.GetProjectOption("board_name")))

lib/obp60task/gen_set.py

@@ -20,7 +20,7 @@ import getopt
 import re
 import json
 
-__version__ = "0.2"
+__version__ = "1.2"
 
 def detect_pages(filename):
     # returns a dictionary with page name and the number of gui fields
@@ -110,11 +110,10 @@ def create_json(device, no_of_pages, pagedata):
                 "description": "The display for field {}".format(number_to_text(field_no)),
                 "category": f"{device.upper()} Page {page_no}",
                 "capabilities": {device.lower(): "true"},
-                "condition": [
+                "condition": {
-                    {f"page{page_no}type": page}
+                    f"page{page_no}type": [page for page in pages if pagedata[page] >= field_no],
-                    for page in pages
+                    "visiblePages": [vp for vp in range(page_no, no_of_pages + 1)]
-                    if pagedata[page] >= field_no
+                },
-                ],
             }
             output.append(field_data)
 
@@ -149,12 +148,13 @@ 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:', ['device=','--pages='])
+        options, remainder = getopt.getopt(sys.argv[1:], 'd:p:m:', ['device=','--pages=','--merge'])
     except getopt.GetoptError as err:
         print(err)
         usage()
@@ -162,11 +162,14 @@ 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)
@@ -175,5 +178,12 @@ if __name__ == '__main__':
     pagedata = detect_pages("obp60task.cpp")
 
     json_output = create_json(device, no_of_pages, pagedata)
-    # print omitting first line containing [  of JSON array
+    if merge_json and os.path.isfile(merge_json):
-    print(json_output[1:])
+        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

@@ -1,12 +0,0 @@
-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/hbuffer.cpp

@@ -0,0 +1,84 @@
+/* History Buffer
+ *
+ * Storage backed buffer for sensordata
+ * Permanent storage only supported type: FRAM on I2C-Bus
+ *  
+ * Values can be 1 to 4 bytes in length
+ * 
+ * Header: 32 bytes of size
+ *    0 0x00 HB00              4 magic number
+ *    4 0x04 xxxxxxxxxxxxxxxx 16 name, space padded
+ *   20 0x14 n                 1 byte size of values in buffer
+ *   21 0x15 mm                2 buffer size in count of values
+ *   23 0x17 dd                2 time step in seconds between values
+ *   25 0x19 tttt              4 unix timestamp of head
+ *   29 0x1d hh                2 head pointer
+ *   31 0x1f 0xff              1 header end sign
+ *
+ *   32 0x20 ...                 start of buffer data
+ * 
+ * Usage example: 7 hours of data collected every 75 seconds
+ * TODO
+ * 
+ */
+ #include <stdint.h>
+ #include <time.h>
+ 
+ class HistoryBuffer {
+
+private:
+     // Header prototype for permanent storage
+     uint8_t header[32] = {
+         0x41, 0x48, 0x30, 0x30, // magic: HB00
+         0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+         0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, // empty name
+         0x01, // byte size
+         0x50, 0x01, // value count
+         0x4b, 0x00, // time step
+         0x00, 0x00, 0x00, 0x00, // unix time stamp
+         0x00, 0x00, // head pointer
+         0xff // end sign
+     };
+     uint16_t head = 0; // head pointer to next new value position
+     time_t timestamp; // last modification time of head
+     uint16_t delta_t; // time step in seconds
+
+public:
+     HistoryBuffer(uint16_t size) {
+     }
+     ~HistoryBuffer() {
+         // free memory
+     }
+     void begin() {
+         // 
+     }
+     void finish() {
+     }
+     uint16_t add() {
+         // returns new head value pointer
+     }
+     uint8_t* get() {
+         // returns complete buffer in order new to old
+     }
+     uint8_t getvalue(uint16_t dt) {
+         // Return a single value delta seconds ago
+         uint16_t index = head - abs(dt) / delta_t;
+         return 0;
+     }
+     uint8_t getvalue3() {
+     }
+     bool clear() {
+         // clears buffer and permanent storage
+         return true;
+     }
+ };
+
+class History {
+public:
+    History() {
+    }
+    ~History() {
+    }
+    void *addSeries() {
+    }
+};

lib/obp60task/hbuffer.h

@@ -0,0 +1,21 @@
+#ifndef __HBUFFER_H__
+#define __HBUFFER_H__
+
+class HistoryBuffer {
+public:
+    HistoryBuffer(uint16_t size);
+    void begin();
+    void finish();
+    uint16_t add();
+    uint8_t* get() ;
+    uint8_t getvalue(uint16_t dt);
+    uint8_t getvalue3();
+    void clear();
+};
+class History {
+public:
+    History();
+    void *addSeries();
+};
+
+#endif

lib/obp60task/obp40.conf

@@ -0,0 +1,807 @@
+[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

@@ -0,0 +1,790 @@
+[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,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 #if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include "obp60task.h"
 #include "Pagedata.h"                   // Data exchange for pages
@@ -18,23 +19,15 @@
 
 #ifdef BOARD_OBP40S3
 #include "driver/rtc_io.h"              // Needs for weakup from deep sleep
-#include <FS.h>                         // SD-Card access
-#include <SD.h>
 #include <SPI.h>
 #endif
 
-// True type character sets includes
-// See OBP60ExtensionPort.cpp
-
 // Pictures
-//#include GxEPD_BitmapExamples         // Example picture
+#include "images/OBP_400x300.xbm"       // OBP Logo
-#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
 
-
 // Global vars
 bool initComplete = false;      // Initialization complete
 int taskRunCounter = 0;         // Task couter for loop section
@@ -47,63 +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 rail 5.0V
+#ifdef BOARD_OBP40S3
-    String powermode = api->getConfig()->getConfigItem(api->getConfig()->powerMode,true)->asString();
-    api->getLogger()->logDebug(GwLog::DEBUG,"Power Mode is: %s", powermode.c_str());
-    if(powermode == "Max Power" || powermode == "Only 5.0V"){
-        #ifdef HARDWARE_V21
-        setPortPin(OBP_POWER_50, true); // Power on 5.0V rail
-        #endif
-        #ifdef BOARD_OBP40S3
-        setPortPin(OBP_POWER_EPD, true);// Power on ePaper display
-        setPortPin(OBP_POWER_SD, true); // Power on SD card
-        #endif
-    }
-    else{
-        #ifdef HARDWARE_V21
-        setPortPin(OBP_POWER_50, false); // Power off 5.0V rail
-        #endif
-        #ifdef BOARD_OBP40S3
-        setPortPin(OBP_POWER_EPD, false);// Power off ePaper display
-        setPortPin(OBP_POWER_SD, false); // Power off SD card
-        #endif
-    }
-
-    #ifdef BOARD_OBP40S3
-    bool sdcard = config->getBool(config->useSDCard);
-    if (sdcard) {
-        SPIClass SD_SPI = SPIClass(HSPI);
-        SD_SPI.begin(SD_SPI_CLK, SD_SPI_MISO, SD_SPI_MOSI);
-        if (SD.begin(SD_SPI_CS, SD_SPI, 80000000)) {
-            String sdtype = "unknown";
-            uint8_t cardType = SD.cardType();
-            switch (cardType) {
-                case CARD_MMC:
-                   sdtype = "MMC";
-                   break;
-                case CARD_SD:
-                   sdtype = "SDSC";
-                   break;
-                case CARD_SDHC:
-                   sdtype = "SDHC";
-                   break;
-            }
-            uint64_t cardSize = SD.cardSize() / (1024 * 1024);
-            LOG_DEBUG(GwLog::LOG,"SD card type %s of size %d MB detected", sdtype, cardSize);
-        }
-    }
-
     // Deep sleep wakeup configuration
     esp_sleep_enable_ext0_wakeup(OBP_WAKEWUP_PIN, 0);   // 1 = High, 0 = Low
     rtc_gpio_pullup_en(OBP_WAKEWUP_PIN);                // Activate pullup resistor
@@ -112,14 +65,14 @@ 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
+#ifdef DISPLAY_GDEY042T81
     if(fastrefresh == "true"){
         static const bool useFastFullUpdate = true;   // Enable fast full display update only for GDEY042T81
     }
-    #endif
+#endif
 
-    #ifdef BOARD_OBP60S3
+#ifdef BOARD_OBP60S3
     touchSleepWakeUpEnable(TP1, 45); // TODO sensitivity should be configurable via web interface
     touchSleepWakeUpEnable(TP2, 45);
     touchSleepWakeUpEnable(TP3, 45);
@@ -127,15 +80,15 @@ void OBP60Init(GwApi *api){
     touchSleepWakeUpEnable(TP5, 45);
     touchSleepWakeUpEnable(TP6, 45);
     esp_sleep_enable_touchpad_wakeup();
-    #endif
+#endif
 
     // Get CPU speed
     int freq = getCpuFrequencyMhz();
-    api->getLogger()->logDebug(GwLog::LOG,"CPU speed at boot: %i MHz", freq);
+    logger->logDebug(GwLog::LOG,"CPU speed at boot: %i MHz", freq);
     
     // Settings for backlight
     String backlightMode = api->getConfig()->getConfigItem(api->getConfig()->backlight,true)->asString();
-    api->getLogger()->logDebug(GwLog::DEBUG,"Backlight Mode is: %s", backlightMode.c_str());
+    logger->logDebug(GwLog::DEBUG,"Backlight Mode is: %s", backlightMode.c_str());
     uint brightness = uint(api->getConfig()->getConfigItem(api->getConfig()->blBrightness,true)->asInt());
     String backlightColor = api->getConfig()->getConfigItem(api->getConfig()->blColor,true)->asString();
     if(String(backlightMode) == "On"){
@@ -150,7 +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);
     }
@@ -254,12 +207,13 @@ class PageList{
  * each page should have defined a registerXXXPage variable of type
  * PageData that describes what it needs
  */
-void registerAllPages(PageList &list){
+void registerAllPages(GwLog *logger, PageList &list){
     //the next line says that this variable is defined somewhere else
     //in our case in a separate C++ source file
     //this way this separate source file can be compiled by it's own
     //and has no access to any of our data except the one that we
     //give as a parameter to the page function
+    logger->logDebug(GwLog::LOG, "Memory before registering pages: stack=%d, heap=%d", uxTaskGetStackHighWaterMark(NULL), ESP.getFreeHeap());
     extern PageDescription registerPageSystem;
     //we add the variable to our list
     list.add(&registerPageSystem);
@@ -282,7 +236,7 @@ void registerAllPages(PageList &list){
     extern PageDescription registerPageWindRose;
     list.add(&registerPageWindRose);
     extern PageDescription registerPageWindRoseFlex;
-    list.add(&registerPageWindRoseFlex); // 
+    list.add(&registerPageWindRoseFlex);
     extern PageDescription registerPageVoltage;
     list.add(&registerPageVoltage);
     extern PageDescription registerPageDST810;
@@ -313,6 +267,15 @@ void registerAllPages(PageList &list){
     list.add(&registerPageXTETrack);
     extern PageDescription registerPageFluid;
     list.add(&registerPageFluid);
+    extern PageDescription registerPageSkyView;
+    list.add(&registerPageSkyView);
+    extern PageDescription registerPageAnchor;
+    list.add(&registerPageAnchor);
+    extern PageDescription registerPageAIS;
+    list.add(&registerPageAIS);
+    extern PageDescription registerPageBarograph;
+    list.add(&registerPageBarograph);   
+    logger->logDebug(GwLog::LOG,"Memory after registering pages: stack=%d, heap=%d", uxTaskGetStackHighWaterMark(NULL), ESP.getFreeHeap());
 }
 
 // Undervoltage detection for shutdown display
@@ -321,54 +284,54 @@ void underVoltageDetection(GwApi *api, CommonData &common){
     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
+#if defined VOLTAGE_SENSOR && defined LIPO_ACCU_1200
     float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.53) * 2;   // Vin = 1/2 for OBP40
     float minVoltage = 3.65;  // Absolut minimum volatge for 3,7V LiPo accu
-    #else
+#else
     float actVoltage = (float(analogRead(OBP_ANALOG0)) * 3.3 / 4096 + 0.17) * 20;   // Vin = 1/20 for OBP60
     float minVoltage = MIN_VOLTAGE;
-    #endif
+#endif
     double calVoltage = actVoltage * vslope + voffset;  // Calibration
     if(calVoltage < minVoltage){
-        #if defined VOLTAGE_SENSOR && defined LIPO_ACCU_1200
+#if defined VOLTAGE_SENSOR && defined LIPO_ACCU_1200
         // Switch off all power lines
         setPortPin(OBP_BACKLIGHT_LED, false);   // Backlight Off
         setFlashLED(false);                     // Flash LED Off            
         buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
         // Shutdown EInk display
-        getdisplay().setFullWindow();           // Set full Refresh
+        epd->setFullWindow();           // Set full Refresh
-        //getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        //epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-        getdisplay().fillScreen(common.bgcolor);// Clear screen
+        epd->fillScreen(common.bgcolor);// Clear screen
-        getdisplay().setTextColor(common.fgcolor);
+        epd->setTextColor(common.fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(65, 150);
+        epd->setCursor(65, 150);
-        getdisplay().print("Undervoltage");
+        epd->print("Undervoltage");
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(65, 175);
+        epd->setCursor(65, 175);
-        getdisplay().print("Charge battery and restart system");
+        epd->print("Charge battery and restart system");
-        getdisplay().nextPage();                // Partial update
+        epd->nextPage();                // Partial update
-        getdisplay().powerOff();                // Display power off
+        epd->powerOff();                // Display power off
         setPortPin(OBP_POWER_EPD, false);       // Power off ePaper display
         setPortPin(OBP_POWER_SD, false);        // Power off SD card
-        #else
+#else
         // Switch off all power lines
         setPortPin(OBP_BACKLIGHT_LED, false);   // Backlight Off
         setFlashLED(false);                     // Flash LED Off            
         buzzer(TONE4, 20);                      // Buzzer tone 4kHz 20ms
         setPortPin(OBP_POWER_50, false);        // Power rail 5.0V Off
         // Shutdown EInk display
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-        getdisplay().fillScreen(common.bgcolor);// Clear screen
+        epd->fillScreen(common.bgcolor);// Clear screen
-        getdisplay().setTextColor(common.fgcolor);
+        epd->setTextColor(common.fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold20pt8b);
+        epd->setFont(&Ubuntu_Bold20pt8b);
-        getdisplay().setCursor(65, 150);
+        epd->setCursor(65, 150);
-        getdisplay().print("Undervoltage");
+        epd->print("Undervoltage");
-        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        epd->setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(65, 175);
+        epd->setCursor(65, 175);
-        getdisplay().print("To wake up repower system");
+        epd->print("To wake up repower system");
-        getdisplay().nextPage();                // Partial update
+        epd->nextPage();                // Partial update
-        getdisplay().powerOff();                // Display power off
+        epd->powerOff();                // Display power off
-        #endif
+#endif
         // Stop system
         while(true){
             esp_deep_sleep_start();             // Deep Sleep without weakup. Weakup only after power cycle (restart).
@@ -505,7 +468,7 @@ void OBP60Task(GwApi *api){
     startLedTask(api);
 #endif
     PageList allPages;
-    registerAllPages(allPages);
+    registerAllPages(logger, allPages);
     CommonData commonData;
     commonData.logger=logger;
     commonData.config=config;
@@ -536,44 +499,45 @@ 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
+#ifdef BOARD_OBP40S3
     bool syspage_enabled = config->getBool(config->systemPage);
-    #endif
+#endif
 
-    #ifdef DISPLAY_GDEY042T81
+#ifdef DISPLAY_GDEY042T81
-        getdisplay().init(115200, true, 2, false);  // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+        epd->init(115200, true, 2, false);  // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
-    #else
+#else
-        getdisplay().init(115200);                  // Init for normal displays
+        epd->init(115200);                  // Init for normal displays
-    #endif
+#endif
 
-    getdisplay().setRotation(0);                 // Set display orientation (horizontal)
+    epd->setRotation(0);                 // Set display orientation (horizontal)
-    getdisplay().setFullWindow();                // Set full Refresh
+    epd->setFullWindow();                // Set full Refresh
-    getdisplay().firstPage();                    // set first page
+    epd->firstPage();                    // set first page
-    getdisplay().fillScreen(commonData.bgcolor);
+    epd->fillScreen(commonData.bgcolor);
-    getdisplay().setTextColor(commonData.fgcolor);
+    epd->setTextColor(commonData.fgcolor);
-    getdisplay().nextPage();                     // Full Refresh
+    epd->nextPage();                     // Full Refresh
-    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-    getdisplay().fillScreen(commonData.bgcolor);
+    epd->fillScreen(commonData.bgcolor);
-    getdisplay().nextPage();                     // Fast Refresh
+    epd->nextPage();                     // Fast Refresh
-    getdisplay().nextPage();                     // Fast Refresh
+    epd->nextPage();                     // Fast Refresh
     if(String(displaymode) == "Logo + QR Code" || String(displaymode) == "Logo"){
-        getdisplay().fillScreen(commonData.bgcolor);
+        epd->fillScreen(commonData.bgcolor);
-        getdisplay().drawBitmap(0, 0, gImage_Logo_OBP_400x300_sw, getdisplay().width(), getdisplay().height(), commonData.fgcolor); // Draw start logo
+        epd->drawXBitmap(0, 0, OBP_400x300_bits, OBP_400x300_width, OBP_400x300_height, commonData.fgcolor);
-        getdisplay().nextPage();                 // Fast Refresh
+        epd->nextPage();                 // Fast Refresh
-        getdisplay().nextPage();                 // Fast Refresh
+        epd->nextPage();                 // Fast Refresh
         delay(SHOW_TIME);                        // Logo show time
         if(String(displaymode) == "Logo + QR Code"){
-            getdisplay().fillScreen(commonData.bgcolor);
+            epd->fillScreen(commonData.bgcolor);
             qrWiFi(systemname, wifipass, commonData.fgcolor, commonData.bgcolor);  // Show QR code for WiFi connection
-            getdisplay().nextPage();             // Fast Refresh
+            epd->nextPage();             // Fast Refresh
-            getdisplay().nextPage();             // Fast Refresh
+            epd->nextPage();             // Fast Refresh
             delay(SHOW_TIME);                    // QR code show time
         }
-        getdisplay().fillScreen(commonData.bgcolor);
+        epd->fillScreen(commonData.bgcolor);
-        getdisplay().nextPage();                 // Fast Refresh
+        epd->nextPage();                 // Fast Refresh
-        getdisplay().nextPage();                 // Fast Refresh
+        epd->nextPage();                 // Fast Refresh
     }
     
     // Init pages
@@ -681,9 +645,9 @@ void OBP60Task(GwApi *api){
     allParameters.page0=3;
     allParameters.queue=xQueueCreate(10,sizeof(int));
     allParameters.sensitivity= api->getConfig()->getInt(GwConfigDefinitions::tSensitivity);
-    #ifdef BOARD_OBP40S3
+#ifdef BOARD_OBP40S3
     allParameters.use_syspage = syspage_enabled;
-    #endif
+#endif
     xTaskCreate(keyboardTask,"keyboard",2000,&allParameters,configMAX_PRIORITIES-1,NULL);
     SharedData *shared=new SharedData(api);
     createSensorTask(shared);
@@ -709,9 +673,9 @@ 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);
+        logger->logDebug(GwLog::LOG, "Home location set to lat=%f, lon=%f", homelat, homelon);
     } else {
-        LOG_DEBUG(GwLog::LOG, "No valid home location found");
+        logger->logDebug(GwLog::LOG, "No valid home location found");
     }
 
     // refreshmode defined in init section
@@ -743,6 +707,7 @@ void OBP60Task(GwApi *api){
     //####################################################################################
 
     bool systemPage = false;
+    bool systemPageNew = false;
     Page *currentPage;
     while (true){
         delay(100);     // Delay 100ms (loop time)
@@ -795,6 +760,7 @@ void OBP60Task(GwApi *api){
                     systemPage = true; // System page is out of band
                     syspage->setupKeys();
                     keyboardMessage = 0;
+                    systemPageNew = true;
                 }
                 else {
                     currentPage = pages[pageNumber].page;
@@ -821,12 +787,12 @@ void OBP60Task(GwApi *api){
                             toggleBacklightLED(commonData.backlight.brightness, commonData.backlight.color);
                         }
                     }
-                    #ifdef BOARD_OBP40S3
+#ifdef BOARD_OBP40S3
                     // #3 Deep sleep mode for OBP40
                     if ((keyboardMessage == 3) and !syspage_enabled){
                         deepSleep(commonData);
                     }
-                    #endif
+#endif
                     // #9 Swipe right or #4 key right
                     if ((keyboardMessage == 9) or (keyboardMessage == 4))
                     {
@@ -884,23 +850,23 @@ void OBP60Task(GwApi *api){
             if(millis() > starttime4 + 4000 && delayedDisplayUpdate == true){
                 starttime1 = millis();
                 starttime2 = millis();
-                getdisplay().setFullWindow();    // Set full update
+                epd->setFullWindow();    // Set full update
                 if(fastrefresh == "true"){
-                    getdisplay().nextPage();                     // Full update
+                    epd->nextPage();                     // Full update
                 }
                 else{
-                    getdisplay().fillScreen(commonData.fgcolor); // Clear display
+                    epd->fillScreen(commonData.fgcolor); // Clear display
-                    #ifdef DISPLAY_GDEY042T81
+#ifdef DISPLAY_GDEY042T81
-                        getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+                        epd->init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
-                    #else
+#else
-                        getdisplay().init(115200);               // Init for normal displays
+                        epd->init(115200);               // Init for normal displays
-                    #endif
+#endif
-                    getdisplay().firstPage();                    // Full update
+                    epd->firstPage();                    // Full update
-                    getdisplay().nextPage();                     // Full update
+                    epd->nextPage();                     // Full update
-//                    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+//                    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-//                    getdisplay().fillScreen(commonData.bgcolor); // Clear display
+//                    epd->fillScreen(commonData.bgcolor); // Clear display
-//                    getdisplay().nextPage();                     // Partial update
+//                    epd->nextPage();                     // Partial update
-//                    getdisplay().nextPage();                     // Partial update
+//                    epd->nextPage();                     // Partial update
                 }
                 delayedDisplayUpdate = false;
             }
@@ -911,23 +877,23 @@ void OBP60Task(GwApi *api){
                 starttime1 = millis();
                 starttime2 = millis();
                 LOG_DEBUG(GwLog::DEBUG,"E-Ink full refresh first 5 min");
-                getdisplay().setFullWindow();    // Set full update
+                epd->setFullWindow();    // Set full update
                 if(fastrefresh == "true"){
-                    getdisplay().nextPage();                     // Full update
+                    epd->nextPage();                     // Full update
                 }
                 else{
-                    getdisplay().fillScreen(commonData.fgcolor); // Clear display
+                    epd->fillScreen(commonData.fgcolor); // Clear display
-                    #ifdef DISPLAY_GDEY042T81
+#ifdef DISPLAY_GDEY042T81
-                        getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+                        epd->init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
-                    #else
+#else
-                        getdisplay().init(115200);               // Init for normal displays
+                        epd->init(115200);               // Init for normal displays
-                    #endif
+#endif
-                    getdisplay().firstPage();                    // Full update
+                    epd->firstPage();                    // Full update
-                    getdisplay().nextPage();                     // Full update
+                    epd->nextPage();                     // Full update
-//                    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+//                    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-//                    getdisplay().fillScreen(commonData.bgcolor); // Clear display
+//                    epd->fillScreen(commonData.bgcolor); // Clear display
-//                    getdisplay().nextPage();                     // Partial update
+//                    epd->nextPage();                     // Partial update
-//                    getdisplay().nextPage();                     // Partial update
+//                    epd->nextPage();                     // Partial update
                 }
             }
 
@@ -935,23 +901,23 @@ void OBP60Task(GwApi *api){
             if(millis() > starttime2 + fullrefreshtime * 60 * 1000){
                 starttime2 = millis();
                 LOG_DEBUG(GwLog::DEBUG,"E-Ink full refresh");
-                getdisplay().setFullWindow();    // Set full update
+                epd->setFullWindow();    // Set full update
                 if(fastrefresh == "true"){
-                    getdisplay().nextPage();                     // Full update
+                    epd->nextPage();                     // Full update
                 }
                 else{
-                    getdisplay().fillScreen(commonData.fgcolor); // Clear display
+                    epd->fillScreen(commonData.fgcolor); // Clear display
-                    #ifdef DISPLAY_GDEY042T81
+#ifdef DISPLAY_GDEY042T81
-                        getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
+                        epd->init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
-                    #else
+#else
-                        getdisplay().init(115200);               // Init for normal displays
+                        epd->init(115200);               // Init for normal displays
-                    #endif
+#endif
-                    getdisplay().firstPage();                    // Full update
+                    epd->firstPage();                    // Full update
-                    getdisplay().nextPage();                     // Full update
+                    epd->nextPage();                     // Full update
-//                    getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+//                    epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-//                    getdisplay().fillScreen(commonData.bgcolor); // Clear display
+//                    epd->fillScreen(commonData.bgcolor); // Clear display
-//                    getdisplay().nextPage();                     // Partial update
+//                    epd->nextPage();                     // Partial update
-//                    getdisplay().nextPage();                     // Partial update
+//                    epd->nextPage();                     // Partial update
                 }
             }        
                 
@@ -977,39 +943,45 @@ void OBP60Task(GwApi *api){
                  handleHstryBuf(api, &boatValues, hstryBufList);
 
                 // Clear display
-                // getdisplay().fillRect(0, 0, getdisplay().width(), getdisplay().height(), commonData.bgcolor);
+                // epd->fillRect(0, 0, epd->width(), epd->height(), commonData.bgcolor);
-                getdisplay().fillScreen(commonData.bgcolor);  // Clear display
+                epd->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, date, time, hdop);  // Show page header
+                    displayHeader(commonData, symbolmode, date, time, hdop);  // Show page header
                 }
 
                 // Call the particular page
                 if (systemPage) {
                     displayFooter(commonData);
                     PageData sysparams; // empty
+                    sysparams.api = api;
+                    if (systemPageNew) {
+                        syspage->displayNew(sysparams);
+                        systemPageNew = false;
+                    }
                     syspage->displayPage(sysparams);
                 }
                 else {
                     if (currentPage == NULL){
                         LOG_DEBUG(GwLog::ERROR,"page number %d not found", pageNumber);
                         // Error handling for missing page
-                        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
+                        epd->setPartialWindow(0, 0, epd->width(), epd->height()); // Set partial update
-                        getdisplay().fillScreen(commonData.bgcolor);  // Clear display
+                        epd->fillScreen(commonData.bgcolor);  // Clear display
-                        getdisplay().drawXBitmap(200 - unknown_width / 2, 150 - unknown_height / 2, unknown_bits, unknown_width, unknown_height, commonData.fgcolor);
+                        epd->drawXBitmap(200 - unknown_width / 2, 150 - unknown_height / 2, unknown_bits, unknown_width, unknown_height, commonData.fgcolor);
-                        getdisplay().setCursor(140, 250);
+                        epd->setCursor(140, 250);
-                        getdisplay().setFont(&Atari16px);
+                        epd->setFont(&Atari16px);
-                        getdisplay().print("Here be dragons!");
+                        epd->print("Here be dragons!");
-                        getdisplay().nextPage(); // Partial update (fast)
+                        epd->nextPage(); // Partial update (fast)
                     }
-                    else{
+                    else {
                         if (lastPage != pageNumber){
-                            if (hasFRAM) fram.write(FRAM_PAGE_NO, pageNumber); // remember page for device restart
+                            pages[lastPage].page->leavePage(pages[lastPage].parameters); // call page cleanup code
+                            if (hasFRAM) fram.write(FRAM_PAGE_NO, pageNumber); // remember new page for device restart
                             currentPage->setupKeys();
                             currentPage->displayNew(pages[pageNumber].parameters);
-                            lastPage=pageNumber;
+                            lastPage = pageNumber;
                         }
                         //call the page code
                         LOG_DEBUG(GwLog::DEBUG,"calling page %d",pageNumber);
@@ -1022,10 +994,10 @@ void OBP60Task(GwApi *api){
                             displayAlarm(commonData);
                         }
                         if (ret & PAGE_UPDATE) {
-                            getdisplay().nextPage(); // Partial update (fast)
+                            epd->nextPage(); // Partial update (fast)
                         }
                         if (ret & PAGE_HIBERNATE) {
-                            getdisplay().hibernate();
+                            epd->hibernate();
                         }
                     }
 

lib/obp60task/platformio.ini

@@ -8,7 +8,6 @@ default_envs =
     obp40_s3
 
 [env:obp60_s3]
-platform = espressif32@6.8.1
 board_build.variants_dir = variants
 #board = obp60_s3_n8     #ESP32-S3 N8, 8MB flash, no PSRAM
 #board = obp60_s3_n16    #ESP32-S3 N16,16MB flash, no PSRAM, zero series
@@ -16,6 +15,7 @@ board_build.variants_dir = variants
 board = obp60_s3_n16r8  #ESP32-S3 N16R8, 16MB flash, 8MB PSRAM, production series
 #board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
 board_build.partitions = default_16MB.csv #ESP32-S3 N16, 16MB flash
+board_name = OBP60
 framework = arduino
 lib_deps = 
     ${basedeps.lib_deps}
@@ -62,17 +62,16 @@ upload_speed = 230400
 monitor_speed = 115200
 
 [env:obp40_s3]
-platform = espressif32@6.8.1
 board_build.variants_dir = variants
 board = obp40_s3_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone (CrowPanel 4.2)
 board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
+board_name = OBP40
 custom_config = config_obp40.json
 framework = arduino
 lib_deps =
     ${basedeps.lib_deps}
     Wire
     SPI
-    SD
     ESP32time
     esphome/AsyncTCP-esphome@2.0.1
     robtillaart/PCF8574@0.3.9

lib/obp60task/utils/make_json.py

@@ -0,0 +1,172 @@
+#!/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)

lib/usercode/GwUserCode.cpp

@@ -216,6 +216,10 @@ public:
     {
         return api->getLogger();
     }
+    virtual Nmea2kTwai *getNMEA2000()
+    {
+        return api->getNMEA2000();
+    }
     virtual GwBoatData *getBoatData()
     {
         return api->getBoatData();

platformio.ini

@@ -30,7 +30,7 @@ lib_deps =
 	Update
 
 [env]
-platform = espressif32 @ 6.8.1
+platform = espressif32 @ 6.11.0
 framework = arduino
 ;platform_packages=
 ;	framework-arduinoespressif32 @ 3.20017.0
@@ -56,6 +56,9 @@ lib_ldf_mode = off
 monitor_speed = 115200
 build_flags = 
 	-D PIO_ENV_BUILD=$PIOENV
+	-std=gnu++17
+build_unflags =
+	-std=gnu++11
 
 [sensors]
 ; collect the libraries for sensors here

src/main.cpp

@@ -333,6 +333,9 @@ public:
     status.n2kTx=countNMEA2KOut.getGlobal();
     channels.fillStatus(status);
   }
+  virtual Nmea2kTwai *getNMEA2000(){
+    return &NMEA2000;
+  }
   virtual GwBoatData *getBoatData(){
     return &boatData;
   }