@@ -79,7 +79,7 @@ void ZigbeeColorDimmerSwitch::findCb(esp_zb_zdp_status_t zdo_status, uint16_t ad
79
79
// find on_off light endpoint
80
80
void ZigbeeColorDimmerSwitch::findEndpoint (esp_zb_zdo_match_desc_req_param_t *cmd_req) {
81
81
uint16_t cluster_list[] = {ESP_ZB_ZCL_CLUSTER_ID_ON_OFF, ESP_ZB_ZCL_CLUSTER_ID_LEVEL_CONTROL, ESP_ZB_ZCL_CLUSTER_ID_COLOR_CONTROL,
82
- ESP_ZB_ZCL_CLUSTER_ID_ON_OFF, ESP_ZB_ZCL_CLUSTER_ID_LEVEL_CONTROL, ESP_ZB_ZCL_CLUSTER_ID_COLOR_CONTROL};
82
+ ESP_ZB_ZCL_CLUSTER_ID_ON_OFF, ESP_ZB_ZCL_CLUSTER_ID_LEVEL_CONTROL, ESP_ZB_ZCL_CLUSTER_ID_COLOR_CONTROL};
83
83
esp_zb_zdo_match_desc_req_param_t color_dimmable_light_req = {
84
84
.dst_nwk_addr = cmd_req->dst_nwk_addr ,
85
85
.addr_of_interest = cmd_req->addr_of_interest ,
@@ -148,8 +148,10 @@ void ZigbeeColorDimmerSwitch::lightToggle(uint8_t endpoint, esp_zb_ieee_addr_t i
148
148
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_64_ENDP_PRESENT;
149
149
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_TOGGLE_ID;
150
150
memcpy (cmd_req.zcl_basic_cmd .dst_addr_u .addr_long , ieee_addr, sizeof (esp_zb_ieee_addr_t ));
151
- log_v (" Sending 'light toggle' command to endpoint %d, ieee address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x" ,
152
- 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 ]);
151
+ log_v (
152
+ " Sending 'light toggle' command to endpoint %d, ieee address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x" , endpoint, ieee_addr[7 ], ieee_addr[6 ], ieee_addr[5 ],
153
+ ieee_addr[4 ], ieee_addr[3 ], ieee_addr[2 ], ieee_addr[1 ], ieee_addr[0 ]
154
+ );
153
155
esp_zb_lock_acquire (portMAX_DELAY);
154
156
esp_zb_zcl_on_off_cmd_req (&cmd_req);
155
157
esp_zb_lock_release ();
@@ -214,8 +216,10 @@ void ZigbeeColorDimmerSwitch::lightOn(uint8_t endpoint, esp_zb_ieee_addr_t ieee_
214
216
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_64_ENDP_PRESENT;
215
217
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_ON_ID;
216
218
memcpy (cmd_req.zcl_basic_cmd .dst_addr_u .addr_long , ieee_addr, sizeof (esp_zb_ieee_addr_t ));
217
- log_v (" Sending 'light on' command to endpoint %d, ieee address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x" ,
218
- 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 ]);
219
+ log_v (
220
+ " Sending 'light on' command to endpoint %d, ieee address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x" , endpoint, ieee_addr[7 ], ieee_addr[6 ], ieee_addr[5 ],
221
+ ieee_addr[4 ], ieee_addr[3 ], ieee_addr[2 ], ieee_addr[1 ], ieee_addr[0 ]
222
+ );
219
223
esp_zb_lock_acquire (portMAX_DELAY);
220
224
esp_zb_zcl_on_off_cmd_req (&cmd_req);
221
225
esp_zb_lock_release ();
@@ -280,8 +284,10 @@ void ZigbeeColorDimmerSwitch::lightOff(uint8_t endpoint, esp_zb_ieee_addr_t ieee
280
284
cmd_req.address_mode = ESP_ZB_APS_ADDR_MODE_64_ENDP_PRESENT;
281
285
cmd_req.on_off_cmd_id = ESP_ZB_ZCL_CMD_ON_OFF_OFF_ID;
282
286
memcpy (cmd_req.zcl_basic_cmd .dst_addr_u .addr_long , ieee_addr, sizeof (esp_zb_ieee_addr_t ));
283
- log_v (" Sending 'light off' command to endpoint %d, ieee address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x" ,
284
- 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 ]);
287
+ log_v (
288
+ " Sending 'light off' command to endpoint %d, ieee address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x" , endpoint, ieee_addr[7 ], ieee_addr[6 ], ieee_addr[5 ],
289
+ ieee_addr[4 ], ieee_addr[3 ], ieee_addr[2 ], ieee_addr[1 ], ieee_addr[0 ]
290
+ );
285
291
esp_zb_lock_acquire (portMAX_DELAY);
286
292
esp_zb_zcl_on_off_cmd_req (&cmd_req);
287
293
esp_zb_lock_release ();
@@ -397,8 +403,10 @@ void ZigbeeColorDimmerSwitch::setLightLevel(uint8_t level, uint8_t endpoint, esp
397
403
memcpy (cmd_req.zcl_basic_cmd .dst_addr_u .addr_long , ieee_addr, sizeof (esp_zb_ieee_addr_t ));
398
404
cmd_req.level = level;
399
405
cmd_req.transition_time = 0xffff ;
400
- log_v (" Sending 'set light level' command to endpoint %d, ieee address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x" ,
401
- 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 ]);
406
+ log_v (
407
+ " Sending 'set light level' command to endpoint %d, ieee address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x" , endpoint, ieee_addr[7 ], ieee_addr[6 ],
408
+ ieee_addr[5 ], ieee_addr[4 ], ieee_addr[3 ], ieee_addr[2 ], ieee_addr[1 ], ieee_addr[0 ]
409
+ );
402
410
esp_zb_lock_acquire (portMAX_DELAY);
403
411
esp_zb_zcl_level_move_to_level_cmd_req (&cmd_req);
404
412
esp_zb_lock_release ();
@@ -407,7 +415,6 @@ void ZigbeeColorDimmerSwitch::setLightLevel(uint8_t level, uint8_t endpoint, esp
407
415
}
408
416
}
409
417
410
-
411
418
void ZigbeeColorDimmerSwitch::setLightColor (uint8_t red, uint8_t green, uint8_t blue) {
412
419
if (_is_bound) {
413
420
// Convert RGB to XY
@@ -488,8 +495,10 @@ void ZigbeeColorDimmerSwitch::setLightColor(uint8_t red, uint8_t green, uint8_t
488
495
cmd_req.color_x = color_x;
489
496
cmd_req.color_y = color_y;
490
497
cmd_req.transition_time = 0 ;
491
- log_v (" Sending 'set light color' command to endpoint %d, ieee address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x" ,
492
- 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 ]);
498
+ log_v (
499
+ " Sending 'set light color' command to endpoint %d, ieee address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x" , endpoint, ieee_addr[7 ], ieee_addr[6 ],
500
+ ieee_addr[5 ], ieee_addr[4 ], ieee_addr[3 ], ieee_addr[2 ], ieee_addr[1 ], ieee_addr[0 ]
501
+ );
493
502
esp_zb_lock_acquire (portMAX_DELAY);
494
503
esp_zb_zcl_color_move_to_color_cmd_req (&cmd_req);
495
504
esp_zb_lock_release ();
0 commit comments