Integrated config menu into system page

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

lib/obp60task/LedSpiTask.h

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

lib/obp60task/OBP60Extensions.cpp

@@ -107,6 +107,27 @@ void hardwareInit(GwApi *api)
     }
 }
 
+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
+    }
+}
+
 void setPortPin(uint pin, bool value){
     pinMode(pin, OUTPUT);
     digitalWrite(pin, value);
@@ -276,30 +297,20 @@ String xdrDelete(String input){
     return input;
 }
 
-Point rotatePoint(const Point& origin, const Point& p, double angle) {
-    // rotate poind around origin by degrees
-    Point rotated;
-    double phi = angle * M_PI / 180.0;
-    double dx = p.x - origin.x;
-    double dy = p.y - origin.y;
-    rotated.x = origin.x + cos(phi) * dx - sin(phi) * dy;
-    rotated.y = origin.y + sin(phi) * dx + cos(phi) * dy;
-    return rotated;
-}
-
-std::vector<Point> rotatePoints(const Point& origin, const std::vector<Point>& pts, double angle) {
-    std::vector<Point> rotatedPoints;
-    for (const auto& p : pts) {
-         rotatedPoints.push_back(rotatePoint(origin, p, angle));
-    }
-     return rotatedPoints;
-}
-
 void fillPoly4(const std::vector<Point>& p4, uint16_t color) {
     getdisplay().fillTriangle(p4[0].x, p4[0].y, p4[1].x, p4[1].y, p4[2].x, p4[2].y, color);
     getdisplay().fillTriangle(p4[0].x, p4[0].y, p4[2].x, p4[2].y, p4[3].x, p4[3].y, color);
 }
 
+void drawPoly(const std::vector<Point>& points, uint16_t color) {
+    size_t polysize = points.size();
+    for (size_t i = 0; i < polysize - 1; i++) {
+        getdisplay().drawLine(points[i].x, points[i].y, points[i+1].x, points[i+1].y, color);
+    }
+    // close path
+    getdisplay().drawLine(points[polysize-1].x, points[polysize-1].y, points[0].x, points[0].y, color);
+}
+
 // Split string into words, whitespace separated
 std::vector<String> split(const String &s) {
     std::vector<String> words;
@@ -361,6 +372,24 @@ void drawTextRalign(int16_t x, int16_t y, String text) {
     getdisplay().print(text);
 }
 
+// Draw text inside box, normal or inverted
+void drawTextBoxed(Rect box, String text, uint16_t fg, uint16_t bg, bool inverted, bool border) {
+    if (inverted) {
+        getdisplay().fillRect(box.x, box.y, box.w, box.h, fg);
+        getdisplay().setTextColor(bg);
+    } else {
+        if (border) {
+            getdisplay().fillRect(box.x + 1, box.y + 1, box.w - 2, box.h - 2, bg);
+            getdisplay().drawRect(box.x, box.y, box.w, box.h, fg);
+        }
+        getdisplay().setTextColor(fg);
+    }
+    uint16_t border_offset = box.h / 4; // 25% of box height
+    getdisplay().setCursor(box.x + border_offset, box.y + box.h - border_offset);
+    getdisplay().print(text);
+    getdisplay().setTextColor(fg);
+}
+
 // Show a triangle for trend direction high (x, y is the left edge)
 void displayTrendHigh(int16_t x, int16_t y, uint16_t size, uint16_t color){
     getdisplay().fillTriangle(x, y, x+size*2, y, x+size, y-size*2, color);

lib/obp60task/OBP60Extensions.h

@@ -4,6 +4,7 @@
 #include <Arduino.h>
 #include "OBP60Hardware.h"
 #include "LedSpiTask.h"
+#include "Graphics.h"
 #include <GxEPD2_BW.h>                  // E-paper lib V2
 #include <Adafruit_FRAM_I2C.h>          // I2C FRAM
 
@@ -62,19 +63,15 @@ GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> & getdisplay();
 #define PAGE_UPDATE 1      // page wants display to update
 #define PAGE_HIBERNATE 2   // page wants displey to hibernate
 
-struct Point {
-    double x;
-    double y;
-};
-Point rotatePoint(const Point& origin, const Point& p, double angle);
-std::vector<Point> rotatePoints(const Point& origin, const std::vector<Point>& pts, double angle);
 void fillPoly4(const std::vector<Point>& p4, uint16_t color);
+void drawPoly(const std::vector<Point>& points, uint16_t color);
 
 void deepSleep(CommonData &common);
 
 uint8_t getLastPage();
 
 void hardwareInit(GwApi *api);
+void powerInit(String powermode);
 
 void setPortPin(uint pin, bool value);          // Set port pin for extension port
 
@@ -96,6 +93,7 @@ String xdrDelete(String input);                 // Delete xdr prefix from string
 
 void drawTextCenter(int16_t cx, int16_t cy, String text);
 void drawTextRalign(int16_t x, int16_t y, String text);
+void drawTextBoxed(Rect box, String text, uint16_t fg, uint16_t bg, bool inverted, bool border);
 
 void displayTrendHigh(int16_t x, int16_t y, uint16_t size, uint16_t color);
 void displayTrendLow(int16_t x, int16_t y, uint16_t size, uint16_t color);

lib/obp60task/OBP60Formatter.cpp

@@ -65,7 +65,6 @@ 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){
@@ -73,19 +72,6 @@ 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];
@@ -220,13 +206,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             result.unit = "m/s";
         }
         if(speed < 10){
-            snprintf(buffer, bsize, fmt_dec_1, speed);
+            snprintf(buffer,bsize,"%3.2f",speed);
         }
-        else if (speed < 100) {
+        if(speed >= 10 && speed < 100){
-            snprintf(buffer, bsize, fmt_dec_10, speed);
+            snprintf(buffer,bsize,"%3.1f",speed);
         }
-        else {
+        if(speed >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, speed);
+            snprintf(buffer,bsize,"%3.0f",speed);
         }
     }
     //########################################################
@@ -252,40 +238,40 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             if(speed < 0.3){
                 speed = 0;
             }
-            else if (speed < 1.5) {
+            if(speed >=0.3 && speed < 1.5){
                 speed = 1;
             }
-            else if (speed < 3.3) {
+            if(speed >=1.5 && speed < 3.3){
                 speed = 2;
             }
-            else if (speed < 5.4) {
+            if(speed >=3.3 && speed < 5.4){
                 speed = 3;
             }
-            else if (speed < 7.9) {
+            if(speed >=5.4 && speed < 7.9){
                 speed = 4;
             }
-            else if (speed < 10.7) {
+            if(speed >=7.9 && speed < 10.7){
                 speed = 5;
             }
-            else if (speed < 13.8) {
+            if(speed >=10.7 && speed < 13.8){
                 speed = 6;
             }
-            else if (speed < 17.1) {
+            if(speed >=13.8 && speed < 17.1){
                 speed = 7;
             }
-            else if (speed < 20.7) {
+            if(speed >=17.1 && speed < 20.7){
                 speed = 8;
             }
-            else if (speed < 24.4) {
+            if(speed >=20.7 && speed < 24.4){
                 speed = 9;
             }
-            else if (speed < 28.4) {
+            if(speed >=24.4 && speed < 28.4){
                 speed = 10;
             }
-            else if (speed < 32.6) {
+            if(speed >=28.4 && speed < 32.6){
                 speed = 11;
             }
-            else {
+            if(speed >=32.6){
                 speed = 12;
             }
             result.unit = "bft";
@@ -299,13 +285,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
         }
         else{
             if(speed < 10){
-                snprintf(buffer, bsize, fmt_dec_1, speed);
+                snprintf(buffer,bsize,"%3.2f",speed);
             }
-            else if (speed < 100){
+            if(speed >= 10 && speed < 100){
-                snprintf(buffer, bsize, fmt_dec_10, speed);
+                snprintf(buffer,bsize,"%3.1f",speed);
             }
-            else {
+            if(speed >= 100){
-                snprintf(buffer, bsize, fmt_dec_100, speed);
+                snprintf(buffer,bsize,"%3.0f",speed);
             }
         }
     }
@@ -351,13 +337,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             dop = 99.9;
         }
         if(dop < 10){
-            snprintf(buffer, bsize, fmt_dec_1, dop);
+            snprintf(buffer,bsize,"%3.2f",dop);
         }
-        else if(dop < 100){
+        if(dop >= 10 && dop < 100){
-            snprintf(buffer, bsize, fmt_dec_10, dop);
+            snprintf(buffer,bsize,"%3.1f",dop);
-        }
-        else {
-            snprintf(buffer, bsize, fmt_dec_100, dop);
         }
     }
     //########################################################
@@ -427,13 +410,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             result.unit = "m";
         }
         if(depth < 10){
-            snprintf(buffer, bsize, fmt_dec_1, depth);
+            snprintf(buffer,bsize,"%3.2f",depth);
         }
-        else if (depth < 100){
+        if(depth >= 10 && depth < 100){
-            snprintf(buffer, bsize, fmt_dec_10, depth);
+            snprintf(buffer,bsize,"%3.1f",depth);
         }
-        else {
+        if(depth >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, depth);
+            snprintf(buffer,bsize,"%3.0f",depth);
         }
     }
     //########################################################
@@ -447,11 +430,11 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             xte = rawvalue;
         }
         if (xte >= 100) {
-            snprintf(buffer, bsize, fmt_dec_100, value->value);
+            snprintf(buffer,bsize,"%3.0f",value->value);
         } else if (xte >= 10) {
-            snprintf(buffer, bsize, fmt_dec_10, value->value);
+            snprintf(buffer,bsize,"%3.1f",value->value);
         } else {
-            snprintf(buffer, bsize, fmt_dec_1, value->value);
+            snprintf(buffer,bsize,"%3.2f",value->value);
         }
         result.unit = "nm";
     }
@@ -478,13 +461,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             result.unit = "K";
         }
         if(temp < 10){
-            snprintf(buffer, bsize, fmt_dec_1, temp);
+            snprintf(buffer,bsize,"%3.2f",temp);
         }
-        else if (temp < 100) {
+        if(temp >= 10 && temp < 100){
-            snprintf(buffer, bsize, fmt_dec_10, temp);
+            snprintf(buffer,bsize,"%3.1f",temp);
         }
-        else {
+        if(temp >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, temp);
+            snprintf(buffer,bsize,"%3.0f",temp);
         }
     }
     //########################################################
@@ -506,17 +489,17 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             distance = distance * 0.000539957;
             result.unit = "nm";
         }
-        else {
+        else{;
             result.unit = "m";
         }
         if(distance < 10){
-            snprintf(buffer, bsize, fmt_dec_1, distance);
+            snprintf(buffer,bsize,"%3.2f",distance);
         }
-        else if (distance < 100){
+        if(distance >= 10 && distance < 100){
-            snprintf(buffer, bsize, fmt_dec_10, distance);
+            snprintf(buffer,bsize,"%3.1f",distance);
         }
-        else {
+        if(distance >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, distance);
+            snprintf(buffer,bsize,"%3.0f",distance);
         }
     }
     //########################################################
@@ -564,10 +547,10 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             voltage = rawvalue;
         }
         if(voltage < 10){
-            snprintf(buffer, bsize, fmt_dec_1, voltage);
+            snprintf(buffer,bsize,"%3.2f",voltage);
         }
         else{
-            snprintf(buffer, bsize, fmt_dec_10, voltage);
+            snprintf(buffer,bsize,"%3.1f",voltage);
         }
         result.unit = "V";
     }
@@ -583,13 +566,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             current = rawvalue;
         }
         if(current < 10){
-            snprintf(buffer, bsize, fmt_dec_1, current);
+            snprintf(buffer,bsize,"%3.2f",current);
         }
-        else if(current < 100) {
+        if(current >= 10 && current < 100){
-            snprintf(buffer, bsize, fmt_dec_10, current);
+            snprintf(buffer,bsize,"%3.1f",current);
         }
-        else {
+        if(current >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, current);
+            snprintf(buffer,bsize,"%3.0f",current);
         }
         result.unit = "A";
     }
@@ -605,13 +588,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             temperature = rawvalue;
         }
         if(temperature < 10){
-            snprintf(buffer, bsize, fmt_dec_1, temperature);
+            snprintf(buffer,bsize,"%3.2f",temperature);
         }
-        else if (temperature < 100) {
+        if(temperature >= 10 && temperature < 100){
-            snprintf(buffer, bsize, fmt_dec_10, temperature);
+            snprintf(buffer,bsize,"%3.1f",temperature);
         }
-        else {
+        if(temperature >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, temperature);
+            snprintf(buffer,bsize,"%3.0f",temperature);
         }
         result.unit = "Deg C";
     }
@@ -627,13 +610,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             temperature = rawvalue;
         }
         if(temperature < 10){
-            snprintf(buffer, bsize, fmt_dec_1, temperature);
+            snprintf(buffer,bsize,"%3.2f",temperature);
         }
-        else if(temperature < 100) {
+        if(temperature >= 10 && temperature < 100){
-            snprintf(buffer, bsize, fmt_dec_10, temperature);
+            snprintf(buffer,bsize,"%3.1f",temperature);
         }
-        else {
+        if(temperature >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, temperature);
+            snprintf(buffer,bsize,"%3.0f",temperature);
         }
         result.unit = "Deg C";
     }
@@ -649,13 +632,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             humidity = rawvalue;
         }
         if(humidity < 10){
-            snprintf(buffer, bsize, fmt_dec_1, humidity);
+            snprintf(buffer,bsize,"%3.2f",humidity);
         }
-        else if(humidity < 100) {
+        if(humidity >= 10 && humidity < 100){
-            snprintf(buffer, bsize, fmt_dec_10, humidity);
+            snprintf(buffer,bsize,"%3.1f",humidity);
         }
-        else {
+        if(humidity >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, humidity);
+            snprintf(buffer,bsize,"%3.0f",humidity);
         }
         result.unit = "%";
     }
@@ -671,13 +654,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             volume = rawvalue;
         }
         if(volume < 10){
-            snprintf(buffer, bsize, fmt_dec_1, volume);
+            snprintf(buffer,bsize,"%3.2f",volume);
         }
-        else if (volume < 100) {
+        if(volume >= 10 && volume < 100){
-            snprintf(buffer, bsize, fmt_dec_10, volume);
+            snprintf(buffer,bsize,"%3.1f",volume);
         }
-        else if (volume >= 100) {
+        if(volume >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, volume);
+            snprintf(buffer,bsize,"%3.0f",volume);
         }
         result.unit = "%";
     }
@@ -693,13 +676,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             volume = rawvalue;
         }
         if(volume < 10){
-            snprintf(buffer, bsize, fmt_dec_1, volume);
+            snprintf(buffer,bsize,"%3.2f",volume);
         }
