Skip to content

feat(zigbee): Save network channel after 1st joining for faster rejoin #11123

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 9 commits into from
Mar 19, 2025
Merged

feat(zigbee): Save network channel after 1st joining for faster rejoin #11123

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4edf517
feat(zigbee): Save network channel after 1st joining for faster rejoin
P-R-O-C-H-Y Mar 14, 2025
1908c6e
ci(pre-commit): Apply automatic fixes
pre-commit-ci-lite[bot] Mar 14, 2025
1ff918b
feat(zigbee): Add channel mask reset after timeout
P-R-O-C-H-Y Mar 18, 2025
267c042
feat(zigbee): Add the resetChannelMask to all Begin methods
P-R-O-C-H-Y Mar 18, 2025
ad1b952
Merge branch 'master' into feat/zigbee-rejoin-scan-enhancement
P-R-O-C-H-Y Mar 18, 2025
a2b5105
feaz(zigbee): Move function to private and add set method
P-R-O-C-H-Y Mar 18, 2025
34e67cc
Merge branch 'feat/zigbee-rejoin-scan-enhancement' of github.com:P-R-…
P-R-O-C-H-Y Mar 18, 2025
572fea3
fix(example): Remove test from device mode name
P-R-O-C-H-Y Mar 18, 2025
677a984
ci(pre-commit): Apply automatic fixes
pre-commit-ci-lite[bot] Mar 18, 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
14 changes: 13 additions & 1 deletion libraries/Zigbee/src/ZigbeeCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,16 @@

#define ZB_INIT_TIMEOUT 30000 // 30 seconds

extern "C" void zb_set_ed_node_descriptor(bool power_src, bool rx_on_when_idle, bool alloc_addr);
#ifdef __cplusplus
extern "C" {
#endif
#include "zboss_api.h"
extern zb_ret_t zb_nvram_write_dataset(zb_nvram_dataset_types_t t); // rejoin scanning workaround
extern void zb_set_ed_node_descriptor(bool power_src, bool rx_on_when_idle, bool alloc_addr); // sleepy device power mode workaround
#ifdef __cplusplus
}
#endif

static bool edBatteryPowered = false;

ZigbeeCore::ZigbeeCore() {
Expand Down Expand Up @@ -289,6 +298,9 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct) {
extended_pan_id[0], esp_zb_get_pan_id(), esp_zb_get_current_channel(), esp_zb_get_short_address()
);
Zigbee._connected = true;
// Set channel mask and write to NVRAM, so that the device will re-join the network faster after reboot (scan only on the current channel)
esp_zb_set_channel_mask((1 << esp_zb_get_current_channel()));
zb_nvram_write_dataset(ZB_NVRAM_COMMON_DATA);
} else {
log_i("Network steering was not successful (status: %s)", esp_err_to_name(err_status));
esp_zb_scheduler_alarm((esp_zb_callback_t)bdb_start_top_level_commissioning_cb, ESP_ZB_BDB_MODE_NETWORK_STEERING, 1000);
Expand Down
Loading