Skip to content

Commit 2276f0b

Browse files
authored
fix(zigbee): Add manuf_code to report attribure commands (espressif#11066)
1 parent 665d6f8 commit 2276f0b

7 files changed

+9
-2
lines changed

libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/Zigbee_Temp_Hum_Sensor_Sleepy.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ void loop() {
125125
int startTime = millis();
126126
while (digitalRead(button) == LOW) {
127127
delay(50);
128-
if ((millis() - startTime) > 3000) {
129-
// If key pressed for more than 3secs, factory reset Zigbee and reboot
128+
if ((millis() - startTime) > 10000) {
129+
// If key pressed for more than 10secs, factory reset Zigbee and reboot
130130
Serial.println("Resetting Zigbee to factory and rebooting in 1s.");
131131
delay(1000);
132132
Zigbee.factoryReset();

libraries/Zigbee/src/ep/ZigbeeAnalog.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ void ZigbeeAnalog::reportAnalogInput() {
9393
report_attr_cmd.direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_CLI;
9494
report_attr_cmd.clusterID = ESP_ZB_ZCL_CLUSTER_ID_ANALOG_INPUT;
9595
report_attr_cmd.zcl_basic_cmd.src_endpoint = _endpoint;
96+
report_attr_cmd.manuf_code = ESP_ZB_ZCL_ATTR_NON_MANUFACTURER_SPECIFIC;
9697

9798
esp_zb_lock_acquire(portMAX_DELAY);
9899
esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);

libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ void ZigbeeCarbonDioxideSensor::report() {
8585
report_attr_cmd.direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_CLI;
8686
report_attr_cmd.clusterID = ESP_ZB_ZCL_CLUSTER_ID_CARBON_DIOXIDE_MEASUREMENT;
8787
report_attr_cmd.zcl_basic_cmd.src_endpoint = _endpoint;
88+
report_attr_cmd.manuf_code = ESP_ZB_ZCL_ATTR_NON_MANUFACTURER_SPECIFIC;
8889

8990
esp_zb_lock_acquire(portMAX_DELAY);
9091
esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);

libraries/Zigbee/src/ep/ZigbeeFlowSensor.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ void ZigbeeFlowSensor::report() {
7979
report_attr_cmd.direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_CLI;
8080
report_attr_cmd.clusterID = ESP_ZB_ZCL_CLUSTER_ID_FLOW_MEASUREMENT;
8181
report_attr_cmd.zcl_basic_cmd.src_endpoint = _endpoint;
82+
report_attr_cmd.manuf_code = ESP_ZB_ZCL_ATTR_NON_MANUFACTURER_SPECIFIC;
8283

8384
esp_zb_lock_acquire(portMAX_DELAY);
8485
esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);

libraries/Zigbee/src/ep/ZigbeeOccupancySensor.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ void ZigbeeOccupancySensor::report() {
4949
report_attr_cmd.direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_CLI;
5050
report_attr_cmd.clusterID = ESP_ZB_ZCL_CLUSTER_ID_OCCUPANCY_SENSING;
5151
report_attr_cmd.zcl_basic_cmd.src_endpoint = _endpoint;
52+
report_attr_cmd.manuf_code = ESP_ZB_ZCL_ATTR_NON_MANUFACTURER_SPECIFIC;
5253

5354
esp_zb_lock_acquire(portMAX_DELAY);
5455
esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);

libraries/Zigbee/src/ep/ZigbeePressureSensor.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ void ZigbeePressureSensor::report() {
7575
report_attr_cmd.direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_CLI;
7676
report_attr_cmd.clusterID = ESP_ZB_ZCL_CLUSTER_ID_PRESSURE_MEASUREMENT;
7777
report_attr_cmd.zcl_basic_cmd.src_endpoint = _endpoint;
78+
report_attr_cmd.manuf_code = ESP_ZB_ZCL_ATTR_NON_MANUFACTURER_SPECIFIC;
7879

7980
esp_zb_lock_acquire(portMAX_DELAY);
8081
esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);

libraries/Zigbee/src/ep/ZigbeeTempSensor.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ void ZigbeeTempSensor::reportTemperature() {
7474
report_attr_cmd.direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_CLI;
7575
report_attr_cmd.clusterID = ESP_ZB_ZCL_CLUSTER_ID_TEMP_MEASUREMENT;
7676
report_attr_cmd.zcl_basic_cmd.src_endpoint = _endpoint;
77+
report_attr_cmd.manuf_code = ESP_ZB_ZCL_ATTR_NON_MANUFACTURER_SPECIFIC;
7778

7879
esp_zb_lock_acquire(portMAX_DELAY);
7980
esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);
@@ -116,6 +117,7 @@ void ZigbeeTempSensor::reportHumidity() {
116117
report_attr_cmd.direction = ESP_ZB_ZCL_CMD_DIRECTION_TO_CLI;
117118
report_attr_cmd.clusterID = ESP_ZB_ZCL_CLUSTER_ID_REL_HUMIDITY_MEASUREMENT;
118119
report_attr_cmd.zcl_basic_cmd.src_endpoint = _endpoint;
120+
report_attr_cmd.manuf_code = ESP_ZB_ZCL_ATTR_NON_MANUFACTURER_SPECIFIC;
119121

120122
esp_zb_lock_acquire(portMAX_DELAY);
121123
esp_zb_zcl_report_attr_cmd_req(&report_attr_cmd);

0 commit comments

Comments
 (0)