Skip to content

Commit 51f1454

Browse files
P-R-O-C-H-YP-R-O-C-H-Y
committed
fix(zigbee): Apply same formatting on all returns
1 parent f5e28e1 commit 51f1454

8 files changed

+29
-32
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ bool ZigbeeCarbonDioxideSensor::setTolerance(float tolerance) {
5151
);
5252
if(ret != ESP_OK) {
5353
log_e("Failed to set tolerance: 0x%x: %s", ret, esp_err_to_name(ret));
54+
return false;
5455
}
55-
return ret == ESP_OK;
56+
return true;
5657
}
5758

5859
bool ZigbeeCarbonDioxideSensor::setReporting(uint16_t min_interval, uint16_t max_interval, uint16_t delta) {
@@ -77,8 +78,9 @@ bool ZigbeeCarbonDioxideSensor::setReporting(uint16_t min_interval, uint16_t max
7778
esp_zb_lock_release();
7879
if(ret != ESP_OK) {
7980
log_e("Failed to set reporting: 0x%x: %s", ret, esp_err_to_name(ret));
81+
return false;
8082
}
81-
return ret == ESP_OK;
83+
return true;
8284
}
8385

8486
bool ZigbeeCarbonDioxideSensor::setCarbonDioxide(float carbon_dioxide) {
@@ -95,8 +97,9 @@ bool ZigbeeCarbonDioxideSensor::setCarbonDioxide(float carbon_dioxide) {
9597
esp_zb_lock_release();
9698
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
9799
log_e("Failed to set carbon dioxide: 0x%x: %s", ret, esp_zb_zcl_status_to_name(ret));
100+
return false;
98101
}
99-
return ret == ESP_ZB_ZCL_STATUS_SUCCESS;
102+
return true;
100103
}
101104

102105
bool ZigbeeCarbonDioxideSensor::report() {

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ bool ZigbeeFlowSensor::setMinMaxValue(float min, float max) {
2727
uint16_t zb_max = (uint16_t)(max * 10);
2828
esp_zb_attribute_list_t *flow_measure_cluster =
2929
esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_FLOW_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
30-
if (!flow_measure_cluster) {
31-
log_e("Failed to get flow measurement cluster");
32-
return false;
33-
}
3430
esp_err_t ret = esp_zb_cluster_update_attr(flow_measure_cluster, ESP_ZB_ZCL_ATTR_FLOW_MEASUREMENT_MIN_VALUE_ID, (void *)&zb_min);
3531
if(ret != ESP_OK) {
3632
log_e("Failed to set min value: 0x%x: %s", ret, esp_err_to_name(ret));
@@ -48,10 +44,6 @@ bool ZigbeeFlowSensor::setTolerance(float tolerance) {
4844
uint16_t zb_tolerance = (uint16_t)(tolerance * 10);
4945
esp_zb_attribute_list_t *flow_measure_cluster =
5046
esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_FLOW_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
51-
if (!flow_measure_cluster) {
52-
log_e("Failed to get flow measurement cluster");
53-
return false;
54-
}
5547
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);
5648
if (ret != ESP_OK) {
5749
log_e("Failed to set tolerance: 0x%x: %s", ret, esp_err_to_name(ret));

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ ZigbeeIlluminanceSensor::ZigbeeIlluminanceSensor(uint8_t endpoint) : ZigbeeEP(en
1313
bool ZigbeeIlluminanceSensor::setMinMaxValue(uint16_t min, uint16_t max) {
1414
esp_zb_attribute_list_t *light_measure_cluster =
1515
esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_ILLUMINANCE_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
16-
if (!light_measure_cluster) {
17-
log_e("Failed to get illuminance measurement cluster");
18-
return false;
19-
}
2016
esp_err_t ret = esp_zb_cluster_update_attr(light_measure_cluster, ESP_ZB_ZCL_ATTR_ILLUMINANCE_MEASUREMENT_MIN_MEASURED_VALUE_ID, (void *)&min);
2117
if (ret != ESP_OK) {
2218
log_e("Failed to set min value: 0x%x: %s", ret, esp_err_to_name(ret));
@@ -33,10 +29,6 @@ bool ZigbeeIlluminanceSensor::setMinMaxValue(uint16_t min, uint16_t max) {
3329
bool ZigbeeIlluminanceSensor::setTolerance(uint16_t tolerance) {
3430
esp_zb_attribute_list_t *light_measure_cluster =
3531
esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_ILLUMINANCE_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
36-
if (!light_measure_cluster) {
37-
log_e("Failed to get illuminance measurement cluster");
38-
return false;
39-
}
4032
esp_err_t ret = esp_zb_illuminance_meas_cluster_add_attr(light_measure_cluster, ESP_ZB_ZCL_ATTR_ILLUMINANCE_MEASUREMENT_TOLERANCE_ID, (void *)&tolerance);
4133
if (ret != ESP_OK) {
4234
log_e("Failed to set tolerance: 0x%x: %s", ret, esp_err_to_name(ret));

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ bool ZigbeeOccupancySensor::setOccupancy(bool occupied) {
5151
esp_zb_lock_release();
5252
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
5353
log_e("Failed to set occupancy: 0x%x: %s", ret, esp_zb_zcl_status_to_name(ret));
54+
return false;
5455
}
55-
return ret == ESP_ZB_ZCL_STATUS_SUCCESS;
56+
return true;
5657
}
5758

5859
bool ZigbeeOccupancySensor::report() {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,9 @@ bool ZigbeePressureSensor::setReporting(uint16_t min_interval, uint16_t max_inte
6868
esp_zb_lock_release();
6969
if(ret != ESP_OK) {
7070
log_e("Failed to set reporting: 0x%x: %s", ret, esp_err_to_name(ret));
71+
return false;
7172
}
72-
return ret == ESP_OK;
73+
return true;
7374
}
7475

7576
bool ZigbeePressureSensor::setPressure(int16_t pressure) {
@@ -84,8 +85,9 @@ bool ZigbeePressureSensor::setPressure(int16_t pressure) {
8485
esp_zb_lock_release();
8586
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
8687
log_e("Failed to set pressure: 0x%x: %s", ret, esp_zb_zcl_status_to_name(ret));
88+
return false;
8789
}
88-
return ret == ESP_ZB_ZCL_STATUS_SUCCESS;
90+
return true;
8991
}
9092

9193
bool ZigbeePressureSensor::report() {

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ bool ZigbeeTempSensor::setTolerance(float tolerance) {
4343
esp_err_t ret = esp_zb_temperature_meas_cluster_add_attr(temp_measure_cluster, ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_TOLERANCE_ID, (void *)&zb_tolerance);
4444
if(ret != ESP_OK) {
4545
log_e("Failed to set tolerance: 0x%x: %s", ret, esp_err_to_name(ret));
46+
return false;
4647
}
47-
return ret == ESP_OK;
48+
return true;
4849
}
4950

5051
bool ZigbeeTempSensor::setReporting(uint16_t min_interval, uint16_t max_interval, float delta) {
@@ -67,8 +68,9 @@ bool ZigbeeTempSensor::setReporting(uint16_t min_interval, uint16_t max_interval
6768
esp_zb_lock_release();
6869
if(ret != ESP_OK) {
6970
log_e("Failed to set reporting: 0x%x: %s", ret, esp_err_to_name(ret));
71+
return false;
7072
}
71-
return ret == ESP_OK;
73+
return true;
7274
}
7375

7476
bool ZigbeeTempSensor::setTemperature(float temperature) {
@@ -84,8 +86,9 @@ bool ZigbeeTempSensor::setTemperature(float temperature) {
8486
esp_zb_lock_release();
8587
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
8688
log_e("Failed to set temperature: 0x%x: %s", ret, esp_zb_zcl_status_to_name(ret));
89+
return false;
8790
}
88-
return ret == ESP_ZB_ZCL_STATUS_SUCCESS;
91+
return true;
8992
}
9093

9194
bool ZigbeeTempSensor::reportTemperature() {
@@ -137,8 +140,9 @@ bool ZigbeeTempSensor::setHumidity(float humidity) {
137140
esp_zb_lock_release();
138141
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
139142
log_e("Failed to set humidity: 0x%x: %s", ret, esp_zb_zcl_status_to_name(ret));
143+
return false;
140144
}
141-
return ret == ESP_ZB_ZCL_STATUS_SUCCESS;
145+
return true;
142146
}
143147

144148
bool ZigbeeTempSensor::reportHumidity() {
@@ -182,8 +186,9 @@ bool ZigbeeTempSensor::setHumidityReporting(uint16_t min_interval, uint16_t max_
182186
esp_zb_lock_release();
183187
if(ret != ESP_OK) {
184188
log_e("Failed to set humidity reporting: 0x%x: %s", ret, esp_err_to_name(ret) );
189+
return false;
185190
}
186-
return ret == ESP_OK;
191+
return true;
187192
}
188193

189194
bool ZigbeeTempSensor::report() {

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ bool ZigbeeWindSpeedSensor::setTolerance(float tolerance) {
5454
esp_err_t ret = esp_zb_wind_speed_measurement_cluster_add_attr(windspeed_measure_cluster, ESP_ZB_ZCL_ATTR_WIND_SPEED_MEASUREMENT_TOLERANCE_ID, (void *)&zb_tolerance);
5555
if(ret != ESP_OK) {
5656
log_e("Failed to set tolerance: 0x%x: %s", ret, esp_err_to_name(ret));
57+
return false;
5758
}
58-
return ret == ESP_OK;
59+
return true;
5960
}
6061

6162
bool ZigbeeWindSpeedSensor::setReporting(uint16_t min_interval, uint16_t max_interval, float delta) {
@@ -78,8 +79,9 @@ bool ZigbeeWindSpeedSensor::setReporting(uint16_t min_interval, uint16_t max_int
7879
esp_zb_lock_release();
7980
if(ret != ESP_OK) {
8081
log_e("Failed to set reporting: 0x%x: %s", ret, esp_err_to_name(ret));
82+
return false;
8183
}
82-
return ret == ESP_OK;
84+
return true;
8385
}
8486

8587
bool ZigbeeWindSpeedSensor::setWindSpeed(float windspeed) {
@@ -96,8 +98,9 @@ bool ZigbeeWindSpeedSensor::setWindSpeed(float windspeed) {
9698
esp_zb_lock_release();
9799
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
98100
log_e("Failed to set wind speed: 0x%x: %s", ret, esp_zb_zcl_status_to_name(ret));
101+
return false;
99102
}
100-
return ret == ESP_ZB_ZCL_STATUS_SUCCESS;
103+
return true;
101104
}
102105

103106
bool ZigbeeWindSpeedSensor::reportWindSpeed() {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,10 @@ bool ZigbeeWindowCovering::setLimits(
132132
_installed_open_limit_tilt = installed_open_limit_tilt;
133133
_installed_closed_limit_tilt = installed_closed_limit_tilt;
134134
_physical_closed_limit_tilt = installed_closed_limit_tilt;
135-
esp_err_t ret;
136135

137136
esp_zb_attribute_list_t *window_covering_cluster =
138137
esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_WINDOW_COVERING, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
139-
ret = esp_zb_cluster_update_attr(window_covering_cluster, ESP_ZB_ZCL_ATTR_WINDOW_COVERING_INSTALLED_OPEN_LIMIT_LIFT_ID, (void *)&_installed_open_limit_lift);
138+
esp_err_t ret = esp_zb_cluster_update_attr(window_covering_cluster, ESP_ZB_ZCL_ATTR_WINDOW_COVERING_INSTALLED_OPEN_LIMIT_LIFT_ID, (void *)&_installed_open_limit_lift);
140139
if (ret != ESP_OK) {
141140
log_e("Failed to set installed open limit lift: 0x%x: %s", ret, esp_err_to_name(ret));
142141
return false;

0 commit comments

Comments
 (0)