From e919b3da9cb8db0cf17eee472c552544ede4acc8 Mon Sep 17 00:00:00 2001 From: mverch67 Date: Wed, 6 Aug 2025 10:36:04 +0200 Subject: [PATCH] cleanup --- arch/esp32/esp32.ini | 10 +++++----- platformio.ini | 1 - src/platform/esp32/main-esp32.cpp | 6 +----- .../esp32s3/seeed-sensecap-indicator/platformio.ini | 7 ++----- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini index edadd2298..cf4fcaf49 100644 --- a/arch/esp32/esp32.ini +++ b/arch/esp32/esp32.ini @@ -4,7 +4,7 @@ extends = arduino_base custom_esp32_kind = esp32 platform = # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32 - # platformio/espressif32@6.11.0 + platformio/espressif32@6.11.0 build_src_filter = ${arduino_base.build_src_filter} - - - - - @@ -30,10 +30,10 @@ build_flags = -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL -DAXP_DEBUG_PORT=Serial - ;-DCONFIG_BT_NIMBLE_ENABLED - ;-DCONFIG_NIMBLE_CPP_LOG_LEVEL=2 - ;-DCONFIG_BT_NIMBLE_MAX_CCCDS=20 - ;-DCONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=8192 + -DCONFIG_BT_NIMBLE_ENABLED + -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2 + -DCONFIG_BT_NIMBLE_MAX_CCCDS=20 + -DCONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=8192 -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING -DSERIAL_BUFFER_SIZE=4096 -DLIBPAX_ARDUINO diff --git a/platformio.ini b/platformio.ini index a25f2007b..9e1990baf 100644 --- a/platformio.ini +++ b/platformio.ini @@ -112,7 +112,6 @@ lib_deps = 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/a82b73344332850ea8369fa9f03c495d481fac11.zip - ;symlink:///home/manuel/Documents/PlatformIO/Projects/device-ui-latest ; Common libs for environmental measurements in telemetry module [environmental_base] diff --git a/src/platform/esp32/main-esp32.cpp b/src/platform/esp32/main-esp32.cpp index 72615344b..a99e851dc 100644 --- a/src/platform/esp32/main-esp32.cpp +++ b/src/platform/esp32/main-esp32.cpp @@ -25,8 +25,6 @@ #include #include -#include "esp_idf_version.h" - #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !MESHTASTIC_EXCLUDE_BLUETOOTH void setBluetoothEnable(bool enable) { @@ -193,9 +191,7 @@ void esp32Setup() /// loop code specific to ESP32 targets void esp32Loop() { - if (esp_task_wdt_reset() != ESP_OK) { - LOG_ERROR("Failed to reset task watchdog"); - } + esp_task_wdt_reset(); // service our app level watchdog // for debug printing // radio.radioIf.canSleep(); diff --git a/variants/esp32s3/seeed-sensecap-indicator/platformio.ini b/variants/esp32s3/seeed-sensecap-indicator/platformio.ini index 6c0005f88..7458be149 100644 --- a/variants/esp32s3/seeed-sensecap-indicator/platformio.ini +++ b/variants/esp32s3/seeed-sensecap-indicator/platformio.ini @@ -3,13 +3,10 @@ [env:seeed-sensecap-indicator] extends = esp32s3_base platform = - ;https://github.com/pioarduino/platform-espressif32/releases/download/stable/platform-espressif32.zip - https://github.com/pioarduino/platform-espressif32.git#55.03.30-1 - ;symlink:///home/manuel/Documents/PlatformIO/Projects/platform-espressif32 + https://github.com/pioarduino/platform-espressif32.git#55.03.30-1 + platform_packages = - ;platformio/framework-arduinoespressif32-libs@https://dl.espressif.com/AE/esp-arduino-libs/esp32-3.2.0-h.zip platformio/framework-arduinoespressif32 @ https://github.com/mverch67/arduino-esp32#ab7f873773424561fa0d8434034960a36d335fcb - ;platformio/framework-arduinoespressif32 @ symlink:///home/manuel/Documents/PlatformIO/Projects/arduino-esp32 board = seeed-sensecap-indicator board_check = true