Skip to content

IDF release/v5.4 #10998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 25, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ZigbeeCore.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Zigbee Core Functions */

#include "ZigbeeCore.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "ZigbeeHandlers.cpp"
#include "Arduino.h"
@@ -526,4 +526,4 @@ const char *ZigbeeCore::getDeviceTypeString(esp_zb_ha_standard_devices_t deviceI

ZigbeeCore Zigbee = ZigbeeCore();

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ZigbeeCore.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#include "soc/soc_caps.h"
#include "sdkconfig.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "esp_zigbee_core.h"
#include "zdo/esp_zigbee_zdo_common.h"
@@ -144,4 +144,4 @@ class ZigbeeCore {

extern ZigbeeCore Zigbee;

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ZigbeeEP.cpp
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

#include "ZigbeeEP.h"

#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "esp_zigbee_cluster.h"
#include "zcl/esp_zigbee_zcl_power_config.h"
@@ -431,4 +431,4 @@ void ZigbeeEP::requestOTAUpdate() {
esp_zb_lock_release();
}

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ZigbeeEP.h
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
#pragma once

#include "ZigbeeCore.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include <Arduino.h>
#include <ColorFormat.h>
@@ -157,4 +157,4 @@ class ZigbeeEP {
friend class ZigbeeCore;
};

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ZigbeeHandlers.cpp
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
#include "ZigbeeCore.h"
#include "Arduino.h"

#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "esp_ota_ops.h"
#if CONFIG_ZB_DELTA_OTA // Delta OTA, code is prepared for this feature but not enabled by default
@@ -397,4 +397,4 @@ static esp_err_t zb_cmd_default_resp_handler(const esp_zb_zcl_cmd_default_resp_m
return ESP_OK;
}

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeAnalog.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "ZigbeeAnalog.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

esp_zb_cluster_list_t *zigbee_analog_clusters_create(zigbee_analog_cfg_t *analog_sensor) {
esp_zb_basic_cluster_cfg_t *basic_cfg = analog_sensor ? &(analog_sensor->basic_cfg) : NULL;
@@ -121,4 +121,4 @@ void ZigbeeAnalog::setAnalogInputReporting(uint16_t min_interval, uint16_t max_i
esp_zb_lock_release();
}

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeAnalog.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#include "soc/soc_caps.h"
#include "sdkconfig.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h"
@@ -73,4 +73,4 @@ class ZigbeeAnalog : public ZigbeeEP {
uint8_t _analog_clusters;
};

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "ZigbeeCarbonDioxideSensor.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

esp_zb_cluster_list_t *zigbee_carbon_dioxide_sensor_clusters_create(zigbee_carbon_dioxide_sensor_cfg_t *carbon_dioxide_sensor) {
esp_zb_basic_cluster_cfg_t *basic_cfg = carbon_dioxide_sensor ? &(carbon_dioxide_sensor->basic_cfg) : NULL;
@@ -90,4 +90,4 @@ void ZigbeeCarbonDioxideSensor::report() {
log_v("Carbon dioxide report sent");
}

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#include "soc/soc_caps.h"
#include "sdkconfig.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h"
@@ -58,4 +58,4 @@ class ZigbeeCarbonDioxideSensor : public ZigbeeEP {
void report();
};

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeColorDimmableLight.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "ZigbeeColorDimmableLight.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

ZigbeeColorDimmableLight::ZigbeeColorDimmableLight(uint8_t endpoint) : ZigbeeEP(endpoint) {
_device_id = ESP_ZB_HA_COLOR_DIMMABLE_LIGHT_DEVICE_ID;
@@ -177,4 +177,4 @@ void ZigbeeColorDimmableLight::setLightColor(espHsvColor_t hsv_color) {
setLight(_current_state, _current_level, rgb_color.r, rgb_color.g, rgb_color.b);
}

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeColorDimmableLight.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#include "soc/soc_caps.h"
#include "sdkconfig.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h"
@@ -105,4 +105,4 @@ class ZigbeeColorDimmableLight : public ZigbeeEP {
espRgbColor_t _current_color;
};

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeColorDimmerSwitch.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "ZigbeeColorDimmerSwitch.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

// Initialize the static instance pointer
ZigbeeColorDimmerSwitch *ZigbeeColorDimmerSwitch::_instance = nullptr;
@@ -481,4 +481,4 @@ void ZigbeeColorDimmerSwitch::setLightColor(uint8_t red, uint8_t green, uint8_t
}
}

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeColorDimmerSwitch.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#include "soc/soc_caps.h"
#include "sdkconfig.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h"
@@ -55,4 +55,4 @@ class ZigbeeColorDimmerSwitch : public ZigbeeEP {
void calculateXY(uint8_t red, uint8_t green, uint8_t blue, uint16_t &x, uint16_t &y);
};

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeContactSwitch.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "ZigbeeContactSwitch.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

esp_zb_cluster_list_t *zigbee_contact_switch_clusters_create(zigbee_contact_switch_cfg_t *contact_switch) {
esp_zb_basic_cluster_cfg_t *basic_cfg = contact_switch ? &(contact_switch->basic_cfg) : NULL;
@@ -93,4 +93,4 @@ void ZigbeeContactSwitch::zbIASZoneEnrollResponse(const esp_zb_zcl_ias_zone_enro
}
}

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeContactSwitch.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#include "soc/soc_caps.h"
#include "sdkconfig.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h"
@@ -64,4 +64,4 @@ class ZigbeeContactSwitch : public ZigbeeEP {
uint8_t _ias_cie_endpoint;
};

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
2 changes: 1 addition & 1 deletion libraries/Zigbee/src/ep/ZigbeeDimmableLight.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

#include "ZigbeeDimmableLight.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "esp_zigbee_cluster.h"

2 changes: 1 addition & 1 deletion libraries/Zigbee/src/ep/ZigbeeDimmableLight.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#include "soc/soc_caps.h"
#include "sdkconfig.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h"
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeDoorWindowHandle.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "ZigbeeDoorWindowHandle.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

esp_zb_cluster_list_t *zigbee_door_window_handle_clusters_create(zigbee_door_window_handle_cfg_t *door_window_handle) {
esp_zb_basic_cluster_cfg_t *basic_cfg = door_window_handle ? &(door_window_handle->basic_cfg) : NULL;
@@ -105,4 +105,4 @@ void ZigbeeDoorWindowHandle::zbIASZoneEnrollResponse(const esp_zb_zcl_ias_zone_e
}
}

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeDoorWindowHandle.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#include "soc/soc_caps.h"
#include "sdkconfig.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h"
@@ -68,4 +68,4 @@ class ZigbeeDoorWindowHandle : public ZigbeeEP {
uint8_t _ias_cie_endpoint;
};

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeFlowSensor.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "ZigbeeFlowSensor.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

esp_zb_cluster_list_t *zigbee_flow_sensor_clusters_create(zigbee_flow_sensor_cfg_t *flow_sensor) {
esp_zb_basic_cluster_cfg_t *basic_cfg = flow_sensor ? &(flow_sensor->basic_cfg) : NULL;
@@ -86,4 +86,4 @@ void ZigbeeFlowSensor::report() {
log_v("Flow report sent");
}

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeFlowSensor.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#include "soc/soc_caps.h"
#include "sdkconfig.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h"
@@ -57,4 +57,4 @@ class ZigbeeFlowSensor : public ZigbeeEP {
void report();
};

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeLight.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "ZigbeeLight.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

ZigbeeLight::ZigbeeLight(uint8_t endpoint) : ZigbeeEP(endpoint) {
_device_id = ESP_ZB_HA_ON_OFF_LIGHT_DEVICE_ID;
@@ -46,4 +46,4 @@ void ZigbeeLight::setLight(bool state) {
esp_zb_lock_release();
}

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeLight.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#include "soc/soc_caps.h"
#include "sdkconfig.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h"
@@ -38,4 +38,4 @@ class ZigbeeLight : public ZigbeeEP {
bool _current_state;
};

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeOccupancySensor.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "ZigbeeOccupancySensor.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

esp_zb_cluster_list_t *zigbee_occupancy_sensor_clusters_create(zigbee_occupancy_sensor_cfg_t *occupancy_sensor) {
esp_zb_basic_cluster_cfg_t *basic_cfg = occupancy_sensor ? &(occupancy_sensor->basic_cfg) : NULL;
@@ -56,4 +56,4 @@ void ZigbeeOccupancySensor::report() {
log_v("Occupancy report sent");
}

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeOccupancySensor.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#include "soc/soc_caps.h"
#include "sdkconfig.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h"
@@ -51,4 +51,4 @@ class ZigbeeOccupancySensor : public ZigbeeEP {
void report();
};

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeePressureSensor.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "ZigbeePressureSensor.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

esp_zb_cluster_list_t *zigbee_pressure_sensor_clusters_create(zigbee_pressure_sensor_cfg_t *pressure_sensor) {
esp_zb_basic_cluster_cfg_t *basic_cfg = pressure_sensor ? &(pressure_sensor->basic_cfg) : NULL;
@@ -82,4 +82,4 @@ void ZigbeePressureSensor::report() {
log_v("Pressure report sent");
}

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeePressureSensor.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#include "soc/soc_caps.h"
#include "sdkconfig.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h"
@@ -57,4 +57,4 @@ class ZigbeePressureSensor : public ZigbeeEP {
void report();
};

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeRangeExtender.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "ZigbeeRangeExtender.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

ZigbeeRangeExtender::ZigbeeRangeExtender(uint8_t endpoint) : ZigbeeEP(endpoint) {
_device_id = ESP_ZB_HA_RANGE_EXTENDER_DEVICE_ID;
@@ -12,4 +12,4 @@ ZigbeeRangeExtender::ZigbeeRangeExtender(uint8_t endpoint) : ZigbeeEP(endpoint)
_ep_config = {.endpoint = _endpoint, .app_profile_id = ESP_ZB_AF_HA_PROFILE_ID, .app_device_id = ESP_ZB_HA_RANGE_EXTENDER_DEVICE_ID, .app_device_version = 0};
}

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
4 changes: 2 additions & 2 deletions libraries/Zigbee/src/ep/ZigbeeRangeExtender.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

#include "soc/soc_caps.h"
#include "sdkconfig.h"
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#if CONFIG_ZB_ENABLED

#include "ZigbeeEP.h"
#include "ha/esp_zigbee_ha_standard.h"
@@ -15,4 +15,4 @@ class ZigbeeRangeExtender : public ZigbeeEP {
~ZigbeeRangeExtender() {}
};

#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
#endif // CONFIG_ZB_ENABLED
Loading