Skip to content

Commit a334fbd

Browse files
authored
IDF master (#10887)
* feat(ci): Run sketches on ESP32-C5 * IDF master 1160a86b * fix(zigbee): Remove RCP mode from ESP32-C5
1 parent fe3e0e3 commit a334fbd

File tree

5 files changed

+181
-180
lines changed

5 files changed

+181
-180
lines changed

Diff for: .github/scripts/on-push.sh

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ if [ "$BUILD_LOG" -eq 1 ]; then
9090
fi
9191

9292
#build sketches for different targets
93+
build "esp32c5" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$LOG_LEVEL" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
9394
build "esp32p4" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$LOG_LEVEL" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
9495
build "esp32s3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$LOG_LEVEL" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
9596
build "esp32s2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$LOG_LEVEL" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"

Diff for: .github/scripts/sketch_utils.sh

+5
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ function build_sketch { # build_sketch <ide_path> <user_path> <path-to-ino> [ext
156156
esp32c6_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
157157
esp32h2_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
158158
esp32p4_opts=$(echo "PSRAM=enabled,USBMode=default,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
159+
esp32c5_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
159160

160161
# Select the common part of the FQBN based on the target. The rest will be
161162
# appended depending on the passed options.
@@ -191,6 +192,10 @@ function build_sketch { # build_sketch <ide_path> <user_path> <path-to-ino> [ext
191192
[ -n "${options:-$esp32p4_opts}" ] && opt=":${options:-$esp32p4_opts}"
192193
fqbn="espressif:esp32:esp32p4$opt"
193194
;;
195+
"esp32c5")
196+
[ -n "${options:-$esp32c5_opts}" ] && opt=":${options:-$esp32c5_opts}"
197+
fqbn="espressif:esp32:esp32c5$opt"
198+
;;
194199
*)
195200
echo "ERROR: Invalid chip: $target"
196201
exit 1

Diff for: .github/workflows/push.yml

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ on:
5151
- "variants/esp32c3/**/*"
5252
- "variants/esp32c6/**/*"
5353
- "variants/esp32h2/**/*"
54+
- "variants/esp32c5/**/*"
5455

5556
concurrency:
5657
group: build-${{github.event.pull_request.number || github.ref}}

Diff for: boards.txt

+4-10
Original file line numberDiff line numberDiff line change
@@ -359,22 +359,16 @@ esp32c5.menu.ZigbeeMode.default.build.zigbee_mode=
359359
esp32c5.menu.ZigbeeMode.default.build.zigbee_libs=
360360
esp32c5.menu.ZigbeeMode.ed=Zigbee ED (end device)
361361
esp32c5.menu.ZigbeeMode.ed.build.zigbee_mode=-DZIGBEE_MODE_ED
362-
esp32c5.menu.ZigbeeMode.ed.build.zigbee_libs=-lesp_zb_api_ed -lesp_zb_cli_command -lzboss_stack.ed -lzboss_port
362+
esp32c5.menu.ZigbeeMode.ed.build.zigbee_libs=-lesp_zb_api.ed -lzboss_stack.ed -lzboss_port.native
363363
esp32c5.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator/router)
364364
esp32c5.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
365-
esp32c5.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr -lzboss_port
366-
esp32c5.menu.ZigbeeMode.rcp=Zigbee RCP (radio co-processor)
367-
esp32c5.menu.ZigbeeMode.rcp.build.zigbee_mode=-DZIGBEE_MODE_RCP
368-
esp32c5.menu.ZigbeeMode.rcp.build.zigbee_libs=-lesp_zb_api_rcp -lesp_zb_cli_command -lzboss_stack.rcp -lzboss_port
365+
esp32c5.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api.zczr -lzboss_stack.zczr -lzboss_port.native
369366
esp32c5.menu.ZigbeeMode.ed_debug=Zigbee ED (end device) - Debug
370367
esp32c5.menu.ZigbeeMode.ed_debug.build.zigbee_mode=-DZIGBEE_MODE_ED
371-
esp32c5.menu.ZigbeeMode.ed_debug.build.zigbee_libs=-lesp_zb_api_ed.debug -lesp_zb_cli_command -lzboss_stack.ed.debug -lzboss_port.debug
368+
esp32c5.menu.ZigbeeMode.ed_debug.build.zigbee_libs=-lesp_zb_api.ed.debug -lzboss_stack.ed.debug -lzboss_port.native.debug
372369
esp32c5.menu.ZigbeeMode.zczr_debug=Zigbee ZCZR (coordinator/router) - Debug
373370
esp32c5.menu.ZigbeeMode.zczr_debug.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
374-
esp32c5.menu.ZigbeeMode.zczr_debug.build.zigbee_libs=-lesp_zb_api_zczr.debug -lesp_zb_cli_command -lzboss_stack.zczr.debug -lzboss_port.debug
375-
esp32c5.menu.ZigbeeMode.rcp_debug=Zigbee RCP (radio co-processor) - Debug
376-
esp32c5.menu.ZigbeeMode.rcp_debug.build.zigbee_mode=-DZIGBEE_MODE_RCP
377-
esp32c5.menu.ZigbeeMode.rcp_debug.build.zigbee_libs=-lesp_zb_api_rcp.debug -lesp_zb_cli_command -lzboss_stack.rcp.debug -lzboss_port.debug
371+
esp32c5.menu.ZigbeeMode.zczr_debug.build.zigbee_libs=-lesp_zb_api.zczr.debug -lzboss_stack.zczr.debug -lzboss_port.native.debug
378372

379373
##############################################################
380374

0 commit comments

Comments
 (0)