Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: espressif/arduino-esp32
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 104a381abff94c51319f27af31f4a0315eeae1da
Choose a base ref
..
head repository: espressif/arduino-esp32
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 80eba948594e68195ee6639d101044c3d1239ad6
Choose a head ref
10 changes: 5 additions & 5 deletions libraries/Zigbee/src/ZigbeeEP.cpp
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ bool ZigbeeEP::setManufacturerAndModel(const char *name, const char *model) {
esp_err_t ret_manufacturer = esp_zb_basic_cluster_add_attr(basic_cluster, ESP_ZB_ZCL_ATTR_BASIC_MANUFACTURER_NAME_ID, (void *)zb_name);
esp_err_t ret_model = esp_zb_basic_cluster_add_attr(basic_cluster, ESP_ZB_ZCL_ATTR_BASIC_MODEL_IDENTIFIER_ID, (void *)zb_model);
if(ret_manufacturer != ESP_OK || ret_model != ESP_OK) {
log_e("Failed to set manufacturer and model");
log_e("Failed to set manufacturer (0x%x) or model (0x%x)", ret_manufacturer, ret_model);
return false;
}
return true;
@@ -103,7 +103,7 @@ bool ZigbeeEP::setBatteryPercentage(uint8_t percentage) {
);
esp_zb_lock_release();
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
log_e("Failed to set battery percentage");
log_e("Failed to set battery percentage: 0x%x", ret);
return false;
}
log_v("Battery percentage updated");
@@ -124,7 +124,7 @@ bool ZigbeeEP::reportBatteryPercentage() {
esp_err_t ret = esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);
esp_zb_lock_release();
if(ret != ESP_OK) {
log_e("Failed to report battery percentage");
log_e("Failed to report battery percentage: 0x%x: %s", ret, esp_err_to_name(ret));
return false;
}
log_v("Battery percentage reported");
@@ -287,7 +287,7 @@ bool ZigbeeEP::setTime(tm time) {
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);
esp_zb_lock_release();
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
log_e("Failed to set time");
log_e("Failed to set time: 0x%x", ret);
return false;
}
return true;
@@ -300,7 +300,7 @@ bool ZigbeeEP::setTimezone(int32_t gmt_offset) {
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);
esp_zb_lock_release();
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
log_e("Failed to set timezone");
log_e("Failed to set timezone: 0x%x", ret);
return false;
}
return true;
14 changes: 7 additions & 7 deletions libraries/Zigbee/src/ep/ZigbeeAnalog.cpp
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ ZigbeeAnalog::ZigbeeAnalog(uint8_t endpoint) : ZigbeeEP(endpoint) {
bool ZigbeeAnalog::addAnalogValue() {
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);
if (ret != ESP_OK) {
log_e("Failed to add Analog Value cluster");
log_e("Failed to add Analog Value cluster: 0x%x: %s", ret, esp_err_to_name(ret));
return false;
}
_analog_clusters |= ANALOG_VALUE;
@@ -33,7 +33,7 @@ bool ZigbeeAnalog::addAnalogValue() {
bool ZigbeeAnalog::addAnalogInput() {
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);
if (ret != ESP_OK) {
log_e("Failed to add Analog Input cluster");
log_e("Failed to add Analog Input cluster: 0x%x: %s", ret, esp_err_to_name(ret));
return false;
}
_analog_clusters |= ANALOG_INPUT;
@@ -43,7 +43,7 @@ bool ZigbeeAnalog::addAnalogInput() {
bool ZigbeeAnalog::addAnalogOutput() {
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);
if (ret != ESP_OK) {
log_e("Failed to add Analog Output cluster");
log_e("Failed to add Analog Output cluster: 0x%x: %s", ret, esp_err_to_name(ret));
return false;
}
_analog_clusters |= ANALOG_OUTPUT;
@@ -85,7 +85,7 @@ bool ZigbeeAnalog::setAnalogValue(float analog) {
);
esp_zb_lock_release();
if (ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
log_e("Failed to set analog value");
log_e("Failed to set analog value: 0x%x", ret);
return false;
}
return true;
@@ -104,7 +104,7 @@ bool ZigbeeAnalog::setAnalogInput(float analog) {
);
esp_zb_lock_release();
if (ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
log_e("Failed to set analog input");
log_e("Failed to set analog input: 0x%x", ret);
return false;
}
return true;
@@ -124,7 +124,7 @@ bool ZigbeeAnalog::reportAnalogInput() {
esp_err_t ret = esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);
esp_zb_lock_release();
if (ret != ESP_OK) {
log_e("Failed to send Analog Input report");
log_e("Failed to send Analog Input report: 0x%x: %s", ret, esp_err_to_name(ret));
return false;
}
log_v("Analog Input report sent");
@@ -151,7 +151,7 @@ bool ZigbeeAnalog::setAnalogInputReporting(uint16_t min_interval, uint16_t max_i
esp_err_t ret = esp_zb_zcl_update_reporting_info(&reporting_info);
esp_zb_lock_release();
if (ret != ESP_OK) {
log_e("Failed to set Analog Input reporting");
log_e("Failed to set Analog Input reporting: 0x%x: %s", ret, esp_err_to_name(ret));
return false;
}
return true;
12 changes: 6 additions & 6 deletions libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.cpp
View file
Original file line number Diff line number Diff line change
@@ -31,11 +31,11 @@ bool ZigbeeCarbonDioxideSensor::setMinMaxValue(float min, float max) {
esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_CARBON_DIOXIDE_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
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);
if(ret_min != ESP_OK) {
log_e("Failed to set min value");
log_e("Failed to set min value: 0x%x: %s", ret_min, esp_err_to_name(ret_min));
}
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);
if(ret_max != ESP_OK) {
log_e("Failed to set max value");
log_e("Failed to set max value: 0x%x: %s", ret_max, esp_err_to_name(ret_max));
}
return ret_min == ESP_OK && ret_max == ESP_OK;
}
@@ -48,7 +48,7 @@ bool ZigbeeCarbonDioxideSensor::setTolerance(float tolerance) {
carbon_dioxide_measure_cluster, ESP_ZB_ZCL_ATTR_CARBON_DIOXIDE_MEASUREMENT_TOLERANCE_ID, (void *)&zb_tolerance
);
if(ret != ESP_OK) {
log_e("Failed to set tolerance");
log_e("Failed to set tolerance: 0x%x: %s", ret, esp_err_to_name(ret));
}
return ret == ESP_OK;
}
@@ -74,7 +74,7 @@ bool ZigbeeCarbonDioxideSensor::setReporting(uint16_t min_interval, uint16_t max
esp_err_t ret = esp_zb_zcl_update_reporting_info(&reporting_info);
esp_zb_lock_release();
if(ret != ESP_OK) {
log_e("Failed to set reporting");
log_e("Failed to set reporting: 0x%x: %s", ret, esp_err_to_name(ret));
}
return ret == ESP_OK;
}
@@ -92,7 +92,7 @@ bool ZigbeeCarbonDioxideSensor::setCarbonDioxide(float carbon_dioxide) {
);
esp_zb_lock_release();
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
log_e("Failed to set carbon dioxide");
log_e("Failed to set carbon dioxide: 0x%x", ret);
}
return ret == ESP_ZB_ZCL_STATUS_SUCCESS;
}
@@ -111,7 +111,7 @@ bool ZigbeeCarbonDioxideSensor::report() {
esp_err_t ret = esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);
esp_zb_lock_release();
if(ret != ESP_OK) {
log_e("Failed to send carbon dioxide report");
log_e("Failed to send carbon dioxide report: 0x%x: %s", ret, esp_err_to_name(ret));
return false;
}
log_v("Carbon dioxide report sent");
2 changes: 1 addition & 1 deletion libraries/Zigbee/src/ep/ZigbeeColorDimmableLight.cpp
View file
Original file line number Diff line number Diff line change
@@ -156,7 +156,7 @@ bool ZigbeeColorDimmableLight::setLight(bool state, uint8_t level, uint8_t red,
esp_zb_lock_release();

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) {
log_e("Failed to set light attributes");
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);
return false;
}
return true;
6 changes: 3 additions & 3 deletions libraries/Zigbee/src/ep/ZigbeeContactSwitch.cpp
View file
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ bool ZigbeeContactSwitch::setClosed() {
);
esp_zb_lock_release();
if (ret != ESP_OK) {
log_e("Failed to set contact switch to closed");
log_e("Failed to set contact switch to closed: 0x%x: %s", ret, esp_err_to_name(ret));
return false;
}
_zone_status = closed;
@@ -54,7 +54,7 @@ bool ZigbeeContactSwitch::setOpen() {
);
esp_zb_lock_release();
if (ret != ESP_OK) {
log_e("Failed to set contact switch to open");
log_e("Failed to set contact switch to open: 0x%x: %s", ret, esp_err_to_name(ret));
return false;
}
_zone_status = open;
@@ -79,7 +79,7 @@ bool ZigbeeContactSwitch::report() {
esp_err_t ret = esp_zb_zcl_ias_zone_status_change_notif_cmd_req(&status_change_notif_cmd);
esp_zb_lock_release();
if (ret != ESP_OK) {
log_e("Failed to send IAS Zone status changed notification");
log_e("Failed to send IAS Zone status changed notification: 0x%x: %s", ret, esp_err_to_name(ret));
return false;
}
log_v("IAS Zone status changed notification sent");
2 changes: 1 addition & 1 deletion libraries/Zigbee/src/ep/ZigbeeDimmableLight.cpp
View file
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ bool ZigbeeDimmableLight::setLight(bool state, uint8_t level) {
esp_zb_lock_release();

if (ret_state != ESP_ZB_ZCL_STATUS_SUCCESS || ret_level != ESP_ZB_ZCL_STATUS_SUCCESS) {
log_e("Failed to set light state and level");
log_e("Failed to set light state(0x%x) or level(0x%x)", ret_state, ret_level);
return false;
}
return true;
6 changes: 3 additions & 3 deletions libraries/Zigbee/src/ep/ZigbeeDoorWindowHandle.cpp
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ bool ZigbeeDoorWindowHandle::setClosed() {
);
esp_zb_lock_release();
if (ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
log_e("Failed to set door/window handle to closed");
log_e("Failed to set door/window handle to closed: 0x%x", ret);
return false;
}
_zone_status = closed;
@@ -57,7 +57,7 @@ bool ZigbeeDoorWindowHandle::setOpen() {
);
esp_zb_lock_release();
if (ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
log_e("Failed to set door/window handle to open");
log_e("Failed to set door/window handle to open: 0x%x", ret);
return false;
}
_zone_status = open;
@@ -75,7 +75,7 @@ bool ZigbeeDoorWindowHandle::setTilted() {
);
esp_zb_lock_release();
if (ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
log_e("Failed to set door/window handle to tilted");
log_e("Failed to set door/window handle to tilted: 0x%x", ret);
return false;
}
_zone_status = tilted;
12 changes: 6 additions & 6 deletions libraries/Zigbee/src/ep/ZigbeeFlowSensor.cpp
View file
Original file line number Diff line number Diff line change
@@ -33,11 +33,11 @@ bool ZigbeeFlowSensor::setMinMaxValue(float min, float max) {
}
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);
if(ret_min != ESP_OK) {
log_e("Failed to set min value");
log_e("Failed to set min value: 0x%x: %s", ret_min, esp_err_to_name(ret_min));
}
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);
if(ret_max != ESP_OK) {
log_e("Failed to set max value");
log_e("Failed to set max value: 0x%x: %s", ret_max, esp_err_to_name(ret_max));
}
return ret_min == ESP_OK && ret_max == ESP_OK;
}
@@ -52,7 +52,7 @@ bool ZigbeeFlowSensor::setTolerance(float tolerance) {
}
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);
if (ret != ESP_OK) {
log_e("Failed to set tolerance");
log_e("Failed to set tolerance: 0x%x: %s", ret, esp_err_to_name(ret));
return false;
}
return true;
@@ -79,7 +79,7 @@ bool ZigbeeFlowSensor::setReporting(uint16_t min_interval, uint16_t max_interval
esp_zb_lock_release();

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

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

if (ret != ESP_OK) {
log_e("Failed to send flow report");
log_e("Failed to send flow report: 0x%x: %s", ret, esp_err_to_name(ret));
return false;
}
log_v("Flow report sent");
2 changes: 1 addition & 1 deletion libraries/Zigbee/src/ep/ZigbeeLight.cpp
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ bool ZigbeeLight::setLight(bool state) {
esp_zb_lock_release();

if (ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
log_e("Failed to set light state");
log_e("Failed to set light state: 0x%x", ret);
return false;
}
return true;
8 changes: 4 additions & 4 deletions libraries/Zigbee/src/ep/ZigbeeOccupancySensor.cpp
View file
Original file line number Diff line number Diff line change
@@ -28,11 +28,11 @@ bool ZigbeeOccupancySensor::setSensorType(uint8_t sensor_type) {
esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_OCCUPANCY_SENSING, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
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);
if(ret_type != ESP_OK) {
log_e("Failed to set sensor type");
log_e("Failed to set sensor type: 0x%x: %s", ret_type, esp_err_to_name(ret_type));
}
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);
if(ret_bitmap != ESP_OK) {
log_e("Failed to set sensor type bitmap");
log_e("Failed to set sensor type bitmap: 0x%x: %s", ret_bitmap, esp_err_to_name(ret_bitmap));
}
return ret_type == ESP_OK && ret_bitmap == ESP_OK;
}
@@ -48,7 +48,7 @@ bool ZigbeeOccupancySensor::setOccupancy(bool occupied) {
);
esp_zb_lock_release();
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
log_e("Failed to set occupancy");
log_e("Failed to set occupancy: 0x%x", ret);
}
return ret == ESP_ZB_ZCL_STATUS_SUCCESS;
}
@@ -67,7 +67,7 @@ bool ZigbeeOccupancySensor::report() {
esp_err_t ret = esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);
esp_zb_lock_release();
if(ret != ESP_OK) {
log_e("Failed to send occupancy report");
log_e("Failed to send occupancy report: 0x%x: %s", ret, esp_err_to_name(ret));
return false;
}
log_v("Occupancy report sent");
12 changes: 6 additions & 6 deletions libraries/Zigbee/src/ep/ZigbeePressureSensor.cpp
View file
Original file line number Diff line number Diff line change
@@ -27,11 +27,11 @@ bool ZigbeePressureSensor::setMinMaxValue(int16_t min, int16_t max) {
esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_PRESSURE_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
esp_err_t ret_min = esp_zb_cluster_update_attr(pressure_measure_cluster, ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_MIN_VALUE_ID, (void *)&min);
if(ret_min != ESP_OK) {
log_e("Failed to set min value");
log_e("Failed to set min value: 0x%x: %s", ret_min, esp_err_to_name(ret_min));
}
esp_err_t ret_max = esp_zb_cluster_update_attr(pressure_measure_cluster, ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_MAX_VALUE_ID, (void *)&max);
if(ret_max != ESP_OK) {
log_e("Failed to set max value");
log_e("Failed to set max value: 0x%x: %s", ret_max, esp_err_to_name(ret_max));
}
return ret_min == ESP_OK && ret_max == ESP_OK;
}
@@ -41,7 +41,7 @@ bool ZigbeePressureSensor::setTolerance(uint16_t tolerance) {
esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_PRESSURE_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
esp_err_t ret = esp_zb_pressure_meas_cluster_add_attr(pressure_measure_cluster, ESP_ZB_ZCL_ATTR_PRESSURE_MEASUREMENT_TOLERANCE_ID, (void *)&tolerance);
if(ret != ESP_OK) {
log_e("Failed to set tolerance");
log_e("Failed to set tolerance: 0x%x: %s", ret, esp_err_to_name(ret));
}
return ret == ESP_OK;
}
@@ -65,7 +65,7 @@ bool ZigbeePressureSensor::setReporting(uint16_t min_interval, uint16_t max_inte
esp_err_t ret = esp_zb_zcl_update_reporting_info(&reporting_info);
esp_zb_lock_release();
if(ret != ESP_OK) {
log_e("Failed to set reporting");
log_e("Failed to set reporting: 0x%x: %s", ret, esp_err_to_name(ret));
}
return ret == ESP_OK;
}
@@ -81,7 +81,7 @@ bool ZigbeePressureSensor::setPressure(int16_t pressure) {
);
esp_zb_lock_release();
if(ret != ESP_ZB_ZCL_STATUS_SUCCESS) {
log_e("Failed to set pressure");
log_e("Failed to set pressure: 0x%x", ret);
}
return ret == ESP_ZB_ZCL_STATUS_SUCCESS;
}
@@ -100,7 +100,7 @@ bool ZigbeePressureSensor::report() {
esp_err_t ret = esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);
esp_zb_lock_release();
if(ret != ESP_OK) {
log_e("Failed to send pressure report");
log_e("Failed to send pressure report: 0x%x: %s", ret, esp_err_to_name(ret));
return false;
}
log_v("Pressure report sent");
Loading