Skip to content

fix(zigbee): Fix rejoin issue for battery powered devices #10704

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 7 commits into from
Dec 11, 2024
Merged

fix(zigbee): Fix rejoin issue for battery powered devices #10704

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8c3efc2
fix(zigbee): set rx on idle and alloc address
P-R-O-C-H-Y Dec 10, 2024
be95fc5
fix(zigbee): Set scan to 3 and remove duplicate
P-R-O-C-H-Y Dec 10, 2024
87d988f
fix(zigbee): Add getter for RxOnWhenIdle
P-R-O-C-H-Y Dec 10, 2024
a281b26
fix(zigbee): Move button and led pins from defines
P-R-O-C-H-Y Dec 10, 2024
d7492b1
fix(example): Lower the delay for sleepy device
P-R-O-C-H-Y Dec 10, 2024
07a3e62
fix(example): Remove wait on Serial after begin
P-R-O-C-H-Y Dec 11, 2024
3a8d4c5
fix(example): Use Serial in printBoundDevices()
P-R-O-C-H-Y Dec 11, 2024
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
3 changes: 2 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 @@ -21,6 +21,7 @@ ZigbeeCore::ZigbeeCore() {
_started = false;
_connected = false;
_scan_duration = 4; // maximum scan duration
_rx_on_when_idle = true;
if (!lock) {
lock = xSemaphoreCreateBinary();
if (lock == NULL) {
Expand Down Expand Up @@ -98,7 +99,7 @@ static void esp_zb_task(void *pvParameters) {

//NOTE: This is a workaround to make battery powered devices to be discovered as battery powered
if (((zigbee_role_t)Zigbee.getRole() == ZIGBEE_END_DEVICE) && edBatteryPowered) {
zb_set_ed_node_descriptor(0, 0, 0);
zb_set_ed_node_descriptor(0, _rx_on_when_idle, 1);
}

esp_zb_stack_main_loop();
Expand Down
6 changes: 6 additions & 0 deletions libraries/Zigbee/src/ZigbeeCore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class ZigbeeCore {
uint32_t _primary_channel_mask;
int16_t _scan_status;
uint8_t _scan_duration;
bool _rx_on_when_idle;

esp_zb_ep_list_t *_zb_ep_list;
zigbee_role_t _role;
Expand Down Expand Up @@ -112,12 +113,17 @@ class ZigbeeCore {
void setHostConfig(esp_zb_host_config_t config);
esp_zb_host_config_t getHostConfig();

void setPrimaryChannelMask(uint32_t mask);
void setPrimaryChannelMask(uint32_t mask); // By default all channels are scanned (11-26) -> mask 0x07FFF800
void setScanDuration(uint8_t duration); // Can be set from 1 - 4. 1 is fastest, 4 is slowest
uint8_t getScanDuration() {
return _scan_duration;
}

void setRxOnWhenIdle(bool rx_on_when_idle) {
_rx_on_when_idle = rx_on_when_idle;
}

void setRebootOpenNetwork(uint8_t time);
void openNetwork(uint8_t time);

Expand Down
Loading