Skip to content

Commit 2fbb4e8

Browse files
fix(zigbee): initialize missing callbacks in contructors (#12087)
* fix(zigbee): initialize callbacks in contructors * ci(pre-commit): Apply automatic fixes --------- Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
1 parent 5049a93 commit 2fbb4e8

11 files changed

+21
-0
lines changed

libraries/Zigbee/src/ZigbeeEP.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ ZigbeeEP::ZigbeeEP(uint8_t endpoint) {
2929
_cluster_list = nullptr;
3030
_on_identify = nullptr;
3131
_on_ota_state_change = nullptr;
32+
_on_default_response = nullptr;
3233
_read_model = NULL;
3334
_read_manufacturer = NULL;
3435
_time_status = 0;

libraries/Zigbee/src/ep/ZigbeeAnalog.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
ZigbeeAnalog::ZigbeeAnalog(uint8_t endpoint) : ZigbeeEP(endpoint) {
2020
_device_id = ESP_ZB_HA_SIMPLE_SENSOR_DEVICE_ID;
21+
_on_analog_output_change = nullptr;
2122

2223
//Create basic analog sensor clusters without configuration
2324
_cluster_list = esp_zb_zcl_cluster_list_create();

libraries/Zigbee/src/ep/ZigbeeBinary.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
ZigbeeBinary::ZigbeeBinary(uint8_t endpoint) : ZigbeeEP(endpoint) {
1919
_device_id = ESP_ZB_HA_SIMPLE_SENSOR_DEVICE_ID;
20+
_on_binary_output_change = nullptr;
2021

2122
//Create basic binary sensor clusters without configuration
2223
_cluster_list = esp_zb_zcl_cluster_list_create();

libraries/Zigbee/src/ep/ZigbeeColorDimmableLight.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
ZigbeeColorDimmableLight::ZigbeeColorDimmableLight(uint8_t endpoint) : ZigbeeEP(endpoint) {
2020
_device_id = ESP_ZB_HA_COLOR_DIMMABLE_LIGHT_DEVICE_ID;
21+
_on_light_change = nullptr;
2122

2223
esp_zb_color_dimmable_light_cfg_t light_cfg = ZIGBEE_DEFAULT_COLOR_DIMMABLE_LIGHT_CONFIG();
2324
_cluster_list = esp_zb_color_dimmable_light_clusters_create(&light_cfg);

libraries/Zigbee/src/ep/ZigbeeDimmableLight.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
ZigbeeDimmableLight::ZigbeeDimmableLight(uint8_t endpoint) : ZigbeeEP(endpoint) {
2121
_device_id = ESP_ZB_HA_DIMMABLE_LIGHT_DEVICE_ID;
22+
_on_light_change = nullptr;
2223

2324
zigbee_dimmable_light_cfg_t light_cfg = ZIGBEE_DEFAULT_DIMMABLE_LIGHT_CONFIG();
2425
_cluster_list = zigbee_dimmable_light_clusters_create(&light_cfg);

libraries/Zigbee/src/ep/ZigbeeFanControl.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
ZigbeeFanControl::ZigbeeFanControl(uint8_t endpoint) : ZigbeeEP(endpoint) {
1919
_device_id = ESP_ZB_HA_THERMOSTAT_DEVICE_ID; //There is no FAN_CONTROL_DEVICE_ID in the Zigbee spec
20+
_on_fan_mode_change = nullptr;
2021

2122
//Create basic analog sensor clusters without configuration
2223
_cluster_list = esp_zb_zcl_cluster_list_create();

libraries/Zigbee/src/ep/ZigbeeLight.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
ZigbeeLight::ZigbeeLight(uint8_t endpoint) : ZigbeeEP(endpoint) {
1919
_device_id = ESP_ZB_HA_ON_OFF_LIGHT_DEVICE_ID;
20+
_on_light_change = nullptr;
2021

2122
esp_zb_on_off_light_cfg_t light_cfg = ESP_ZB_DEFAULT_ON_OFF_LIGHT_CONFIG();
2223
_cluster_list = esp_zb_on_off_light_clusters_create(&light_cfg); // use esp_zb_zcl_cluster_list_create() instead of esp_zb_on_off_light_clusters_create()

libraries/Zigbee/src/ep/ZigbeePowerOutlet.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
ZigbeePowerOutlet::ZigbeePowerOutlet(uint8_t endpoint) : ZigbeeEP(endpoint) {
1919
_device_id = ESP_ZB_HA_MAINS_POWER_OUTLET_DEVICE_ID;
20+
_on_state_change = nullptr;
2021

2122
esp_zb_mains_power_outlet_cfg_t outlet_cfg = ESP_ZB_DEFAULT_MAINS_POWER_OUTLET_CONFIG();
2223
_cluster_list = esp_zb_mains_power_outlet_clusters_create(&outlet_cfg);

libraries/Zigbee/src/ep/ZigbeeSwitch.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ ZigbeeSwitch::ZigbeeSwitch(uint8_t endpoint) : ZigbeeEP(endpoint) {
2222
_device_id = ESP_ZB_HA_ON_OFF_SWITCH_DEVICE_ID;
2323
_instance = this; // Set the static pointer to this instance
2424
_device = nullptr;
25+
_on_light_state_change = nullptr;
26+
_on_light_state_change_with_source = nullptr;
2527

2628
esp_zb_on_off_switch_cfg_t switch_cfg = ESP_ZB_DEFAULT_ON_OFF_SWITCH_CONFIG();
2729
_cluster_list = esp_zb_on_off_switch_clusters_create(&switch_cfg);

libraries/Zigbee/src/ep/ZigbeeThermostat.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ ZigbeeThermostat::ZigbeeThermostat(uint8_t endpoint) : ZigbeeEP(endpoint) {
2626
_device_id = ESP_ZB_HA_THERMOSTAT_DEVICE_ID;
2727
_instance = this; // Set the static pointer to this instance
2828
_device = nullptr; // Initialize sensor pointer to null
29+
_on_temp_receive = nullptr;
30+
_on_temp_receive_with_source = nullptr;
31+
_on_temp_config_receive = nullptr;
32+
_on_humidity_receive = nullptr;
33+
_on_humidity_receive_with_source = nullptr;
34+
_on_humidity_config_receive = nullptr;
2935

3036
//use custom config to avoid narrowing error -> must be fixed in zigbee-sdk
3137
esp_zb_thermostat_cfg_t thermostat_cfg = ZB_DEFAULT_THERMOSTAT_CONFIG();

0 commit comments

Comments
 (0)