@@ -14,8 +14,8 @@ ZigbeeWindSpeedSensor::ZigbeeWindSpeedSensor(uint8_t endpoint) : ZigbeeEP(endpoi
14
14
};
15
15
}
16
16
17
- static int16_t zb_windspeed_to_s16 (float temp ) {
18
- return (int16_t )(temp * 100 );
17
+ static int16_t zb_windspeed_to_s16 (float windspeed ) {
18
+ return (int16_t )(windspeed * 100 );
19
19
}
20
20
21
21
/* * @brief Wind_Speed_Measurement cluster server attribute identifiers
@@ -29,19 +29,19 @@ typedef enum {
29
29
void ZigbeeWindSpeedSensor::setMinMaxValue (float min, float max) {
30
30
int16_t zb_min = zb_windspeed_to_s16 (min);
31
31
int16_t zb_max = zb_windspeed_to_s16 (max);
32
- esp_zb_attribute_list_t *temp_measure_cluster =
32
+ esp_zb_attribute_list_t *windspeed_measure_cluster =
33
33
esp_zb_cluster_list_get_cluster (_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_WIND_SPEED_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
34
34
//
35
- esp_zb_cluster_update_attr (temp_measure_cluster, ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_MIN_VALUE_ID , (void *)&zb_min);
36
- esp_zb_cluster_update_attr (temp_measure_cluster, ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_MAX_VALUE_ID , (void *)&zb_max);
35
+ esp_zb_cluster_update_attr (windspeed_measure_cluster, ESP_ZB_ZCL_ATTR_WIND_SPEED_MEASUREMENT_MIN_MEASURED_VALUE_ID , (void *)&zb_min);
36
+ esp_zb_cluster_update_attr (windspeed_measure_cluster, ESP_ZB_ZCL_ATTR_WIND_SPEED_MEASUREMENT_MAX_MEASURED_VALUE_ID , (void *)&zb_max);
37
37
}
38
38
39
39
void ZigbeeWindSpeedSensor::setTolerance (float tolerance) {
40
40
// Convert tolerance to ZCL uint16_t
41
41
uint16_t zb_tolerance = (uint16_t )(tolerance * 100 );
42
- esp_zb_attribute_list_t *temp_measure_cluster =
42
+ esp_zb_attribute_list_t *windspeed_measure_cluster =
43
43
esp_zb_cluster_list_get_cluster (_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_WIND_SPEED_MEASUREMENT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
44
- esp_zb_windspeed_meas_cluster_add_attr (temp_measure_cluster, ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_TOLERANCE_ID , (void *)&zb_tolerance);
44
+ esp_zb_windspeed_meas_cluster_add_attr (windspeed_measure_cluster, ESP_ZB_ZCL_ATTR_WIND_SPEED_MEASUREMENT_TOLERANCE_ID , (void *)&zb_tolerance);
45
45
}
46
46
47
47
void ZigbeeWindSpeedSensor::setReporting (uint16_t min_interval, uint16_t max_interval, float delta) {
@@ -50,7 +50,6 @@ void ZigbeeWindSpeedSensor::setReporting(uint16_t min_interval, uint16_t max_int
50
50
.ep = _endpoint,
51
51
.cluster_id = ESP_ZB_ZCL_CLUSTER_ID_WIND_SPEED_MEASUREMENT,
52
52
.cluster_role = ESP_ZB_ZCL_CLUSTER_SERVER_ROLE,
53
- // .attr_id = ESP_ZB_ZCL_ATTR_TEMP_MEASUREMENT_VALUE_ID,
54
53
.attr_id = ESP_ZB_ZCL_ATTR_WIND_SPEED_MEASUREMENT_MEASURED_VALUE_ID,
55
54
.u =
56
55
{
0 commit comments