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
Appearance settings

Commit b33470e

Browse filesBrowse files
me-no-devP-R-O-C-H-Y
me-no-dev
and
P-R-O-C-H-Y
authored
IDF release/v5.4 (espressif#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
Copy full SHA for b33470e
Expand file treeCollapse file tree

40 files changed

+110
-110
lines changed

‎libraries/Zigbee/src/ZigbeeCore.cpp

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ZigbeeCore.cpp
+2-2Lines 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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ZigbeeCore.h
+2-2Lines 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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ZigbeeEP.cpp
+2-2Lines 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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ZigbeeEP.h
+2-2Lines 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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ZigbeeHandlers.cpp
+2-2Lines 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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeAnalog.cpp
+2-2Lines 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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeAnalog.h
+2-2Lines 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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.cpp
+2-2Lines 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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.h
+2-2Lines 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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeColorDimmableLight.cpp
+2-2Lines 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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeColorDimmableLight.h
+2-2Lines 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"
@@ -105,4 +105,4 @@ class ZigbeeColorDimmableLight : public ZigbeeEP {
105105
espRgbColor_t _current_color;
106106
};
107107

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeColorDimmerSwitch.cpp
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "ZigbeeColorDimmerSwitch.h"
2-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
2+
#if CONFIG_ZB_ENABLED
33

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

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeColorDimmerSwitch.h
+2-2Lines 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"
@@ -55,4 +55,4 @@ class ZigbeeColorDimmerSwitch : public ZigbeeEP {
5555
void calculateXY(uint8_t red, uint8_t green, uint8_t blue, uint16_t &x, uint16_t &y);
5656
};
5757

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeContactSwitch.cpp
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "ZigbeeContactSwitch.h"
2-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
2+
#if CONFIG_ZB_ENABLED
33

44
esp_zb_cluster_list_t *zigbee_contact_switch_clusters_create(zigbee_contact_switch_cfg_t *contact_switch) {
55
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
9393
}
9494
}
9595

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeContactSwitch.h
+2-2Lines 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"
@@ -64,4 +64,4 @@ class ZigbeeContactSwitch : public ZigbeeEP {
6464
uint8_t _ias_cie_endpoint;
6565
};
6666

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeDimmableLight.cpp
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
#include "ZigbeeDimmableLight.h"
3-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
3+
#if CONFIG_ZB_ENABLED
44

55
#include "esp_zigbee_cluster.h"
66

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeDimmableLight.h
+1-1Lines changed: 1 addition & 1 deletion
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"

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeDoorWindowHandle.cpp
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "ZigbeeDoorWindowHandle.h"
2-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
2+
#if CONFIG_ZB_ENABLED
33

44
esp_zb_cluster_list_t *zigbee_door_window_handle_clusters_create(zigbee_door_window_handle_cfg_t *door_window_handle) {
55
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
105105
}
106106
}
107107

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeDoorWindowHandle.h
+2-2Lines 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"
@@ -68,4 +68,4 @@ class ZigbeeDoorWindowHandle : public ZigbeeEP {
6868
uint8_t _ias_cie_endpoint;
6969
};
7070

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeFlowSensor.cpp
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "ZigbeeFlowSensor.h"
2-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
2+
#if CONFIG_ZB_ENABLED
33

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

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeFlowSensor.h
+2-2Lines 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"
@@ -57,4 +57,4 @@ class ZigbeeFlowSensor : public ZigbeeEP {
5757
void report();
5858
};
5959

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeLight.cpp
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "ZigbeeLight.h"
2-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
2+
#if CONFIG_ZB_ENABLED
33

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

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeLight.h
+2-2Lines 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"
@@ -38,4 +38,4 @@ class ZigbeeLight : public ZigbeeEP {
3838
bool _current_state;
3939
};
4040

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeOccupancySensor.cpp
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "ZigbeeOccupancySensor.h"
2-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
2+
#if CONFIG_ZB_ENABLED
33

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

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeOccupancySensor.h
+2-2Lines 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"
@@ -51,4 +51,4 @@ class ZigbeeOccupancySensor : public ZigbeeEP {
5151
void report();
5252
};
5353

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeePressureSensor.cpp
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "ZigbeePressureSensor.h"
2-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
2+
#if CONFIG_ZB_ENABLED
33

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

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeePressureSensor.h
+2-2Lines 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"
@@ -57,4 +57,4 @@ class ZigbeePressureSensor : public ZigbeeEP {
5757
void report();
5858
};
5959

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeRangeExtender.cpp
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "ZigbeeRangeExtender.h"
2-
#if SOC_IEEE802154_SUPPORTED && CONFIG_ZB_ENABLED
2+
#if CONFIG_ZB_ENABLED
33

44
ZigbeeRangeExtender::ZigbeeRangeExtender(uint8_t endpoint) : ZigbeeEP(endpoint) {
55
_device_id = ESP_ZB_HA_RANGE_EXTENDER_DEVICE_ID;
@@ -12,4 +12,4 @@ ZigbeeRangeExtender::ZigbeeRangeExtender(uint8_t endpoint) : ZigbeeEP(endpoint)
1212
_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};
1313
}
1414

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

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

Copy file name to clipboardExpand all lines: libraries/Zigbee/src/ep/ZigbeeRangeExtender.h
+2-2Lines 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"
@@ -15,4 +15,4 @@ class ZigbeeRangeExtender : public ZigbeeEP {
1515
~ZigbeeRangeExtender() {}
1616
};
1717

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

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.