Correct splitting between OBP60 and OBP40 hardware

Merge pull request #144 from thooge/system
New system page
2025-01-20 21:21:58 +01:00 · 2025-01-20 20:22:01 +01:00 · 2025-01-20 19:20:37 +01:00 · 2025-01-20 16:13:07 +01:00 · 2025-01-20 16:10:32 +01:00 · 2025-01-20 06:33:51 +01:00
66 changed files with 594 additions and 239 deletions
--- a/boards/obp60_s3_light_n8r8.json
+++ b/boards/obp60_s3_light_n8r8.json
@ -10,7 +10,7 @@
      "-DBOARD_HAS_PSRAM",
      "-DARDUINO_ESP32S3_DEV",
      "-DARDUINO_USB_MODE=1",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_CDC_ON_BOOT=0",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=1"
    ],
@ -24,7 +24,7 @@
      ]
    ],
    "mcu": "esp32s3",
-    "variant": "obp60s3_light"
+    "variant": "obp40s3"
  },
  "connectivity": [
    "bluetooth",
@ -41,7 +41,7 @@
    "arduino",
    "espidf"
  ],
-  "name": "OBP60 Light ESP32-S3-N8R8 (8 MB QD, 8 MB PSRAM)",
+  "name": "OBP40 ESP32-S3-N8R8 (8 MB QD, 8 MB PSRAM)",
  "upload": {
    "flash_size": "8MB",
    "maximum_ram_size": 327680,
--- a/lib/obp60task/AS5600.cpp
+++ b/lib/obp60task/AS5600.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 /****************************************************
  AMS 5600 class for Arduino platform
--- a/lib/obp60task/OBP60Extensions.cpp
+++ b/lib/obp60task/OBP60Extensions.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include <Arduino.h>
 #include <PCF8574.h>      // Driver for PCF8574 output modul from Horter
@ -426,7 +426,7 @@ void displayFooter(CommonData &commonData) {
        getdisplay().print("Press 1 and 6 fast to unlock keys");
    }
 #endif
-#ifdef HARDWARE_LIGHT
+#ifdef BOARD_OBP40S3
    // grapical page indicator
    static const uint16_t r = 5;
    static const uint16_t space = 4;
--- a/lib/obp60task/OBP60Extensions.h
+++ b/lib/obp60task/OBP60Extensions.h
@ -36,6 +36,7 @@ extern const GFXfont DSEG7Classic_BoldItalic20pt7b;
 extern const GFXfont DSEG7Classic_BoldItalic30pt7b;
 extern const GFXfont DSEG7Classic_BoldItalic42pt7b;
 extern const GFXfont DSEG7Classic_BoldItalic60pt7b;
+extern const GFXfont Atari16px;

 // Global functions
 #ifdef DISPLAY_GDEW042T2
--- a/lib/obp60task/OBP60Formater.cpp
+++ b/lib/obp60task/OBP60Formater.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include <Arduino.h>
 #include "GwApi.h"
--- a/lib/obp60task/OBP60Hardware.h
+++ b/lib/obp60task/OBP60Hardware.h
@ -76,9 +76,9 @@
    #define OBP_POWER_50 5          // 5.0V power rail
 #endif

-// Hardware configuration for OBP60 LIGHT
+// Hardware configuration for OBP40

-#ifdef HARDWARE_LIGHT
+#ifdef BOARD_OBP40S3
    // Direction pin for RS485 NMEA0183
    #define OBP_DIRECTION_PIN 8
    // I2C
--- a/lib/obp60task/OBP60Keypad.h
+++ b/lib/obp60task/OBP60Keypad.h
@ -60,7 +60,7 @@ void initKeys(CommonData &commonData) {

  #ifdef HARDWARE_V21
  // Keypad functions for original OBP60 hardware
-  int readKeypad(uint thSensitivity) {
+  int readKeypad(GwLog* logger, uint thSensitivity) {
    
    // Touch sensor values
    // 35000 - Not touched
@ -110,14 +110,14 @@ void initKeys(CommonData &commonData) {
      keypad[6] = 0;
    }
    // Nothing touched
-    if(keypad[1] == 0 && keypad[2] == 0 && keypad[3] == 0 &&  keypad[4] == 0 && keypad[5] == 0 && keypad[6] == 0){
+/*    if(keypad[1] == 0 && keypad[2] == 0 && keypad[3] == 0 &&  keypad[4] == 0 && keypad[5] == 0 && keypad[6] == 0){
      keypad[0] = 1;
    }
    else{
      keypad[0] = 0;
-    } 
+    }  */

-    for (int i = 0; i < 9; i++) {
+    for (int i = 1; i <= 6; i++) {
        if(i > 0){
            // Convert keypad to keycode
            if(keypad[i] == 1){
@ -141,11 +141,13 @@ void initKeys(CommonData &commonData) {
      }
      // Detect a very short keynumber (10ms)
      if (millis() > starttime + 10 && keycode == keycodeold && keylock == true) {
+        logger->logDebug(GwLog::LOG,"Very short 20ms key touch: %d", keycode);
+
        // Process only valid keys
-        if(keycode == 1 || keycode == 6){
+        if(keycode == 1 || keycode == 4 || keycode == 5 || keycode == 6){
          keycode2 = keycode;
        }
-        // Clear by unvalid keys
+        // Clear by invalid keys
        else{
          keycode2 = 0;
          keycodeold2 = 0;
@ -157,6 +159,7 @@ void initKeys(CommonData &commonData) {
      }
      // Detect a short keynumber (200ms)
      if (keyoff == false && millis() > starttime + 200 && keycode == keycodeold && keylock == true) {
+        logger->logDebug(GwLog::LOG,"Short 200ms key touch: %d", keycode);
        keystatus = keycode;
        keycode = 0;
        keycodeold = 0;
@ -168,6 +171,21 @@ void initKeys(CommonData &commonData) {
      }
    }

+    // System page with key 5 and 4 in fast series
+    if (keycode2 == 5 && keycodeold2 == 4) {
+        logger->logDebug(GwLog::LOG,"Keycode for system page");
+      keycode = 0;
+      keycodeold = 0;
+      keycode2 = 0;
+      keycodeold2 = 0;
+      keystatus = 12;
+      buzzer(TONE4, 50);
+      delay(30);
+      buzzer(TONE4, 50);
+      delay(30);
+      buzzer(TONE4, 50);
+    }
+
    // Key lock with key 1 and 6 or 6 and 1 in fast series
    if((keycode2 == 1 && keycodeold2 == 6) || (keycode2 == 6 && keycodeold2 == 1)) {
      keycode = 0;
@ -218,7 +236,7 @@ void initKeys(CommonData &commonData) {
  }
  #endif

-  #ifdef HARDWARE_LIGHT
+  #ifdef BOARD_OBP40S3
  int readSensorpads(){
      // Read key code
      if(digitalRead(UP) == LOW){
@ -243,7 +261,7 @@ void initKeys(CommonData &commonData) {
    }

  // Keypad functions for OBP60 clone (thSensitivity is inactiv)
-  int readKeypad(uint thSensitivity) {
+  int readKeypad(GwLog* logger, uint thSensitivity) {
    pinMode(UP, INPUT);
    pinMode(DOWN, INPUT);
    pinMode(CONF, INPUT);
--- a/lib/obp60task/OBPSensorTask.cpp
+++ b/lib/obp60task/OBPSensorTask.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include <Adafruit_Sensor.h>            // Adafruit Lib for sensors
 #include <Adafruit_BME280.h>            // Adafruit Lib for BME280
 #include <Adafruit_BMP280.h>            // Adafruit Lib for BMP280
--- a/lib/obp60task/PageBME280.cpp
+++ b/lib/obp60task/PageBME280.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageBattery.cpp
+++ b/lib/obp60task/PageBattery.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageBattery2.cpp
+++ b/lib/obp60task/PageBattery2.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageClock.cpp
+++ b/lib/obp60task/PageClock.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageDST810.cpp
+++ b/lib/obp60task/PageDST810.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageFluid.cpp
+++ b/lib/obp60task/PageFluid.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageFourValues.cpp
+++ b/lib/obp60task/PageFourValues.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageFourValues2.cpp
+++ b/lib/obp60task/PageFourValues2.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageGenerator.cpp
+++ b/lib/obp60task/PageGenerator.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageKeelPosition.cpp
+++ b/lib/obp60task/PageKeelPosition.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageOneValue.cpp
+++ b/lib/obp60task/PageOneValue.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageRollPitch.cpp
+++ b/lib/obp60task/PageRollPitch.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageRudderPosition.cpp
+++ b/lib/obp60task/PageRudderPosition.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageSolar.cpp
+++ b/lib/obp60task/PageSolar.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageSystem.cpp
+++ b/lib/obp60task/PageSystem.cpp
@ -0,0 +1,205 @@
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
+
+#include "Pagedata.h"
+#include "OBP60Extensions.h"
+#include "images/logo64.xbm"
+#include <esp_clk.h>
+
+#define STRINGIZE_IMPL(x) #x
+#define STRINGIZE(x) STRINGIZE_IMPL(x)
+#define VERSINFO STRINGIZE(GWDEVVERSION)
+
+/*
+ * Special system page, called directly with fast key sequence 5,4
+ * Out of normal page order.
+ */
+
+class PageSystem : public Page
+{
+uint64_t chipid;
+bool simulation;
+String buzzer_mode;
+uint8_t buzzer_power;
+String cpuspeed;
+String rtc_module;
+String gps_module;
+String env_module;
+
+char mode = 'N'; // (N)ormal, (D)evice list
+
+public:
+    PageSystem(CommonData &common){
+        commonData = &common;
+        common.logger->logDebug(GwLog::LOG,"Instantiate PageSystem");
+        chipid = ESP.getEfuseMac();
+        simulation = common.config->getBool(common.config->useSimuData);
+        buzzer_mode = common.config->getString(common.config->buzzerMode);
+        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);
+    }
+
+    virtual void setupKeys(){
+        commonData->keydata[0].label = "EXIT";
+        commonData->keydata[1].label = "MODE";
+        commonData->keydata[2].label = "";
+        commonData->keydata[3].label = "";
+        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 = 'D';
+            } else {
+                mode = 'N';
+            }
+            if (hasFRAM) fram.write(FRAM_VOLTAGE_MODE, mode);
+            return 0;
+        }
+        // grab cursor keys to disable page navigation
+        if (key == 3 or key == 4) {
+            return 0;
+        }
+        // Code for keylock
+        if (key == 11) {
+            commonData->keylock = !commonData->keylock;
+            return 0;
+        }
+        return key;
+    }
+
+    virtual void displayPage(PageData &pageData){
+        GwConfigHandler *config = commonData->config;
+        GwLog *logger = commonData->logger;
+
+        // Get config data
+        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
+        //***********************************************************
+
+        const uint16_t y0 = 120; // 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_Bold12pt7b);
+            getdisplay().setCursor(20, 50);
+            getdisplay().print("System Information");
+
+            getdisplay().drawXBitmap(320, 25, logo64_bits, logo64_width, logo64_height, commonData->fgcolor);
+
+            getdisplay().setFont(&Ubuntu_Bold8pt7b);
+
+            char ssid[23];
+            snprintf(ssid, 23, "MCUDEVICE-%04X%08X", (uint16_t)(chipid >> 32), (uint32_t)chipid);
+            getdisplay().setCursor(20, 70);
+            getdisplay().print(ssid);
+            getdisplay().setCursor(20, 100);
+            getdisplay().print("Press STBY for white page and standby");
+
+            getdisplay().setCursor(2, y0);
+            getdisplay().print("Simulation:");
+            getdisplay().setCursor(120, y0);
+            getdisplay().print(simulation ? "on" : "off");
+
+            getdisplay().setCursor(202, y0);
+            getdisplay().print("Wifi:");
+            getdisplay().setCursor(300, y0);
+            getdisplay().print(commonData->status.wifiApOn ? "On" : "Off");
+
+            getdisplay().setCursor(2, y0 + 16);
+            getdisplay().print("Environment:");
+            getdisplay().setCursor(120, y0 + 16);
+            getdisplay().print(env_module);
+
+            getdisplay().setCursor(2, y0 + 32);
+            getdisplay().print("Buzzer:");
+            getdisplay().setCursor(120, y0 + 32);
+            getdisplay().print(buzzer_mode);
+
+            getdisplay().setCursor(2, y0 + 48);
+            getdisplay().print("CPU speed:");
+            getdisplay().setCursor(120, y0 + 48);
+            getdisplay().print(cpuspeed);
+            getdisplay().print(" / ");
+            int cpu_freq = esp_clk_cpu_freq() / 1000000;
+            getdisplay().print(String(cpu_freq));
+
+            getdisplay().setCursor(2, y0 + 64);
+            getdisplay().print("RTC:");
+            getdisplay().setCursor(120, y0 + 64);
+            getdisplay().print(rtc_module);
+
+            getdisplay().setCursor(202, y0 + 64);
+            getdisplay().print("GPS:");
+            getdisplay().setCursor(300, y0 + 64);
+            getdisplay().print(gps_module);
+
+            getdisplay().setCursor(2, y0 + 80);
+            getdisplay().print("FRAM:");
+            getdisplay().setCursor(120, y0 + 80);
+            getdisplay().print(hasFRAM ? "available" : "not found");
+
+            getdisplay().setCursor(2, y0 + 120);
+            getdisplay().print("Firmware Version: ");
+            getdisplay().print(VERSINFO);
+
+
+        } else {
+            // NMEA2000 device list
+            getdisplay().setFont(&Ubuntu_Bold12pt7b);
+            getdisplay().setCursor(20, 50);
+            getdisplay().print("NMEA2000 device list");
+
+            getdisplay().setFont(&Ubuntu_Bold8pt7b);
+            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)
+
+    };
+};
+
+static Page* createPage(CommonData &common){
+    return new PageSystem(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 registerPageSystem(
+    "System",   // Page name
+    createPage, // Action
+    0,          // No bus values
+    true        // Headers are anabled so far
+);
+
+#endif
--- a/lib/obp60task/PageThreeValues.cpp
+++ b/lib/obp60task/PageThreeValues.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageTwoValues.cpp
+++ b/lib/obp60task/PageTwoValues.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageVoltage.cpp
+++ b/lib/obp60task/PageVoltage.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageWhite.cpp
+++ b/lib/obp60task/PageWhite.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageWind.cpp
+++ b/lib/obp60task/PageWind.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageWindRose.cpp
+++ b/lib/obp60task/PageWindRose.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageWindRoseFlex.cpp
+++ b/lib/obp60task/PageWindRoseFlex.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/PageXTETrack.cpp
+++ b/lib/obp60task/PageXTETrack.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/obp60task/Pagedata.h
+++ b/lib/obp60task/Pagedata.h
@ -115,7 +115,7 @@ class Page{
            commonData->keydata[5].label = "";
        }
 #endif
-#ifdef HARDWARE_LIGHT
+#ifdef BOARD_OBP40S3
        commonData->keydata[0].label = "";
        commonData->keydata[1].label = "";

--- a/lib/obp60task/gen_set.py
+++ b/lib/obp60task/gen_set.py
@ -31,7 +31,7 @@ no_of_fields_per_page = {
    "White": 0,
    "WindRose": 0,
    "WindRoseFlex": 6,
-    "SixValues" : 6,
+   # "SixValues" : 6,
 }

 # No changes needed beyond this point
--- a/lib/obp60task/images/logo64.xbm
+++ b/lib/obp60task/images/logo64.xbm
@ -0,0 +1,51 @@
+#ifndef _LOGO64_XBM_
+#define _LOGO64_XBM_ 1
+
+#define logo64_width 64
+#define logo64_height 64
+static unsigned char logo64_bits[] PROGMEM = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 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, 0xff, 0xff, 0xff, 0xff,
+   0x00, 0x00, 0x00, 0xc1, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x80, 0xc1,
+   0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xc0, 0xc1, 0x7f, 0xf8, 0x01, 0xfe,
+   0x00, 0x00, 0xc0, 0xc1, 0x1f, 0xe0, 0x01, 0xfc, 0x00, 0x00, 0xe0, 0xc1,
+   0x0f, 0xc3, 0xf1, 0xf8, 0x00, 0x00, 0xf0, 0xc1, 0xc7, 0x8f, 0xf1, 0xf9,
+   0x00, 0x00, 0xf8, 0xc1, 0xc7, 0x8f, 0xf1, 0xf9, 0x00, 0x00, 0xf8, 0xc1,
+   0xe7, 0x9f, 0xf1, 0xf8, 0x00, 0x00, 0xfc, 0xc1, 0xe7, 0x9f, 0x01, 0xfc,
+   0x00, 0x00, 0xfe, 0xc1, 0xe7, 0x9f, 0x01, 0xfe, 0x00, 0x00, 0xfe, 0xc1,
+   0xc7, 0x8f, 0xf1, 0xff, 0x00, 0x00, 0xff, 0xc1, 0xc7, 0x8f, 0xf1, 0xff,
+   0x00, 0x80, 0xff, 0xc1, 0x8f, 0xc7, 0xf1, 0xff, 0x00, 0x80, 0xff, 0xc1,
+   0x1f, 0xe0, 0xf1, 0xff, 0x00, 0xc0, 0xff, 0xc1, 0x7f, 0xf8, 0xf1, 0xff,
+   0x00, 0xe0, 0xff, 0xc1, 0xff, 0xff, 0xff, 0xff, 0x00, 0xf0, 0xff, 0xc1,
+   0xff, 0xff, 0xff, 0xff, 0x00, 0xf0, 0xff, 0xc1, 0xff, 0xff, 0xff, 0xff,
+   0x00, 0xf8, 0xff, 0xc1, 0x0f, 0xe0, 0xf8, 0xfc, 0x00, 0xfc, 0xff, 0xc1,
+   0x0f, 0xe0, 0xf8, 0xfc, 0x00, 0xfc, 0xff, 0xc1, 0xcf, 0xff, 0xf0, 0xfc,
+   0x00, 0xfe, 0xff, 0xc1, 0xcf, 0xff, 0xe0, 0xfc, 0x00, 0xff, 0xff, 0xc1,
+   0xcf, 0xff, 0xe4, 0xfc, 0x00, 0xff, 0xff, 0xc1, 0x0f, 0xe0, 0xc4, 0xfc,
+   0x80, 0xff, 0xff, 0xc1, 0x0f, 0xe0, 0xcc, 0xfc, 0xc0, 0xff, 0xff, 0xc1,
+   0xcf, 0xff, 0x8c, 0xfc, 0xe0, 0xff, 0xff, 0xc1, 0xcf, 0xff, 0x9c, 0xfc,
+   0xe0, 0xff, 0xff, 0xc1, 0xcf, 0xff, 0x1c, 0xfc, 0xf0, 0xff, 0xff, 0xc1,
+   0xcf, 0xff, 0x3c, 0xfc, 0xf8, 0xff, 0xff, 0xc1, 0x0f, 0xe0, 0x7c, 0xfc,
+   0xf8, 0xff, 0xff, 0xc1, 0x0f, 0xe0, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xc1,
+   0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xc1, 0xff, 0xff, 0xff, 0xff,
+   0xfe, 0xff, 0xff, 0xc1, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x3c, 0x00, 0x00, 0x38, 0x00, 0x04, 0x00, 0x00, 0x44, 0x00, 0x10, 0x48,
+   0x00, 0x00, 0x00, 0x01, 0x44, 0x86, 0x7b, 0x48, 0x67, 0xc4, 0xf0, 0x77,
+   0x3c, 0x09, 0x12, 0x38, 0x91, 0x24, 0x09, 0x11, 0x44, 0xc9, 0x13, 0x08,
+   0x91, 0xe4, 0x09, 0x61, 0x44, 0x49, 0x12, 0x08, 0x91, 0x24, 0x08, 0x41,
+   0x3c, 0xc6, 0x73, 0x08, 0x61, 0xc4, 0x71, 0x77, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+
+#endif
--- a/lib/obp60task/images/unknown.xbm
+++ b/lib/obp60task/images/unknown.xbm
@ -0,0 +1,171 @@
+#ifndef _UNKNOWN_XBM_
+#define _UNKNOWN_XBM_ 1
+
+#define unknown_width 120
+#define unknown_height 130
+static unsigned char unknown_bits[] PROGMEM = {
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x03, 0x00, 0x00, 0xe0, 0xff, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0xc0, 0x7f, 0x70, 0x80, 0xcf, 0x01, 0x00, 0x00,
+   0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xf7, 0xc0, 0x7f,
+   0x00, 0x00, 0xc0, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x80,
+   0xff, 0xfb, 0x7b, 0x00, 0x00, 0xf8, 0x7f, 0xe0, 0x0f, 0x00, 0x00, 0x00,
+   0x00, 0xfc, 0x07, 0xb8, 0xff, 0xfb, 0x7f, 0x00, 0xff, 0x3f, 0xf8, 0x1f,
+   0x00, 0x00, 0x00, 0x00, 0x9c, 0x0f, 0xd0, 0xff, 0xfd, 0x19, 0xe0, 0xff,
+   0x0d, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf0, 0xf9, 0x3f,
+   0x0d, 0xfc, 0x7f, 0x86, 0xff, 0x07, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x07,
+   0xfe, 0xc1, 0xdf, 0x07, 0xff, 0xc1, 0xe3, 0x3d, 0x03, 0x00, 0x00, 0x3f,
+   0x00, 0x00, 0x07, 0x7e, 0x81, 0xff, 0x84, 0x7f, 0xf3, 0x7b, 0x07, 0x03,
+   0x00, 0x00, 0x7e, 0x80, 0x3f, 0x0f, 0xf0, 0xc3, 0x3b, 0xe4, 0xdd, 0x9d,
+   0xcf, 0x80, 0x01, 0x00, 0x00, 0x6c, 0x00, 0xff, 0x3f, 0xe0, 0x17, 0x9c,
+   0x7f, 0xf7, 0xc3, 0x63, 0x80, 0x01, 0x00, 0x00, 0xfe, 0x0c, 0xf0, 0xfd,
+   0xc3, 0x3c, 0xde, 0xfd, 0xef, 0xf8, 0x18, 0x80, 0x01, 0x00, 0x00, 0xfe,
+   0x0e, 0xf0, 0x9f, 0x8f, 0x78, 0xcf, 0xfe, 0x1b, 0x3f, 0x0e, 0xc0, 0x00,
+   0x00, 0x00, 0xfe, 0x1d, 0xf0, 0xff, 0x9f, 0x21, 0xcc, 0xfb, 0xe7, 0x8f,
+   0x03, 0xc0, 0x00, 0x00, 0x00, 0xcc, 0x1f, 0xb0, 0xff, 0x1f, 0x00, 0xc0,
+   0xbf, 0xb9, 0xc7, 0x01, 0xc0, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0x3c, 0x1f,
+   0xfe, 0x00, 0xfe, 0x6f, 0xfe, 0xf1, 0x01, 0xc0, 0x00, 0x00, 0xf8, 0xfb,
+   0x1f, 0xbc, 0xfe, 0xff, 0xc0, 0xff, 0x9d, 0x7f, 0x7c, 0x00, 0x60, 0x00,
+   0x00, 0xfc, 0xef, 0x1d, 0xfc, 0xc3, 0xff, 0xe9, 0xcf, 0xed, 0x1f, 0x1f,
+   0x00, 0x60, 0x00, 0x00, 0xfe, 0xef, 0x1d, 0x00, 0x97, 0xf0, 0xf9, 0xcf,
+   0xfd, 0x87, 0x07, 0x03, 0x60, 0x00, 0x00, 0xfe, 0xcc, 0x0c, 0x00, 0xfc,
+   0x81, 0xff, 0xdf, 0xfd, 0xc0, 0xf9, 0x03, 0x60, 0x00, 0x00, 0xe4, 0xdc,
+   0x0f, 0x00, 0xf8, 0x9f, 0xff, 0xdf, 0x3d, 0xe0, 0x0f, 0x00, 0x60, 0x00,
+   0x00, 0xc0, 0xdf, 0x03, 0x00, 0xe0, 0xf1, 0xfe, 0xdf, 0x0c, 0xfe, 0xff,
+   0x01, 0x60, 0x00, 0x00, 0xc0, 0xcf, 0x01, 0x00, 0x60, 0xf3, 0xff, 0xdb,
+   0x06, 0xff, 0x01, 0x00, 0x70, 0x00, 0x00, 0x00, 0x8f, 0x01, 0x00, 0x78,
+   0xff, 0x1f, 0x9b, 0x87, 0xff, 0xff, 0x0f, 0x30, 0x00, 0x00, 0x00, 0x66,
+   0x03, 0x00, 0xfc, 0x7f, 0xfb, 0x99, 0xc7, 0xff, 0xff, 0x00, 0x30, 0x00,
+   0x00, 0x00, 0x06, 0x03, 0x00, 0xc6, 0xff, 0xff, 0xd9, 0x67, 0xff, 0xc1,
+   0x01, 0x70, 0x00, 0x00, 0x00, 0xc7, 0x03, 0x00, 0x07, 0x7c, 0xe3, 0xf9,
+   0xe3, 0xff, 0x7f, 0x00, 0x70, 0x00, 0x00, 0x80, 0xf3, 0x07, 0x00, 0x1f,
+   0x6c, 0xe0, 0x7b, 0xe3, 0xff, 0xff, 0x01, 0x70, 0x00, 0x00, 0x80, 0xd9,
+   0x06, 0x80, 0xff, 0x0f, 0xce, 0xef, 0xe3, 0xff, 0xf7, 0x01, 0x70, 0x00,
+   0x00, 0xe0, 0xbf, 0x0d, 0xc0, 0xff, 0x43, 0xe4, 0xef, 0xe3, 0x3f, 0x7f,
+   0x07, 0x60, 0x00, 0x00, 0xe0, 0xbf, 0x1d, 0xe0, 0x78, 0x43, 0x70, 0xec,
+   0xe1, 0xff, 0xf8, 0x1d, 0x60, 0x00, 0x00, 0xe0, 0xff, 0x19, 0x70, 0x00,
+   0x03, 0x37, 0xfc, 0xf1, 0xbf, 0xc3, 0x07, 0x60, 0x00, 0x00, 0xc0, 0xff,
+   0x19, 0x70, 0x80, 0x01, 0x3b, 0xd6, 0xf9, 0xef, 0x1c, 0x3e, 0x60, 0x00,
+   0x00, 0x80, 0x63, 0x1b, 0xf0, 0xc6, 0x39, 0x19, 0xfe, 0xf8, 0xbf, 0x31,
+   0xf8, 0x60, 0x00, 0x00, 0x00, 0x60, 0x3b, 0xf8, 0xfe, 0x98, 0x1f, 0xfe,
+   0xf8, 0x7f, 0x67, 0xe0, 0x61, 0x00, 0x00, 0x00, 0x60, 0x33, 0xfc, 0x7f,
+   0x80, 0x0f, 0xeb, 0xfc, 0xff, 0x0d, 0x80, 0xc7, 0x00, 0x00, 0x00, 0x60,
+   0x33, 0x0c, 0x7f, 0x06, 0x0c, 0x7f, 0xec, 0x6f, 0x0b, 0x00, 0xfe, 0x00,
+   0x00, 0x00, 0x60, 0x76, 0x0e, 0xf8, 0xbf, 0x87, 0x7f, 0xee, 0xdf, 0x00,
+   0x00, 0xf8, 0x01, 0x00, 0x00, 0xc0, 0x76, 0x0e, 0xb8, 0xa0, 0x87, 0x3f,
+   0xde, 0x3f, 0x01, 0x00, 0xf0, 0x03, 0x00, 0x00, 0xc0, 0xf6, 0x0f, 0x3c,
+   0x80, 0xdf, 0x3f, 0xdf, 0x77, 0x02, 0x00, 0xc0, 0x03, 0x00, 0x00, 0xc0,
+   0xdd, 0xef, 0x1f, 0x80, 0xfe, 0x9f, 0xdf, 0xe7, 0x06, 0x00, 0xe0, 0x03,
+   0x00, 0x00, 0x80, 0xfd, 0xfe, 0x1f, 0xcc, 0xff, 0xdf, 0xdf, 0xee, 0x18,
+   0x00, 0xf0, 0x03, 0x00, 0x00, 0x80, 0xfd, 0xff, 0x1b, 0xdc, 0xf6, 0xcf,
+   0xdf, 0xc0, 0x19, 0x00, 0x70, 0x00, 0x00, 0x00, 0x80, 0x7f, 0x03, 0x98,
+   0x01, 0xb6, 0xcf, 0x93, 0x80, 0x33, 0x00, 0x30, 0x00, 0x00, 0x00, 0x80,
+   0x7f, 0x01, 0x1c, 0xc0, 0xfe, 0xff, 0x9f, 0x00, 0x03, 0x00, 0x30, 0x00,
+   0x00, 0x00, 0x80, 0x9f, 0x01, 0x0c, 0xc0, 0xff, 0xe7, 0x9b, 0x01, 0x06,
+   0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0xff, 0x0f, 0x0e, 0xcc, 0xff, 0xe3,
+   0xbb, 0x01, 0x0c, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0xff, 0xcf, 0x07,
+   0x8c, 0xff, 0xf9, 0xbb, 0x01, 0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x80,
+   0xbf, 0xff, 0xcf, 0x1f, 0xdf, 0xfd, 0xbb, 0x09, 0x38, 0x00, 0x1c, 0x00,
+   0x00, 0x00, 0x80, 0xfb, 0xff, 0x8d, 0xdf, 0x6f, 0xfc, 0xbb, 0x01, 0x70,
+   0x00, 0x0c, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0x8f, 0xff, 0x3f, 0xff,
+   0xbb, 0x01, 0x60, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0xef, 0xe0, 0x8f,
+   0xbf, 0x1f, 0xbf, 0xab, 0x09, 0xe0, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00,
+   0xff, 0xf0, 0x8d, 0xd6, 0xc3, 0xbb, 0xab, 0x01, 0xc0, 0x01, 0x0e, 0x00,
+   0x00, 0x00, 0x00, 0x7f, 0x31, 0x00, 0x7e, 0xe0, 0x39, 0xab, 0x19, 0x80,
+   0x03, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x66, 0x19, 0x80, 0x79, 0x7c, 0x3c,
+   0xa9, 0x01, 0x00, 0x03, 0x06, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x19, 0x80,
+   0x6d, 0x7e, 0x1c, 0xb1, 0x01, 0x00, 0x07, 0x06, 0x00, 0x00, 0x00, 0x00,
+   0xe0, 0x1f, 0x80, 0x0d, 0x1c, 0x10, 0xb1, 0x01, 0x00, 0x06, 0x0e, 0x00,
+   0x00, 0x00, 0x00, 0xc0, 0x3f, 0x10, 0x00, 0x38, 0x00, 0xb1, 0x01, 0x00,
+   0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3d, 0xb3, 0x00, 0x3b, 0x00,
+   0xa1, 0x01, 0x00, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe7, 0xf1,
+   0xd8, 0x7f, 0x03, 0xb1, 0x01, 0x00, 0x1c, 0x06, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0xc3, 0xfb, 0xf0, 0x7f, 0x01, 0xb1, 0x01, 0x00, 0x18, 0x06, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x83, 0xfb, 0xf0, 0x7f, 0x01, 0xb1, 0x01, 0x00,
+   0x18, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0x01, 0x7f, 0x00,
+   0x80, 0x01, 0x00, 0x30, 0x06, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0x3f,
+   0x01, 0xff, 0x07, 0x80, 0x01, 0x00, 0x30, 0x06, 0x00, 0x00, 0x00, 0x00,
+   0xc0, 0xfd, 0x1d, 0x01, 0xfb, 0x3f, 0x80, 0x01, 0x00, 0x70, 0x06, 0x00,
+   0x00, 0x00, 0x00, 0xc0, 0xf0, 0xde, 0x67, 0x18, 0x7f, 0x80, 0x01, 0x00,
+   0x60, 0x07, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x78, 0xcf, 0x0f, 0x86, 0xfd,
+   0x81, 0x01, 0x00, 0x65, 0x07, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xaf, 0xbf,
+   0x3d, 0x80, 0xf9, 0x81, 0x01, 0xf8, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00,
+   0xe0, 0xaf, 0xff, 0x78, 0x00, 0xe0, 0x83, 0x01, 0x7f, 0xf8, 0x01, 0x00,
+   0x00, 0x00, 0x00, 0x70, 0xfe, 0x7f, 0x70, 0x20, 0x6c, 0x87, 0xe0, 0x07,
+   0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x30, 0xf8, 0x0f, 0xf0, 0x30, 0x06,
+   0xcf, 0xf8, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xdb, 0x0e,
+   0xd8, 0x00, 0x30, 0xcf, 0x3c, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xf8, 0xfb, 0x38, 0xfc, 0x01, 0x20, 0xcc, 0x0f, 0x00, 0x60, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x1c, 0x3e, 0xf8, 0xbf, 0x03, 0x06, 0xfd, 0x03, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x1e, 0xf8, 0xdf, 0x0f, 0x02,
+   0xff, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0xcc, 0x0f, 0xf0,
+   0x07, 0x3e, 0x30, 0xfa, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00,
+   0xfe, 0x07, 0x00, 0x03, 0x78, 0x30, 0xfb, 0x03, 0x00, 0x80, 0x03, 0x00,
+   0x00, 0x00, 0x00, 0xff, 0x06, 0x00, 0xc3, 0xff, 0x00, 0xff, 0x1f, 0x00,
+   0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0xfb, 0x03, 0x00, 0xbf, 0xdf, 0x01,
+   0xfe, 0x1f, 0x00, 0xc0, 0x03, 0x00, 0x00, 0x00, 0x00, 0xfb, 0x01, 0x00,
+   0xfe, 0x8f, 0x83, 0xef, 0x0f, 0x00, 0xe0, 0x03, 0x00, 0x00, 0x00, 0x80,
+   0xef, 0x00, 0x00, 0xf8, 0x03, 0x83, 0xb1, 0x03, 0x00, 0x60, 0x03, 0x00,
+   0x00, 0xe0, 0x80, 0x61, 0x00, 0x00, 0x80, 0x01, 0x04, 0xb0, 0x03, 0x03,
+   0x30, 0x03, 0x00, 0x00, 0xfc, 0xc1, 0x30, 0x06, 0x00, 0x80, 0x01, 0x1e,
+   0xa0, 0x87, 0x03, 0x30, 0x03, 0x00, 0x00, 0x7e, 0xff, 0xb8, 0x0f, 0x00,
+   0x80, 0x8b, 0x1f, 0x04, 0x86, 0x03, 0x18, 0x03, 0x00, 0x00, 0xf6, 0x7f,
+   0xf8, 0x3f, 0x00, 0x80, 0xff, 0x77, 0xfe, 0x86, 0x07, 0x0e, 0x01, 0x00,
+   0x00, 0xfe, 0x19, 0x00, 0x76, 0x00, 0x00, 0xff, 0x63, 0xf6, 0x86, 0xfd,
+   0x87, 0x01, 0x00, 0x00, 0xf6, 0x0f, 0x00, 0x7e, 0x00, 0x00, 0xfc, 0x60,
+   0x00, 0x8c, 0xf3, 0x81, 0x01, 0x00, 0x00, 0x06, 0x06, 0xfe, 0x7c, 0x00,
+   0x00, 0x70, 0xc0, 0x00, 0x8e, 0x07, 0x83, 0x01, 0x00, 0x00, 0xf8, 0xb3,
+   0xff, 0x7f, 0x00, 0x00, 0x60, 0xc0, 0x9c, 0x0f, 0xff, 0xc1, 0x00, 0x00,
+   0x00, 0xfc, 0xd9, 0x03, 0x3f, 0x00, 0x00, 0xe0, 0xc0, 0x80, 0x0d, 0x7e,
+   0xc0, 0x00, 0x00, 0x00, 0x0e, 0xde, 0x00, 0x1c, 0x00, 0x00, 0xe0, 0xff,
+   0x01, 0xfc, 0x0f, 0xc0, 0x00, 0x00, 0x00, 0xde, 0xdf, 0x00, 0x00, 0x00,
+   0x00, 0xfe, 0xbf, 0x03, 0xfc, 0x00, 0x66, 0x00, 0x00, 0x00, 0xda, 0xcc,
+   0x00, 0x00, 0x00, 0xc0, 0xff, 0x0f, 0x62, 0x1f, 0x00, 0x67, 0x00, 0x00,
+   0x00, 0x7e, 0xcc, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x03, 0xe3, 0x5f, 0xc1,
+   0x33, 0x00, 0x00, 0x00, 0x3e, 0x8e, 0x01, 0x00, 0x00, 0xf8, 0xf1, 0x03,
+   0x06, 0xfc, 0x7f, 0x33, 0x00, 0x00, 0x00, 0x0e, 0xde, 0x00, 0x00, 0x00,
+   0x6e, 0xc0, 0x07, 0x0e, 0xfc, 0x1f, 0x13, 0x00, 0x00, 0x00, 0x1e, 0x7c,
+   0x00, 0x00, 0x00, 0x1f, 0xe2, 0x3f, 0xef, 0x7f, 0x00, 0x1b, 0x00, 0x00,
+   0x00, 0x1c, 0x6c, 0x02, 0x00, 0x80, 0x07, 0xf8, 0xff, 0x47, 0x0c, 0x80,
+   0x19, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x03, 0x00, 0xc0, 0x03, 0xfb, 0xff,
+   0x0d, 0x0c, 0x80, 0x19, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00, 0x60,
+   0x40, 0x3f, 0x18, 0x4c, 0x3d, 0x80, 0x0b, 0x00, 0x00, 0x00, 0x00, 0xf0,
+   0x01, 0x00, 0x70, 0x40, 0x1f, 0x18, 0xfc, 0x37, 0x80, 0x0b, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0xb0, 0x1f, 0x18, 0x0c, 0x3e, 0x80,
+   0x9f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xc8, 0x08, 0x78,
+   0x2c, 0x06, 0x00, 0xdf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
+   0x60, 0x00, 0xf8, 0xcf, 0x06, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x0c, 0x35, 0x00, 0xf8, 0x9f, 0x06, 0x00, 0xfe, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x36, 0x00, 0xf8, 0x77, 0x03, 0x00,
+   0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x31, 0x00, 0xd8,
+   0xdd, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c,
+   0x1a, 0x00, 0x08, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0xce, 0x1e, 0x00, 0x0c, 0xfe, 0x03, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0x18, 0x00, 0x0c, 0x8c, 0x01, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xce, 0x1f, 0x00, 0x7c,
+   0xef, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xce,
+   0x1e, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0xce, 0xf0, 0x03, 0xfc, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0xde, 0xfb, 0x01, 0x0c, 0x5f, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbe, 0xef, 0x01, 0x06,
+   0x7d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e,
+   0xd7, 0x81, 0x87, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x3c, 0xdf, 0xc3, 0xc7, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0xfe, 0xff, 0xff, 0x3b, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0xfc, 0x7f, 0xfe,
+   0x3d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8,
+   0xfd, 0x7f, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x80, 0x37, 0xe6, 0xfe, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf7, 0xe3, 0xff, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x3f,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0xfe, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0xfe, 0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x01, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+
+#endif
--- a/lib/obp60task/obp60task.cpp
+++ b/lib/obp60task/obp60task.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include "obp60task.h"
 #include "Pagedata.h"                   // Data exchange for pages
 #include "OBP60Hardware.h"              // PIN definitions
@ -13,7 +13,7 @@
 #include "OBP60Extensions.h"            // Functions lib for extension board
 #include "OBP60Keypad.h"                // Functions for keypad

-#ifdef HARDWARE_LIGHT
+#ifdef BOARD_OBP40S3
 #include <FS.h> // SD-Card access
 #include <SD.h>
 #include <SPI.h>
@ -26,10 +26,10 @@
 //#include GxEPD_BitmapExamples         // Example picture
 #include "MFD_OBP60_400x300_sw.h"       // MFD with logo
 #include "Logo_OBP_400x300_sw.h"        // OBP Logo
+#include "images/unknown.xbm"           // unknown page indicator
 #include "OBP60QRWiFi.h"                // Functions lib for WiFi QR code
 #include "OBPSensorTask.h"              // Functions lib for sensor data

-#include "LedSpiTask.h"

 // Global vars
 bool initComplete = false;      // Initialization complete
@ -54,8 +54,9 @@ void OBP60Init(GwApi *api){
    // Init hardware
    hardwareInit(api);

-#ifdef HARDWARE_LIGHT
-    String sdcard = config->getConfigItem(config->useSDCard, true)->asString();
+#ifdef BOARD_OBP40S3
+    //String sdcard = config->getConfigItem(config->useSDCard, true)->asString();
+    String sdcard = "on";
    if (sdcard == "on") {
        setPortPin(OBP_POWER_SD, true); // Power on SD
        delay(10);
@ -88,7 +89,7 @@ void OBP60Init(GwApi *api){
        #ifdef HARDWARE_V21
        setPortPin(OBP_POWER_50, true); // Power on 5.0V rail
        #endif
-        #ifdef HARDWARE_LIGHT
+        #ifdef BOARD_OBP40S3
        setPortPin(OBP_POWER_EPD, true);// Power on ePaper display
        #endif
    }
@ -96,7 +97,7 @@ void OBP60Init(GwApi *api){
        #ifdef HARDWARE_V21
        setPortPin(OBP_POWER_50, false); // Power off 5.0V rail
        #endif
-        #ifdef HARDWARE_LIGHT
+        #ifdef BOARD_OBP40S3
        setPortPin(OBP_POWER_EPD, false);// Power off ePaper display
        #endif
    }
@ -163,7 +164,7 @@ void keyboardTask(void *param){

    // Loop for keyboard task
    while (true){
-        keycode = readKeypad(data->sensitivity);
+        keycode = readKeypad(data->logger, data->sensitivity);
        //send a key event
        if(keycode != 0){
            xQueueSend(data->queue, &keycode, 0);
@ -240,8 +241,10 @@ void registerAllPages(PageList &list){
    //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
-    extern PageDescription registerPageOneValue;
+    extern PageDescription registerPageSystem;
    //we add the variable to our list
+    list.add(&registerPageSystem);
+    extern PageDescription registerPageOneValue;
    list.add(&registerPageOneValue);
    extern PageDescription registerPageTwoValues;
    list.add(&registerPageTwoValues);
@ -446,6 +449,8 @@ void OBP60Task(GwApi *api){
            pages[i].parameters.values.push_back(value); 
       }
    }
+    // add out of band system page (always available)
+    Page *syspage = allPages.pages[0]->creator(commonData);

    // Display screenshot handler for HTTP request
    // http://192.168.15.1/api/user/OBP60Task/screenshot
@ -507,11 +512,11 @@ void OBP60Task(GwApi *api){

    // Main loop runs with 100ms
    //####################################################################################
-    
+
+    bool systemPage = false;
    while (true){
        delay(100);     // Delay 100ms (loop time)

-    
        // Undervoltage detection
        if(uvoltage == true){
            underVoltageDetection(api, commonData);
@ -552,12 +557,27 @@ void OBP60Task(GwApi *api){
            int keyboardMessage=0;
            while (xQueueReceive(allParameters.queue,&keyboardMessage,0)){
                LOG_DEBUG(GwLog::LOG,"new key from keyboard %d",keyboardMessage);
-                
-                Page *currentPage=pages[pageNumber].page;
-                if (currentPage ){
-                    keyboardMessage=currentPage->handleKey(keyboardMessage);
+
+                Page *currentPage;
+                if (keyboardMessage == 12) {
+                    LOG_DEBUG(GwLog::LOG, "Calling system page");
+                    systemPage = true; // System page is out of band
+                    syspage->setupKeys();
                }
-                if (keyboardMessage > 0)
+                else {
+                    currentPage = pages[pageNumber].page;
+                    if (systemPage && keyboardMessage == 1) {
+                        // exit system mode with exit key number 1
+                        systemPage = false;
+                        currentPage->setupKeys();
+                    }
+                }
+                if (systemPage) {
+                    keyboardMessage = syspage->handleKey(keyboardMessage);
+                } else if (currentPage) {
+                    keyboardMessage = currentPage->handleKey(keyboardMessage);
+                }
+                if (keyboardMessage > 0) // not handled by page
                {
                    // Decoding all key codes
                    // #6 Backlight on if key controled
@ -613,8 +633,7 @@ void OBP60Task(GwApi *api){
                        }
                        else{
                            setBacklightLED(0, COLOR_BLUE); // Backlight LEDs off (blue without britghness)
-                        }           
-
+                        }
                    }
                }
            }
@ -671,36 +690,53 @@ void OBP60Task(GwApi *api){
                api->getBoatDataValues(boatValues.numValues,boatValues.allBoatValues);
                api->getStatus(commonData.status);

+                // Clear display
+                // getdisplay().fillRect(0, 0, getdisplay().width(), getdisplay().height(), commonData.bgcolor);
+                getdisplay().fillScreen(commonData.bgcolor);  // Clear display
+
                // Show header if enabled
-                getdisplay().fillRect(0, 0, getdisplay().width(), getdisplay().height(), commonData.bgcolor);   // Clear display
-                if (pages[pageNumber].description && pages[pageNumber].description->header){
+                if (pages[pageNumber].description && pages[pageNumber].description->header or systemPage){
                    // build header using commonData
-                    getdisplay().fillScreen(commonData.bgcolor);  // Clear display
                    displayHeader(commonData, date, time, hdop);  // Show page header
                }

                // Call the particular page
-                Page *currentPage=pages[pageNumber].page;
-                if (currentPage == NULL){
-                    LOG_DEBUG(GwLog::ERROR,"page number %d not found",pageNumber);
-                    // Error handling for missing page
+                if (systemPage) {
+                    displayFooter(commonData);
+                    PageData sysparams; // empty
+                    syspage->displayPage(sysparams);
                }
-                else{
-                    if (lastPage != pageNumber){
-                        if (hasFRAM) fram.write(FRAM_PAGE_NO, pageNumber); // remember page for device restart
-                        currentPage->setupKeys();
-                        currentPage->displayNew(pages[pageNumber].parameters);
-                        lastPage=pageNumber;
+                else {
+                    Page *currentPage = pages[pageNumber].page;
+                    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
+                        getdisplay().fillScreen(commonData.bgcolor);  // Clear display
+                        getdisplay().drawXBitmap(200 - unknown_width / 2, 150 - unknown_height / 2, unknown_bits, unknown_width, unknown_height, commonData.fgcolor);
+                        getdisplay().setCursor(140, 250);
+                        getdisplay().setFont(&Atari16px);
+                        getdisplay().print("Here be dragons!");
+                        getdisplay().nextPage(); // Partial update (fast)
                    }
-                    //call the page code
-                    LOG_DEBUG(GwLog::DEBUG,"calling page %d",pageNumber);
-                    // Show footer if enabled (together with header)
-                    if (pages[pageNumber].description && pages[pageNumber].description->header){
-                        displayFooter(commonData);
+                    else{
+                        if (lastPage != pageNumber){
+                            if (hasFRAM) fram.write(FRAM_PAGE_NO, pageNumber); // remember page for device restart
+                            currentPage->setupKeys();
+                            currentPage->displayNew(pages[pageNumber].parameters);
+                            lastPage=pageNumber;
+                        }
+                        //call the page code
+                        LOG_DEBUG(GwLog::DEBUG,"calling page %d",pageNumber);
+                        // Show footer if enabled (together with header)
+                        if (pages[pageNumber].description && pages[pageNumber].description->header){
+                            displayFooter(commonData);
+                        }
+                        currentPage->displayPage(pages[pageNumber].parameters);
                    }
-                    currentPage->displayPage(pages[pageNumber].parameters);
+
                }
-            }
+            } // refresh display all 1s
        }
    }
    vTaskDelete(NULL);
--- a/lib/obp60task/obp60task.h
+++ b/lib/obp60task/obp60task.h
@ -1,7 +1,7 @@
 #pragma once
 #include "GwApi.h"
 //we only compile for some boards
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
    #define USBSerial Serial
    #ifdef HARDWARE_V21
        // CAN NMEA2000
@ -14,7 +14,7 @@
        #define GWSERIAL_RX 8
        #define GWSERIAL_MODE "UNI"
    #endif
-    #ifdef HARDWARE_LIGHT
+    #ifdef BOARD_OBP40S3
        // CAN NMEA2000
        #define ESP32_CAN_TX_PIN 15
        #define ESP32_CAN_RX_PIN 16
@ -38,7 +38,7 @@
    #ifdef HARDWARE_V21
    DECLARE_CAPABILITY(obp60,true);
    #endif
-    #ifdef HARDWARE_LIGHT
+    #ifdef BOARD_OBP40S3
    DECLARE_CAPABILITY(obp40,true)
    #endif
    DECLARE_STRING_CAPABILITY(HELP_URL, "https://obp60-v2-docu.readthedocs.io/de/latest/"); // Link to help pages
--- a/lib/obp60task/platformio.ini
+++ b/lib/obp60task/platformio.ini
@ -10,7 +10,6 @@ board_build.variants_dir = variants
 #board = obp60_s3_n16    #ESP32-S3 N16,16MB flash, no PSRAM, zero series
 #board = obp60_s3_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM
 board = obp60_s3_n16r8  #ESP32-S3 N16R8, 16MB flash, 8MB PSRAM, production series
-#board = obp60_s3_light_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone
 #board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
 board_build.partitions = default_16MB.csv #ESP32-S3 N16, 16MB flash
 framework = arduino
@ -39,15 +38,12 @@ lib_deps =
    adafruit/Adafruit FRAM I2C@^2.0.3
 build_flags=
    #https://thingpulse.com/usb-settings-for-logging-with-the-esp32-s3-in-platformio/?srsltid=AfmBOopGskbkr4GoeVkNlFaZXe_zXkLceKF6Rn-tmoXABCeAR2vWsdHL
-#    -D ARDUINO_USB_MODE=1           #0=OTG (to implement other external devices), 1=CDC (is a serial device) 
-#    -D ARDUINO_USB_CDC_ON_BOOT=1    #0=JTAG, 1=CDC (serial device)
 #    -D CORE_DEBUG_LEVEL=1           #Debug level for CPU core via CDC (seral device)
 #    -D TIME=$UNIX_TIME              #Set PC time for RTC (only settable via VSC)
    -D DISABLE_DIAGNOSTIC_OUTPUT    #Disable diagnostic output for GxEPD2 lib
    -D BOARD_OBP60S3                #Board OBP60 V2.1 with ESP32S3
 #    -D HARDWARE_V20                 #OBP60 hardware revision V2.0
    -D HARDWARE_V21                 #OBP60 hardware revision V2.1
-#    -D HARDWARE_LIGHT               #OBP60 hardware clone
 #    -D DISPLAY_GDEW042T2            #old E-Ink display from Waveshare, R10 0.47 ohm
    -D DISPLAY_GDEY042T81           #new E-Ink display from Waveshare, R10 2.2 ohm
 #    -D DISPLAY_GYE042A87            #alternativ E-Ink display from Genyo Optical, R10 2.2 ohm
@ -60,10 +56,10 @@ upload_protocol = esptool           #firmware upload via USB OTG seriell, by fir
 upload_speed = 230400
 monitor_speed = 115200

-[env:obp40]
+[env:obp40_s3]
 platform = espressif32@6.8.1
 board_build.variants_dir = variants
-board = obp60_s3_light_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone
+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
 custom_config = config_obp40.json
 framework = arduino
@ -93,8 +89,7 @@ lib_deps =
    adafruit/Adafruit FRAM I2C@^2.0.3
 build_flags=
    -D DISABLE_DIAGNOSTIC_OUTPUT    #Disable diagnostic output for GxEPD2 lib
-    -D BOARD_OBP60S3                #Board OBP60 V2.1 with ESP32S3
-    -D HARDWARE_LIGHT               #OBP60 hardware clone (OBP40)
+    -D BOARD_OBP40S3                #Board OBP40 V1.0 with ESP32S3 SKU:DIE07300S (CrowPanel 4.2)
    -D DISPLAY_GDEY042T81           #new E-Ink display from Waveshare, R10 2.2 ohm
    ${env.build_flags}
 upload_port = /dev/ttyUSB0          #OBP60 clone
--- a/lib/obp60task/platformio.ini.light
+++ b/lib/obp60task/platformio.ini.light
@ -1,61 +0,0 @@
-[platformio]
-#if you want a pio run to only build
-#your special environments you can set this here
-#by uncommenting the next line
-default_envs = obp60_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
-#board = obp60_s3_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM
-#board = obp60_s3_n16r8  #ESP32-S3 N16R8, 16MB flash, 8MB PSRAM, production series
-board = obp60_s3_light_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone
-board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
-#board_build.partitions = default_16MB.csv #ESP32-S3 N16, 16MB flash
-framework = arduino
-lib_deps = 
-    ${basedeps.lib_deps}
-    Wire
-    SPI
-    esphome/AsyncTCP-esphome@2.0.1
-    robtillaart/PCF8574@0.3.9
-    adafruit/Adafruit Unified Sensor @ 1.1.13
-    blemasle/MCP23017@2.0.0
-    adafruit/Adafruit BusIO@1.5.0
-    adafruit/Adafruit GFX Library@1.11.9
-    #zinggjm/GxEPD2@1.5.8
-    #https://github.com/ZinggJM/GxEPD2
-    https://github.com/thooge/GxEPD2
-    sstaub/Ticker@4.4.0
-    adafruit/Adafruit BMP280 Library@2.6.2
-    adafruit/Adafruit BME280 Library@2.2.2
-    adafruit/Adafruit BMP085 Library@1.2.1
-    enjoyneering/HTU21D@1.2.1
-    robtillaart/INA226@0.2.0
-    paulstoffregen/OneWire@2.3.8
-    milesburton/DallasTemperature@3.11.0
-    signetica/SunRise@2.0.2
-    adafruit/Adafruit FRAM I2C@^2.0.3
-build_flags=
-    #https://thingpulse.com/usb-settings-for-logging-with-the-esp32-s3-in-platformio/?srsltid=AfmBOopGskbkr4GoeVkNlFaZXe_zXkLceKF6Rn-tmoXABCeAR2vWsdHL
-#    -D ARDUINO_USB_MODE=1           #0=OTG (to implement other external devices), 1=CDC (is a serial device) 
-    -D ARDUINO_USB_CDC_ON_BOOT=0    #Serial output via RX/TX
-#    -D CORE_DEBUG_LEVEL=1           #Debug level for CPU core via CDC (seral device)
-#    -D TIME=$UNIX_TIME              #Set PC time for RTC (only settable via VSC)
-    -D DISABLE_DIAGNOSTIC_OUTPUT    #Disable diagnostic output for GxEPD2 lib
-    -D BOARD_OBP60S3                #Board OBP60 V2.1 with ESP32S3
-#    -D HARDWARE_V20                 #OBP60 hardware revision V2.0
-#    -D HARDWARE_V21                 #OBP60 hardware revision V2.1
-    -D HARDWARE_LIGHT               #OBP60 hardware clone
-#    -D DISPLAY_GDEW042T2            #old E-Ink display from Waveshare, R10 0.47 ohm
-    -D DISPLAY_GDEY042T81           #new E-Ink display from Waveshare, R10 2.2 ohm
-#    -D DISPLAY_GYE042A87            #alternativ E-Ink display from Genyo Optical, R10 2.2 ohm
-#    -D DISPLAY_SE0420NQ04           #alternativ E-Ink display from SID Technology, R10 2.2 ohm
-    ${env.build_flags}
-#CONFIG_ESP_TASK_WDT_TIMEOUT_S = 10 #Task Watchdog timeout period (seconds) [1...60] 5 default
-#upload_port = /dev/ttyACM0          #OBP60 original
-upload_port = /dev/ttyUSB0          #OBP60 clone
-upload_protocol = esptool           #firmware upload via USB OTG seriell, by first upload need to set the ESP32-S3 in the upload mode with shortcut GND to Pin27 
-upload_speed = 230400
-monitor_speed = 115200
--- a/lib/obp60task/platformio.ini.orig
+++ b/lib/obp60task/platformio.ini.orig
@ -1,61 +0,0 @@
-[platformio]
-#if you want a pio run to only build
-#your special environments you can set this here
-#by uncommenting the next line
-default_envs = obp60_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
-#board = obp60_s3_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM
-board = obp60_s3_n16r8  #ESP32-S3 N16R8, 16MB flash, 8MB PSRAM, production series
-#board = obp60_s3_light_n8r8   #ESP32-S3 N8R8, 8MB flash, 8MB PSRAM, OBP60 clone
-#board_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
-board_build.partitions = default_16MB.csv #ESP32-S3 N16, 16MB flash
-framework = arduino
-lib_deps = 
-    ${basedeps.lib_deps}
-    Wire
-    SPI
-    esphome/AsyncTCP-esphome@2.0.1
-    robtillaart/PCF8574@0.3.9
-    adafruit/Adafruit Unified Sensor @ 1.1.13
-    blemasle/MCP23017@2.0.0
-    adafruit/Adafruit BusIO@1.5.0
-    adafruit/Adafruit GFX Library@1.11.9
-    #zinggjm/GxEPD2@1.5.8
-    #https://github.com/ZinggJM/GxEPD2
-    https://github.com/thooge/GxEPD2
-    sstaub/Ticker@4.4.0
-    adafruit/Adafruit BMP280 Library@2.6.2
-    adafruit/Adafruit BME280 Library@2.2.2
-    adafruit/Adafruit BMP085 Library@1.2.1
-    enjoyneering/HTU21D@1.2.1
-    robtillaart/INA226@0.2.0
-    paulstoffregen/OneWire@2.3.8
-    milesburton/DallasTemperature@3.11.0
-    signetica/SunRise@2.0.2
-    adafruit/Adafruit FRAM I2C@^2.0.3
-build_flags=
-    #https://thingpulse.com/usb-settings-for-logging-with-the-esp32-s3-in-platformio/?srsltid=AfmBOopGskbkr4GoeVkNlFaZXe_zXkLceKF6Rn-tmoXABCeAR2vWsdHL
-#    -D ARDUINO_USB_MODE=1           #0=OTG (to implement other external devices), 1=CDC (is a serial device) 
-#    -D ARDUINO_USB_CDC_ON_BOOT=1    #0=JTAG, 1=CDC (serial device)
-#    -D CORE_DEBUG_LEVEL=1           #Debug level for CPU core via CDC (seral device)
-#    -D TIME=$UNIX_TIME              #Set PC time for RTC (only settable via VSC)
-    -D DISABLE_DIAGNOSTIC_OUTPUT    #Disable diagnostic output for GxEPD2 lib
-    -D BOARD_OBP60S3                #Board OBP60 V2.1 with ESP32S3
-#    -D HARDWARE_V20                 #OBP60 hardware revision V2.0
-    -D HARDWARE_V21                 #OBP60 hardware revision V2.1
-#    -D HARDWARE_LIGHT               #OBP60 hardware clone
-#    -D DISPLAY_GDEW042T2            #old E-Ink display from Waveshare, R10 0.47 ohm
-    -D DISPLAY_GDEY042T81           #new E-Ink display from Waveshare, R10 2.2 ohm
-#    -D DISPLAY_GYE042A87            #alternativ E-Ink display from Genyo Optical, R10 2.2 ohm
-#    -D DISPLAY_SE0420NQ04           #alternativ E-Ink display from SID Technology, R10 2.2 ohm
-    ${env.build_flags}
-#CONFIG_ESP_TASK_WDT_TIMEOUT_S = 10 #Task Watchdog timeout period (seconds) [1...60] 5 default
-upload_port = /dev/ttyACM0          #OBP60 original
-#upload_port = /dev/ttyUSB0          #OBP60 clone
-upload_protocol = esptool           #firmware upload via USB OTG seriell, by first upload need to set the ESP32-S3 in the upload mode with shortcut GND to Pin27 
-upload_speed = 230400
-monitor_speed = 115200
--- a/lib/queue/obp60task/AS5600.cpp
+++ b/lib/queue/obp60task/AS5600.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 /****************************************************
  AMS 5600 class for Arduino platform
--- a/lib/queue/obp60task/OBP60Extensions.cpp
+++ b/lib/queue/obp60task/OBP60Extensions.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include <Arduino.h>
 #define FASTLED_ALL_PINS_HARDWARE_SPI
--- a/lib/queue/obp60task/OBP60Formater.cpp
+++ b/lib/queue/obp60task/OBP60Formater.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include <Arduino.h>
 #include "GwApi.h"
--- a/lib/queue/obp60task/OBPSensorTask.cpp
+++ b/lib/queue/obp60task/OBPSensorTask.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include <Adafruit_Sensor.h>            // Adafruit Lib for sensors
 #include <Adafruit_BME280.h>            // Adafruit Lib for BME280
 #include <Adafruit_BMP280.h>            // Adafruit Lib for BMP280
--- a/lib/queue/obp60task/PageApparentWind.cpp
+++ b/lib/queue/obp60task/PageApparentWind.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageBME280.cpp
+++ b/lib/queue/obp60task/PageBME280.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageBattery.cpp
+++ b/lib/queue/obp60task/PageBattery.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageBattery2.cpp
+++ b/lib/queue/obp60task/PageBattery2.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageClock.cpp
+++ b/lib/queue/obp60task/PageClock.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageDST810.cpp
+++ b/lib/queue/obp60task/PageDST810.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageFourValues.cpp
+++ b/lib/queue/obp60task/PageFourValues.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageFourValues2.cpp
+++ b/lib/queue/obp60task/PageFourValues2.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageGenerator.cpp
+++ b/lib/queue/obp60task/PageGenerator.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3s

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageKeelPosition.cpp
+++ b/lib/queue/obp60task/PageKeelPosition.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageOneValue.cpp
+++ b/lib/queue/obp60task/PageOneValue.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageRollPitch.cpp
+++ b/lib/queue/obp60task/PageRollPitch.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageRudderPosition.cpp
+++ b/lib/queue/obp60task/PageRudderPosition.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageSolar.cpp
+++ b/lib/queue/obp60task/PageSolar.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageThreeValues.cpp
+++ b/lib/queue/obp60task/PageThreeValues.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageTwoValues.cpp
+++ b/lib/queue/obp60task/PageTwoValues.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageVoltage.cpp
+++ b/lib/queue/obp60task/PageVoltage.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageWhite.cpp
+++ b/lib/queue/obp60task/PageWhite.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/PageWindRose.cpp
+++ b/lib/queue/obp60task/PageWindRose.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3

 #include "Pagedata.h"
 #include "OBP60Extensions.h"
--- a/lib/queue/obp60task/obp60task.cpp
+++ b/lib/queue/obp60task/obp60task.cpp
@ -1,4 +1,4 @@
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
 #include "obp60task.h"
 #include "Pagedata.h"                   // Data exchange for pages
 #include "OBP60Hardware.h"              // PIN definitions
--- a/lib/queue/obp60task/obp60task.h
+++ b/lib/queue/obp60task/obp60task.h
@ -1,7 +1,7 @@
 #pragma once
 #include "GwApi.h"
 //we only compile for some boards
-#ifdef BOARD_OBP60S3
+#if defined BOARD_OBP60S3 || defined BOARD_OBP40S3
    #define USBSerial Serial
    // CAN NMEA2000
    #define ESP32_CAN_TX_PIN 46
--- a/variants/obp60s3_light/pins_arduino.h
+++ b/variants/obp60s3_light/pins_arduino.h
@ -12,7 +12,7 @@
 #define NUM_DIGITAL_PINS        48
 #define NUM_ANALOG_INPUTS       20

-// Multi Function Display OBP60 V2.0
+// Multi Function Display OBP40 V1.0
 static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 #define BUILTIN_LED  LED_BUILTIN // backward compatibility
 #define LED_BUILTIN LED_BUILTIN
Author	SHA1	Message	Date
norbert-walter	569273519c	Correct splitting between OBP60 and OBP40 hardware	2025-01-20 21:21:58 +01:00
Norbert Walter	4c8ffae0b6	Merge pull request #144 from thooge/system New system page	2025-01-20 20:22:01 +01:00
Thomas Hooge	a73f50ba74	First working system page	2025-01-20 19:20:37 +01:00
Norbert Walter	f377ab135d	Merge pull request #143 from thooge/master OBP40 integration code and improvements	2025-01-20 16:13:07 +01:00
Norbert Walter	e348e40ab4	Merge pull request #142 from TobiasE-github/master modified gen_set.py, as PageSixValues does not exist (yet)	2025-01-20 16:10:32 +01:00
Thomas Hooge	9d395c719a	More work on system page	2025-01-20 06:33:51 +01:00
Thomas Hooge	322ae30858	Merge branch 'master' into system	2025-01-19 15:09:29 +01:00
Tobias E	27b916c079	modified gen_set.py, as PageSixValues does not exist (yet)	2025-01-19 08:36:13 +00:00
Thomas Hooge	57e194e39d	Add new system page	2024-12-07 11:11:07 +01:00