Skip to content

Release/v5.4 #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 18, 2025
Merged

Release/v5.4 #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
77f5eff
Configure build for ESP-IDF v5.4
me-no-dev Jan 8, 2025
731afdf
Remove support for REV0 ESP32-P4
me-no-dev Jan 8, 2025
784cd9d
Add temporarily the option to use toolchains with `_signed` postfix
me-no-dev Jan 15, 2025
cc827d8
Fix tools json generation
me-no-dev Jan 16, 2025
43e5553
fix(zigbee): Exclude correct libs for 1.6.2 version (#269)
P-R-O-C-H-Y Feb 4, 2025
ffdf58b
fix(zigbee): Update exclude libs in script (#274)
P-R-O-C-H-Y Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions configs/defconfig.esp32p4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,6 @@ CONFIG_ESP_SDIO_PIN_D1=15
CONFIG_ESP_SDIO_PIN_D2=16
CONFIG_ESP_SDIO_PIN_D3=17

#
# Chip revision
#
CONFIG_ESP32P4_REV_MIN_0=y
# CONFIG_ESP32P4_REV_MIN_1 is not set
CONFIG_ESP32P4_REV_MIN_FULL=0
CONFIG_ESP_REV_MIN_FULL=0
CONFIG_ESP32P4_REV_MAX_FULL=99
CONFIG_ESP_REV_MAX_FULL=99
# end of Chip revision

# RGB Display Optimizations
CONFIG_LCD_RGB_ISR_IRAM_SAFE=y
CONFIG_LCD_RGB_RESTART_IN_VSYNC=y
4 changes: 2 additions & 2 deletions tools/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ if [ -z $IDF_PATH ]; then
fi

if [ -z $IDF_BRANCH ]; then
IDF_BRANCH="release/v5.3"
IDF_BRANCH="release/v5.4"
fi

if [ -z $AR_PR_TARGET_BRANCH ]; then
AR_PR_TARGET_BRANCH="master"
AR_PR_TARGET_BRANCH="release/v3.2.x"
fi

if [ -z $IDF_TARGET ]; then
Expand Down
4 changes: 2 additions & 2 deletions tools/copy-libs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ fi
# copy zigbee + zboss lib
if [ -d "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET/" ]; then
cp -r "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET"/* "$AR_SDK/lib/"
EXCLUDE_LIBS+="esp_zb_api_ed;"
EXCLUDE_LIBS+="esp_zb_api.ed;"
fi

if [ -d "managed_components/espressif__esp-zboss-lib/lib/$IDF_TARGET/" ]; then
cp -r "managed_components/espressif__esp-zboss-lib/lib/$IDF_TARGET"/* "$AR_SDK/lib/"
EXCLUDE_LIBS+="zboss_stack.ed;zboss_port.debug;"
EXCLUDE_LIBS+="zboss_stack.ed;zboss_port.native;zboss_port.native.debug;"
fi

#collect includes, defines and c-flags
Expand Down
8 changes: 8 additions & 0 deletions tools/gen_tools_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ def replace_if_xz(system):

new_url = system['url'].replace(".tar.xz", ".tar.gz")
new_name = system['archiveFileName'].replace(".tar.xz", ".tar.gz")
new_signed_url = system['url'].replace(".tar.xz", "_signed.tar.gz")
new_signed_name = system['archiveFileName'].replace(".tar.xz", "_signed.tar.gz")
new_checksum = ""
new_size = 0

Expand Down Expand Up @@ -76,6 +78,12 @@ def replace_if_xz(system):
release_manifests.append(manifest)

# find the new file in the list and get it's size and checksum
for file in release_manifests[manifest_index]['files']:
if file['name'] == new_signed_name:
print("Found a signed version of the file")
new_url = new_signed_url
new_name = new_signed_name
break
for file in release_manifests[manifest_index]['files']:
if file['name'] == new_name:
system['url'] = new_url
Expand Down
Loading