ci(pre-commit): Apply automatic fixes

libraries/Zigbee/examples/Zigbee_Wind_Speed_Sensor/README.md

@@ -42,7 +42,7 @@ For more information and guidance on creating custom quirks, visit the [ZHA Devi
  - Action Type: ZHA Toolkit: Read Attribute
  - Setup the action:
  ```yaml
- action: zha_toolkit.attr_read 
+ action: zha_toolkit.attr_read
  metadata: {}
  data:
  ieee: f0:f5:bd:ff:fe:0e:61:30 #set device IEEE address

libraries/Zigbee/examples/Zigbee_Wind_Speed_Sensor/Zigbee_Wind_Speed_Sensor.ino

@@ -26,95 +26,94 @@
  * Created by Jan Procházka (https://github.com/P-R-O-C-H-Y/)
  */
 
- #ifndef ZIGBEE_MODE_ED
- #error "Zigbee coordinator mode is not selected in Tools->Zigbee mode"
- #endif
-
- #include "Zigbee.h"
-
- #define BUTTON_PIN 9 //Boot button for C6/H2
- #define WIND_SPEED_SENSOR_ENDPOINT_NUMBER 10
-
- ZigbeeWindSpeedSensor zbWindSpeedSensor = ZigbeeWindSpeedSensor(WIND_SPEED_SENSOR_ENDPOINT_NUMBER);
-
- /************************ WindSpeed sensor *****************************/
- static void windspeed_sensor_value_update(void *arg) {
- for (;;) {
- // Read wind speed sensor value (simulated now by temperature sensor)
- float windspeed = temperatureRead();
- log_v("Wind speed sensor value: %.2fm/s", windspeed);
- // Update windspeed value in Windspeed sensor EP
- zbWindSpeedSensor.setWindSpeed(windspeed);
- delay(1000);
- }
- }
-
- /********************* Arduino functions **************************/
- void setup() {
- Serial.begin(115200);
- while (!Serial) {
- delay(10);
- }
-
- // Init button switch
- pinMode(BUTTON_PIN, INPUT);
-
- // Optional: set Zigbee device name and model
- zbWindSpeedSensor.setManufacturerAndModel("Espressif", "ZigbeeWindSpeedSensor");
-
- // Set minimum and maximum windspeed measurement value in m/s
- zbWindSpeedSensor.setMinMaxValue(0, 50);
-
- // Set tolerance for windspeed measurement in m/s (lowest possible value is 0.01 m/s)
- zbWindSpeedSensor.setTolerance(1);
-
- // Add endpoint to Zigbee Core
- Zigbee.addEndpoint(&zbWindSpeedSensor);
-
- Serial.println("Starting Zigbee...");
- // When all EPs are registered, start Zigbee in End Device mode
- if (!Zigbee.begin()) {
- Serial.println("Zigbee failed to start!");
- Serial.println("Rebooting...");
- ESP.restart();
- } else {
- Serial.println("Zigbee started successfully!");
- }
- Serial.println("Connecting to network");
- while (!Zigbee.connected()) {
- Serial.print(".");
- delay(100);
- }
- Serial.println();
-
- // Start Wind speed sensor reading task
- xTaskCreate(windspeed_sensor_value_update, "wind_speed_sensor_update", 2048, NULL, 10, NULL);
-
- // Set reporting interval for windspeed measurement in seconds, must be called after Zigbee.begin()
- // min_interval and max_interval in seconds, delta (WindSpeed change in m/s)
- // if min = 1 and max = 0, reporting is sent only when windspeed changes by delta
- // if min = 0 and max = 10, reporting is sent every 10 seconds or windspeed changes by delta
- // if min = 0, max = 10 and delta = 0, reporting is sent every 10 seconds regardless of windspeed change
- zbWindSpeedSensor.setReporting(1, 0, 1);
- }
-
- void loop() {
- // Checking button for factory reset
- if (digitalRead(BUTTON_PIN) == LOW) { // Push button pressed
- // Key debounce handling
- delay(100);
- int startTime = millis();
- while (digitalRead(BUTTON_PIN) == LOW) {
- delay(50);
- if ((millis() - startTime) > 3000) {
- // If key pressed for more than 3secs, factory reset Zigbee and reboot
- Serial.println("Resetting Zigbee to factory and rebooting in 1s.");
- delay(1000);
- Zigbee.factoryReset();
- }
- }
- zbWindSpeedSensor.reportWindSpeed();
- }
- delay(100);
- }
-
+#ifndef ZIGBEE_MODE_ED
+#error "Zigbee coordinator mode is not selected in Tools->Zigbee mode"
+#endif
+
+#include "Zigbee.h"
+
+#define BUTTON_PIN 9 //Boot button for C6/H2
+#define WIND_SPEED_SENSOR_ENDPOINT_NUMBER 10
+
+ZigbeeWindSpeedSensor zbWindSpeedSensor = ZigbeeWindSpeedSensor(WIND_SPEED_SENSOR_ENDPOINT_NUMBER);
+
+/************************ WindSpeed sensor *****************************/
+static void windspeed_sensor_value_update(void *arg) {
+ for (;;) {
+ // Read wind speed sensor value (simulated now by temperature sensor)
+ float windspeed = temperatureRead();
+ log_v("Wind speed sensor value: %.2fm/s", windspeed);
+ // Update windspeed value in Windspeed sensor EP
+ zbWindSpeedSensor.setWindSpeed(windspeed);
+ delay(1000);
+ }
+}
+
+/********************* Arduino functions **************************/
+void setup() {
+ Serial.begin(115200);
+ while (!Serial) {
+ delay(10);
+ }
+
+ // Init button switch
+ pinMode(BUTTON_PIN, INPUT);
+
+ // Optional: set Zigbee device name and model
+ zbWindSpeedSensor.setManufacturerAndModel("Espressif", "ZigbeeWindSpeedSensor");
+
+ // Set minimum and maximum windspeed measurement value in m/s
+ zbWindSpeedSensor.setMinMaxValue(0, 50);
+
+ // Set tolerance for windspeed measurement in m/s (lowest possible value is 0.01 m/s)
+ zbWindSpeedSensor.setTolerance(1);
+
+ // Add endpoint to Zigbee Core
+ Zigbee.addEndpoint(&zbWindSpeedSensor);
+
+ Serial.println("Starting Zigbee...");
+ // When all EPs are registered, start Zigbee in End Device mode
+ if (!Zigbee.begin()) {
+ Serial.println("Zigbee failed to start!");
+ Serial.println("Rebooting...");
+ ESP.restart();
+ } else {
+ Serial.println("Zigbee started successfully!");
+ }
+ Serial.println("Connecting to network");
+ while (!Zigbee.connected()) {
+ Serial.print(".");
+ delay(100);
+ }
+ Serial.println();
+
+ // Start Wind speed sensor reading task
+ xTaskCreate(windspeed_sensor_value_update, "wind_speed_sensor_update", 2048, NULL, 10, NULL);
+
+ // Set reporting interval for windspeed measurement in seconds, must be called after Zigbee.begin()
+ // min_interval and max_interval in seconds, delta (WindSpeed change in m/s)
+ // if min = 1 and max = 0, reporting is sent only when windspeed changes by delta
+ // if min = 0 and max = 10, reporting is sent every 10 seconds or windspeed changes by delta
+ // if min = 0, max = 10 and delta = 0, reporting is sent every 10 seconds regardless of windspeed change
+ zbWindSpeedSensor.setReporting(1, 0, 1);
+}
+
+void loop() {
+ // Checking button for factory reset
+ if (digitalRead(BUTTON_PIN) == LOW) { // Push button pressed
+ // Key debounce handling
+ delay(100);
+ int startTime = millis();
+ while (digitalRead(BUTTON_PIN) == LOW) {
+ delay(50);
+ if ((millis() - startTime) > 3000) {
+ // If key pressed for more than 3secs, factory reset Zigbee and reboot
+ Serial.println("Resetting Zigbee to factory and rebooting in 1s.");
+ delay(1000);
+ Zigbee.factoryReset();
+ }
+ }
+ zbWindSpeedSensor.reportWindSpeed();
+ }
+ delay(100);
+}

libraries/Zigbee/src/ep/ZigbeeWindSpeedSensor.cpp

@@ -8,7 +8,9 @@ esp_zb_cluster_list_t *zigbee_wind_speed_sensor_clusters_create(zigbee_wind_spee
  esp_zb_cluster_list_t *cluster_list = esp_zb_zcl_cluster_list_create();
  esp_zb_cluster_list_add_basic_cluster(cluster_list, esp_zb_basic_cluster_create(basic_cfg), ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
  esp_zb_cluster_list_add_identify_cluster(cluster_list, esp_zb_identify_cluster_create(identify_cfg), ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
- esp_zb_cluster_list_add_wind_speed_measurement_cluster(cluster_list, esp_zb_wind_speed_measurement_cluster_create(wind_speed_cfg), ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
+ esp_zb_cluster_list_add_wind_speed_measurement_cluster(
+ cluster_list, esp_zb_wind_speed_measurement_cluster_create(wind_speed_cfg), ESP_ZB_ZCL_CLUSTER_SERVER_ROLE
+ );
  return cluster_list;
 }
 
@@ -19,9 +21,7 @@ ZigbeeWindSpeedSensor::ZigbeeWindSpeedSensor(uint8_t endpoint) : ZigbeeEP(endpoi
  zigbee_wind_speed_sensor_cfg_t windspeed_sensor_cfg = ZIGBEE_DEFAULT_WIND_SPEED_SENSOR_CONFIG();
  _cluster_list = zigbee_wind_speed_sensor_clusters_create(&windspeed_sensor_cfg);
 
- _ep_config = {
- .endpoint = _endpoint, .app_profile_id = ESP_ZB_AF_HA_PROFILE_ID, .app_device_id = ESP_ZB_HA_SIMPLE_SENSOR_DEVICE_ID, .app_device_version = 0
- };
+ _ep_config = {.endpoint = _endpoint, .app_profile_id = ESP_ZB_AF_HA_PROFILE_ID, .app_device_id = ESP_ZB_HA_SIMPLE_SENSOR_DEVICE_ID, .app_device_version = 0};
 }
 
 static uint16_t zb_windspeed_to_u16(float windspeed) {
@@ -33,7 +33,7 @@ void ZigbeeWindSpeedSensor::setMinMaxValue(float min, float max) {
  uint16_t zb_max = zb_windspeed_to_u16(max);
  esp_zb_attribute_list_t *windspeed_measure_cluster =
  esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_WIND_SPEED_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
- // 
+ //
  esp_zb_cluster_update_attr(windspeed_measure_cluster, ESP_ZB_ZCL_ATTR_WIND_SPEED_MEASUREMENT_MIN_MEASURED_VALUE_ID, (void *)&zb_min);
  esp_zb_cluster_update_attr(windspeed_measure_cluster, ESP_ZB_ZCL_ATTR_WIND_SPEED_MEASUREMENT_MAX_MEASURED_VALUE_ID, (void *)&zb_max);
 }
@@ -73,7 +73,8 @@ void ZigbeeWindSpeedSensor::setWindSpeed(float windspeed) {
  log_d("Setting windspeed to %d", zb_windspeed);
  esp_zb_lock_acquire(portMAX_DELAY);
  esp_zb_zcl_set_attribute_val(
- _endpoint, ESP_ZB_ZCL_CLUSTER_ID_WIND_SPEED_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE, ESP_ZB_ZCL_ATTR_WIND_SPEED_MEASUREMENT_MEASURED_VALUE_ID, &zb_windspeed, false
+ _endpoint, ESP_ZB_ZCL_CLUSTER_ID_WIND_SPEED_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE, ESP_ZB_ZCL_ATTR_WIND_SPEED_MEASUREMENT_MEASURED_VALUE_ID,
+ &zb_windspeed, false
  );
  esp_zb_lock_release();
 }

libraries/Zigbee/src/ep/ZigbeeWindSpeedSensor.h

@@ -9,29 +9,29 @@
 #include "ZigbeeEP.h"
 #include "ha/esp_zigbee_ha_standard.h"
 
-#define ZIGBEE_DEFAULT_WIND_SPEED_SENSOR_CONFIG() \
- { \
- .basic_cfg = \
- { \
- .zcl_version = ESP_ZB_ZCL_BASIC_ZCL_VERSION_DEFAULT_VALUE, \
- .power_source = ESP_ZB_ZCL_BASIC_POWER_SOURCE_DEFAULT_VALUE, \
- }, \
- .identify_cfg = \
- { \
- .identify_time = ESP_ZB_ZCL_IDENTIFY_IDENTIFY_TIME_DEFAULT_VALUE, \
- }, \
- .wind_speed_meas_cfg = \
- { \
- .measured_value = ESP_ZB_ZCL_WIND_SPEED_MEASUREMENT_MEASURED_VALUE_DEFAULT, \
- .min_measured_value = ESP_ZB_ZCL_WIND_SPEED_MEASUREMENT_MIN_MEASURED_VALUE_DEFAULT, \
- .max_measured_value = ESP_ZB_ZCL_WIND_SPEED_MEASUREMENT_MAX_MEASURED_VALUE_DEFAULT, \
- }, \
- }
+#define ZIGBEE_DEFAULT_WIND_SPEED_SENSOR_CONFIG() \
+ { \
+ .basic_cfg = \
+ { \
+ .zcl_version = ESP_ZB_ZCL_BASIC_ZCL_VERSION_DEFAULT_VALUE, \
+ .power_source = ESP_ZB_ZCL_BASIC_POWER_SOURCE_DEFAULT_VALUE, \
+ }, \
+ .identify_cfg = \
+ { \
+ .identify_time = ESP_ZB_ZCL_IDENTIFY_IDENTIFY_TIME_DEFAULT_VALUE, \
+ }, \
+ .wind_speed_meas_cfg = { \
+ .measured_value = ESP_ZB_ZCL_WIND_SPEED_MEASUREMENT_MEASURED_VALUE_DEFAULT, \
+ .min_measured_value = ESP_ZB_ZCL_WIND_SPEED_MEASUREMENT_MIN_MEASURED_VALUE_DEFAULT, \
+ .max_measured_value = ESP_ZB_ZCL_WIND_SPEED_MEASUREMENT_MAX_MEASURED_VALUE_DEFAULT, \
+ }, \
+ }
 
 typedef struct zigbee_wind_speed_sensor_cfg_s {
- esp_zb_basic_cluster_cfg_t basic_cfg; /*!< Basic cluster configuration, @ref esp_zb_basic_cluster_cfg_s */
- esp_zb_identify_cluster_cfg_t identify_cfg; /*!< Identify cluster configuration, @ref esp_zb_identify_cluster_cfg_s */
- esp_zb_wind_speed_measurement_cluster_cfg_t wind_speed_meas_cfg; /*!< Wind speed measurement cluster configuration, @ref esp_zb_wind_speed_measurement_cluster_cfg_s */
+ esp_zb_basic_cluster_cfg_t basic_cfg; /*!< Basic cluster configuration, @ref esp_zb_basic_cluster_cfg_s */
+ esp_zb_identify_cluster_cfg_t identify_cfg; /*!< Identify cluster configuration, @ref esp_zb_identify_cluster_cfg_s */
+ esp_zb_wind_speed_measurement_cluster_cfg_t
+ wind_speed_meas_cfg; /*!< Wind speed measurement cluster configuration, @ref esp_zb_wind_speed_measurement_cluster_cfg_s */
 } zigbee_wind_speed_sensor_cfg_t;
 
 class ZigbeeWindSpeedSensor : public ZigbeeEP {