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=0",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

lib/obp60task/README

@@ -9,27 +9,3 @@ THIS BRANCH IS NOT INTENDED TO MERGE INTO "master"!
 
 platformio.ini adapted to compile directly
 
-Differences to OBP60
---------------------
-
-- no GPS
-- no RTC
-- no LEDs
-- no environment sensor
-- no key lock
-- no swipe
-- only 5 keys
-
-+ SD card interface
-
-
-Keyboard
---------
-
-Keycode   Key              Function
--------- ---------------- -------------------------
-  1       Menu key         Key 1 of OBP60 (left)
-  2       Exit key         Key 2 of OBP60
-  3       Jog-Dial press
-  9       Jog-Dial down    Next page
- 10       Jog-Dial up      Previous page

lib/obp60task/config.json

@@ -297,7 +297,7 @@
         "name": "useRTC",
         "label": "RTC Modul",
         "type": "list",
-        "default": "off",
+        "default": "DS1388",
         "description": "Use internal RTC module type [off|DS1388]",
         "list": [
             "off",
@@ -312,7 +312,7 @@
         "name": "useGPS",
         "label": "GPS Sensor",
         "type": "list",
-        "default": "off",
+        "default": "ATGM336H",
         "description": "Use internal GPS module type [off|NEO-6M|NEO-M8N|ATGM336H]",
         "list": [
             "off",
@@ -343,7 +343,7 @@
         "name": "useEnvSensor",
         "label": "Env. Sensor",
         "type": "list",
-        "default": "off",
+        "default": "BMP280",
         "description": "Use internal or external environment sensor via I2C bus [off|BME280|BMP280|BMP180|BMP085|HTU21|SHT21]",
         "list": [
             "off",
@@ -573,21 +573,6 @@
             "obp60":"true"
         }
     },
-    {
-        "name": "useSDCard",
-        "label": "SD Card",
-        "type": "boolean",
-        "default": "off",
-        "description": "Use internal SD card interface [off|on]",
-        "list": [
-            "off",
-            "on"
-        ],
-        "category": "OBP60 Hardware",
-        "capabilities": {
-            "obp60":"true"
-        }
-    },
     {
         "name": "powerMode",
         "label": "Power Mode",
@@ -933,7 +918,7 @@
         "name": "page1type",
         "label": "Type",
         "type": "list",
-        "default": "Clock",
+        "default": "Voltage",
         "description": "Type of page for page 1",
         "list": [
             "BME280",
@@ -1193,7 +1178,7 @@
         "name": "page2type",
         "label": "Type",
         "type": "list",
-        "default": "Wind",
+        "default": "WindRose",
         "description": "Type of page for page 2",
         "list": [
             "BME280",
@@ -2691,7 +2676,7 @@
         "name": "page8type",
         "label": "Type",
         "type": "list",
-        "default": "Fluid",
+        "default": "Clock",
         "description": "Type of page for page 8",
         "list": [
             "BME280",

lib/obp60task/obp60task.cpp

@@ -27,6 +27,8 @@
 #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
 int taskRunCounter = 0;         // Task couter for loop section
@@ -35,9 +37,6 @@ int taskRunCounter = 0;         // Task couter for loop section
 //####################################################################################
 void OBP60Init(GwApi *api){
 
-    GwLog *logger = api->getLogger();
-    GwConfigHandler *config = api->getConfig();
-
     // Set a new device name and hidden the original name in the main config
     String devicename = api->getConfig()->getConfigItem(api->getConfig()->deviceName,true)->asString();
     api->getConfig()->setValue(GwConfigDefinitions::systemName, devicename, GwConfigInterface::ConfigType::HIDDEN);
@@ -50,31 +49,6 @@ void OBP60Init(GwApi *api){
     // Init hardware
     hardwareInit(api);
 
-    String sdcard = config->getConfigItem(config->useSDCard, true)->asString();
-    if (sdcard == "on") {
-        setPortPin(OBP_POWER_SD, true); // Power on SD
-        delay(10);
-        SPIClass SD_SPI = SPIClass(HSPI);
-        SD_SPI.begin(SD_SPI_CLK, SD_SPI_MISO, SD_SPI_MOSI);
-        if (SD.begin(SD_SPI_CS, SD_SPI, 80000000)) {
-            String sdtype = "unknown";
-            uint8_t cardType = SD.cardType();
-            switch (cardType) {
-                case CARD_MMC:
-                   sdtype = "MMC";
-                   break;
-                case CARD_SD:
-                   sdtype = "SDSC";
-                   break;
-                case CARD_SDHC:
-                   sdtype = "SDHC";
-                   break;
-            }
-            uint64_t cardSize = SD.cardSize() / (1024 * 1024);
-            LOG_DEBUG(GwLog::LOG,"SD card type %s of size %d MB detected", sdtype, cardSize);
-        }
-    }
-
     // Init power rail 5.0V
     String powermode = api->getConfig()->getConfigItem(api->getConfig()->powerMode,true)->asString();
     api->getLogger()->logDebug(GwLog::DEBUG,"Power Mode is: %s", powermode.c_str());
@@ -318,9 +292,7 @@ void OBP60Task(GwApi *api){
 //    return;
     GwLog *logger=api->getLogger();
     GwConfigHandler *config=api->getConfig();
-#ifdef HARDWARE_V21
     startLedTask(api);
-#endif
     PageList allPages;
     registerAllPages(allPages);
     CommonData commonData;
@@ -442,6 +414,26 @@ void OBP60Task(GwApi *api){
         doImageRequest(api, &pageNumber, pages, request);
     });
 
+    // SD-Card: init an check
+    SPI.begin(SD_SPI_CLK, SD_SPI_MISO, SD_SPI_MOSI, SD_SPI_CS);
+    if (SD.begin(SD_SPI_CS)) {
+        String sdtype = "unknown";
+        uint8_t cardType = SD.cardType();
+        switch (cardType) {
+            case CARD_MMC:
+               sdtype = "MMC";
+               break;
+            case CARD_SD:
+               sdtype = "SDSC";
+               break;
+            case CARD_SDHC:
+               sdtype = "SDHC";
+               break;
+        }
+        uint64_t cardSize = SD.cardSize() / (1024 * 1024);
+        LOG_DEBUG(GwLog::DEBUG,"SD card type %s of size %d MB detected", sdtype, cardSize);
+    }
+
     //now we have prepared the page data
     //we start a separate task that will fetch our keys...
     MyData allParameters;

lib/obp60task/platformio.ini

@@ -41,7 +41,7 @@ lib_deps =
 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    #0=JTAG, 1=CDC (serial device)
+    -D ARDUINO_USB_CDC_ON_BOOT=0    #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