Add key indicators

extra_script.py

@@ -10,7 +10,7 @@ from datetime import datetime
 import re
 import pprint
 from platformio.project.config import ProjectConfig
-
+from platformio.project.exception import InvalidProjectConfError
 
 Import("env")
 #print(env.Dump())
@@ -104,13 +104,22 @@ def writeFileIfChanged(fileName,data):
     return True    
 
 def mergeConfig(base,other):
+    try:
+        customconfig = env.GetProjectOption("custom_config")
+    except InvalidProjectConfError:
+        customconfig = None
     for bdir in other:
+        if customconfig and os.path.exists(os.path.join(bdir,customconfig)):
+            cname=os.path.join(bdir,customconfig)
+            print("merge custom config {}".format(cname))
+            with open(cname,'rb') as ah:
+                base += json.load(ah)
+            continue
         cname=os.path.join(bdir,"config.json")
         if os.path.exists(cname):
-            print("merge config %s"%cname)
+            print("merge config {}".format(cname))
             with open(cname,'rb') as ah:
-                merge=json.load(ah)
-                base=base+merge
+                base += json.load(ah)
     return base
 
 def replaceTexts(data,replacements):
@@ -274,9 +283,9 @@ class Grove:
     def _ss(self,z=False):
         if z:
             return self.name
-        return self.name if self.name is not 'Z' else ''
+        return self.name if self.name != 'Z' else ''
     def _suffix(self):
-        return '_'+self.name if self.name is not 'Z' else ''
+        return '_'+self.name if self.name != 'Z' else ''
     def replace(self,line):
         if line is None:
             return line

lib/obp60task/OBP60Extensions.cpp

@@ -326,12 +326,14 @@ void displayHeader(CommonData &commonData, GwApi::BoatValue *date, GwApi::BoatVa
         usbRxOld = commonData.status.usbRx;
         usbTxOld = commonData.status.usbTx;
 
+#ifdef HARDWARE_V21
         // Display key lock status
         if (commonData.keylock) {
             getdisplay().drawXBitmap(170, 1, lock_bits, icon_width, icon_height, commonData.fgcolor);
         } else {
             getdisplay().drawXBitmap(166, 1, swipe_bits, swipe_width, swipe_height, commonData.fgcolor);
         }
+#endif
 
         // Heartbeat as dot
         getdisplay().setTextColor(commonData.fgcolor);
@@ -376,6 +378,7 @@ void displayFooter(CommonData &commonData) {
     getdisplay().setFont(&Atari16px);
     getdisplay().setTextColor(commonData.fgcolor);
 
+#ifdef HARDWARE_V21
     // Frame around key icon area
     if (! commonData.keylock) {
         // horizontal elements
@@ -422,6 +425,32 @@ void displayFooter(CommonData &commonData) {
         getdisplay().setCursor(65, 295);
         getdisplay().print("Press 1 and 6 fast to unlock keys");
     }
+#endif
+#ifdef HARDWARE_LIGHT
+    // grapical page indicator
+    static const uint16_t r = 5;
+    static const uint16_t space = 4;
+    uint16_t w = commonData.data.maxpage * r * 2 + (commonData.data.maxpage - 1) * space;
+    uint16_t x0 = (GxEPD_WIDTH - w) / 2 + r * 2;
+    for (int i = 0; i < commonData.data.maxpage; i++) {
+        if (i == (commonData.data.actpage - 1)) {
+            getdisplay().fillCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
+        } else {
+            getdisplay().drawCircle(x0 + i * (r * 2 + space), 290, r, commonData.fgcolor);
+        }
+    }
+    // key indicators
+    // left side = top key "menu"
+    getdisplay().drawLine(0, 280, 10, 280, commonData.fgcolor);
+    getdisplay().drawLine(55, 280, 65, 280, commonData.fgcolor);
+    getdisplay().drawLine(65, 280, 65, 299, commonData.fgcolor);
+    drawTextCenter(33, 291, commonData.keydata[0].label);
+    // right side = bottom key "exit"
+    getdisplay().drawLine(390, 280, 399, 280, commonData.fgcolor);
+    getdisplay().drawLine(335, 280, 345, 280, commonData.fgcolor);
+    getdisplay().drawLine(335, 280, 335, 399, commonData.fgcolor);
+    drawTextCenter(366, 291, commonData.keydata[1].label);
+#endif
 }
 
 // Sunset und sunrise calculation

lib/obp60task/Pagedata.h

@@ -103,6 +103,7 @@ class Page{
     virtual void displayPage(PageData &pageData)=0;
     virtual void displayNew(PageData &pageData){}
     virtual void setupKeys() {
+#ifdef HARDWARE_V21
         commonData->keydata[0].label = "";
         commonData->keydata[1].label = "";
         commonData->keydata[2].label = "#LEFT";
@@ -113,6 +114,12 @@ class Page{
         } else {
             commonData->keydata[5].label = "";
         }
+#endif
+#ifdef HARDWARE_LIGHT
+        commonData->keydata[0].label = "";
+        commonData->keydata[1].label = "";
+
+#endif
     }
     //return -1 if handled by the page
     virtual int handleKey(int key){return key;}

lib/obp60task/README

@@ -7,7 +7,12 @@ Important information:
 THIS BRANCH IS NOT INTENDED TO MERGE INTO "master"!
 ***************************************************
 
-platformio.ini adapted to compile directly
+platformio.ini adapted to compile directly. For compile use matching
+environent:
+    pio run -e obp40
+
+for upload to device:
+    pio run -e obp40 -t upload
 
 Differences to OBP60
 --------------------

lib/obp60task/obp60task.cpp

@@ -327,8 +327,10 @@ void OBP60Task(GwApi *api){
     commonData.logger=logger;
     commonData.config=config;
 
+#ifdef HARDWARE_V21
     // Keyboard coordinates for page footer
     initKeys(commonData);
+#endif
 
     tN2kMsg N2kMsg;
 

lib/obp60task/obp60task.h

@@ -35,6 +35,11 @@
     // OBP60 Task
     void OBP60Task(GwApi *param);
     DECLARE_USERTASK_PARAM(OBP60Task, 35000);   // Need 35k RAM as stack size
+    #ifdef HARDWARE_V21
     DECLARE_CAPABILITY(obp60,true);
+    #endif
+    #ifdef HARDWARE_LIGHT
+    DECLARE_CAPABILITY(obp40,true)
+    #endif
     DECLARE_STRING_CAPABILITY(HELP_URL, "https://obp60-v2-docu.readthedocs.io/de/latest/"); // Link to help pages
 #endif

lib/obp60task/platformio.ini

@@ -14,7 +14,7 @@ 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 = 
+lib_deps =
     ${basedeps.lib_deps}
     Wire
     SPI
@@ -60,3 +60,46 @@ 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
+
+[env:obp40]
+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_build.partitions = default_8MB.csv #ESP32-S3 N8, 8MB flash
+custom_config = config_obp40.json
+framework = arduino
+lib_deps =
+    ${basedeps.lib_deps}
+    Wire
+    SPI
+    SD
+    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 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 DISPLAY_GDEY042T81           #new E-Ink display from Waveshare, R10 2.2 ohm
+    ${env.build_flags}
+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