Skip to content

Commit 80eba94

Browse files
P-R-O-C-H-YP-R-O-C-H-Y
committed
feat(zigbee): Add error info in the logs
1 parent 52b0e3a commit 80eba94

15 files changed

+74
-74
lines changed

‎libraries/Zigbee/src/ZigbeeEP.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ bool ZigbeeEP::setManufacturerAndModel(const char *name, const char *model) {
6565
esp_err_t ret_manufacturer = esp_zb_basic_cluster_add_attr(basic_cluster, ESP_ZB_ZCL_ATTR_BASIC_MANUFACTURER_NAME_ID, (void *)zb_name);
6666
esp_err_t ret_model = esp_zb_basic_cluster_add_attr(basic_cluster, ESP_ZB_ZCL_ATTR_BASIC_MODEL_IDENTIFIER_ID, (void *)zb_model);
6767
if(ret_manufacturer != ESP_OK || ret_model != ESP_OK) {
68-
log_e("Failed to set manufacturer and model");
68+
log_e("Failed to set manufacturer (0x%x) or model (0x%x)", ret_manufacturer, ret_model);
6969
return false;
7070
}
7171
return true;
@@ -103,14 +103,14 @@ bool ZigbeeEP::setBatteryPercentage(uint8_t percentage) {
103103
);
104104
esp_zb_lock_release();
105105
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
106-
log_e("Failed to set battery percentage");
106+
log_e("Failed to set battery percentage: 0x%x", ret);
107107
return false;
108108
}
109109
log_v("Battery percentage updated");
110110
return true;
111111
}
112112

