Merge upstream tag 'v24.10.15' into development

lib/SpiManager/src/SpiBus.cpp

@@ -18,11 +18,19 @@ SpiBus::SpiBus(const std::string& _id, spi_host_device_t _host_device)
         .data5_io_num = -1,
         .data6_io_num = -1,
         .data7_io_num = -1,
-        .max_transfer_sz = SPI_MAX_DMA_LEN,
+        .max_transfer_sz = 0, // defaults to SPI_MAX_DMA_LEN (=4092) or SOC_SPI_MAXIMUM_BUFFER_SIZE (=64)
         .flags = 0,
         .intr_flags = 0
     };
-    ESP_ERROR_CHECK(spi_bus_initialize(host_device, &bus_config, SPI_DMA_CH_AUTO));
+
+#if !CONFIG_IDF_TARGET_ESP32S2
+    spi_dma_chan_t dma_channel = SPI_DMA_CH_AUTO;
+#else
+    // DMA for SPI3 on ESP32-S2 is shared with ADC/DAC, so we cannot use it here
+    spi_dma_chan_t dma_channel = (host_device != SPI3_HOST ? SPI_DMA_CH_AUTO : SPI_DMA_DISABLED);
+#endif
+
+    ESP_ERROR_CHECK(spi_bus_initialize(host_device, &bus_config, dma_channel));
 }
 
 SpiBus::~SpiBus()

pio-scripts/patch_apply.py

@@ -23,20 +23,20 @@ def is_tool(name):
     return which(name) is not None
 
 def replaceInFile(in_file, out_file, text, subs, flags=0):
-    """
-        Function for replacing content for the given file
-        Taken from https://www.studytonight.com/python-howtos/search-and-replace-a-text-in-a-file-in-python
-    """
+    """Function for replacing content for the given file."""
+
     if os.path.exists(in_file):
-        with open(in_file, "rb") as infile:
-            with open(out_file, "wb") as outfile:
-                #read the file contents
-                file_contents = infile.read()
-                text_pattern = re.compile(re.escape(text), flags)
-                file_contents = text_pattern.sub(subs, file_contents.decode('utf-8'))
-                outfile.seek(0)
-                outfile.truncate()
-                outfile.write(file_contents.encode())
+        # read the file contents
+        with open(in_file, "r", encoding="utf-8") as infile:
+            file_contents = infile.read()
+
+        # do replacement
+        text_pattern = re.compile(re.escape(text), flags)
+        file_contents = text_pattern.sub(subs, file_contents)
+
+        # write the result
+        with open(out_file, "w", encoding="utf-8") as outfile:
+            outfile.write(file_contents)
 
 def main():
     if (env.GetProjectOption('custom_patches', '') == ''):

platformio.ini

@@ -41,11 +41,11 @@ build_unflags =
     -std=gnu++11
 
 lib_deps =
-    mathieucarbou/ESPAsyncWebServer @ 3.3.12
+    mathieucarbou/ESPAsyncWebServer @ 3.3.16
     bblanchon/ArduinoJson @ 7.2.0
     https://github.com/bertmelis/espMqttClient.git#v1.7.0
     nrf24/RF24 @ 1.4.9
-    olikraus/U8g2 @ 2.35.30
+    olikraus/U8g2 @ 2.36.2
     buelowp/sunset @ 1.1.7
     arkhipenko/TaskScheduler @ 3.8.5
     https://github.com/coryjfowler/MCP_CAN_lib

src/NetworkSettings.cpp

@@ -101,7 +101,7 @@ void NetworkSettingsClass::NetworkEvent(const WiFiEvent_t event, WiFiEventInfo_t
         break;
     case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
         // Reason codes can be found here: https://github.com/espressif/esp-idf/blob/5454d37d496a8c58542eb450467471404c606501/components/esp_wifi/include/esp_wifi_types_generic.h#L79-L141
-        MessageOutput.printf("WiFi disconnected: %" PRId8 "\r\n", info.wifi_sta_disconnected.reason);
+        MessageOutput.printf("WiFi disconnected: %" PRIu8 "\r\n", info.wifi_sta_disconnected.reason);
         if (_networkMode == network_mode::WiFi) {
             MessageOutput.println("Try reconnecting");
             WiFi.disconnect(true, false);

src/main.cpp

@@ -55,10 +55,8 @@ void setup()
 
     // Initialize serial output
     Serial.begin(SERIAL_BAUDRATE);
-#if ARDUINO_USB_CDC_ON_BOOT
-    Serial.setTxTimeoutMs(0);
-    delay(200);
-#else
+#if !ARDUINO_USB_CDC_ON_BOOT
+    // Only wait for serial interface to be set up when not using CDC
     while (!Serial)
         yield();
 #endif

webapp/env.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="vite/client" />
 
 import { Router, Route } from 'vue-router'
-declare module '@vue/runtime-core' {
+declare module 'vue' {
   interface ComponentCustomProperties {
     $router: Router
     $route: Route

webapp/package.json

@@ -19,30 +19,30 @@
     "mitt": "^3.0.1",
     "sortablejs": "^1.15.3",
     "spark-md5": "^3.0.2",
-    "vue": "^3.5.11",
-    "vue-i18n": "9.13.1",
+    "vue": "^3.5.12",
+    "vue-i18n": "10.0.4",
     "vue-router": "^4.4.5"
   },
   "devDependencies": {
-    "@intlify/unplugin-vue-i18n": "^4.0.0",
+    "@intlify/unplugin-vue-i18n": "^5.2.0",
     "@tsconfig/node22": "^22.0.0",
     "@types/bootstrap": "^5.2.10",
     "@types/node": "^22.7.4",
     "@types/pulltorefreshjs": "^0.1.7",
     "@types/sortablejs": "^1.15.8",
     "@types/spark-md5": "^3.0.4",
     "@vitejs/plugin-vue": "^5.1.4",
-    "@vue/eslint-config-typescript": "^14.0.0",
+    "@vue/eslint-config-typescript": "^14.1.1",
     "@vue/tsconfig": "^0.5.1",
     "eslint": "^9.12.0",
-    "eslint-plugin-vue": "^9.28.0",
+    "eslint-plugin-vue": "^9.29.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.3.3",
     "pulltorefreshjs": "^0.1.22",
-    "sass": "^1.77.6",
+    "sass": "=1.77.6",
     "terser": "^5.34.1",
-    "typescript": "^5.6.2",
-    "vite": "^5.4.8",
+    "typescript": "^5.6.3",
+    "vite": "^5.4.9",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-css-injected-by-js": "^3.5.2",
     "vue-tsc": "^2.1.6"

webapp/src/emitter.d.ts

@@ -1,4 +1,4 @@
-declare module '@vue/runtime-core' {
+declare module 'vue' {
     interface ComponentCustomProperties {
         $emitter: Emitter;
     }

webapp/vite.config.ts

@@ -30,7 +30,6 @@ export default defineConfig({
         fullInstall: false,
         forceStringify: true,
         strictMessage: false,
-        jitCompilation: false,
     }),
   ],
   resolve: {