From e2e8979f578bea588d9680665699b41a32df7762 Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Tue, 25 Feb 2025 10:46:08 -0300
Subject: [PATCH 1/4] ci(zigbee): Check if Zigbee is enabled for CI tests

---
 libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json    | 2 +-
 libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.json   | 2 +-
 libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json   | 2 +-
 libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/ci.json    | 2 +-
 libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.json         | 2 +-
 libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.json         | 2 +-
 libraries/Zigbee/examples/Zigbee_OTA_Client/ci.json             | 2 +-
 libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.json       | 2 +-
 libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json           | 2 +-
 libraries/Zigbee/examples/Zigbee_On_Off_Switch/ci.json          | 2 +-
 libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.json   | 2 +-
 libraries/Zigbee/examples/Zigbee_Range_Extender/ci.json         | 2 +-
 libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json          | 2 +-
 libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.json | 2 +-
 libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json     | 2 +-
 libraries/Zigbee/examples/Zigbee_Thermostat/ci.json             | 2 +-
 libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.json       | 2 +-
 libraries/Zigbee/examples/Zigbee_Window_Covering/ci.json        | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json b/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json
index 7b7ccef8ed7..bba9646d799 100644
--- a/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.json
index 7b7ccef8ed7..bba9646d799 100644
--- a/libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json b/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json
index 7b7ccef8ed7..bba9646d799 100644
--- a/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/ci.json b/libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/ci.json
index e79a477da11..15d6190e4ae 100644
--- a/libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.json b/libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.json
index 7b7ccef8ed7..bba9646d799 100644
--- a/libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.json b/libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.json
index 7b7ccef8ed7..bba9646d799 100644
--- a/libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_OTA_Client/ci.json b/libraries/Zigbee/examples/Zigbee_OTA_Client/ci.json
index 7b7ccef8ed7..bba9646d799 100644
--- a/libraries/Zigbee/examples/Zigbee_OTA_Client/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_OTA_Client/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.json
index 7b7ccef8ed7..bba9646d799 100644
--- a/libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json b/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json
index 7b7ccef8ed7..bba9646d799 100644
--- a/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_On_Off_Switch/ci.json b/libraries/Zigbee/examples/Zigbee_On_Off_Switch/ci.json
index e79a477da11..15d6190e4ae 100644
--- a/libraries/Zigbee/examples/Zigbee_On_Off_Switch/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_On_Off_Switch/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.json
index 7b7ccef8ed7..bba9646d799 100644
--- a/libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Range_Extender/ci.json b/libraries/Zigbee/examples/Zigbee_Range_Extender/ci.json
index e79a477da11..15d6190e4ae 100644
--- a/libraries/Zigbee/examples/Zigbee_Range_Extender/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Range_Extender/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json b/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json
index 7b7ccef8ed7..bba9646d799 100644
--- a/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.json b/libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.json
index 7b7ccef8ed7..bba9646d799 100644
--- a/libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json
index 7b7ccef8ed7..bba9646d799 100644
--- a/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Thermostat/ci.json b/libraries/Zigbee/examples/Zigbee_Thermostat/ci.json
index e79a477da11..15d6190e4ae 100644
--- a/libraries/Zigbee/examples/Zigbee_Thermostat/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Thermostat/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.json
index 7b7ccef8ed7..bba9646d799 100644
--- a/libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Window_Covering/ci.json b/libraries/Zigbee/examples/Zigbee_Window_Covering/ci.json
index 7b7ccef8ed7..bba9646d799 100644
--- a/libraries/Zigbee/examples/Zigbee_Window_Covering/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Window_Covering/ci.json
@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+    "CONFIG_ZB_ENABLED=y"
   ]
 }

From ad352a0a2672fd7174d0ad1f35890c1bd793a5c8 Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Tue, 25 Feb 2025 10:57:41 -0300
Subject: [PATCH 2/4] ci(zigbee): Fix requirements

---
 libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json    | 1 +
 libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.json   | 1 +
 libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json   | 1 +
 libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.json         | 1 +
 libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.json         | 1 +
 libraries/Zigbee/examples/Zigbee_OTA_Client/ci.json             | 1 +
 libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.json       | 1 +
 libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json           | 1 +
 libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.json   | 1 +
 libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json          | 1 +
 libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.json | 1 +
 libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json     | 1 +
 libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.json       | 1 +
 libraries/Zigbee/examples/Zigbee_Window_Covering/ci.json        | 1 +
 14 files changed, 14 insertions(+)

diff --git a/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json b/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json
index bba9646d799..ceacc367801 100644
--- a/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json
@@ -1,6 +1,7 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
     "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.json
index bba9646d799..ceacc367801 100644
--- a/libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.json
@@ -1,6 +1,7 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
     "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json b/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json
