Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 78c6725

Browse files
P-R-O-C-H-YP-R-O-C-H-Y
committedDec 3, 2024·
feat(zigbee): Recall bound devices after reboot
1 parent 9f5f95e commit 78c6725

File tree

9 files changed

+310
-87
lines changed

9 files changed

+310
-87
lines changed
 

‎libraries/Zigbee/src/ZigbeeCore.cpp

Lines changed: 68 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct) {
243243
} else {
244244
Zigbee._connected = true;
245245
}
246+
Zigbee.searchBindings();
246247
}
247248
} else {
248249
/* commissioning failed */
@@ -309,8 +310,7 @@ void esp_zb_app_signal_handler(esp_zb_app_signal_t *signal_struct) {
309310
Bit 6 – Security capability
310311
Bit 7 – Reserved
311312
*/
312-
313-
// for each endpoint in the list call the findEndpoint function if not bounded or allowed to bind multiple devices
313+
// for each endpoint in the list call the findEndpoint function if not bounded or allowed to bind multiple devices
314314
for (std::list<ZigbeeEP *>::iterator it = Zigbee.ep_objects.begin(); it != Zigbee.ep_objects.end(); ++it) {
315315
if (!(*it)->bound() || (*it)->epAllowMultipleBinding()) {
316316
(*it)->findEndpoint(&cmd_req);
@@ -391,6 +391,72 @@ void ZigbeeCore::scanDelete() {
391391
_scan_status = ZB_SCAN_FAILED;
392392
}
393393

394+
// Recall bounded devices from the binding table after reboot
395+
void ZigbeeCore::bindingTableCb(const esp_zb_zdo_binding_table_info_t *table_info, void *user_ctx)
396+
{
397+
bool done = true;
398+
esp_zb_zdo_mgmt_bind_param_t *req = (esp_zb_zdo_mgmt_bind_param_t *)user_ctx;
399+
esp_zb_zdp_status_t zdo_status = (esp_zb_zdp_status_t)table_info->status;
400+
log_d("Binding table callback for address 0x%04x with status %d", req->dst_addr, zdo_status);
401+
if (zdo_status == ESP_ZB_ZDP_STATUS_SUCCESS) {
402+
// Print binding table log simple
403+
log_d("Binding table info: total %d, index %d, count %d", table_info->total, table_info->index, table_info->count);
404+
405+
if(table_info->total == 0) {
406+
log_d("No binding table entries found");
407+
free(req);
408+
return;
409+
}
410+
411+
// Create a new device object and fill it with the binding table info
412+
zb_device_params_t *device = (zb_device_params_t *)malloc(sizeof(zb_device_params_t));
413+
device->endpoint = table_info->record->dst_endp;
414+
415+
//log all tableinfo record
416+
log_d("Binding table record: src_endp %d, dst_endp %d, cluster_id 0x%04x, dst_addr_mode %d", table_info->record->src_endp, table_info->record->dst_endp, table_info->record->cluster_id, table_info->record->dst_addr_mode);
417+
log_d("Short address: 0x%04x", table_info->record->dst_address.addr_short);
418+
log_d("ieee_address: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", table_info->record->dst_address.addr_long[7], table_info->record->dst_address.addr_long[6], table_info->record->dst_address.addr_long[5], table_info->record->dst_address.addr_long[4], table_info->record->dst_address.addr_long[3], table_info->record->dst_address.addr_long[2], table_info->record->dst_address.addr_long[1], table_info->record->dst_address.addr_long[0]);
419+
420+
if(table_info->record->dst_addr_mode == ESP_ZB_APS_ADDR_MODE_16_ENDP_PRESENT ) {
421+
device->short_addr = table_info->record->dst_address.addr_short;
422+
} else { //ESP_ZB_APS_ADDR_MODE_64_ENDP_PRESENT
423+
memcpy(device->ieee_addr, table_info->record->dst_address.addr_long, sizeof(esp_zb_ieee_addr_t));
424+
}
425+
426+
log_d("Bound device: endpoint %d, short address 0x%04x to endpoint %d", table_info->record->dst_endp, table_info->record->dst_address.addr_short, table_info->record->src_endp);
427+
428+
// Add to list of bound devices of proper endpoint
429+
for (std::list<ZigbeeEP *>::iterator it = Zigbee.ep_objects.begin(); it != Zigbee.ep_objects.end(); ++it) {
430+
if ((*it)->getEndpoint() == table_info->record->src_endp) {
431+
(*it)->addBoundDevice(device);
432+
}
433+
}
434+
435+
// Continue reading the binding table
436+
if (table_info->index + table_info->count < table_info->total) {
437+
/* There are unreported binding table entries, request for them. */
438+
req->start_index = table_info->index + table_info->count;
439+
esp_zb_zdo_binding_table_req(req, bindingTableCb, req);
440+
done = false;
441+
}
442+
}
443+
444+
if (done) {
445+
// Print bound devices
446+
log_d("Filling bounded devices finished");
447+
free(req);
448+
}
449+
}
450+
451+
452+
void ZigbeeCore::searchBindings(){
453+
esp_zb_zdo_mgmt_bind_param_t *mb_req = (esp_zb_zdo_mgmt_bind_param_t *)malloc(sizeof(esp_zb_zdo_mgmt_bind_param_t));
454+
mb_req->dst_addr = esp_zb_get_short_address();
455+
mb_req->start_index = 0;
456+
log_d("Requesting binding table for address 0x%04x", mb_req->dst_addr);
457+
esp_zb_zdo_binding_table_req(mb_req, bindingTableCb, (void *)mb_req);
458+
}
459+
394460
// Function to convert enum value to string
395461
const char *ZigbeeCore::getDeviceTypeString(esp_zb_ha_standard_devices_t deviceId) {
396462
switch (deviceId) {

‎libraries/Zigbee/src/ZigbeeCore.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ class ZigbeeCore {
8080
bool zigbeeInit(esp_zb_cfg_t *zb_cfg, bool erase_nvs);
8181
static void scanCompleteCallback(esp_zb_zdp_status_t zdo_status, uint8_t count, esp_zb_network_descriptor_t *nwk_descriptor);
8282
const char *getDeviceTypeString(esp_zb_ha_standard_devices_t deviceId);
83+
void searchBindings();
84+
static void bindingTableCb(const esp_zb_zdo_binding_table_info_t *table_info, void *user_ctx);
8385

8486
public:
8587
ZigbeeCore();

‎libraries/Zigbee/src/ZigbeeEP.cpp

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,20 @@ void ZigbeeEP::reportBatteryPercentage() {
112112
log_v("Battery percentage reported");
113113
}
114114

115-
char *ZigbeeEP::readManufacturer(uint8_t endpoint, uint16_t short_addr) {
115+
char *ZigbeeEP::readManufacturer(uint8_t endpoint, uint16_t short_addr, esp_zb_ieee_addr_t ieee_addr) {
116116
/* Read peer Manufacture Name & Model Identifier */
117117
esp_zb_zcl_read_attr_cmd_t read_req;
118-
read_req.address_mode = ESP_ZB_APS_ADDR_MODE_16_ENDP_PRESENT;
118+
119+
if(short_addr != 0){
120+
read_req.address_mode = ESP_ZB_APS_ADDR_MODE_16_ENDP_PRESENT;
121+
read_req.zcl_basic_cmd.dst_addr_u.addr_short = short_addr;
122+
} else {
123+
read_req.address_mode = ESP_ZB_APS_ADDR_MODE_64_ENDP_PRESENT;
124+
memcpy(read_req.zcl_basic_cmd.dst_addr_u.addr_long, ieee_addr, sizeof(esp_zb_ieee_addr_t));
125+
}
126+
119127
read_req.zcl_basic_cmd.src_endpoint = _endpoint;
120128
read_req.zcl_basic_cmd.dst_endpoint = endpoint;
121-
read_req.zcl_basic_cmd.dst_addr_u.addr_short = short_addr;
122129
read_req.clusterID = ESP_ZB_ZCL_CLUSTER_ID_BASIC;
123130

124131
uint16_t attributes[] = {
@@ -139,13 +146,20 @@ char *ZigbeeEP::readManufacturer(uint8_t endpoint, uint16_t short_addr) {
139146
return _read_manufacturer;
140147
}
141148

142-
char *ZigbeeEP::readModel(uint8_t endpoint, uint16_t short_addr) {
149+
char *ZigbeeEP::readModel(uint8_t endpoint, uint16_t short_addr, esp_zb_ieee_addr_t ieee_addr) {
143150
/* Read peer Manufacture Name & Model Identifier */
144151
esp_zb_zcl_read_attr_cmd_t read_req;
145-
read_req.address_mode = ESP_ZB_APS_ADDR_MODE_16_ENDP_PRESENT;
152+
153+
if(short_addr != 0){
154+
read_req.address_mode = ESP_ZB_APS_ADDR_MODE_16_ENDP_PRESENT;
155+
read_req.zcl_basic_cmd.dst_addr_u.addr_short = short_addr;
156+
} else {
157+
read_req.address_mode = ESP_ZB_APS_ADDR_MODE_64_ENDP_PRESENT;
158+
memcpy(read_req.zcl_basic_cmd.dst_addr_u.addr_long, ieee_addr, sizeof(esp_zb_ieee_addr_t));
159+
}
160+
146161
read_req.zcl_basic_cmd.src_endpoint = _endpoint;
147162
read_req.zcl_basic_cmd.dst_endpoint = endpoint;
148-
read_req.zcl_basic_cmd.dst_addr_u.addr_short = short_addr;
149163
read_req.clusterID = ESP_ZB_ZCL_CLUSTER_ID_BASIC;
150164

151165
uint16_t attributes[] = {

‎libraries/Zigbee/src/ZigbeeEP.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ class ZigbeeEP {
8787
void reportBatteryPercentage();
8888

8989
// Methods to read manufacturer and model name from selected endpoint and short address
90-
char *readManufacturer(uint8_t endpoint, uint16_t short_addr);
91-
char *readModel(uint8_t endpoint, uint16_t short_addr);
90+
char *readManufacturer(uint8_t endpoint, uint16_t short_addr, esp_zb_ieee_addr_t ieee_addr);
91+
char *readModel(uint8_t endpoint, uint16_t short_addr, esp_zb_ieee_addr_t ieee_addr);
9292

9393
bool epAllowMultipleBinding() {
9494
return _allow_multiple_binding;
@@ -108,7 +108,7 @@ class ZigbeeEP {
108108
}
109109

110110
private:
111-
static bool _allow_multiple_binding;
111+
112112
char *_read_manufacturer;
113113
char *_read_model;
114114
void (*_on_identify)(uint16_t time);
@@ -119,10 +119,16 @@ class ZigbeeEP {
119119
esp_zb_endpoint_config_t _ep_config;
120120
esp_zb_cluster_list_t *_cluster_list;
121121
static bool _is_bound;
122+
static bool _allow_multiple_binding;
122123
std::list<zb_device_params_t *> _bound_devices;
123124
SemaphoreHandle_t lock;
124125
zb_power_source_t _power_source;
125126

127+
void addBoundDevice(zb_device_params_t *device) {
128+
_bound_devices.push_back(device);
129+
_is_bound = true;
130+
}
131+
126132
friend class ZigbeeCore;
127133
};
128134

‎libraries/Zigbee/src/ep/ZigbeeColorDimmerSwitch.cpp

Lines changed: 123 additions & 47 deletions
Large diffs are not rendered by default.

‎libraries/Zigbee/src/ep/ZigbeeColorDimmerSwitch.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@ class ZigbeeColorDimmerSwitch : public ZigbeeEP {
1818
void lightToggle();
1919
void lightToggle(uint16_t group_addr);
2020
void lightToggle(uint8_t endpoint, uint16_t short_addr);
21+
void lightToggle(uint8_t endpoint, esp_zb_ieee_addr_t ieee_addr);
2122

2223
void lightOn();
2324
void lightOn(uint16_t group_addr);
2425
void lightOn(uint8_t endpoint, uint16_t short_addr);
26+
void lightOn(uint8_t endpoint, esp_zb_ieee_addr_t ieee_addr);
2527

2628
void lightOff();
2729
void lightOff(uint16_t group_addr);
2830
void lightOff(uint8_t endpoint, uint16_t short_addr);
31+
void lightOff(uint8_t endpoint, esp_zb_ieee_addr_t ieee_addr);
2932

3033
void lightOffWithEffect(uint8_t effect_id, uint8_t effect_variant);
3134
void lightOnWithTimedOff(uint8_t on_off_control, uint16_t time_on, uint16_t time_off);
@@ -34,10 +37,12 @@ class ZigbeeColorDimmerSwitch : public ZigbeeEP {
3437
void setLightLevel(uint8_t level);
3538
void setLightLevel(uint8_t level, uint16_t group_addr);
3639
void setLightLevel(uint8_t level, uint8_t endpoint, uint16_t short_addr);
40+
void setLightLevel(uint8_t level, uint8_t endpoint, esp_zb_ieee_addr_t ieee_addr);
3741

3842
void setLightColor(uint8_t red, uint8_t green, uint8_t blue);
3943
void setLightColor(uint8_t red, uint8_t green, uint8_t blue, uint16_t group_addr);
4044
void setLightColor(uint8_t red, uint8_t green, uint8_t blue, uint8_t endpoint, uint16_t short_addr);
45+
void setLightColor(uint8_t red, uint8_t green, uint8_t blue, uint8_t endpoint, esp_zb_ieee_addr_t ieee_addr);
4146

4247
private:
4348
// save instance of the class in order to use it in static functions

‎libraries/Zigbee/src/ep/ZigbeeSwitch.cpp

Lines changed: 72 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,18 @@ void ZigbeeSwitch::findCb(esp_zb_zdp_status_t zdo_status, uint16_t addr, uint8_t
5050

5151
// find on_off light endpoint
5252
void ZigbeeSwitch::findEndpoint(esp_zb_zdo_match_desc_req_param_t *cmd_req) {
53-
uint16_t cluster_list[] = {ESP_ZB_ZCL_CLUSTER_ID_ON_OFF, ESP_ZB_ZCL_CLUSTER_ID_ON_OFF};
54-
esp_zb_zdo_match_desc_req_param_t on_off_req = {
55-
.dst_nwk_addr = cmd_req->dst_nwk_addr,
56-
.addr_of_interest = cmd_req->addr_of_interest,
57-
.profile_id = ESP_ZB_AF_HA_PROFILE_ID,
58-
.num_in_clusters = 1,
59-
.num_out_clusters = 1,
60-
.cluster_list = cluster_list,
61-
};
62-
63-
esp_zb_zdo_match_cluster(&on_off_req, findCb, &_endpoint);
53+
if(!_is_bound || _allow_multiple_binding){
54+
uint16_t cluster_list[] = {ESP_ZB_ZCL_CLUSTER_ID_ON_OFF, ESP_ZB_ZCL_CLUSTER_ID_ON_OFF};
55+
esp_zb_zdo_match_desc_req_param_t on_off_req = {
56+
.dst_nwk_addr = cmd_req->dst_nwk_addr,
57+
.addr_of_interest = cmd_req->addr_of_interest,
58+
.profile_id = ESP_ZB_AF_HA_PROFILE_ID,
59+
.num_in_clusters = 1,
60+
.num_out_clusters = 1,
61+
.cluster_list = cluster_list,
62+
};
63+
esp_zb_zdo_match_cluster(&on_off_req, findCb, &_endpoint);
64+
}
6465
}
6566

6667
// Methods to control the light
@@ -70,7 +71,7 @@ void ZigbeeSwitch::lightToggle() {
7071
cmd_req.zcl_basic_cmd.src_endpoint = _endpoint;
7172
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_DST_ADDR_ENDP_NOT_PRESENT;
7273
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_TOGGLE_ID;
73-
log_i("Sending 'light toggle' command");
74+
log_v("Sending 'light toggle' command");
7475
esp_zb_zcl_on_off_cmd_req(&cmd_req);
7576
} else {
7677
log_e("Light not bound");
@@ -84,7 +85,7 @@ void ZigbeeSwitch::lightToggle(uint16_t group_addr) {
8485
cmd_req.zcl_basic_cmd.dst_addr_u.addr_short = group_addr;
8586
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_16_GROUP_ENDP_NOT_PRESENT;
8687
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_TOGGLE_ID;
87-
log_i("Sending 'light toggle' command to group address 0x%x", group_addr);
88+
log_v("Sending 'light toggle' command to group address 0x%x", group_addr);
8889
esp_zb_zcl_on_off_cmd_req(&cmd_req);
8990
} else {
9091
log_e("Light not bound");
@@ -99,7 +100,23 @@ void ZigbeeSwitch::lightToggle(uint8_t endpoint, uint16_t short_addr) {
99100
cmd_req.zcl_basic_cmd.dst_addr_u.addr_short = short_addr;
100101
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_16_ENDP_PRESENT;
101102
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_TOGGLE_ID;
102-
log_i("Sending 'light toggle' command to endpoint %d, address 0x%x", endpoint, short_addr);
103+
log_v("Sending 'light toggle' command to endpoint %d, address 0x%x", endpoint, short_addr);
104+
esp_zb_zcl_on_off_cmd_req(&cmd_req);
105+
} else {
106+
log_e("Light not bound");
107+
}
108+
}
109+
110+
void ZigbeeSwitch::lightToggle(uint8_t endpoint, esp_zb_ieee_addr_t ieee_addr) {
111+
if (_is_bound) {
112+
esp_zb_zcl_on_off_cmd_t cmd_req;
113+
cmd_req.zcl_basic_cmd.src_endpoint = _endpoint;
114+
cmd_req.zcl_basic_cmd.dst_endpoint = endpoint;
115+
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_64_ENDP_PRESENT;
116+
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_TOGGLE_ID;
117+
memcpy(cmd_req.zcl_basic_cmd.dst_addr_u.addr_long, ieee_addr, sizeof(esp_zb_ieee_addr_t));
118+
log_v("Sending 'light toggle' command to endpoint %d, ieee address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
119+
endpoint, ieee_addr[7], ieee_addr[6], ieee_addr[5], ieee_addr[4], ieee_addr[3], ieee_addr[2], ieee_addr[1], ieee_addr[0]);
103120
esp_zb_zcl_on_off_cmd_req(&cmd_req);
104121
} else {
105122
log_e("Light not bound");
@@ -112,7 +129,7 @@ void ZigbeeSwitch::lightOn() {
112129
cmd_req.zcl_basic_cmd.src_endpoint = _endpoint;
113130
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_DST_ADDR_ENDP_NOT_PRESENT;
114131
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_ON_ID;
115-
log_i("Sending 'light on' command");
132+
log_v("Sending 'light on' command");
116133
esp_zb_zcl_on_off_cmd_req(&cmd_req);
117134
} else {
118135
log_e("Light not bound");
@@ -126,7 +143,7 @@ void ZigbeeSwitch::lightOn(uint16_t group_addr) {
126143
cmd_req.zcl_basic_cmd.dst_addr_u.addr_short = group_addr;
127144
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_16_GROUP_ENDP_NOT_PRESENT;
128145
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_ON_ID;
129-
log_i("Sending 'light on' command to group address 0x%x", group_addr);
146+
log_v("Sending 'light on' command to group address 0x%x", group_addr);
130147
esp_zb_zcl_on_off_cmd_req(&cmd_req);
131148
} else {
132149
log_e("Light not bound");
@@ -141,7 +158,23 @@ void ZigbeeSwitch::lightOn(uint8_t endpoint, uint16_t short_addr) {
141158
cmd_req.zcl_basic_cmd.dst_addr_u.addr_short = short_addr;
142159
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_16_ENDP_PRESENT;
143160
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_ON_ID;
144-
log_i("Sending 'light on' command to endpoint %d, address 0x%x", endpoint, short_addr);
161+
log_v("Sending 'light on' command to endpoint %d, address 0x%x", endpoint, short_addr);
162+
esp_zb_zcl_on_off_cmd_req(&cmd_req);
163+
} else {
164+
log_e("Light not bound");
165+
}
166+
}
167+
168+
void ZigbeeSwitch::lightOn(uint8_t endpoint, esp_zb_ieee_addr_t ieee_addr) {
169+
if (_is_bound) {
170+
esp_zb_zcl_on_off_cmd_t cmd_req;
171+
cmd_req.zcl_basic_cmd.src_endpoint = _endpoint;
172+
cmd_req.zcl_basic_cmd.dst_endpoint = endpoint;
173+
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_64_ENDP_PRESENT;
174+
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_ON_ID;
175+
memcpy(cmd_req.zcl_basic_cmd.dst_addr_u.addr_long, ieee_addr, sizeof(esp_zb_ieee_addr_t));
176+
log_v("Sending 'light on' command to endpoint %d, ieee address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
177+
endpoint, ieee_addr[7], ieee_addr[6], ieee_addr[5], ieee_addr[4], ieee_addr[3], ieee_addr[2], ieee_addr[1], ieee_addr[0]);
145178
esp_zb_zcl_on_off_cmd_req(&cmd_req);
146179
} else {
147180
log_e("Light not bound");
@@ -154,7 +187,7 @@ void ZigbeeSwitch::lightOff() {
154187
cmd_req.zcl_basic_cmd.src_endpoint = _endpoint;
155188
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_DST_ADDR_ENDP_NOT_PRESENT;
156189
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_OFF_ID;
157-
log_i("Sending 'light off' command");
190+
log_v("Sending 'light off' command");
158191
esp_zb_zcl_on_off_cmd_req(&cmd_req);
159192
} else {
160193
log_e("Light not bound");
@@ -168,7 +201,7 @@ void ZigbeeSwitch::lightOff(uint16_t group_addr) {
168201
cmd_req.zcl_basic_cmd.dst_addr_u.addr_short = group_addr;
169202
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_16_GROUP_ENDP_NOT_PRESENT;
170203
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_OFF_ID;
171-
log_i("Sending 'light off' command to group address 0x%x", group_addr);
204+
log_v("Sending 'light off' command to group address 0x%x", group_addr);
172205
esp_zb_zcl_on_off_cmd_req(&cmd_req);
173206
} else {
174207
log_e("Light not bound");
@@ -183,7 +216,23 @@ void ZigbeeSwitch::lightOff(uint8_t endpoint, uint16_t short_addr) {
183216
cmd_req.zcl_basic_cmd.dst_addr_u.addr_short = short_addr;
184217
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_16_ENDP_PRESENT;
185218
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_OFF_ID;
186-
log_i("Sending 'light off' command to endpoint %d, address 0x%x", endpoint, short_addr);
219+
log_v("Sending 'light off' command to endpoint %d, address 0x%x", endpoint, short_addr);
220+
esp_zb_zcl_on_off_cmd_req(&cmd_req);
221+
} else {
222+
log_e("Light not bound");
223+
}
224+
}
225+
226+
void ZigbeeSwitch::lightOff(uint8_t endpoint, esp_zb_ieee_addr_t ieee_addr) {
227+
if (_is_bound) {
228+
esp_zb_zcl_on_off_cmd_t cmd_req;
229+
cmd_req.zcl_basic_cmd.src_endpoint = _endpoint;
230+
cmd_req.zcl_basic_cmd.dst_endpoint = endpoint;
231+
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_64_ENDP_PRESENT;
232+
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_OFF_ID;
233+
memcpy(cmd_req.zcl_basic_cmd.dst_addr_u.addr_long, ieee_addr, sizeof(esp_zb_ieee_addr_t));
234+
log_v("Sending 'light off' command to endpoint %d, ieee address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
235+
endpoint, ieee_addr[7], ieee_addr[6], ieee_addr[5], ieee_addr[4], ieee_addr[3], ieee_addr[2], ieee_addr[1], ieee_addr[0]);
187236
esp_zb_zcl_on_off_cmd_req(&cmd_req);
188237
} else {
189238
log_e("Light not bound");
@@ -197,7 +246,7 @@ void ZigbeeSwitch::lightOffWithEffect(uint8_t effect_id, uint8_t effect_variant)
197246
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_DST_ADDR_ENDP_NOT_PRESENT;
198247
cmd_req.effect_id = effect_id;
199248
cmd_req.effect_variant = effect_variant;
200-
log_i("Sending 'light off with effect' command");
249+
log_v("Sending 'light off with effect' command");
201250
esp_zb_zcl_on_off_off_with_effect_cmd_req(&cmd_req);
202251
} else {
203252
log_e("Light not bound");
@@ -209,7 +258,7 @@ void ZigbeeSwitch::lightOnWithSceneRecall() {
209258
esp_zb_zcl_on_off_on_with_recall_global_scene_cmd_t cmd_req;
210259
cmd_req.zcl_basic_cmd.src_endpoint = _endpoint;
211260
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_DST_ADDR_ENDP_NOT_PRESENT;
212-
log_i("Sending 'light on with scene recall' command");
261+
log_v("Sending 'light on with scene recall' command");
213262
esp_zb_zcl_on_off_on_with_recall_global_scene_cmd_req(&cmd_req);
214263
} else {
215264
log_e("Light not bound");
@@ -223,7 +272,7 @@ void ZigbeeSwitch::lightOnWithTimedOff(uint8_t on_off_control, uint16_t time_on,
223272
cmd_req.on_off_control = on_off_control; //TODO: Test how it works, then maybe change API
224273
cmd_req.on_time = time_on;
225274
cmd_req.off_wait_time = time_off;
226-
log_i("Sending 'light on with time off' command");
275+
log_v("Sending 'light on with time off' command");
227276
esp_zb_zcl_on_off_on_with_timed_off_cmd_req(&cmd_req);
228277
} else {
229278
log_e("Light not bound");

‎libraries/Zigbee/src/ep/ZigbeeSwitch.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@ class ZigbeeSwitch : public ZigbeeEP {
1818
void lightToggle();
1919
void lightToggle(uint16_t group_addr);
2020
void lightToggle(uint8_t endpoint, uint16_t short_addr);
21+
void lightToggle(uint8_t endpoint, esp_zb_ieee_addr_t ieee_addr);
2122

2223
void lightOn();
2324
void lightOn(uint16_t group_addr);
2425
void lightOn(uint8_t endpoint, uint16_t short_addr);
26+
void lightOn(uint8_t endpoint, esp_zb_ieee_addr_t ieee_addr);
2527

2628
void lightOff();
2729
void lightOff(uint16_t group_addr);
2830
void lightOff(uint8_t endpoint, uint16_t short_addr);
31+
void lightOff(uint8_t endpoint, esp_zb_ieee_addr_t ieee_addr);
2932

3033
void lightOffWithEffect(uint8_t effect_id, uint8_t effect_variant);
3134
void lightOnWithTimedOff(uint8_t on_off_control, uint16_t time_on, uint16_t time_off);

‎libraries/Zigbee/src/ep/ZigbeeThermostat.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,14 @@ void ZigbeeThermostat::findCb(esp_zb_zdp_status_t zdo_status, uint16_t addr, uin
9191
}
9292

9393
void ZigbeeThermostat::findEndpoint(esp_zb_zdo_match_desc_req_param_t *param) {
94-
uint16_t cluster_list[] = {ESP_ZB_ZCL_CLUSTER_ID_TEMP_MEASUREMENT};
95-
param->profile_id = ESP_ZB_AF_HA_PROFILE_ID;
96-
param->num_in_clusters = 1;
97-
param->num_out_clusters = 0;
98-
param->cluster_list = cluster_list;
99-
esp_zb_zdo_match_cluster(param, findCb, &_endpoint);
94+
if(!_is_bound || _allow_multiple_binding) {
95+
uint16_t cluster_list[] = {ESP_ZB_ZCL_CLUSTER_ID_TEMP_MEASUREMENT};
96+
param->profile_id = ESP_ZB_AF_HA_PROFILE_ID;
97+
param->num_in_clusters = 1;
98+
param->num_out_clusters = 0;
99+
param->cluster_list = cluster_list;
100+
esp_zb_zdo_match_cluster(param, findCb, &_endpoint);
101+
}
100102
}
101103

102104
void ZigbeeThermostat::zbAttributeRead(uint16_t cluster_id, const esp_zb_zcl_attribute_t *attribute) {

0 commit comments

Comments
 (0)
Please sign in to comment.