-        else if (volume < 100) {
+        if(volume >= 10 && volume < 100){
-            snprintf(buffer, bsize, fmt_dec_10, volume);
+            snprintf(buffer,bsize,"%3.1f",volume);
         }
-        else {
+        if(volume >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, volume);
+            snprintf(buffer,bsize,"%3.0f",volume);
         }
         result.unit = "l";
     }
@@ -715,13 +698,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             flow = rawvalue;
         }
         if(flow < 10){
-            snprintf(buffer, bsize, fmt_dec_1, flow);
+            snprintf(buffer,bsize,"%3.2f",flow);
         }
-        else if (flow < 100) {
+        if(flow >= 10 && flow < 100){
-            snprintf(buffer, bsize, fmt_dec_10, flow);
+            snprintf(buffer,bsize,"%3.1f",flow);
         }
-        else {
+        if(flow >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, flow);
+            snprintf(buffer,bsize,"%3.0f",flow);
         }
         result.unit = "l/min";
     }
@@ -729,7 +712,7 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
     else if (value->getFormat() == "formatXdr:G:"){
         double generic = 0;
         if(usesimudata == false) {
-            generic = value->value;
+            generic = value->value;    // Value in l/min
             rawvalue = value->value;
         }
         else{
@@ -737,13 +720,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             generic = rawvalue;
         }
         if(generic < 10){
-            snprintf(buffer, bsize, fmt_dec_1, generic);
+            snprintf(buffer,bsize,"%3.2f",generic);
         }
-        else if (generic < 100) {
+        if(generic >= 10 && generic < 100){
-            snprintf(buffer, bsize, fmt_dec_10, generic);
+            snprintf(buffer,bsize,"%3.1f",generic);
         }
-        else {
+        if(generic >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, generic);
+            snprintf(buffer,bsize,"%3.0f",generic);
         }
         result.unit = "";
     }
@@ -759,13 +742,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             dplace = rawvalue;
         }
         if(dplace < 10){
-            snprintf(buffer, bsize, fmt_dec_1, dplace);
+            snprintf(buffer,bsize,"%3.2f",dplace);
         }
