Merge branch 'letscontrolit:mega' into P021-state_based_extension

letscontrolit · Nov 3, 2024 · 66ae575 · 66ae575
2 parents 604a20e + b4b381c
commit 66ae575
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 14 deletions.
diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini
@@ -169,7 +169,7 @@ extra_scripts             = ${esp82xx_common.extra_scripts}
 ; For MUSTFIX_CLIENT_TIMEOUT_IN_SECONDS See: https://github.com/espressif/arduino-esp32/pull/6676
 [core_esp32_IDF5_1_4__3_0_5_SPIFFS]
 platform                    = https://github.com/tasmota/platform-espressif32/releases/download/2024.09.10/platform-espressif32.zip
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/2962/framework-arduinoespressif32-all-release_v5.1-33fbade.zip
+platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3110/framework-arduinoespressif32-all-release_v5.1-632e0c2.zip
 build_flags                 = -DESP32_STAGE
                               -DESP_IDF_VERSION_MAJOR=5
                               -DLIBRARIES_NO_LOG=1
@@ -197,8 +197,8 @@ lib_extra_dirs            =
 
 ; ESP_IDF 5.3.1
 [core_esp32_IDF5_3_1__3_0_5_LittleFS]
-platform                    = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF53
-platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3019/framework-arduinoespressif32-all-release_v5.3-98aecc7e.zip
+platform                  = https://github.com/tasmota/platform-espressif32/releases/download/2024.10.31/platform-espressif32.zip
+platform_packages           = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3112/framework-arduinoespressif32-all-release_v5.3-1c74f314.zip
 build_flags                 = -DESP32_STAGE
                               -DESP_IDF_VERSION_MAJOR=5
                               -DLIBRARIES_NO_LOG=1

diff --git a/platformio_esp32_solo1.ini b/platformio_esp32_solo1.ini
@@ -2,8 +2,8 @@
 ; IDF 5.3.1
 [esp32_solo1_common_LittleFS]
 extends                   = esp32_base_idf5
-platform                  = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF53
-platform_packages         = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3085/framework-arduinoespressif32-all-release_v5.3-4c885a26.zip
+platform                  = https://github.com/tasmota/platform-espressif32/releases/download/2024.10.31/platform-espressif32.zip
+platform_packages         = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3113/framework-arduinoespressif32-solo1-release_v5.3-1c74f314.zip
 build_flags               = ${esp32_base_idf5.build_flags}
                             -DFEATURE_ARDUINO_OTA=1
                             -DUSE_LITTLEFS

diff --git a/src/src/Helpers/_Plugin_init.cpp b/src/src/Helpers/_Plugin_init.cpp
@@ -2092,7 +2092,7 @@ constexpr size_t DeviceIndex_to_Plugin_id_size = NR_ELEMENTS(DeviceIndex_to_Plug
 constexpr size_t Lowest_Plugin_id = DeviceIndex_to_Plugin_id_size == 0 ? 0 : DeviceIndex_to_Plugin_id[0];
 
 // Highest plugin ID included in the build
-constexpr size_t Highest_Plugin_id = DeviceIndex_to_Plugin_id_size > 1 ? DeviceIndex_to_Plugin_id[DeviceIndex_to_Plugin_id_size - 1] : 0;
+constexpr size_t Highest_Plugin_id = DeviceIndex_to_Plugin_id_size > 0 ? DeviceIndex_to_Plugin_id[DeviceIndex_to_Plugin_id_size - 1] : 0;
 
 // Array size including index of highest plugin ID.
 constexpr size_t Plugin_id_to_DeviceIndex_size = Highest_Plugin_id + 1 - Lowest_Plugin_id;

diff --git a/src/src/WebServer/TimingStats.cpp b/src/src/WebServer/TimingStats.cpp
@@ -28,14 +28,21 @@ void handle_timingstats() {
   sendHeadandTail_stdtemplate(_HEAD);
   html_table_class_multirow();
   html_TR();
-  html_table_header(F("Description"));
-  html_table_header(F("Function"));
-  html_table_header(F("#calls"));
-  html_table_header(F("call/sec"));
-  html_table_header(F("duty (%)"));
-  html_table_header(F("min (ms)"));
-  html_table_header(F("Avg (ms)"));
-  html_table_header(F("max (ms)"));
+  {
+    const __FlashStringHelper * headers[] = {
+      F("Description"),
+      F("Function"),
+      F("#calls"),
+      F("call/sec"),
+      F("duty (%)"),
+      F("min (ms)"),
+      F("Avg (ms)"),
+      F("max (ms)")};
+    for (unsigned int i = 0; i < NR_ELEMENTS(headers); ++i) {
+      html_table_header(headers[i]);
+    }
+  }
+
 
   const long timeSinceLastReset = stream_timing_statistics(true);
   html_end_table();

diff --git a/tools/set_tty_permissions_WSL2.sh b/tools/set_tty_permissions_WSL2.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+sudo modprobe usbserial
+sudo modprobe ch341
+sudo modprobe cp210x
+sudo modprobe ftdi_sio
+
+
+sudo chmod 666 /dev/ttyACM*
+sudo chmod 666 /dev/ttyUSB*