Merge 776a0c61fb into 0952007805

arch/esp32/esp32c6.ini

@@ -1,8 +1,8 @@
 [esp32c6_base]
 extends = esp32_base
 platform =
-  # Do not renovate until we have switched to pioarduino tagged builds
+  # renovate: datasource=github-releases depName=platform-espressif32 packageName=pioarduino/platform-espressif32
-  https://github.com/Jason2866/platform-espressif32/archive/22faa566df8c789000f8136cd8d0aca49617af55.zip
+  https://github.com/pioarduino/platform-espressif32/releases/download/54.03.21-2/platform-espressif32.zip
 build_flags =
   ${arduino_base.build_flags}
   -Wall
@@ -14,7 +14,7 @@ build_flags =
   -DLIBPAX_ARDUINO
   -DLIBPAX_WIFI
   -DLIBPAX_BLE
-  -DMESHTASTIC_EXCLUDE_WEBSERVER
+  ;-DMESHTASTIC_EXCLUDE_WEBSERVER
   ;-DDEBUG_HEAP
   ; TEMP
   -DHAS_BLUETOOTH=0
@@ -33,9 +33,11 @@ lib_deps =
   https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
   rweather/Crypto@0.4.0
+  # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
+  https://github.com/meshtastic/esp32_https_server/archive/3223704846752e6d545139204837bdb2a55459ca.zip
 
 build_src_filter = 
- ${esp32_base.build_src_filter} -<mesh/http> 
+ ${esp32_base.build_src_filter}
 
 monitor_speed = 460800
 monitor_filters = esp32_c3_exception_decoder
@@ -44,4 +46,5 @@ lib_ignore =
   NonBlockingRTTTL
   NimBLE-Arduino
   libpax
+  Syslog
   

src/platform/esp32/main-esp32.cpp

@@ -173,7 +173,7 @@ void esp32Setup()
     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->trigger_panic = true;
-    res = esp_task_wdt_init(wdt_config);
+    res = esp_task_wdt_reconfigure(wdt_config);
     assert(res == ESP_OK);
 #else
     res = esp_task_wdt_init(APP_WATCHDOG_SECS, true);

src/sleep.cpp

@@ -90,7 +90,7 @@ void setCPUFast(bool on)
          *     all WiFi use cases.
          * (Added: Dec 23, 2021 by Jm Casler)
          */
-#ifndef CONFIG_IDF_TARGET_ESP32C3
+#if !defined(CONFIG_IDF_TARGET_ESP32C3) || !defined(CONFIG_IDF_TARGET_ESP32C6)
         LOG_DEBUG("Set CPU to 240MHz because WiFi is in use");
         setCpuFrequencyMhz(240);
 #endif