Skip to content

feat(zigbee): Update to esp-zigbee-sdk 1.6.5 and fix ci.json files #11436

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 3 commits into from
Jun 4, 2025
Merged

feat(zigbee): Update to esp-zigbee-sdk 1.6.5 and fix ci.json files #11436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c88dd5f
feat(zigbee): Update esp-zigbee-sdk and fix ci.json files
P-R-O-C-H-Y Jun 4, 2025
679d32b
fix(ci): Check if LED_BUILTIN exist
P-R-O-C-H-Y Jun 4, 2025
45e953b
ci(pre-commit): Apply automatic fixes
pre-commit-ci-lite[bot] Jun 4, 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
4 changes: 2 additions & 2 deletions idf_component.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ dependencies:
espressif/esp_modem:
version: "^1.1.0"
espressif/esp-zboss-lib:
version: "==1.6.3"
version: "==1.6.4" # compatible with esp-zigbee-lib 1.6.5
require: public
rules:
- if: "target not in [esp32c2, esp32p4]"
espressif/esp-zigbee-lib:
version: "==1.6.3"
version: "==1.6.5"
require: public
rules:
- if: "target not in [esp32c2, esp32p4]"
Expand Down
2 changes: 1 addition & 1 deletion libraries/Zigbee/examples/Zigbee_On_Off_MultiSwitch/ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
"requires": [
"CONFIG_SOC_IEEE802154_SUPPORTED=y"
"CONFIG_ZB_ENABLED=y"
]
}
8 changes: 7 additions & 1 deletion libraries/Zigbee/examples/Zigbee_Power_Outlet/Zigbee_Power_Outlet.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,13 @@

/* Zigbee power outlet configuration */
#define ZIGBEE_OUTLET_ENDPOINT 1
uint8_t led = RGB_BUILTIN;

#ifdef LED_BUILTIN // Use built-in LED if defined for the board
uint8_t led = LED_BUILTIN;
#else
uint8_t led = 2; // Use custom LED pin
#endif

uint8_t button = BOOT_PIN;

ZigbeePowerOutlet zbOutlet = ZigbeePowerOutlet(ZIGBEE_OUTLET_ENDPOINT);
Expand Down
1 change: 0 additions & 1 deletion libraries/Zigbee/examples/Zigbee_Power_Outlet/ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
"requires": [
"CONFIG_SOC_IEEE802154_SUPPORTED=y",
"CONFIG_ZB_ENABLED=y"
]
}