-        else if (dplace < 100) {
+        if(dplace >= 10 && dplace < 100){
-            snprintf(buffer, bsize, fmt_dec_10, dplace);
+            snprintf(buffer,bsize,"%3.1f",dplace);
         }
-        else {
+        if(dplace >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, dplace);
+            snprintf(buffer,bsize,"%3.0f",dplace);
         }
         result.unit = "%";
     }
@@ -801,13 +784,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
             rpm = rawvalue;
         }
         if(rpm < 10){
-            snprintf(buffer, bsize, fmt_dec_1, rpm);
+            snprintf(buffer,bsize,"%3.2f",rpm);
         }
-        else if (rpm < 100) {
+        if(rpm >= 10 && rpm < 100){
-            snprintf(buffer, bsize, fmt_dec_10, rpm);
+            snprintf(buffer,bsize,"%3.1f",rpm);
         }
-        else {
+        if(rpm >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, rpm);
+            snprintf(buffer,bsize,"%3.0f",rpm);
         }
         result.unit = "rpm";
     }
@@ -816,13 +799,13 @@ FormattedData formatValue(GwApi::BoatValue *value, CommonData &commondata){
     //########################################################
     else{
         if(value->value < 10){
-            snprintf(buffer, bsize, fmt_dec_1, value->value);
+            snprintf(buffer,bsize,"%3.2f",value->value);
         }
-        else if (value->value < 100) {
+        if(value->value >= 10 && value->value < 100){
-            snprintf(buffer, bsize, fmt_dec_10, value->value);
+            snprintf(buffer,bsize,"%3.1f",value->value);
         }
-        else {
+        if(value->value >= 100){
-            snprintf(buffer, bsize, fmt_dec_100, value->value);
+            snprintf(buffer,bsize,"%3.0f",value->value);
         }
         result.unit = "";
     }

lib/obp60task/PageSystem.cpp

@@ -2,6 +2,7 @@
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
+#include "ConfigMenu.h"
 #include "images/logo64.xbm"
 #include <esp32/clk.h>
 #include "qrcode.h"
@@ -25,11 +26,33 @@
  * Consists of some sub-pages with following content:
  *   1. Hard and software information
  *   2. System settings
- *   3. NMEA2000 device list
+ *   3. System configuration: running and NVRAM
+ *   4. NMEA2000 device list
+ *   5. SD Card information if available
+ *
+ * TODO
+ *    - setCpuFrequencyMhz(80|160|240);
+ *    - Accesspoint / ! Änderung im Gatewaycode erforderlich?
+ *         if (! isApActive()) {
+ *           wifiSSID = config->getString(config->wifiSSID);
+ *           wifiPass = config->getString(config->wifiPass);
+ *           wifiSoftAP(wifiSSID, wifiPass);
+ *         }
+ *     - Power mode
+ *         powerInit(powermode);
  */
 
 class PageSystem : public Page
 {
+private:
+    GwConfigHandler *config;
+    GwLog *logger;
+
+    // NVRAM config options
+    String flashLED;
+
+    // Generic data access
+
     uint64_t chipid;
     bool simulation;
     bool sdcard;
@@ -47,158 +70,59 @@ String rot_sensor;
     double homelat;
     double homelon;
 
-char mode = 'N'; // (N)ormal, (S)ettings, (D)evice list, (C)ard
+    char mode = 'N'; // (N)ormal, (S)ettings, (C)onfiguration, (D)evice list, c(A)rd
+    int8_t editmode = -1; // marker for menu/edit/set function
 
-public:
+    ConfigMenu *menu;
-    PageSystem(CommonData &common){
-        commonData = &common;
-        common.logger->logDebug(GwLog::LOG,"Instantiate PageSystem");
-        if (hasFRAM) {
-            mode = fram.read(FRAM_SYSTEM_MODE);
-        }
-        chipid = ESP.getEfuseMac();
-        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 incMode() {
-        commonData->keydata[0].label = "EXIT";
+        if (mode == 'N') {        // Normal
-        commonData->keydata[1].label = "MODE";
-        commonData->keydata[2].label = "";
-        commonData->keydata[3].label = "RST";
-        commonData->keydata[4].label = "STBY";
-        commonData->keydata[5].label = "ILUM";
-    }
-
-    virtual int handleKey(int key){
-        // do *NOT* handle key #1 this handled by obp60task as exit
-        // Switch display mode
-        commonData->logger->logDebug(GwLog::LOG, "System keyboard handler");
-        if (key == 2) {
-            if (mode == 'N') {
             mode = 'S';
-            } else if (mode == 'S') {
+        } else if (mode == 'S') { // Settings
+            mode = 'C';
+        } else if (mode == 'C') { // Config
             mode = 'D';
-            } else if (mode == 'D') {
+        } else if (mode == 'D') { // Device list
             if (sdcard) {
+                mode = 'A';       // SD-Card
+            } else {
+                mode = 'N';
+            }
+        } else {
+            mode = 'N';
+        }
+    }
+
+    void decMode() {
+        if (mode == 'N') {
+            if (sdcard) {
+                mode = 'A';
+            } else {
+                mode = 'D';
+            }
+        } else if (mode == 'S') { // Settings
+            mode = 'N';
+        } else if (mode == 'C') { // Config
+            mode = 'S';
+        } else if (mode == 'D') { // Device list
             mode = 'C';
         } else {
-                    mode = 'N';
+            mode = 'D';
-                }
-            } else {
-                mode = 'N';
-            }
-            if (hasFRAM) fram.write(FRAM_SYSTEM_MODE, mode);
-            return 0;
-        }
-#ifdef BOARD_OBP60S3
-        // grab cursor key to disable page navigation
-        if (key == 3) {
-            return 0;
-        }
-        // soft reset
-        if (key == 4) {
-            ESP.restart();
-        }
-        // standby / deep sleep
-        if (key == 5) {
-           deepSleep(*commonData);
-        }
-        // Code for keylock
-        if (key == 11) {
-            commonData->keylock = !commonData->keylock;
-            return 0;
-        }
-#endif
-#ifdef BOARD_OBP40S3
-        // grab cursor keys to disable page navigation
-        if (key == 9 or key == 10) {
-            return 0;
-        }
-        // standby / deep sleep
-        if (key == 12) {
-            deepSleep(*commonData);
-        }
-#endif
-        return key;
-    }
-
-    void displayBarcode(String serialno, uint16_t x, uint16_t y, uint16_t s) {
-        // Barcode with serial number
-        // x, y is top left corner
-        // s is pixel size of a single box
-        QRCode qrcode;
-        uint8_t qrcodeData[qrcode_getBufferSize(4)];
-#ifdef BOARD_OBP40S3
-        String prefix = "OBP40:SN:";
-#endif
-#ifdef BOARD_OBP60S3
-        String prefix = "OBP60:SN:";
-#endif
-        qrcode_initText(&qrcode, qrcodeData, 4, 0, (prefix + serialno).c_str());
-        int16_t x0 = x;
-        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);
-                }
-                x += s;
-            }
-            y += s;
-            x = x0;
         }
     }
 
-    int displayPage(PageData &pageData){
+    void displayModeNormal() {
-        GwConfigHandler *config = commonData->config;
+        // Default system page view
-        GwLog *logger = commonData->logger;
 
-        // Get config data
+        uint16_t y0 = 155;
-        String flashLED = config->getString(config->flashLED);
-
-        // Optical warning by limit violation (unused)
-        if(String(flashLED) == "Limit Violation"){
-            setBlinkingLED(false);
-            setFlashLED(false); 
-        }
-
-        // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageSystem");
-
-        // Draw page
-        //***********************************************************
-
-        uint16_t x0 = 8;  // left column
-        uint16_t y0 = 48; // data table starts here
-
-        // Set display in partial refresh mode
-        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height()); // Set partial update
-
-        if (mode == 'N') {
 
         getdisplay().setFont(&Ubuntu_Bold12pt8b);
         getdisplay().setCursor(8, 48);
-            getdisplay().print("System Information");
+        getdisplay().print("System information");
 
         getdisplay().drawXBitmap(320, 25, logo64_bits, logo64_width, logo64_height, commonData->fgcolor);
 
         getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            y0 = 155;
 
         char ssid[13];
         snprintf(ssid, 13, "%04X%08X", (uint16_t)(chipid >> 32), (uint32_t)chipid);
@@ -287,17 +211,67 @@ public:
         getdisplay().print("Task free:");
         getdisplay().setCursor(300, y0 + 32);
         getdisplay().print(String(RAM_free));
+    }
 
-        } else if (mode == 'S') {
+    void displayModeConfig() {
-            // Settings
+        // Configuration interface
+
+        uint16_t x0 = 16;
+        uint16_t y0 = 80;
+        uint16_t dy = 20;
+
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
+        getdisplay().setCursor(8, 48);
+        getdisplay().print("System configuration");
+
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+
+        /*getdisplay().setCursor(x0, y0);
+        getdisplay().print("CPU speed: 80 | 160 | 240");
+        getdisplay().setCursor(x0, y0 + 1 * dy);
+        getdisplay().print("Power mode: Max | 5V | Min");
+        getdisplay().setCursor(x0, y0 + 2 * dy);
+        getdisplay().print("Accesspoint: On | Off");
+
+        // TODO Change NVRAM-preferences settings here
+        getdisplay().setCursor(x0, y0 + 4 * dy);
+        getdisplay().print("Simulation: On | Off"); */
+
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        for (int i = 0 ; i < menu->getItemCount(); i++) {
+            ConfigMenuItem *itm = menu->getItemByIndex(i);
+            if (!itm) {
+                LOG_DEBUG(GwLog::ERROR, "Menu item not found: %d", i);
+            } else {
+                Rect r = menu->getItemRect(i);
+                bool inverted = (i == menu->getActiveIndex());
+                drawTextBoxed(r, itm->getLabel(), commonData->fgcolor, commonData->bgcolor, inverted, false);
+                if (inverted and editmode > 0) {
+                    // triangle as edit marker
+                    getdisplay().fillTriangle(r.x + r.w + 20, r.y, r.x + r.w + 30, r.y + r.h / 2, r.x + r.w + 20, r.y + r.h,  commonData->fgcolor);
+                }
+                getdisplay().setCursor(r.x + r.w + 40, r.y + r.h - 4);
+                if (itm->getType() == "int") {
+                    getdisplay().print(itm->getValue());
+                    getdisplay().print(itm->getUnit());
+                } else {
+                     getdisplay().print(itm->getValue() == 0 ? "No" : "Yes");
+                }
+            }
+        }
+    }
+
+    void displayModeSettings() {
+        // View some of the current settings
+
+        const uint16_t x0 = 8;
+        const uint16_t y0 = 72;
 
         getdisplay().setFont(&Ubuntu_Bold12pt8b);
         getdisplay().setCursor(x0, 48);
         getdisplay().print("System settings");
 
         getdisplay().setFont(&Ubuntu_Bold8pt8b);
-            x0 = 8;
-            y0 = 72;
 
         // left column
         getdisplay().setCursor(x0, y0);
@@ -333,12 +307,10 @@ public:
         // Home location
         getdisplay().setCursor(x0, y0 + 128);
         getdisplay().print("Home Lat.:");
-            getdisplay().setCursor(120, y0 + 128);
+        drawTextRalign(230, y0 + 128, formatLatitude(homelat));
-            getdisplay().print(formatLatitude(homelat));
         getdisplay().setCursor(x0, y0 + 144);
         getdisplay().print("Home Lon.:");
-            getdisplay().setCursor(120, y0 + 144);
+        drawTextRalign(230, y0 + 144, formatLongitude(homelon));
-            getdisplay().print(formatLongitude(homelon));
 
         // right column
         getdisplay().setCursor(202, y0);
@@ -358,23 +330,43 @@ public:
         getdisplay().setCursor(320, y0 + 32);
         getdisplay().print(gen_sensor);
 
-            // Gyro sensor
+#ifdef BOARD_OBP60S3
+        // Backlight infos
+        getdisplay().setCursor(202, y0 + 64);
+        getdisplay().print("Backlight:");
+        getdisplay().setCursor(320, y0 + 64);
+        getdisplay().printf("%d%%", commonData->backlight.brightness);
+        // TODO test function with OBP60 device
+        getdisplay().setCursor(202, y0 + 80);
+        getdisplay().print("Bl color:");
+        getdisplay().setCursor(320, y0 + 80);
+        getdisplay().print(commonData->backlight.color.toName());
+        getdisplay().setCursor(202, y0 + 96);
+        getdisplay().print("Bl mode:");
+        getdisplay().setCursor(320, y0 + 96);
+        getdisplay().print(commonData->backlight.mode);
+        // TODO Buzzer mode and power
+#endif
+
+        // Gyro sensor
+        // WIP / FEATURE
+    }
+
+    void displayModeSDCard() {
+        // SD card info
+        uint16_t x0 = 20;
+        uint16_t y0 = 72;
 
-        } 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...");
+    }
 
-
+    void displayModeDevicelist() {
-        } else {
         // NMEA2000 device list
         getdisplay().setFont(&Ubuntu_Bold12pt8b);
         getdisplay().setCursor(8, 48);
@@ -389,6 +381,176 @@ public:
         getdisplay().print(String(commonData->status.n2kTx));
     }
 
+   void storeConfig() {
+       menu->storeValues();
+   }
+
+public:
+    PageSystem(CommonData &common){
+        commonData = &common;
+        config = commonData->config;
+        logger = commonData->logger;
+
+        logger->logDebug(GwLog::LOG,"Instantiate PageSystem");
+        if (hasFRAM) {
+            mode = fram.read(FRAM_SYSTEM_MODE);
+        }
+        flashLED = common.config->getString(common.config->flashLED);
+
+        chipid = ESP.getEfuseMac();
+        simulation = common.config->getBool(common.config->useSimuData);
+#ifdef BOARD_OBP40S3
+        sdcard = common.config->getBool(common.config->useSDCard);
+#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();
+
+        // CPU speed: 80 | 160 | 240
+        // Power mode: Max | 5V | Min
+        // Accesspoint: On | Off
+
+        // TODO Change NVRAM-preferences settings here
+        // getdisplay().setCursor(x0, y0 + 4 * dy);
+        // getdisplay().print("Simulation: On | Off");
+
+        // Initialize config menu
+        menu = new ConfigMenu("Options", 40, 80);
+        menu->setItemDimension(150, 20);
+
+        ConfigMenuItem *newitem;
+        newitem = menu->addItem("accesspoint", "Accesspoint", "bool", 0, "");
+        newitem = menu->addItem("simulation", "Simulation", "on/off", 0, "");
+        menu->setItemActive("accesspoint");
+
+    }
+
+    virtual void setupKeys(){
+        commonData->keydata[0].label = "EXIT";
+        commonData->keydata[1].label = "MODE";
+        commonData->keydata[2].label = "";
+        commonData->keydata[3].label = "RST";
+        commonData->keydata[4].label = "STBY";
+        commonData->keydata[5].label = "ILUM";
+    }
+
+    virtual int handleKey(int key){
+        // do *NOT* handle key #1 this handled by obp60task as exit
+        // Switch display mode
+        commonData->logger->logDebug(GwLog::LOG, "System keyboard handler");
+        if (key == 2) {
+            incMode();
+            if (hasFRAM) fram.write(FRAM_SYSTEM_MODE, mode);
+            return 0;
+        }
+#ifdef BOARD_OBP60S3
+        // grab cursor key to disable page navigation
+        if (key == 3) {
+            return 0;
+        }
+        // soft reset
+        if (key == 4) {
+            ESP.restart();
+        }
+        // standby / deep sleep
+        if (key == 5) {
+           deepSleep(*commonData);
+        }
+        // Code for keylock
+        if (key == 11) {
+            commonData->keylock = !commonData->keylock;
+            return 0;
+        }
+#endif
+#ifdef BOARD_OBP40S3
+        // use cursor keys for local mode navigation
+        if (key == 9) {
+            incMode();
+            return 0;
+        }
+        if (key == 10) {
+            decMode();
+            return 0;
+        }
+        // standby / deep sleep
+        if (key == 12) {
+            deepSleep(*commonData);
+        }
+#endif
+        return key;
+    }
+
+    void displayBarcode(String serialno, uint16_t x, uint16_t y, uint16_t s) {
+        // Barcode with serial number
+        // x, y is top left corner
+        // s is pixel size of a single box
+        QRCode qrcode;
+        uint8_t qrcodeData[qrcode_getBufferSize(4)];
+#ifdef BOARD_OBP40S3
+        String prefix = "OBP40:SN:";
+#endif
+#ifdef BOARD_OBP60S3
+        String prefix = "OBP60:SN:";
+#endif
+        qrcode_initText(&qrcode, qrcodeData, 4, 0, (prefix + serialno).c_str());
+        int16_t x0 = x;
+        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);
+                }
+                x += s;
+            }
+            y += s;
+            x = x0;
+        }
+    }
+
+    int displayPage(PageData &pageData){
+        GwConfigHandler *config = commonData->config;
+        GwLog *logger = commonData->logger;
+
+        // Optical warning by limit violation (unused)
+        if(flashLED == "Limit Violation"){
+            setBlinkingLED(false);
+            setFlashLED(false); 
+        }
+
+        // Logging page information
+        LOG_DEBUG(GwLog::LOG,"Drawing at PageSystem, Mode=%c", mode);
+
+        // Set display in partial refresh mode
+        getdisplay().setPartialWindow(0, 0, getdisplay().width(), getdisplay().height());
+
+        // call current system page
+        switch (mode) {
+            case 'N':
+                displayModeNormal();
+                break;
+            case 'S':
+                displayModeSettings();
+                break;
+            case 'C':
+                displayModeConfig();
+                break;
+            case 'A':
+                displayModeSDCard();
+                break;
+            case 'D':
+                displayModeDevicelist();
+                break;
+        }
+
         // Update display
         getdisplay().nextPage();    // Partial update (fast)
         return PAGE_OK;

lib/obp60task/config.json

@@ -1117,21 +1117,6 @@
             "obp60":"true"
         }
     },
