From a7e2e64c5bf79ad3370bead3d4b77507382b7263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Proch=C3=A1zka?= <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Fri, 13 Dec 2024 17:07:08 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com> --- libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.cpp | 2 ++ libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.h | 2 ++ libraries/Zigbee/src/ep/ZigbeeFlowSensor.cpp | 2 ++ libraries/Zigbee/src/ep/ZigbeeFlowSensor.h | 2 ++ libraries/Zigbee/src/ep/ZigbeeOccupancySensor.h | 2 ++ libraries/Zigbee/src/ep/ZigbeePressureSensor.cpp | 2 ++ libraries/Zigbee/src/ep/ZigbeePressureSensor.h | 2 ++ 7 files changed, 14 insertions(+) diff --git a/libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.cpp b/libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.cpp index e7623e96a..b409a5ce6 100644 --- a/libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.cpp +++ b/libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.cpp @@ -46,6 +46,7 @@ void ZigbeeCarbonDioxideSensor::setReporting(uint16_t min_interval, uint16_t max if(delta > 0) { log_e("Delta reporting is currently not supported by the carbon dioxide sensor"); } + // clang-format off esp_zb_zcl_reporting_info_t reporting_info = { .direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_SRV, .ep = _endpoint, @@ -72,6 +73,7 @@ void ZigbeeCarbonDioxideSensor::setReporting(uint16_t min_interval, uint16_t max }, .manuf_code = ESP_ZB_ZCL_ATTR_NON_MANUFACTURER_SPECIFIC, }; + // clang-format on esp_zb_lock_acquire(portMAX_DELAY); esp_zb_zcl_update_reporting_info(&reporting_info); esp_zb_lock_release(); diff --git a/libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.h b/libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.h index 96d3e7f17..72bf63ddf 100644 --- a/libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.h +++ b/libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.h @@ -9,6 +9,7 @@ #include "ZigbeeEP.h" #include "ha/esp_zigbee_ha_standard.h" +// clang-format off #define ZIGBEE_DEFAULT_CARBON_DIOXIDE_SENSOR_CONFIG() \ { \ .basic_cfg = \ @@ -27,6 +28,7 @@ .max_measured_value = 1.0, \ }, \ } +// clang-format on typedef struct zigbee_carbon_dioxide_sensor_cfg_s { esp_zb_basic_cluster_cfg_t basic_cfg; diff --git a/libraries/Zigbee/src/ep/ZigbeeFlowSensor.cpp b/libraries/Zigbee/src/ep/ZigbeeFlowSensor.cpp index 17182a56b..38b31e846 100644 --- a/libraries/Zigbee/src/ep/ZigbeeFlowSensor.cpp +++ b/libraries/Zigbee/src/ep/ZigbeeFlowSensor.cpp @@ -44,6 +44,7 @@ void ZigbeeFlowSensor::setTolerance(float tolerance) { } void ZigbeeFlowSensor::setReporting(uint16_t min_interval, uint16_t max_interval, float delta) { + // clang-format off esp_zb_zcl_reporting_info_t reporting_info = { .direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_SRV, .ep = _endpoint, @@ -70,6 +71,7 @@ void ZigbeeFlowSensor::setReporting(uint16_t min_interval, uint16_t max_interval }, .manuf_code = ESP_ZB_ZCL_ATTR_NON_MANUFACTURER_SPECIFIC, }; + // clang-format on esp_zb_lock_acquire(portMAX_DELAY); esp_zb_zcl_update_reporting_info(&reporting_info); esp_zb_lock_release(); diff --git a/libraries/Zigbee/src/ep/ZigbeeFlowSensor.h b/libraries/Zigbee/src/ep/ZigbeeFlowSensor.h index 651563699..d0f624c85 100644 --- a/libraries/Zigbee/src/ep/ZigbeeFlowSensor.h +++ b/libraries/Zigbee/src/ep/ZigbeeFlowSensor.h @@ -9,6 +9,7 @@ #include "ZigbeeEP.h" #include "ha/esp_zigbee_ha_standard.h" +// clang-format off #define ZIGBEE_DEFAULT_FLOW_SENSOR_CONFIG() \ { \ .basic_cfg = \ @@ -27,6 +28,7 @@ .max_value = 0x7FFF, \ }, \ } +// clang-format on typedef struct zigbee_flow_sensor_cfg_s { esp_zb_basic_cluster_cfg_t basic_cfg; diff --git a/libraries/Zigbee/src/ep/ZigbeeOccupancySensor.h b/libraries/Zigbee/src/ep/ZigbeeOccupancySensor.h index 67103d633..d62ce7496 100644 --- a/libraries/Zigbee/src/ep/ZigbeeOccupancySensor.h +++ b/libraries/Zigbee/src/ep/ZigbeeOccupancySensor.h @@ -9,6 +9,7 @@ #include "ZigbeeEP.h" #include "ha/esp_zigbee_ha_standard.h" +// clang-format off #define ZIGBEE_DEFAULT_OCCUPANCY_SENSOR_CONFIG() \ { \ .basic_cfg = \ @@ -27,6 +28,7 @@ .sensor_type_bitmap = (1 << ESP_ZB_ZCL_OCCUPANCY_SENSING_OCCUPANCY_SENSOR_TYPE_PIR), \ }, \ } +// clang-format on typedef struct zigbee_occupancy_sensor_cfg_s { esp_zb_basic_cluster_cfg_t basic_cfg; diff --git a/libraries/Zigbee/src/ep/ZigbeePressureSensor.cpp b/libraries/Zigbee/src/ep/ZigbeePressureSensor.cpp index 6880a109b..0421c53ee 100644 --- a/libraries/Zigbee/src/ep/ZigbeePressureSensor.cpp +++ b/libraries/Zigbee/src/ep/ZigbeePressureSensor.cpp @@ -41,6 +41,7 @@ void ZigbeePressureSensor::setTolerance(uint16_t tolerance) { } void ZigbeePressureSensor::setReporting(uint16_t min_interval, uint16_t max_interval, uint16_t delta) { + // clang-format off esp_zb_zcl_reporting_info_t reporting_info = { .direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_SRV, .ep = _endpoint, @@ -67,6 +68,7 @@ void ZigbeePressureSensor::setReporting(uint16_t min_interval, uint16_t max_inte }, .manuf_code = ESP_ZB_ZCL_ATTR_NON_MANUFACTURER_SPECIFIC, }; + // clang-format on esp_zb_lock_acquire(portMAX_DELAY); esp_zb_zcl_update_reporting_info(&reporting_info); esp_zb_lock_release(); diff --git a/libraries/Zigbee/src/ep/ZigbeePressureSensor.h b/libraries/Zigbee/src/ep/ZigbeePressureSensor.h index 5874cb7ff..6439b6fcc 100644 --- a/libraries/Zigbee/src/ep/ZigbeePressureSensor.h +++ b/libraries/Zigbee/src/ep/ZigbeePressureSensor.h @@ -9,6 +9,7 @@ #include "ZigbeeEP.h" #include "ha/esp_zigbee_ha_standard.h" +// clang-format off #define ZIGBEE_DEFAULT_PRESSURE_SENSOR_CONFIG() \ { \ .basic_cfg = \ @@ -27,6 +28,7 @@ .max_value = ESP_ZB_ZCL_PATTR_RESSURE_MEASUREMENT_MAX_VALUE_DEFAULT_VALUE, \ }, \ } +// clang-format on typedef struct zigbee_pressure_sensor_cfg_s { esp_zb_basic_cluster_cfg_t basic_cfg;