Fixed legacy esp32 guards

CONFIG_BT_NIMBLE_NVS_PERSIST

.gitignore

@@ -39,14 +39,5 @@ release/
 src/mesh/raspihttp/certificate.pem
 src/mesh/raspihttp/private_key.pem
 
-# pioarduino platform
-managed_components/*
-arduino-lib-builder*
-dependencies.lock
-idf_component.yml
-CMakeLists.txt
-sdkconfig.*
-.dummy/*
-
 # Ignore logo (set at build time with platformio-custom.py)
 data/boot/logo.*

.trunk/trunk.yaml

@@ -8,8 +8,8 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - checkov@3.2.495
-    - renovate@42.66.8
+    - checkov@3.2.496
+    - renovate@42.66.11
     - prettier@3.7.4
     - trufflehog@3.92.4
     - yamllint@1.37.1

boards/seeed-sensecap-indicator.json

@@ -16,7 +16,6 @@
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "f_boot": "120000000L",
-    "boot_freq": "120000000L",
     "boot": "qio",
     "flash_mode": "qio",
     "psram_type": "opi",

platformio.ini

@@ -93,7 +93,6 @@ lib_deps =
 	${env.lib_deps}
 	# renovate: datasource=custom.pio depName=NonBlockingRTTTL packageName=end2endzone/library/NonBlockingRTTTL
 	end2endzone/NonBlockingRTTTL@1.4.0
-
 build_flags = ${env.build_flags} -Os
 build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/>
 
@@ -104,6 +103,8 @@ lib_deps =
 	thingsboard/TBPubSubClient@2.12.1
 	# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
 	arduino-libraries/NTPClient@3.2.1
+	# renovate: datasource=custom.pio depName=Syslog packageName=arcao/library/Syslog
+	arcao/Syslog@2.0.0
 
 ; Minimal networking libs for nrf52 (excludes Syslog to save flash)
 [nrf52_networking_base]
@@ -122,7 +123,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/862ed040c4ab44f0dfbbe492691f144886102588.zip
+	https://github.com/meshtastic/device-ui/archive/7656d49ea2bdb81a43afc1e8552f1cc86b8dce3c.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

src/graphics/draw/MenuHandler.cpp

@@ -724,12 +724,11 @@ void menuHandler::positionBaseMenu()
     static int optionsEnumArray[enumEnd] = {Back, GPSToggle, GPSFormat, CompassMenu};
     int options = 4;
 
-#if !MESHTASTIC_EXCLUDE_I2C
     if (accelerometerThread) {
         optionsArray[options] = "Compass Calibrate";
         optionsEnumArray[options++] = CompassCalibrate;
     }
-#endif
+
     BannerOverlayOptions bannerOptions;
     bannerOptions.message = "Position Action";
     bannerOptions.optionsArrayPtr = optionsArray;
@@ -745,10 +744,8 @@ void menuHandler::positionBaseMenu()
         } else if (selected == CompassMenu) {
             menuQueue = compass_point_north_menu;
             screen->runNow();
-#if !MESHTASTIC_EXCLUDE_I2C
         } else if (selected == CompassCalibrate) {
             accelerometerThread->calibrate(30);
-#endif
         }
     };
     screen->showOverlayBanner(bannerOptions);

src/modules/esp32/PaxcounterModule.cpp

@@ -90,6 +90,8 @@ int32_t PaxcounterModule::runOnce()
             configuration.blecounter = 1;
             configuration.blescantime = 0; // infinite
             configuration.wificounter = 1;
+            configuration.wifi_channel_map = WIFI_CHANNEL_ALL;
+            configuration.wifi_channel_switch_interval = 50;
             configuration.wifi_rssi_threshold = Default::getConfiguredOrDefault(moduleConfig.paxcounter.wifi_threshold, -80);
             configuration.ble_rssi_threshold = Default::getConfiguredOrDefault(moduleConfig.paxcounter.ble_threshold, -80);
             libpax_update_config(&configuration);

src/nimble/NimbleBluetooth.cpp

@@ -15,9 +15,7 @@
 #include <mutex>
 
 #include "NimBLEAdvertising.h"
-#ifdef CONFIG_BT_NIMBLE_EXT_ADV
 #include "NimBLEExtAdvertising.h"
-#endif
 #include "PowerStatus.h"
 
 #if defined(CONFIG_NIMBLE_CPP_IDF)
@@ -312,7 +310,9 @@ class BluetoothPhoneAPI : public PhoneAPI, public concurrency::OSThread
 
 #ifdef DEBUG_NIMBLE_NOTIFY
         int currentNotifyCount = notifyCount.fetch_add(1);
+
         uint8_t cc = bleServer->getConnectedCount();
+
         // This logging slows things down when there are lots of packets going to the phone, like initial connection:
         LOG_DEBUG("BLE notify(%d) fromNum: %d connections: %d", currentNotifyCount, fromRadioNum, cc);
 #endif
@@ -386,8 +386,9 @@ static uint8_t lastToRadio[MAX_TO_FROM_RADIO_SIZE];
 
 class NimbleBluetoothToRadioCallback : public NimBLECharacteristicCallbacks
 {
-    void onWrite(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &) override
+    virtual void onWrite(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &connInfo)
     {
+        (void)connInfo;
         // CAUTION: This callback runs in the NimBLE task!!! Don't do anything except communicate with the main task's runOnce.
         // Assumption: onWrite is serialized by NimBLE, so we don't need to lock here against multiple concurrent onWrite calls.
 
@@ -433,8 +434,9 @@ class NimbleBluetoothToRadioCallback : public NimBLECharacteristicCallbacks
 
 class NimbleBluetoothFromRadioCallback : public NimBLECharacteristicCallbacks
 {
-    void onRead(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &) override
+    virtual void onRead(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &connInfo)
     {
+        (void)connInfo;
         // CAUTION: This callback runs in the NimBLE task!!! Don't do anything except communicate with the main task's runOnce.
 
         int currentReadCount = bluetoothPhoneAPI->readCount.fetch_add(1);
@@ -553,15 +555,16 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
 
         if (config.bluetooth.mode == meshtastic_Config_BluetoothConfig_PairingMode_RANDOM_PIN) {
             LOG_INFO("Use random passkey");
+            // This is the passkey to be entered on peer - we pick a number >100,000 to ensure 6 digits
             passkey = random(100000, 999999);
         }
-        LOG_INFO("*** Enter passkey %06u on the peer side ***", passkey);
+        LOG_INFO("*** Enter passkey %d on the peer side ***", passkey);
 
         powerFSM.trigger(EVENT_BLUETOOTH_PAIR);
         meshtastic::BluetoothStatus newStatus(std::to_string(passkey));
         bluetoothStatus->updateStatus(&newStatus);
 
-#if HAS_SCREEN
+#if HAS_SCREEN // Todo: migrate this display code back into Screen class, and observe bluetoothStatus
         if (screen) {
             screen->startAlert([passkey](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
                 char btPIN[16] = "888888";
@@ -590,8 +593,8 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
             });
         }
 #endif
-
         passkeyShowing = true;
+
         return passkey;
     }
 
@@ -602,13 +605,14 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
         meshtastic::BluetoothStatus newStatus(meshtastic::BluetoothStatus::ConnectionState::CONNECTED);
         bluetoothStatus->updateStatus(&newStatus);
 
+        // Todo: migrate this display code back into Screen class, and observe bluetoothStatus
         if (passkeyShowing) {
             passkeyShowing = false;
-            if (screen) {
+            if (screen)
                 screen->endAlert();
-            }
         }
 
+        // Store the connection handle for future use
         nimbleBluetoothConnHandle = connInfo.getConnHandle();
     }
 
@@ -637,9 +641,10 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
         LOG_INFO("BLE conn %u initial MTU %u (target %u)", connHandle, connInfo.getMTU(), kPreferredBleMtu);
         pServer->updateConnParams(connHandle, 6, 12, 0, 200);
     }
-
     void onDisconnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo, int reason) override
     {
+        (void)pServer;
+        (void)connInfo;
         LOG_INFO("BLE disconnect reason: %d", reason);
         if (ble->isDeInit)
             return;
@@ -666,10 +671,12 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
             bluetoothPhoneAPI->writeCount = 0;
         }
 
+        // Clear the last ToRadio packet buffer to avoid rejecting first packet from new connection
         memset(lastToRadio, 0, sizeof(lastToRadio));
 
-        nimbleBluetoothConnHandle = BLE_HS_CONN_HANDLE_NONE;
+        nimbleBluetoothConnHandle = BLE_HS_CONN_HANDLE_NONE; // BLE_HS_CONN_HANDLE_NONE means "no connection"
 
+        // Restart Advertising
         ble->startAdvertising();
     }
 };
@@ -677,58 +684,11 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
 static NimbleBluetoothToRadioCallback *toRadioCallbacks;
 static NimbleBluetoothFromRadioCallback *fromRadioCallbacks;
 
-void NimbleBluetooth::startAdvertising()
-{
-#if defined(CONFIG_BT_NIMBLE_EXT_ADV)
-    NimBLEExtAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
-    NimBLEExtAdvertisement legacyAdvertising;
-
-    legacyAdvertising.setLegacyAdvertising(true);
-    legacyAdvertising.setScannable(true);
-    legacyAdvertising.setConnectable(true);
-    legacyAdvertising.setFlags(BLE_HS_ADV_F_DISC_GEN);
-    if (powerStatus->getHasBattery() == 1) {
-        legacyAdvertising.setCompleteServices(NimBLEUUID((uint16_t)0x180f));
-    }
-    legacyAdvertising.setCompleteServices(NimBLEUUID(MESH_SERVICE_UUID));
-    legacyAdvertising.setMinInterval(500);
-    legacyAdvertising.setMaxInterval(1000);
-
-    NimBLEExtAdvertisement legacyScanResponse;
-    legacyScanResponse.setLegacyAdvertising(true);
-    legacyScanResponse.setConnectable(true);
-    legacyScanResponse.setName(getDeviceName());
-
-    if (!pAdvertising->setInstanceData(0, legacyAdvertising)) {
-        LOG_ERROR("BLE failed to set legacyAdvertising");
-    } else if (!pAdvertising->setScanResponseData(0, legacyScanResponse)) {
-        LOG_ERROR("BLE failed to set legacyScanResponse");
-    } else if (!pAdvertising->start(0, 0, 0)) {
-        LOG_ERROR("BLE failed to start legacyAdvertising");
-    }
-#else
-    NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
-    pAdvertising->reset();
-    pAdvertising->addServiceUUID(MESH_SERVICE_UUID);
-    if (powerStatus->getHasBattery() == 1) {
-        pAdvertising->addServiceUUID(NimBLEUUID((uint16_t)0x180f));
-    }
-
-    NimBLEAdvertisementData scan;
-    scan.setName(getDeviceName());
-    pAdvertising->setScanResponseData(scan);
-    pAdvertising->enableScanResponse(true);
-
-    if (!pAdvertising->start(0)) {
-        LOG_ERROR("BLE failed to start advertising");
-    }
-#endif
-    LOG_DEBUG("BLE Advertising started");
-}
-
 void NimbleBluetooth::shutdown()
 {
+    // No measurable power saving for ESP32 during light-sleep(?)
 #ifndef ARCH_ESP32
+    // Shutdown bluetooth for minimum power draw
     LOG_INFO("Disable bluetooth");
     NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
     pAdvertising->reset();
@@ -736,6 +696,7 @@ void NimbleBluetooth::shutdown()
 #endif
 }
 
+// Proper shutdown for ESP32. Needs reboot to reverse.
 void NimbleBluetooth::deinit()
 {
 #ifdef ARCH_ESP32
@@ -752,14 +713,15 @@ void NimbleBluetooth::deinit()
 #endif
 }
 
+// Has initial setup been completed
 bool NimbleBluetooth::isActive()
 {
-    return bleServer != nullptr;
+    return bleServer;
 }
 
 bool NimbleBluetooth::isConnected()
 {
-    return bleServer && bleServer->getConnectedCount() > 0;
+    return bleServer->getConnectedCount() > 0;
 }
 
 int NimbleBluetooth::getRssi()
@@ -803,7 +765,7 @@ void NimbleBluetooth::setup()
     LOG_INFO("Init the NimBLE bluetooth module");
 
     NimBLEDevice::init(getDeviceName());
-    NimBLEDevice::setPower(9);
+    NimBLEDevice::setPower(ESP_PWR_LVL_P9);
 
 #if NIMBLE_ENABLE_2M_PHY && (defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C6))
     int mtuResult = NimBLEDevice::setMTU(kPreferredBleMtu);
@@ -836,7 +798,7 @@ void NimbleBluetooth::setup()
         NimBLEDevice::setSecurityIOCap(BLE_HS_IO_DISPLAY_ONLY);
     }
     bleServer = NimBLEDevice::createServer();
-    auto *serverCallbacks = new NimbleBluetoothServerCallback(this);
+    NimbleBluetoothServerCallback *serverCallbacks = new NimbleBluetoothServerCallback(this);
     bleServer->setCallbacks(serverCallbacks, true);
     setupService();
     startAdvertising();
@@ -889,6 +851,51 @@ void NimbleBluetooth::setupService()
     batteryService->start();
 }
 
+void NimbleBluetooth::startAdvertising()
+{
+#if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6)
+    NimBLEExtAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
+    NimBLEExtAdvertisement legacyAdvertising;
+
+    legacyAdvertising.setLegacyAdvertising(true);
+    legacyAdvertising.setScannable(true);
+    legacyAdvertising.setConnectable(true);
+    legacyAdvertising.setFlags(BLE_HS_ADV_F_DISC_GEN);
+    if (powerStatus->getHasBattery() == 1) {
+        legacyAdvertising.setCompleteServices(NimBLEUUID((uint16_t)0x180f));
+    }
+    legacyAdvertising.setCompleteServices(NimBLEUUID(MESH_SERVICE_UUID));
+    legacyAdvertising.setMinInterval(500);
+    legacyAdvertising.setMaxInterval(1000);
+
+    NimBLEExtAdvertisement legacyScanResponse;
+    legacyScanResponse.setLegacyAdvertising(true);
+    legacyScanResponse.setConnectable(true);
+    legacyScanResponse.setName(getDeviceName());
+
+    if (!pAdvertising->setInstanceData(0, legacyAdvertising)) {
+        LOG_ERROR("BLE failed to set legacyAdvertising");
+    } else if (!pAdvertising->setScanResponseData(0, legacyScanResponse)) {
+        LOG_ERROR("BLE failed to set legacyScanResponse");
+    } else if (!pAdvertising->start(0, 0, 0)) {
+        LOG_ERROR("BLE failed to start legacyAdvertising");
+    }
+#else
+    NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
+    pAdvertising->addServiceUUID(NimBLEUUID(MESH_SERVICE_UUID));
+    if (powerStatus->getHasBattery() == 1) {
+        pAdvertising->addServiceUUID(NimBLEUUID((uint16_t)0x180f));
+    }
+    pAdvertising->setName(getDeviceName());
+    // Optionally, set scan response data (not required unless you want to advertise more info)
+    // pAdvertising->setScanResponseData(...); // if needed
+
+    if (!pAdvertising->start()) {
+        LOG_ERROR("BLE failed to start advertising");
+    }
+#endif
+}
+
 /// Given a level between 0-100, update the BLE attribute
 void updateBatteryLevel(uint8_t level)
 {

src/platform/esp32/main-esp32.cpp

@@ -169,10 +169,9 @@ void esp32Setup()
 // #define APP_WATCHDOG_SECS 45
 #define APP_WATCHDOG_SECS 90
 
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+#ifdef CONFIG_IDF_TARGET_ESP32C6
     esp_task_wdt_config_t *wdt_config = (esp_task_wdt_config_t *)malloc(sizeof(esp_task_wdt_config_t));
     wdt_config->timeout_ms = APP_WATCHDOG_SECS * 1000;
-    wdt_config->idle_core_mask = 1 << 1;
     wdt_config->trigger_panic = true;
     res = esp_task_wdt_init(wdt_config);
     assert(res == ESP_OK);

variants/esp32/esp32.ini

@@ -37,8 +37,10 @@ build_flags =
   -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL
   -DAXP_DEBUG_PORT=Serial
   -DCONFIG_BT_NIMBLE_ENABLED
-;  -DCONFIG_BT_NIMBLE_MAX_BONDS=6 # default is 3 ; temporarily disabled to avoid arduino 3.3.5 errors
   -DCONFIG_BT_NIMBLE_ROLE_CENTRAL_DISABLED
+  -DCONFIG_BT_NIMBLE_ROLE_OBSERVER_DISABLED
+  -DCONFIG_BT_NIMBLE_NVS_PERSIST=1
+  -DCONFIG_BT_NIMBLE_MAX_BONDS=6 # default is 3
   -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
   -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
   -DCONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=8192
@@ -61,8 +63,8 @@ lib_deps =
   https://github.com/meshtastic/esp32_https_server/archive/3223704846752e6d545139204837bdb2a55459ca.zip
   # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
   h2zero/NimBLE-Arduino@^2.3.7
-  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/mverch67/libpax gitBranch=master
-  https://github.com/mverch67/libpax/archive/6f52ee989301cdabaeef00bcbf93bff55708ce2f.zip
+  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
+  https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
   # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
   https://github.com/lewisxhe/XPowersLib/archive/v0.3.2.zip
   # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master

variants/esp32c3/heltec_esp32c3/platformio.ini

@@ -3,7 +3,7 @@ extends = esp32c3_base
 board = esp32-c3-devkitm-1
 board_level = pr
 build_flags = 
-  ${esp32_base.build_flags}
+  ${esp32c3_base.build_flags}
   -D HELTEC_HT62
   -I variants/esp32c3/heltec_esp32c3
 monitor_speed = 115200

variants/esp32c6/esp32c6.ini

@@ -20,6 +20,8 @@ build_flags =
   -DHAS_BLUETOOTH=0
   -DMESHTASTIC_EXCLUDE_PAXCOUNTER
   -DMESHTASTIC_EXCLUDE_BLUETOOTH
+  -DCONFIG_BT_NIMBLE_EXT_ADV=1
+  -DCONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=2
 
 lib_deps =
   ${arduino_base.lib_deps}

variants/esp32s3/esp32s3.ini

@@ -3,7 +3,6 @@ extends = esp32_base
 custom_esp32_kind = esp32s3
 
 monitor_speed = 115200
-
 build_flags =
 	${esp32_base.build_flags}
 	-DCONFIG_BT_NIMBLE_EXT_ADV=1

variants/esp32s3/rak3312/platformio.ini

@@ -6,6 +6,6 @@ board_check = true
 upload_protocol = esptool
 
 build_flags = 
-  ${esp32_base.build_flags}
+  ${esp32s3_base.build_flags}
   -D RAK3312
   -I variants/esp32s3/rak3312

variants/esp32s3/seeed-sensecap-indicator/platformio.ini

@@ -1,32 +1,18 @@
 ; Seeed Studio SenseCAP Indicator
-; note: does not work with vscode platformio plugin; needs pioarduino IDE plugin instead
 [env:seeed-sensecap-indicator]
 extends = esp32s3_base
-platform =
-    https://github.com/pioarduino/platform-espressif32/releases/download/55.03.35/platform-espressif32.zip
-
 platform_packages =
-    platformio/framework-arduinoespressif32 @ https://github.com/mverch67/arduino-esp32#60946733b52c30e3d5b58a7158700d65fc1dddae
+    platformio/framework-arduinoespressif32 @ https://github.com/mverch67/arduino-esp32/archive/aef7fef6de3329ed6f75512d46d63bba12b09bb5.zip ; add_tca9535 (based on 2.0.16)
 
 board = seeed-sensecap-indicator
 board_check = true
 board_build.partitions = partition-table-8MB.csv
 upload_protocol = esptool
 
-build_unflags =
-  -DCONFIG_BT_NIMBLE_ENABLED
-  -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
-  -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
-  -DCONFIG_BT_NIMBLE_MAX_BONDS=6
-  -DCONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=8192
-
-build_flags = ${esp32_base.build_flags} -D lcd_periph_signals=lcd_periph_rgb_signals -mtext-section-literals -ffat-lto-objects
+build_flags = ${esp32s3_base.build_flags}
   -Ivariants/esp32s3/seeed-sensecap-indicator
   -DSENSECAP_INDICATOR
-  -DARDUINO_HAL_LOG_LEVEL=5
-  -DARDUHAL_LOG_MAXIMUM_LEVEL=5
-  -DARDUHAL_LOG_COLORS=1
-  -DUSE_ARDUINO_HAL_GPIO
+  -DCONFIG_ARDUHAL_LOG_COLORS
   -DRADIOLIB_DEBUG_SPI=0
   -DRADIOLIB_DEBUG_PROTOCOL=0
   -DRADIOLIB_DEBUG_BASIC=0
@@ -34,73 +20,13 @@ build_flags = ${esp32_base.build_flags} -D lcd_periph_signals=lcd_periph_rgb_sig
   -DRADIOLIB_SPI_PARANOID=0
   -DIO_EXPANDER=0x40
   -DIO_EXPANDER_IRQ=42
-;  -DIO_EXPANDER_DEBUG
+  ;-DIO_EXPANDER_DEBUG
+  -DUSE_ARDUINO_HAL_GPIO
 
 lib_deps = ${esp32s3_base.lib_deps}
-  https://github.com/mverch67/LovyanGFX/archive/a1c1278fc9116d1c6cb15a7bb14565aef59a9a97.zip
-
-custom_component_remove =
-    espressif/esp_hosted
-    espressif/esp_wifi_remote
-    espressif/esp_modem
-    espressif/esp-dsp
-    espressif/esp32-camera
-    espressif/libsodium
-    espressif/esp-modbus
-    espressif/qrcode
-    espressif/esp_insights
-    espressif/esp_diag_data_store
-    espressif/esp_diagnostics
-    espressif/esp_rainmaker
-    espressif/rmaker_common
-    espressif/network_provisioning
-    chmorgan/esp-libhelix-mp3
-
-custom_sdkconfig =
-    CONFIG_AUTOSTART_ARDUINO=y
-    CONFIG_LOG_DEFAULT_LEVEL=4
-    CONFIG_LOG_MAXIMUM_LEVEL=4
-    CONFIG_LOG_COLORS=y
-    CONFIG_ARDUHAL_LOG_COLORS=y
-    CONFIG_SPIRAM_MODE_OCT=y
-    CONFIG_SPIRAM_SPEED_120M=y
-    CONFIG_SPIRAM_SPEED=120
-    CONFIG_SPIRAM_XIP_FROM_PSRAM=y
-    CONFIG_LCD_RGB_ISR_IRAM_SAFE=y
-    CONFIG_GDMA_CTRL_FUNC_IN_IRAM=y
-    CONFIG_I2S_ISR_IRAM_SAFE=y
-    CONFIG_GDMA_ISR_IRAM_SAFE=y
-    CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y
-    CONFIG_ESP32S3_DATA_CACHE_64KB=y
-    CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y
-    CONFIG_I2C_SKIP_LEGACY_CONFLICT_CHECK=y
-    CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
-    CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
-    CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
-    CONFIG_ESP_SYSTEM_ESP32_SRAM1_REGION_AS_IRAM=y
-    CONFIG_ESP_WIFI_IRAM_OPT=n
-    CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
-    CONFIG_SPIRAM_CACHE_LIBCHAR_IN_IRAM=n
-    CONFIG_SPIRAM_CACHE_LIBSTR_IN_IRAM=n
-    CONFIG_SPIRAM_CACHE_LIBMISC_IN_IRAM=n
-    CONFIG_SPIRAM_CACHE_LIBTIME_IN_IRAM=n
-    CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=0
-    CONFIG_BT_ENABLED=y
-    CONFIG_BT_NIMBLE_ENABLED=y
-    CONFIG_BT_BLUEDROID_ENABLED=y
-    CONFIG_BT_CONTROLLER_ENABLED=y
-    CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=8192
-    CONFIG_BT_NIMBLE_MAX_CCCDS=20
-    CONFIG_BT_NIMBLE_MAX_BONDS=6
-    CONFIG_BT_NIMBLE_CPP_LOG_LEVEL=1
-    CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
-    CONFIG_ESPTOOLPY_FLASHSIZE="8MB"
-    CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
-    CONFIG_ESPTOOLPY_FLASHFREQ="120m"
-    CONFIG_ESP_TASK_WDT_INIT=n
-    CONFIG_IDF_EXPERIMENTAL_FEATURES=y
-    CONFIG_COMPILER_OPTIMIZATION_PERF=y
-    CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
+  https://github.com/mverch67/LovyanGFX/archive/4c76238c1344162a234ae917b27651af146d6fb2.zip
+  earlephilhower/ESP8266Audio@^1.9.9
+  earlephilhower/ESP8266SAM@^1.0.1
 
 
 [env:seeed-sensecap-indicator-tft]
@@ -111,19 +37,14 @@ upload_speed = 460800
 build_flags =
   ${env:seeed-sensecap-indicator.build_flags}
   -D INPUTDRIVER_BUTTON_TYPE=38
-  -D MESHTASTIC_EXCLUDE_WEBSERVER=1
-  -D MESHTASTIC_EXCLUDE_SERIAL=1
-  -D MESHTASTIC_EXCLUDE_SOCKETAPI=1
-  -D MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
-  -D HAS_TELEMETRY=0
   -D CONFIG_DISABLE_HAL_LOCKS=1
   -D HAS_SCREEN=1
   -D HAS_TFT=1
   -D DISPLAY_SET_RESOLUTION
-  -D RAM_SIZE=3072
-  -D LV_LVGL_H_INCLUDE_SIMPLE
-  -D LV_CONF_INCLUDE_SIMPLE
-  -D LV_COMP_CONF_INCLUDE_SIMPLE
+  -D RAM_SIZE=4096
+	-D LV_LVGL_H_INCLUDE_SIMPLE
+	-D LV_CONF_INCLUDE_SIMPLE
+	-D LV_COMP_CONF_INCLUDE_SIMPLE
   -D LV_USE_SYSMON=0
   -D LV_USE_PROFILER=0
   -D LV_USE_PERF_MONITOR=0
@@ -143,4 +64,4 @@ build_flags =
 lib_deps =
   ${env:seeed-sensecap-indicator.lib_deps}
   ${device-ui_base.lib_deps}
-  https://github.com/bitbank2/bb_captouch/archive/refs/tags/1.3.1.zip ; alternative touch library supporting FT6x36
+  https://github.com/mverch67/bb_captouch/archive/8626412fe650d808a267791c0eae6e5860c85a5d.zip ; alternative touch library supporting FT6x36

variants/esp32s3/seeed-sensecap-indicator/variant.h

@@ -4,7 +4,7 @@
 // This board has a serial coprocessor for sensor readings
 #define SENSOR_RP2040_TXD 19
 #define SENSOR_RP2040_RXD 20
-#define SENSOR_PORT_NUM UART_NUM_2
+#define SENSOR_PORT_NUM 2
 #define SENSOR_BAUD_RATE 115200
 
 #define BUTTON_PIN 38