adafruit-mirror/arduino-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Apply suggestions from code review

Browse source 
Co-authored-by: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
This commit is contained in:
Jan Procházka 2024-12-13 17:07:08 +01:00 committed by GitHub
parent 57339ba58c
commit a7e2e64c5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.cpp
View file

@ -46,6 +46,7 @@ void ZigbeeCarbonDioxideSensor::setReporting(uint16_t min_interval, uint16_t max
if(delta > 0) { if(delta > 0) {
log_e("Delta reporting is currently not supported by the carbon dioxide sensor"); log_e("Delta reporting is currently not supported by the carbon dioxide sensor");
} }
// clang-format off
esp_zb_zcl_reporting_info_t reporting_info = { esp_zb_zcl_reporting_info_t reporting_info = {
.direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_SRV, .direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_SRV,
.ep = _endpoint, .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, .manuf_code = ESP_ZB_ZCL_ATTR_NON_MANUFACTURER_SPECIFIC,
}; };
// clang-format on
esp_zb_lock_acquire(portMAX_DELAY); esp_zb_lock_acquire(portMAX_DELAY);
esp_zb_zcl_update_reporting_info(&reporting_info); esp_zb_zcl_update_reporting_info(&reporting_info);
esp_zb_lock_release(); esp_zb_lock_release();

2
libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.h
View file

@ -9,6 +9,7 @@
#include "ZigbeeEP.h" #include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h" #include "ha/esp_zigbee_ha_standard.h"
// clang-format off
#define ZIGBEE_DEFAULT_CARBON_DIOXIDE_SENSOR_CONFIG() \ #define ZIGBEE_DEFAULT_CARBON_DIOXIDE_SENSOR_CONFIG() \
{ \ { \
.basic_cfg = \ .basic_cfg = \
@ -27,6 +28,7 @@
.max_measured_value = 1.0, \ .max_measured_value = 1.0, \
}, \ }, \
} }
// clang-format on
typedef struct zigbee_carbon_dioxide_sensor_cfg_s { typedef struct zigbee_carbon_dioxide_sensor_cfg_s {
esp_zb_basic_cluster_cfg_t basic_cfg; esp_zb_basic_cluster_cfg_t basic_cfg;

2
libraries/Zigbee/src/ep/ZigbeeFlowSensor.cpp
View file

@ -44,6 +44,7 @@ void ZigbeeFlowSensor::setTolerance(float tolerance) {
} }
void ZigbeeFlowSensor::setReporting(uint16_t min_interval, uint16_t max_interval, float delta) { void ZigbeeFlowSensor::setReporting(uint16_t min_interval, uint16_t max_interval, float delta) {
// clang-format off
esp_zb_zcl_reporting_info_t reporting_info = { esp_zb_zcl_reporting_info_t reporting_info = {
.direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_SRV, .direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_SRV,
.ep = _endpoint, .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, .manuf_code = ESP_ZB_ZCL_ATTR_NON_MANUFACTURER_SPECIFIC,
}; };
// clang-format on
esp_zb_lock_acquire(portMAX_DELAY); esp_zb_lock_acquire(portMAX_DELAY);
esp_zb_zcl_update_reporting_info(&reporting_info); esp_zb_zcl_update_reporting_info(&reporting_info);
esp_zb_lock_release(); esp_zb_lock_release();

2
libraries/Zigbee/src/ep/ZigbeeFlowSensor.h
View file

@ -9,6 +9,7 @@
#include "ZigbeeEP.h" #include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h" #include "ha/esp_zigbee_ha_standard.h"
// clang-format off
#define ZIGBEE_DEFAULT_FLOW_SENSOR_CONFIG() \ #define ZIGBEE_DEFAULT_FLOW_SENSOR_CONFIG() \
{ \ { \
.basic_cfg = \ .basic_cfg = \
@ -27,6 +28,7 @@
.max_value = 0x7FFF, \ .max_value = 0x7FFF, \
}, \ }, \
} }
// clang-format on
typedef struct zigbee_flow_sensor_cfg_s { typedef struct zigbee_flow_sensor_cfg_s {
esp_zb_basic_cluster_cfg_t basic_cfg; esp_zb_basic_cluster_cfg_t basic_cfg;

2
libraries/Zigbee/src/ep/ZigbeeOccupancySensor.h
View file

@ -9,6 +9,7 @@
#include "ZigbeeEP.h" #include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h" #include "ha/esp_zigbee_ha_standard.h"
// clang-format off
#define ZIGBEE_DEFAULT_OCCUPANCY_SENSOR_CONFIG() \ #define ZIGBEE_DEFAULT_OCCUPANCY_SENSOR_CONFIG() \
{ \ { \
.basic_cfg = \ .basic_cfg = \
@ -27,6 +28,7 @@
.sensor_type_bitmap = (1 << ESP_ZB_ZCL_OCCUPANCY_SENSING_OCCUPANCY_SENSOR_TYPE_PIR), \ .sensor_type_bitmap = (1 << ESP_ZB_ZCL_OCCUPANCY_SENSING_OCCUPANCY_SENSOR_TYPE_PIR), \
}, \ }, \
} }
// clang-format on
typedef struct zigbee_occupancy_sensor_cfg_s { typedef struct zigbee_occupancy_sensor_cfg_s {
esp_zb_basic_cluster_cfg_t basic_cfg; esp_zb_basic_cluster_cfg_t basic_cfg;

2
libraries/Zigbee/src/ep/ZigbeePressureSensor.cpp
View file

@ -41,6 +41,7 @@ void ZigbeePressureSensor::setTolerance(uint16_t tolerance) {
} }
void ZigbeePressureSensor::setReporting(uint16_t min_interval, uint16_t max_interval, uint16_t delta) { 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 = { esp_zb_zcl_reporting_info_t reporting_info = {
.direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_SRV, .direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_SRV,
.ep = _endpoint, .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, .manuf_code = ESP_ZB_ZCL_ATTR_NON_MANUFACTURER_SPECIFIC,
}; };
// clang-format on
esp_zb_lock_acquire(portMAX_DELAY); esp_zb_lock_acquire(portMAX_DELAY);
esp_zb_zcl_update_reporting_info(&reporting_info); esp_zb_zcl_update_reporting_info(&reporting_info);
esp_zb_lock_release(); esp_zb_lock_release();

2
libraries/Zigbee/src/ep/ZigbeePressureSensor.h
View file

@ -9,6 +9,7 @@
#include "ZigbeeEP.h" #include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h" #include "ha/esp_zigbee_ha_standard.h"
// clang-format off
#define ZIGBEE_DEFAULT_PRESSURE_SENSOR_CONFIG() \ #define ZIGBEE_DEFAULT_PRESSURE_SENSOR_CONFIG() \
{ \ { \
.basic_cfg = \ .basic_cfg = \
@ -27,6 +28,7 @@
.max_value = ESP_ZB_ZCL_PATTR_RESSURE_MEASUREMENT_MAX_VALUE_DEFAULT_VALUE, \ .max_value = ESP_ZB_ZCL_PATTR_RESSURE_MEASUREMENT_MAX_VALUE_DEFAULT_VALUE, \
}, \ }, \
} }
// clang-format on
typedef struct zigbee_pressure_sensor_cfg_s { typedef struct zigbee_pressure_sensor_cfg_s {
esp_zb_basic_cluster_cfg_t basic_cfg; esp_zb_basic_cluster_cfg_t basic_cfg;