Skip to content

Commit 216f1f1

Browse files
pre-commit-ci-lite[bot]pre-commit-ci-lite[bot]
authored
ci(pre-commit): Apply automatic fixes
1 parent 30482f1 commit 216f1f1

File tree

4 files changed

+120
-120
lines changed

4 files changed

+120
-120
lines changed

‎libraries/Zigbee/examples/Zigbee_Wind_Speed_Sensor/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ For more information and guidance on creating custom quirks, visit the [ZHA Devi
4242
- Action Type: ZHA Toolkit: Read Attribute
4343
- Setup the action:
4444
```yaml
45-
action: zha_toolkit.attr_read
45+
action: zha_toolkit.attr_read
4646
metadata: {}
4747
data:
4848
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

+91-92
Original file line numberDiff line numberDiff line change
@@ -26,95 +26,94 @@
2626
* Created by Jan Procházka (https://github.com/P-R-O-C-H-Y/)
2727
*/
2828

29-
#ifndef ZIGBEE_MODE_ED
30-
#error "Zigbee coordinator mode is not selected in Tools->Zigbee mode"
31-
#endif
32-
33-
#include "Zigbee.h"
34-
35-
#define BUTTON_PIN 9 //Boot button for C6/H2
36-
#define WIND_SPEED_SENSOR_ENDPOINT_NUMBER 10
37-
38-
ZigbeeWindSpeedSensor zbWindSpeedSensor = ZigbeeWindSpeedSensor(WIND_SPEED_SENSOR_ENDPOINT_NUMBER);
39-
40-
/************************ WindSpeed sensor *****************************/
41-
static void windspeed_sensor_value_update(void *arg) {
42-
for (;;) {
43-
// Read wind speed sensor value (simulated now by temperature sensor)
44-
float windspeed = temperatureRead();
45-
log_v("Wind speed sensor value: %.2fm/s", windspeed);
46-
// Update windspeed value in Windspeed sensor EP
47-
zbWindSpeedSensor.setWindSpeed(windspeed);
48-
delay(1000);
49-
}
50-
}
51-
52-
/********************* Arduino functions **************************/
53-
void setup() {
54-
Serial.begin(115200);
55-
while (!Serial) {
56-
delay(10);
57-
}
58-
59-
// Init button switch
60-
pinMode(BUTTON_PIN, INPUT);
61-
62-
// Optional: set Zigbee device name and model
63-
zbWindSpeedSensor.setManufacturerAndModel("Espressif", "ZigbeeWindSpeedSensor");
64-
65-
// Set minimum and maximum windspeed measurement value in m/s
66-
zbWindSpeedSensor.setMinMaxValue(0, 50);
67-
68-
// Set tolerance for windspeed measurement in m/s (lowest possible value is 0.01 m/s)
69-
zbWindSpeedSensor.setTolerance(1);
70-
71-
// Add endpoint to Zigbee Core
72-
Zigbee.addEndpoint(&zbWindSpeedSensor);
73-
74-
Serial.println("Starting Zigbee...");
75-
// When all EPs are registered, start Zigbee in End Device mode
76-
if (!Zigbee.begin()) {
77-
Serial.println("Zigbee failed to start!");
78-
Serial.println("Rebooting...");
79-
ESP.restart();
80-
} else {
81-
Serial.println("Zigbee started successfully!");
82-
}
83-
Serial.println("Connecting to network");
84-
while (!Zigbee.connected()) {
85-
Serial.print(".");
86-
delay(100);
87-
}
88-
Serial.println();
89-
90-
// Start Wind speed sensor reading task
91-
xTaskCreate(windspeed_sensor_value_update, "wind_speed_sensor_update", 2048, NULL, 10, NULL);
92-
93-
// Set reporting interval for windspeed measurement in seconds, must be called after Zigbee.begin()
94-
// min_interval and max_interval in seconds, delta (WindSpeed change in m/s)
95-
// if min = 1 and max = 0, reporting is sent only when windspeed changes by delta
96-
// if min = 0 and max = 10, reporting is sent every 10 seconds or windspeed changes by delta
97-
// if min = 0, max = 10 and delta = 0, reporting is sent every 10 seconds regardless of windspeed change
98-
zbWindSpeedSensor.setReporting(1, 0, 1);
99-
}
100-
101-
void loop() {
102-
// Checking button for factory reset
103-
if (digitalRead(BUTTON_PIN) == LOW) { // Push button pressed
104-
// Key debounce handling
105-
delay(100);
106-
int startTime = millis();
107-
while (digitalRead(BUTTON_PIN) == LOW) {
108-
delay(50);
109-
if ((millis() - startTime) > 3000) {
110-
// If key pressed for more than 3secs, factory reset Zigbee and reboot
111-
Serial.println("Resetting Zigbee to factory and rebooting in 1s.");
112-
delay(1000);
113-
Zigbee.factoryReset();
114-
}
115-
}
116-
zbWindSpeedSensor.reportWindSpeed();
117-
}
118-
delay(100);
119-
}
120-
29+
#ifndef ZIGBEE_MODE_ED
30+
#error "Zigbee coordinator mode is not selected in Tools->Zigbee mode"
31+
#endif
32+
33+
#include "Zigbee.h"
34+
35+
#define BUTTON_PIN 9 //Boot button for C6/H2
36+
#define WIND_SPEED_SENSOR_ENDPOINT_NUMBER 10
37+
38+
ZigbeeWindSpeedSensor zbWindSpeedSensor = ZigbeeWindSpeedSensor(WIND_SPEED_SENSOR_ENDPOINT_NUMBER);
39+
40+
/************************ WindSpeed sensor *****************************/
41+
static void windspeed_sensor_value_update(void *arg) {
42+
for (;;) {
43+
// Read wind speed sensor value (simulated now by temperature sensor)
44+
float windspeed = temperatureRead();
45+
log_v("Wind speed sensor value: %.2fm/s", windspeed);
46+
// Update windspeed value in Windspeed sensor EP
47+
zbWindSpeedSensor.setWindSpeed(windspeed);
48+
delay(1000);
49+
}
50+
}
51+
52+
/********************* Arduino functions **************************/
53+
void setup() {
54+
Serial.begin(115200);
55+
while (!Serial) {
56+
delay(10);
57+
}
58+
59+
// Init button switch
60+
pinMode(BUTTON_PIN, INPUT);
61+
62+
// Optional: set Zigbee device name and model
63+
zbWindSpeedSensor.setManufacturerAndModel("Espressif", "ZigbeeWindSpeedSensor");
64+
65+
// Set minimum and maximum windspeed measurement value in m/s
66+
zbWindSpeedSensor.setMinMaxValue(0, 50);
67+
68+
// Set tolerance for windspeed measurement in m/s (lowest possible value is 0.01 m/s)
69+
zbWindSpeedSensor.setTolerance(1);
70+
71+
// Add endpoint to Zigbee Core
72+
Zigbee.addEndpoint(&zbWindSpeedSensor);
73+
74+
Serial.println("Starting Zigbee...");
75+
// When all EPs are registered, start Zigbee in End Device mode
76+
if (!Zigbee.begin()) {
77+
Serial.println("Zigbee failed to start!");
78+
Serial.println("Rebooting...");
79+
ESP.restart();
80+
} else {
81+
Serial.println("Zigbee started successfully!");
82+
}
83+
Serial.println("Connecting to network");
84+
while (!Zigbee.connected()) {
85+
Serial.print(".");
86+
delay(100);
87+
}
88+
Serial.println();
89+
90+
// Start Wind speed sensor reading task
91+
xTaskCreate(windspeed_sensor_value_update, "wind_speed_sensor_update", 2048, NULL, 10, NULL);
92+
93+
// Set reporting interval for windspeed measurement in seconds, must be called after Zigbee.begin()
94+
// min_interval and max_interval in seconds, delta (WindSpeed change in m/s)
95+
// if min = 1 and max = 0, reporting is sent only when windspeed changes by delta
96+
// if min = 0 and max = 10, reporting is sent every 10 seconds or windspeed changes by delta
97+
// if min = 0, max = 10 and delta = 0, reporting is sent every 10 seconds regardless of windspeed change
98+
zbWindSpeedSensor.setReporting(1, 0, 1);
99+
}
100+
101+
void loop() {
102+
// Checking button for factory reset
103+
if (digitalRead(BUTTON_PIN) == LOW) { // Push button pressed
104+
// Key debounce handling
105+
delay(100);
106+
int startTime = millis();
107+
while (digitalRead(BUTTON_PIN) == LOW) {
108+
delay(50);
109+
if ((millis() - startTime) > 3000) {
110+
// If key pressed for more than 3secs, factory reset Zigbee and reboot
111+
Serial.println("Resetting Zigbee to factory and rebooting in 1s.");
112+
delay(1000);
113+
Zigbee.factoryReset();
114+
}
115+
}
116+
zbWindSpeedSensor.reportWindSpeed();
117+
}
118+
delay(100);
119+
}

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ esp_zb_cluster_list_t *zigbee_wind_speed_sensor_clusters_create(zigbee_wind_spee
88
esp_zb_cluster_list_t *cluster_list = esp_zb_zcl_cluster_list_create();
99
esp_zb_cluster_list_add_basic_cluster(cluster_list, esp_zb_basic_cluster_create(basic_cfg), ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
1010
esp_zb_cluster_list_add_identify_cluster(cluster_list, esp_zb_identify_cluster_create(identify_cfg), ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
11-
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);
11+
esp_zb_cluster_list_add_wind_speed_measurement_cluster(
12+
cluster_list, esp_zb_wind_speed_measurement_cluster_create(wind_speed_cfg), ESP_ZB_ZCL_CLUSTER_SERVER_ROLE
13+
);
1214
return cluster_list;
1315
}
1416

@@ -19,9 +21,7 @@ ZigbeeWindSpeedSensor::ZigbeeWindSpeedSensor(uint8_t endpoint) : ZigbeeEP(endpoi
1921
zigbee_wind_speed_sensor_cfg_t windspeed_sensor_cfg = ZIGBEE_DEFAULT_WIND_SPEED_SENSOR_CONFIG();
2022
_cluster_list = zigbee_wind_speed_sensor_clusters_create(&windspeed_sensor_cfg);
2123

22-
_ep_config = {
23-
.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
24-
};
24+
_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};
2525
}
2626

2727
static uint16_t zb_windspeed_to_u16(float windspeed) {
@@ -33,7 +33,7 @@ void ZigbeeWindSpeedSensor::setMinMaxValue(float min, float max) {
3333
uint16_t zb_max = zb_windspeed_to_u16(max);
3434
esp_zb_attribute_list_t *windspeed_measure_cluster =
3535
esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_WIND_SPEED_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
36-
//
36+
//
3737
esp_zb_cluster_update_attr(windspeed_measure_cluster, ESP_ZB_ZCL_ATTR_WIND_SPEED_MEASUREMENT_MIN_MEASURED_VALUE_ID, (void *)&zb_min);
3838
esp_zb_cluster_update_attr(windspeed_measure_cluster, ESP_ZB_ZCL_ATTR_WIND_SPEED_MEASUREMENT_MAX_MEASURED_VALUE_ID, (void *)&zb_max);
3939
}
@@ -73,7 +73,8 @@ void ZigbeeWindSpeedSensor::setWindSpeed(float windspeed) {
7373
log_d("Setting windspeed to %d", zb_windspeed);
7474
esp_zb_lock_acquire(portMAX_DELAY);
7575
esp_zb_zcl_set_attribute_val(
76-
_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
76+
_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,
77+
&zb_windspeed, false
7778
);
7879
esp_zb_lock_release();
7980
}

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

+21-21
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@
99
#include "ZigbeeEP.h"
1010
#include "ha/esp_zigbee_ha_standard.h"
1111

12-
#define ZIGBEE_DEFAULT_WIND_SPEED_SENSOR_CONFIG() \
13-
{ \
14-
.basic_cfg = \
15-
{ \
16-
.zcl_version = ESP_ZB_ZCL_BASIC_ZCL_VERSION_DEFAULT_VALUE, \
17-
.power_source = ESP_ZB_ZCL_BASIC_POWER_SOURCE_DEFAULT_VALUE, \
18-
}, \
19-
.identify_cfg = \
20-
{ \
21-
.identify_time = ESP_ZB_ZCL_IDENTIFY_IDENTIFY_TIME_DEFAULT_VALUE, \
22-
}, \
23-
.wind_speed_meas_cfg = \
24-
{ \
25-
.measured_value = ESP_ZB_ZCL_WIND_SPEED_MEASUREMENT_MEASURED_VALUE_DEFAULT, \
26-
.min_measured_value = ESP_ZB_ZCL_WIND_SPEED_MEASUREMENT_MIN_MEASURED_VALUE_DEFAULT, \
27-
.max_measured_value = ESP_ZB_ZCL_WIND_SPEED_MEASUREMENT_MAX_MEASURED_VALUE_DEFAULT, \
28-
}, \
29-
}
12+
#define ZIGBEE_DEFAULT_WIND_SPEED_SENSOR_CONFIG() \
13+
{ \
14+
.basic_cfg = \
15+
{ \
16+
.zcl_version = ESP_ZB_ZCL_BASIC_ZCL_VERSION_DEFAULT_VALUE, \
17+
.power_source = ESP_ZB_ZCL_BASIC_POWER_SOURCE_DEFAULT_VALUE, \
18+
}, \
19+
.identify_cfg = \
20+
{ \
21+
.identify_time = ESP_ZB_ZCL_IDENTIFY_IDENTIFY_TIME_DEFAULT_VALUE, \
22+
}, \
23+
.wind_speed_meas_cfg = { \
24+
.measured_value = ESP_ZB_ZCL_WIND_SPEED_MEASUREMENT_MEASURED_VALUE_DEFAULT, \
25+
.min_measured_value = ESP_ZB_ZCL_WIND_SPEED_MEASUREMENT_MIN_MEASURED_VALUE_DEFAULT, \
26+
.max_measured_value = ESP_ZB_ZCL_WIND_SPEED_MEASUREMENT_MAX_MEASURED_VALUE_DEFAULT, \
27+
}, \
28+
}
3029

3130
typedef struct zigbee_wind_speed_sensor_cfg_s {
32-
esp_zb_basic_cluster_cfg_t basic_cfg; /*!< Basic cluster configuration, @ref esp_zb_basic_cluster_cfg_s */
33-
esp_zb_identify_cluster_cfg_t identify_cfg; /*!< Identify cluster configuration, @ref esp_zb_identify_cluster_cfg_s */
34-
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 */
31+
esp_zb_basic_cluster_cfg_t basic_cfg; /*!< Basic cluster configuration, @ref esp_zb_basic_cluster_cfg_s */
32+
esp_zb_identify_cluster_cfg_t identify_cfg; /*!< Identify cluster configuration, @ref esp_zb_identify_cluster_cfg_s */
33+
esp_zb_wind_speed_measurement_cluster_cfg_t
34+
wind_speed_meas_cfg; /*!< Wind speed measurement cluster configuration, @ref esp_zb_wind_speed_measurement_cluster_cfg_s */
3535
} zigbee_wind_speed_sensor_cfg_t;
3636

3737
class ZigbeeWindSpeedSensor : public ZigbeeEP {

0 commit comments

Comments
 (0)