113-
void ZigbeeEP::reportBatteryPercentage() {
113+
bool ZigbeeEP::reportBatteryPercentage() {
114114
/* Send report attributes command */
115115
esp_zb_zcl_report_attr_cmd_t report_attr_cmd;
116116
report_attr_cmd.address_mode = ESP_ZB_APS_ADDR_MODE_DST_ADDR_ENDP_NOT_PRESENT;
@@ -124,7 +124,7 @@ void ZigbeeEP::reportBatteryPercentage() {
124124
esp_err_t ret = esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);
125125
esp_zb_lock_release();
126126
if(ret != ESP_OK) {
127-
log_e("Failed to report battery percentage");
127+
log_e("Failed to report battery percentage: 0x%x: %s", ret, esp_err_to_name(ret));
128128
return false;
129129
}
130130
log_v("Battery percentage reported");
@@ -287,7 +287,7 @@ bool ZigbeeEP::setTime(tm time) {
287287
ret = esp_zb_zcl_set_attribute_val(_endpoint, ESP_ZB_ZCL_CLUSTER_ID_TIME, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE, ESP_ZB_ZCL_ATTR_TIME_TIME_ID, &utc_time, false);
288288
esp_zb_lock_release();
289289
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
290-
log_e("Failed to set time");
290+
log_e("Failed to set time: 0x%x", ret);
291291
return false;
292292
}
293293
return true;
@@ -300,7 +300,7 @@ bool ZigbeeEP::setTimezone(int32_t gmt_offset) {
300300
ret = esp_zb_zcl_set_attribute_val(_endpoint, ESP_ZB_ZCL_CLUSTER_ID_TIME, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE, ESP_ZB_ZCL_ATTR_TIME_TIME_ZONE_ID, &gmt_offset, false);
301301
esp_zb_lock_release();
302302
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
303-
log_e("Failed to set timezone");
303+
log_e("Failed to set timezone: 0x%x", ret);
304304
return false;
305305
}
306306
return true;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ZigbeeAnalog::ZigbeeAnalog(uint8_t endpoint) : ZigbeeEP(endpoint) {
2323
bool ZigbeeAnalog::addAnalogValue() {
2424
esp_err_t ret = esp_zb_cluster_list_add_analog_value_cluster(_cluster_list, esp_zb_analog_value_cluster_create(NULL), ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
2525
if (ret != ESP_OK) {
26-
log_e("Failed to add Analog Value cluster");
26+
log_e("Failed to add Analog Value cluster: 0x%x: %s", ret, esp_err_to_name(ret));
2727
return false;
2828
}
2929
_analog_clusters |= ANALOG_VALUE;
@@ -33,7 +33,7 @@ bool ZigbeeAnalog::addAnalogValue() {
3333
bool ZigbeeAnalog::addAnalogInput() {
3434
esp_err_t ret = esp_zb_cluster_list_add_analog_input_cluster(_cluster_list, esp_zb_analog_input_cluster_create(NULL), ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
3535
if (ret != ESP_OK) {
36-
log_e("Failed to add Analog Input cluster");
36+
log_e("Failed to add Analog Input cluster: 0x%x: %s", ret, esp_err_to_name(ret));
3737
return false;
3838
}
3939
_analog_clusters |= ANALOG_INPUT;
@@ -43,7 +43,7 @@ bool ZigbeeAnalog::addAnalogInput() {
4343
bool ZigbeeAnalog::addAnalogOutput() {
4444
esp_err_t ret = esp_zb_cluster_list_add_analog_output_cluster(_cluster_list, esp_zb_analog_output_cluster_create(NULL), ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
4545
if (ret != ESP_OK) {
46-
log_e("Failed to add Analog Output cluster");
46+
log_e("Failed to add Analog Output cluster: 0x%x: %s", ret, esp_err_to_name(ret));
4747
return false;
4848
}
4949
_analog_clusters |= ANALOG_OUTPUT;
@@ -85,7 +85,7 @@ bool ZigbeeAnalog::setAnalogValue(float analog) {
8585
);
8686
esp_zb_lock_release();
8787
if (ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
88-
log_e("Failed to set analog value");
88+
log_e("Failed to set analog value: 0x%x", ret);
8989
return false;
9090
}
9191
return true;
@@ -104,7 +104,7 @@ bool ZigbeeAnalog::setAnalogInput(float analog) {
104104
);
105105
esp_zb_lock_release();
106106
if (ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
107-
log_e("Failed to set analog input");
107+
log_e("Failed to set analog input: 0x%x", ret);
108108
return false;
109109
}
110110
return true;
@@ -124,7 +124,7 @@ bool ZigbeeAnalog::reportAnalogInput() {
124124
esp_err_t ret = esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);
125125
esp_zb_lock_release();
126126
if (ret != ESP_OK) {
127-
log_e("Failed to send Analog Input report");
127+
log_e("Failed to send Analog Input report: 0x%x: %s", ret, esp_err_to_name(ret));
128128
return false;
129129
}
130130
log_v("Analog Input report sent");
@@ -151,7 +151,7 @@ bool ZigbeeAnalog::setAnalogInputReporting(uint16_t min_interval, uint16_t max_i
151151
esp_err_t ret = esp_zb_zcl_update_reporting_info(&reporting_info);
152152
esp_zb_lock_release();
153153
if (ret != ESP_OK) {
154-
log_e("Failed to set Analog Input reporting");
154+
log_e("Failed to set Analog Input reporting: 0x%x: %s", ret, esp_err_to_name(ret));
155155
return false;
156156
}
157157
return true;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ bool ZigbeeCarbonDioxideSensor::setMinMaxValue(float min, float max) {
3131
esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_CARBON_DIOXIDE_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
3232
esp_err_t ret_min = esp_zb_cluster_update_attr(carbon_dioxide_measure_cluster, ESP_ZB_ZCL_ATTR_CARBON_DIOXIDE_MEASUREMENT_MIN_MEASURED_VALUE_ID, (void *)&zb_min);
3333
if(ret_min != ESP_OK) {
34-
log_e("Failed to set min value");
34+
log_e("Failed to set min value: 0x%x: %s", ret_min, esp_err_to_name(ret_min));
3535
}
3636
esp_err_t ret_max = esp_zb_cluster_update_attr(carbon_dioxide_measure_cluster, ESP_ZB_ZCL_ATTR_CARBON_DIOXIDE_MEASUREMENT_MAX_MEASURED_VALUE_ID, (void *)&zb_max);
3737
if(ret_max != ESP_OK) {
38-
log_e("Failed to set max value");
38+
log_e("Failed to set max value: 0x%x: %s", ret_max, esp_err_to_name(ret_max));
3939
}
4040
return ret_min == ESP_OK && ret_max == ESP_OK;
4141
}
@@ -48,7 +48,7 @@ bool ZigbeeCarbonDioxideSensor::setTolerance(float tolerance) {
4848
carbon_dioxide_measure_cluster, ESP_ZB_ZCL_ATTR_CARBON_DIOXIDE_MEASUREMENT_TOLERANCE_ID, (void *)&zb_tolerance
4949
);
5050
if(ret != ESP_OK) {
51-
log_e("Failed to set tolerance");
51+
log_e("Failed to set tolerance: 0x%x: %s", ret, esp_err_to_name(ret));
5252
}
5353
return ret == ESP_OK;
5454
}
@@ -74,7 +74,7 @@ bool ZigbeeCarbonDioxideSensor::setReporting(uint16_t min_interval, uint16_t max
7474
esp_err_t ret = esp_zb_zcl_update_reporting_info(&reporting_info);
7575
esp_zb_lock_release();
7676
if(ret != ESP_OK) {
77-
log_e("Failed to set reporting");
77+
log_e("Failed to set reporting: 0x%x: %s", ret, esp_err_to_name(ret));
7878
}
7979
return ret == ESP_OK;
8080
}
@@ -92,7 +92,7 @@ bool ZigbeeCarbonDioxideSensor::setCarbonDioxide(float carbon_dioxide) {
9292
);
9393
esp_zb_lock_release();
9494
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
95-
log_e("Failed to set carbon dioxide");
95+
log_e("Failed to set carbon dioxide: 0x%x", ret);
9696
}
9797
return ret == ESP_ZB_ZCL_STATUS_SUCCESS;
9898
}
@@ -111,7 +111,7 @@ bool ZigbeeCarbonDioxideSensor::report() {
111111
esp_err_t ret = esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);
112112
esp_zb_lock_release();
113113
if(ret != ESP_OK) {
114-
log_e("Failed to send carbon dioxide report");
114+
log_e("Failed to send carbon dioxide report: 0x%x: %s", ret, esp_err_to_name(ret));
115115
return false;
116116
}
117117
log_v("Carbon dioxide report sent");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ bool ZigbeeColorDimmableLight::setLight(bool state, uint8_t level, uint8_t red,
156156
esp_zb_lock_release();
157157

158158
if (ret_state != ESP_ZB_ZCL_STATUS_SUCCESS || ret_level != ESP_ZB_ZCL_STATUS_SUCCESS || ret_xy != ESP_ZB_ZCL_STATUS_SUCCESS || ret_y != ESP_ZB_ZCL_STATUS_SUCCESS || ret_hue != ESP_ZB_ZCL_STATUS_SUCCESS || ret_saturation != ESP_ZB_ZCL_STATUS_SUCCESS) {
159-
log_e("Failed to set light attributes");
159+
log_e("Failed to set light state(0x%x), level(0x%x), xy(0x%x), y(0x%x), hue(0x%x), saturation(0x%x)", ret_state, ret_level, ret_xy, ret_y, ret_hue, ret_saturation);
160160
return false;
161161
}
162162
return true;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ bool ZigbeeContactSwitch::setClosed() {
3838
);
3939
esp_zb_lock_release();
4040
if (ret != ESP_OK) {
41-
log_e("Failed to set contact switch to closed");
41+
log_e("Failed to set contact switch to closed: 0x%x: %s", ret, esp_err_to_name(ret));
4242
return false;
4343
}
4444
_zone_status = closed;
@@ -54,7 +54,7 @@ bool ZigbeeContactSwitch::setOpen() {
5454
);
5555
esp_zb_lock_release();
5656
if (ret != ESP_OK) {
57-
log_e("Failed to set contact switch to open");
57+
log_e("Failed to set contact switch to open: 0x%x: %s", ret, esp_err_to_name(ret));
5858
return false;
5959
}
6060
_zone_status = open;
@@ -79,7 +79,7 @@ bool ZigbeeContactSwitch::report() {
7979
esp_err_t ret = esp_zb_zcl_ias_zone_status_change_notif_cmd_req(&status_change_notif_cmd);
8080
esp_zb_lock_release();
8181
if (ret != ESP_OK) {
82-
log_e("Failed to send IAS Zone status changed notification");
82+
log_e("Failed to send IAS Zone status changed notification: 0x%x: %s", ret, esp_err_to_name(ret));
8383
return false;
8484
}
8585
log_v("IAS Zone status changed notification sent");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ bool ZigbeeDimmableLight::setLight(bool state, uint8_t level) {
7171
esp_zb_lock_release();
7272

7373
if (ret_state != ESP_ZB_ZCL_STATUS_SUCCESS || ret_level != ESP_ZB_ZCL_STATUS_SUCCESS) {
74-
log_e("Failed to set light state and level");
74+
log_e("Failed to set light state(0x%x) or level(0x%x)", ret_state, ret_level);
7575
return false;
7676
}
7777
return true;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ bool ZigbeeDoorWindowHandle::setClosed() {
3939
);
4040
esp_zb_lock_release();
4141
if (ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
42-
log_e("Failed to set door/window handle to closed");
42+
log_e("Failed to set door/window handle to closed: 0x%x", ret);
4343
return false;
4444
}
4545
_zone_status = closed;
@@ -57,7 +57,7 @@ bool ZigbeeDoorWindowHandle::setOpen() {
5757
);
5858
esp_zb_lock_release();
5959
if (ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
60-
log_e("Failed to set door/window handle to open");
60+
log_e("Failed to set door/window handle to open: 0x%x", ret);
6161
return false;
6262
}
6363
_zone_status = open;
@@ -75,7 +75,7 @@ bool ZigbeeDoorWindowHandle::setTilted() {
7575
);
7676
esp_zb_lock_release();
7777
if (ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
78-
log_e("Failed to set door/window handle to tilted");
78+
log_e("Failed to set door/window handle to tilted: 0x%x", ret);
7979
return false;
8080
}
8181
_zone_status = tilted;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ bool ZigbeeFlowSensor::setMinMaxValue(float min, float max) {
3333
}
3434
esp_err_t ret_min = esp_zb_cluster_update_attr(flow_measure_cluster, ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MIN_VALUE_ID, (void *)&zb_min);
3535
if(ret_min != ESP_OK) {
36-
log_e("Failed to set min value");
36+
log_e("Failed to set min value: 0x%x: %s", ret_min, esp_err_to_name(ret_min));
3737
}
3838
esp_err_t ret_max = esp_zb_cluster_update_attr(flow_measure_cluster, ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MAX_VALUE_ID, (void *)&zb_max);
3939
if(ret_max != ESP_OK) {
40-
log_e("Failed to set max value");
40+
log_e("Failed to set max value: 0x%x: %s", ret_max, esp_err_to_name(ret_max));
4141
}
4242
return ret_min == ESP_OK && ret_max == ESP_OK;
4343
}
@@ -52,7 +52,7 @@ bool ZigbeeFlowSensor::setTolerance(float tolerance) {
5252
}
5353
esp_err_t ret = esp_zb_flow_meas_cluster_add_attr(flow_measure_cluster, ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_TOLERANCE_ID, (void *)&zb_tolerance);
5454
if (ret != ESP_OK) {
55-
log_e("Failed to set tolerance");
55+
log_e("Failed to set tolerance: 0x%x: %s", ret, esp_err_to_name(ret));
5656
return false;
5757
}
5858
return true;
@@ -79,7 +79,7 @@ bool ZigbeeFlowSensor::setReporting(uint16_t min_interval, uint16_t max_interval
7979
esp_zb_lock_release();
8080

8181
if (ret != ESP_OK) {
82-
log_e("Failed to set reporting");
82+
log_e("Failed to set reporting: 0x%x: %s", ret, esp_err_to_name(ret));
8383
return false;
8484
}
8585
return true;
@@ -99,7 +99,7 @@ bool ZigbeeFlowSensor::setFlow(float flow) {
9999
esp_zb_lock_release();
100100

101101
if (ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
102-
log_e("Failed to set flow value");
102+
log_e("Failed to set flow value: 0x%x", ret);
103103
return false;
104104
}
105105
return true;
@@ -120,7 +120,7 @@ bool ZigbeeFlowSensor::report() {
120120
esp_zb_lock_release();
121121

122122
if (ret != ESP_OK) {
123-
log_e("Failed to send flow report");
123+
log_e("Failed to send flow report: 0x%x: %s", ret, esp_err_to_name(ret));
124124
return false;
125125
}
126126
log_v("Flow report sent");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ bool ZigbeeLight::setLight(bool state) {
4747
esp_zb_lock_release();
4848

4949
if (ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
50-
log_e("Failed to set light state");
50+
log_e("Failed to set light state: 0x%x", ret);
5151
return false;
5252
}
5353
return true;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ bool ZigbeeOccupancySensor::setSensorType(uint8_t sensor_type) {
2828
esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_OCCUPANCY_SENSING, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
2929
esp_err_t ret_type = esp_zb_cluster_update_attr(occupancy_sens_cluster, ESP_ZB_ZCL_ATTR_OCCUPANCY_SENSING_OCCUPANCY_SENSOR_TYPE_ID, (void *)&sensor_type);
3030
if(ret_type != ESP_OK) {
31-
log_e("Failed to set sensor type");
31+
log_e("Failed to set sensor type: 0x%x: %s", ret_type, esp_err_to_name(ret_type));
3232
}
3333
esp_err_t ret_bitmap = esp_zb_cluster_update_attr(occupancy_sens_cluster, ESP_ZB_ZCL_ATTR_OCCUPANCY_SENSING_OCCUPANCY_SENSOR_TYPE_BITMAP_ID, (void *)&sensor_type_bitmap);
3434
if(ret_bitmap != ESP_OK) {
35-
log_e("Failed to set sensor type bitmap");
35+
log_e("Failed to set sensor type bitmap: 0x%x: %s", ret_bitmap, esp_err_to_name(ret_bitmap));
3636
}
3737
return ret_type == ESP_OK && ret_bitmap == ESP_OK;
3838
}
@@ -48,7 +48,7 @@ bool ZigbeeOccupancySensor::setOccupancy(bool occupied) {
4848
);
4949
esp_zb_lock_release();
5050
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
51-
log_e("Failed to set occupancy");
51+
log_e("Failed to set occupancy: 0x%x", ret);
5252
}
5353
return ret == ESP_ZB_ZCL_STATUS_SUCCESS;
5454
}
@@ -67,7 +67,7 @@ bool ZigbeeOccupancySensor::report() {
6767
esp_err_t ret = esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);
6868
esp_zb_lock_release();
6969
if(ret != ESP_OK) {
70-
log_e("Failed to send occupancy report");
70+
log_e("Failed to send occupancy report: 0x%x: %s", ret, esp_err_to_name(ret));
7171
return false;
7272
}
7373
log_v("Occupancy report sent");

0 commit comments

Comments
 (0)