-    {
-        "name": "valueprecision",
-        "label": "Display value precision",
-        "type": "list",
-        "default": "2",
-        "description": "Maximum number of decimal places to display [1|2]",
-        "list": [
-            "1",
-            "2"
-        ],
-        "category": "OBP60 Display",
-        "capabilities": {
-            "obp60":"true"
-        }
-    },
     {
         "name": "backlight",
         "label": "Backlight Mode",

lib/obp60task/config_obp40.json

@@ -1129,21 +1129,6 @@
             "obp40": "true"
         }
     },
-    {
-        "name": "valueprecision",
-        "label": "Display value precision",
-        "type": "list",
-        "default": "2",
-        "description": "Maximum number of decimal places to display [1|2]",
-        "list": [
-            "1",
-            "2"
-        ],
-        "category": "OBP40 Display",
-        "capabilities": {
-            "obp40":"true"
-        }
-    },
     {
         "name": "backlight",
         "label": "Backlight Mode",

lib/obp60task/gen_set.py

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

lib/obp60task/obp60task.cpp

@@ -54,31 +54,13 @@ void OBP60Init(GwApi *api){
     
     // Check I2C devices
     
-
     // Init hardware
     hardwareInit(api);
 
-    // Init power rail 5.0V
+    // Init power
     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"){
+    powerInit(powermode);
-        #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);
@@ -891,7 +873,6 @@ void OBP60Task(GwApi *api){
                 else{
                     getdisplay().fillScreen(commonData.fgcolor); // Clear display
                     #ifdef DISPLAY_GDEY042T81
-                        getdisplay().hibernate();                  // Set display in hybenate mode
                         getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
                     #else
                         getdisplay().init(115200);               // Init for normal displays
@@ -919,7 +900,6 @@ void OBP60Task(GwApi *api){
                 else{
                     getdisplay().fillScreen(commonData.fgcolor); // Clear display
                     #ifdef DISPLAY_GDEY042T81
-                        getdisplay().hibernate();                  // Set display in hybenate mode
                         getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
                     #else
                         getdisplay().init(115200);               // Init for normal displays
@@ -944,7 +924,6 @@ void OBP60Task(GwApi *api){
                 else{
                     getdisplay().fillScreen(commonData.fgcolor); // Clear display
                     #ifdef DISPLAY_GDEY042T81
-                        getdisplay().hibernate();                  // Set display in hybenate mode
                         getdisplay().init(115200, true, 2, false); // Init for Waveshare boards with "clever" reset circuit, 2ms reset pulse
                     #else
                         getdisplay().init(115200);               // Init for normal displays