Skip to content

Commit 139300c

Browse files
authored
Release 2024.11.31
1 parent ed8955f commit 139300c

File tree

5 files changed

+22
-7
lines changed

5 files changed

+22
-7
lines changed

.github/workflows/examples.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
- "examples/arduino-blink"
1818
- "examples/arduino-rmt-blink"
1919
- "examples/arduino-wifiscan"
20+
- "examples/arduino-usb-keyboard"
2021
- "examples/espidf-arduino-blink"
2122
- "examples/espidf-arduino-littlefs"
2223
- "examples/espidf-blink"

boards/esp32-solo1.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"build": {
33
"core": "esp32",
44
"extra_flags": "-DARDUINO_ESP32_DEV -DARDUINO_USB_CDC_ON_BOOT=0 -DCORE32SOLO1",
5-
"f_cpu": "80000000L",
5+
"f_cpu": "160000000L",
66
"f_flash": "40000000L",
77
"flash_mode": "dio",
88
"mcu": "esp32",
@@ -29,6 +29,11 @@
2929
"require_upload_port": true,
3030
"speed": 460800
3131
},
32+
"espidf": {
33+
"custom_sdkconfig": [
34+
"CONFIG_FREERTOS_UNICORE=y"
35+
]
36+
},
3237
"url": "https://en.wikipedia.org/wiki/ESP32",
3338
"vendor": "Espressif"
3439
}

builder/main.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def _parse_partitions(env):
143143

144144
result = []
145145
next_offset = 0
146-
bound = int(board.get("upload.offset_address", "0x10000"), 16) # default 0x10000
146+
app_offset = int(board.get("upload.offset_address", "0x10000"), 16) # default 0x10000
147147
with open(partitions_csv) as fp:
148148
for line in fp.readlines():
149149
line = line.strip()
@@ -152,23 +152,25 @@ def _parse_partitions(env):
152152
tokens = [t.strip() for t in line.split(",")]
153153
if len(tokens) < 5:
154154
continue
155+
bound = 0x10000 if tokens[1] in ("0", "app") else 4
156+
calculated_offset = (next_offset + bound - 1) & ~(bound - 1)
155157
partition = {
156158
"name": tokens[0],
157159
"type": tokens[1],
158160
"subtype": tokens[2],
159-
"offset": tokens[3] or next_offset,
161+
"offset": tokens[3] or calculated_offset,
160162
"size": tokens[4],
161163
"flags": tokens[5] if len(tokens) > 5 else None
162164
}
163165
result.append(partition)
164166
next_offset = _parse_size(partition["offset"])
165167
if (partition["subtype"] == "ota_0"):
166-
bound = next_offset
167-
next_offset = (next_offset + bound - 1) & ~(bound - 1)
168+
app_offset = next_offset
169+
next_offset = next_offset + _parse_size(partition["size"])
168170
# Configure application partition offset
169-
env.Replace(ESP32_APP_OFFSET=str(hex(bound)))
171+
env.Replace(ESP32_APP_OFFSET=str(hex(app_offset)))
170172
# Propagate application offset to debug configurations
171-
env["INTEGRATION_EXTRA_DATA"].update({"application_offset": str(hex(bound))})
173+
env["INTEGRATION_EXTRA_DATA"].update({"application_offset": str(hex(app_offset))})
172174
return result
173175

174176

examples/espidf-arduino-littlefs/platformio.ini

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@ monitor_speed = 115200
1717
board = esp32-s3-devkitc-1
1818
board_build.filesystem = littlefs
1919
board_build.partitions = partitions_custom.csv
20+
custom_component_remove =
21+
espressif/mdns
22+
espressif/esp-dsp
23+
espressif/esp_modem
24+
espressif/esp32-camera

examples/espidf-blink/platformio.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ build_flags =
2626
-D CONFIG_BLINK_GPIO=8
2727
-D CONFIG_BLINK_LED_GPIO=8
2828
-D CONFIG_BLINK_PERIOD=1000
29+
custom_component_add =
30+
espressif/cmake_utilities @ 0.*
2931

3032
[env:esp32-c6-devkitc-1]
3133
platform = espressif32

0 commit comments

Comments
 (0)