8000 Merge branch 'master' into gtw-3.1.2 · rvbc1/esp32-arduino-lib-builder@c783ba5 · GitHub
[go: up one dir, main page]
Skip to content

Commit c783ba5

Browse files
rvbc1rvbc1
committed
Merge branch 'master' into gtw-3.1.2
2 parents 383615e + 3da1544 commit c783ba5

9 files changed

+21
-35
lines changed

‎.github/workflows/cron.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ jobs:
3535
# - idf_branch: "release/v5.1"
3636
# lib_builder_branch: "release/v5.1"
3737
# targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2"
38-
- idf_branch: "release/v5.3"
39-
lib_builder_branch: "master"
40-
targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
38+
# - idf_branch: "release/v5.3"
39+
# lib_builder_branch: "master"
40+
# targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
4141
- idf_branch: "release/v5.4"
42-
lib_builder_branch: "release/v5.4"
42+
lib_builder_branch: "master"
4343
targets: "esp32,esp32s2,esp32s3,esp32c3,esp32c6,esp32h2,esp32p4"
4444
- idf_branch: "master"
4545
lib_builder_branch: "release/v5.5"

‎configs/defconfig.common

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,3 +136,5 @@ CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y
136136
CONFIG_TINYUSB_CDC_MAX_PORTS=2
137137

138138
CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=7680
139+
# Zigbee Config
140+
CONFIG_ZB_ENABLED=y

‎configs/defconfig.esp32c6

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ CONFIG_ENABLE_MATTER_OVER_THREAD=n
4545
#
4646
# Zigbee
4747
#
48-
CONFIG_ZB_ENABLED=y
4948
CONFIG_ZB_ZED=y
5049
CONFIG_ZB_RADIO_NATIVE=y
5150
# end of Zigbee

‎configs/defconfig.esp32h2

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
3838
#
3939
# Zigbee
4040
#
41-
CONFIG_ZB_ENABLED=y
4241
CONFIG_ZB_ZED=y
4342
CONFIG_ZB_RADIO_NATIVE=y
4443
# end of Zigbee

‎configs/defconfig.esp32p4

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,6 @@ CONFIG_ESP_SDIO_PIN_D1=15
1414
CONFIG_ESP_SDIO_PIN_D2=16
1515
CONFIG_ESP_SDIO_PIN_D3=17
1616

17-
#
18-
# Chip revision
19-
#
20-
CONFIG_ESP32P4_REV_MIN_0=y
21-
# CONFIG_ESP32P4_REV_MIN_1 is not set
22-
CONFIG_ESP32P4_REV_MIN_FULL=0
23-
CONFIG_ESP_REV_MIN_FULL=0
24-
CONFIG_ESP32P4_REV_MAX_FULL=99
25-
CONFIG_ESP_REV_MAX_FULL=99
26-
# end of Chip revision
27-
2817
# RGB Display Optimizations
2918
CONFIG_LCD_RGB_ISR_IRAM_SAFE=y
3019
CONFIG_LCD_RGB_RESTART_IN_VSYNC=y

‎configs/pioarduino_start.txt

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,28 +45,17 @@ flatten_cppdefines = env.Flatten(env['CPPDEFINES'])
4545
if "ZIGBEE_MODE_ZCZR" in flatten_cppdefines:
4646
env.Append(
4747
LIBS=[
48-
"-lesp_zb_api_zczr",
49-
"-lesp_zb_cli_command",
48+
"-lesp_zb_api.zczr",
5049
"-lzboss_stack.zczr",
51-
"-lzboss_port"
50+
"-lzboss_port.native"
5251
]
5352
)
5453
if "ZIGBEE_MODE_ED" in flatten_cppdefines:
5554
env.Append(
5655
LIBS=[
57-
"-lesp_zb_api_ed",
58-
"-lesp_zb_cli_command",
56+
"-lesp_zb_api.ed",
5957
"-lzboss_stack.ed",
60-
"-lzboss_port"
61-
]
62-
)
63-
if "ZIGBEE_MODE_RCP" in flatten_cppdefines:
64-
env.Append(
65-
LIBS=[
66-
"-lesp_zb_api_rcp",
67-
"-lesp_zb_cli_command",
68-
"-lzboss_stack.rcp",
69-
"-lzboss_port"
58+
"-lzboss_port.native"
7059
]
7160
)
7261

‎tools/config.sh

Lines changed: 1 addition & 1 deletion
A3DB
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [ -z $IDF_PATH ]; then
66
fi
77

88
if [ -z $IDF_BRANCH ]; then
9-
IDF_BRANCH="release/v5.3"
9+
IDF_BRANCH="release/v5.4"
1010
fi
1111

1212
if [ -z $AR_PR_TARGET_BRANCH ]; then

‎tools/copy-libs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,12 @@ fi
9090
# copy zigbee + zboss lib
9191
if [ -d "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET/" ]; then
9292
cp -r "managed_components/espressif__esp-zigbee-lib/lib/$IDF_TARGET"/* "$AR_SDK/lib/"
93-
EXCLUDE_LIBS+="esp_zb_api_ed;"
93+
EXCLUDE_LIBS+="esp_zb_api.ed;esp_zb_api.zczr;"
9494
fi
9595

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

101101
#collect includes, defines and c-flags

‎tools/gen_tools_json.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ def replace_if_xz(system):
2929

3030
new_url = system['url'].replace(".tar.xz", ".tar.gz")
3131
new_name = system['archiveFileName'].replace(".tar.xz", ".tar.gz")
32+
new_signed_url = system['url'].replace(".tar.xz", "_signed.tar.gz")
33+
new_signed_name = system['archiveFileName'].replace(".tar.xz", "_signed.tar.gz")
3234
new_checksum = ""
3335
new_size = 0
3436

@@ -76,6 +78,12 @@ def replace_if_xz(system):
7678
release_manifests.append(manifest)
7779

7880
# find the new file in the list and get it's size and checksum
81+
for file in release_manifests[manifest_index]['files']:
82+
if file['name'] == new_signed_name:
83+
print("Found a signed version of the file")
84+
new_url = new_signed_url
85+
new_name = new_signed_name
86+
break
7987
for file in release_manifests[manifest_index]['files']:
8088
if file['name'] == new_name:
8189
system['url'] = new_url

0 commit comments

Comments
 (0)
0