index bba9646d799..ceacc367801 100644
--- a/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json
@@ -1,6 +1,7 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
     "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.json b/libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.json
index bba9646d799..ceacc367801 100644
--- a/libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.json
@@ -1,6 +1,7 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
     "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.json b/libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.json
index bba9646d799..ceacc367801 100644
--- a/libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.json
@@ -1,6 +1,7 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
     "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_OTA_Client/ci.json b/libraries/Zigbee/examples/Zigbee_OTA_Client/ci.json
index bba9646d799..ceacc367801 100644
--- a/libraries/Zigbee/examples/Zigbee_OTA_Client/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_OTA_Client/ci.json
@@ -1,6 +1,7 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
     "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.json
index bba9646d799..ceacc367801 100644
--- a/libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.json
@@ -1,6 +1,7 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
     "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json b/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json
index bba9646d799..ceacc367801 100644
--- a/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json
@@ -1,6 +1,7 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
     "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.json
index bba9646d799..ceacc367801 100644
--- a/libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.json
@@ -1,6 +1,7 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
     "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json b/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json
index bba9646d799..ceacc367801 100644
--- a/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json
@@ -1,6 +1,7 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
     "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.json b/libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.json
index bba9646d799..ceacc367801 100644
--- a/libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.json
@@ -1,6 +1,7 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
     "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json
index bba9646d799..ceacc367801 100644
--- a/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json
@@ -1,6 +1,7 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
     "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.json
index bba9646d799..ceacc367801 100644
--- a/libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.json
@@ -1,6 +1,7 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
     "CONFIG_ZB_ENABLED=y"
   ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Window_Covering/ci.json b/libraries/Zigbee/examples/Zigbee_Window_Covering/ci.json
index bba9646d799..ceacc367801 100644
--- a/libraries/Zigbee/examples/Zigbee_Window_Covering/ci.json
+++ b/libraries/Zigbee/examples/Zigbee_Window_Covering/ci.json
@@ -1,6 +1,7 @@
 {
   "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
   "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
     "CONFIG_ZB_ENABLED=y"
   ]
 }

From a03a0442897bb2c48dc0b3710a2d791c4039acdf Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Tue, 25 Feb 2025 11:07:26 -0300
Subject: [PATCH 3/4] fix(zigbee): Use LED_BUILTIN for range extender

---
 .../examples/Zigbee_Range_Extender/Zigbee_Range_Extender.ino    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Zigbee/examples/Zigbee_Range_Extender/Zigbee_Range_Extender.ino b/libraries/Zigbee/examples/Zigbee_Range_Extender/Zigbee_Range_Extender.ino
index 3c4cfeb61dc..e74a9132ed5 100644
--- a/libraries/Zigbee/examples/Zigbee_Range_Extender/Zigbee_Range_Extender.ino
+++ b/libraries/Zigbee/examples/Zigbee_Range_Extender/Zigbee_Range_Extender.ino
@@ -34,7 +34,7 @@
 /* Zigbee light bulb configuration */
 #define USE_CUSTOM_ZIGBEE_CONFIG 1
 #define ZIGBEE_EXTENDER_ENDPOINT 1
-uint8_t led = RGB_BUILTIN;
+uint8_t led = LED_BUILTIN;
 uint8_t button = BOOT_PIN;
 
 ZigbeeRangeExtender zbExtender = ZigbeeRangeExtender(ZIGBEE_EXTENDER_ENDPOINT);

From f6fcc94cbb66fbc06c244970f7e9cb426498c611 Mon Sep 17 00:00:00 2001
From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com>
Date: Tue, 25 Feb 2025 11:16:49 -0300
Subject: [PATCH 4/4] fix(zigbee): Use default GPIO if LED_BUILTINnot defined

---
 .../examples/Zigbee_Range_Extender/Zigbee_Range_Extender.ino | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libraries/Zigbee/examples/Zigbee_Range_Extender/Zigbee_Range_Extender.ino b/libraries/Zigbee/examples/Zigbee_Range_Extender/Zigbee_Range_Extender.ino
index e74a9132ed5..a1ba90fbaf6 100644
--- a/libraries/Zigbee/examples/Zigbee_Range_Extender/Zigbee_Range_Extender.ino
+++ b/libraries/Zigbee/examples/Zigbee_Range_Extender/Zigbee_Range_Extender.ino
@@ -34,6 +34,11 @@
 /* Zigbee light bulb configuration */
 #define USE_CUSTOM_ZIGBEE_CONFIG 1
 #define ZIGBEE_EXTENDER_ENDPOINT 1
+
+#ifndef LED_BUILTIN
+#define LED_BUILTIN 4
+#endif
+
 uint8_t led = LED_BUILTIN;
 uint8_t button = BOOT_PIN;