Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit b33470e

Browse files
me-no-devP-R-O-C-H-Y
andauthored
IDF release/v5.4 (#10998)
* IDF release/v5.4 bcb3c32d * fix(zigbee): Remove the need of native ieee802154 radio --------- Co-authored-by: Jan Procházka <90197375+P-R-O-C-H-Y@users.noreply.github.com>
1 parent 0c18b17 commit b33470e

40 files changed

+110
-110
lines changed

‎libraries/Zigbee/src/ZigbeeCore.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Zigbee Core Functions */
22

33
#include "ZigbeeCore.h"
4-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
4+
#if CONFIG_ZB_ENABLED
55

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

527527
ZigbeeCore Zigbee = ZigbeeCore();
528528

529-
#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
529+
#endif // CONFIG_ZB_ENABLED

‎libraries/Zigbee/src/ZigbeeCore.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "soc/soc_caps.h"
66
#include "sdkconfig.h"
7-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
7+
#if CONFIG_ZB_ENABLED
88

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

145145
extern ZigbeeCore Zigbee;
146146

147-
#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
147+
#endif // CONFIG_ZB_ENABLED

‎libraries/Zigbee/src/ZigbeeEP.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "ZigbeeEP.h"
44

5-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
5+
#if CONFIG_ZB_ENABLED
66

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

434-
#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
434+
#endif // CONFIG_ZB_ENABLED

‎libraries/Zigbee/src/ZigbeeEP.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#pragma once
44

55
#include "ZigbeeCore.h"
6-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
6+
#if CONFIG_ZB_ENABLED
77

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

160-
#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
160+
#endif // CONFIG_ZB_ENABLED

‎libraries/Zigbee/src/ZigbeeHandlers.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "ZigbeeCore.h"
33
#include "Arduino.h"
44

5-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
5+
#if CONFIG_ZB_ENABLED
66

77
#include "esp_ota_ops.h"
88
#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
397397
return ESP_OK;
398398
}
399399

400-
#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
400+
#endif // CONFIG_ZB_ENABLED

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "ZigbeeAnalog.h"
2-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
2+
#if CONFIG_ZB_ENABLED
33

44
esp_zb_cluster_list_t *zigbee_analog_clusters_create(zigbee_analog_cfg_t *analog_sensor) {
55
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
121121
esp_zb_lock_release();
122122
}
123123

124-
#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
124+
#endif // CONFIG_ZB_ENABLED

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "soc/soc_caps.h"
66
#include "sdkconfig.h"
7-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
7+
#if CONFIG_ZB_ENABLED
88

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

76-
#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
76+
#endif // CONFIG_ZB_ENABLED

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "ZigbeeCarbonDioxideSensor.h"
2-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
2+
#if CONFIG_ZB_ENABLED
33

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

93-
#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
93+
#endif // CONFIG_ZB_ENABLED

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "soc/soc_caps.h"
66
#include "sdkconfig.h"
7-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
7+
#if CONFIG_ZB_ENABLED
88

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

61-
#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
61+
#endif // CONFIG_ZB_ENABLED

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "ZigbeeColorDimmableLight.h"
2-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
2+
#if CONFIG_ZB_ENABLED
33

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

180-
#endif //SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
180+
#endif // CONFIG_ZB_ENABLED

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /