Release 2024.11.31

tasmota · Nov 17, 2024 · 139300c · 139300c
1 parent ed8955f
commit 139300c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -17,6 +17,7 @@ jobs:
           - "examples/arduino-blink"
           - "examples/arduino-rmt-blink"
           - "examples/arduino-wifiscan"
+          - "examples/arduino-usb-keyboard"
           - "examples/espidf-arduino-blink"
           - "examples/espidf-arduino-littlefs"
           - "examples/espidf-blink"

diff --git a/boards/esp32-solo1.json b/boards/esp32-solo1.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "esp32",
     "extra_flags": "-DARDUINO_ESP32_DEV -DARDUINO_USB_CDC_ON_BOOT=0 -DCORE32SOLO1",
-    "f_cpu": "80000000L",
+    "f_cpu": "160000000L",
     "f_flash": "40000000L",
     "flash_mode": "dio",
     "mcu": "esp32",
@@ -29,6 +29,11 @@
     "require_upload_port": true,
     "speed": 460800
   },
+  "espidf": {
+    "custom_sdkconfig": [
+      "CONFIG_FREERTOS_UNICORE=y" 
+    ]
+  },
   "url": "https://en.wikipedia.org/wiki/ESP32",
   "vendor": "Espressif"
 }
diff --git a/builder/main.py b/builder/main.py
@@ -143,7 +143,7 @@ def _parse_partitions(env):
 
     result = []
     next_offset = 0
-    bound = int(board.get("upload.offset_address", "0x10000"), 16) # default 0x10000
+    app_offset = int(board.get("upload.offset_address", "0x10000"), 16) # default 0x10000
     with open(partitions_csv) as fp:
         for line in fp.readlines():
             line = line.strip()
@@ -152,23 +152,25 @@ def _parse_partitions(env):
             tokens = [t.strip() for t in line.split(",")]
             if len(tokens) < 5:
                 continue
+            bound = 0x10000 if tokens[1] in ("0", "app") else 4
+            calculated_offset = (next_offset + bound - 1) & ~(bound - 1)
             partition = {
                 "name": tokens[0],
                 "type": tokens[1],
                 "subtype": tokens[2],
-                "offset": tokens[3] or next_offset,
+                "offset": tokens[3] or calculated_offset,
                 "size": tokens[4],
                 "flags": tokens[5] if len(tokens) > 5 else None
             }
             result.append(partition)
             next_offset = _parse_size(partition["offset"])
             if (partition["subtype"] == "ota_0"):
-                bound = next_offset
-            next_offset = (next_offset + bound - 1) & ~(bound - 1)
+                app_offset = next_offset
+            next_offset = next_offset + _parse_size(partition["size"])
     # Configure application partition offset
-    env.Replace(ESP32_APP_OFFSET=str(hex(bound)))
+    env.Replace(ESP32_APP_OFFSET=str(hex(app_offset)))
     # Propagate application offset to debug configurations
-    env["INTEGRATION_EXTRA_DATA"].update({"application_offset": str(hex(bound))})
+    env["INTEGRATION_EXTRA_DATA"].update({"application_offset": str(hex(app_offset))})
     return result
 
 

diff --git a/examples/espidf-arduino-littlefs/platformio.ini b/examples/espidf-arduino-littlefs/platformio.ini
@@ -17,3 +17,8 @@ monitor_speed = 115200
 board = esp32-s3-devkitc-1
 board_build.filesystem = littlefs
 board_build.partitions = partitions_custom.csv
+custom_component_remove =
+                          espressif/mdns
+                          espressif/esp-dsp
+                          espressif/esp_modem
+                          espressif/esp32-camera
diff --git a/examples/espidf-blink/platformio.ini b/examples/espidf-blink/platformio.ini
@@ -26,6 +26,8 @@ build_flags =
 	-D CONFIG_BLINK_GPIO=8
 	-D CONFIG_BLINK_LED_GPIO=8
 	-D CONFIG_BLINK_PERIOD=1000
+custom_component_add =
+        espressif/cmake_utilities @ 0.*
 
 [env:esp32-c6-devkitc-1]
 platform = espressif32