fix(example): Use requires instead of target in ci.json

lucasssvaz · P-R-O-C-H-Y · lucasssvaz · commit 7cdca56cb6f6 · 2024-10-02T17:46:51.000-03:00
fix(zigbee): Improve JSON files

Co-authored-by: Jan Prochazka &lt;90197375+P-R-O-C-H-Y@users.noreply.github.com&gt;
diff --git a/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json b/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json
@@ -1,16 +1,6 @@
 {
-  "fqbn": {
-    "esp32c6": [
-      "espressif:esp32:esp32c6:PartitionScheme=zigbee,ZigbeeMode=ed"
-    ],
-    "esp32h2": [
-      "espressif:esp32:esp32h2:PartitionScheme=zigbee,ZigbeeMode=ed"
-    ]
-  },
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
+  "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/ci.json b/libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/ci.json
@@ -1,16 +1,6 @@
 {
-  "fqbn": {
-    "esp32c6": [
-      "espressif:esp32:esp32c6:PartitionScheme=zigbee_zczr,ZigbeeMode=zczr"
-    ],
-    "esp32h2": [
-      "espressif:esp32:esp32h2:PartitionScheme=zigbee_zczr,ZigbeeMode=zczr"
-    ]
-  },
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
+  "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json b/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json
@@ -1,16 +1,6 @@
 {
-  "fqbn": {
-    "esp32c6": [
-      "espressif:esp32:esp32c6:PartitionScheme=zigbee,ZigbeeMode=ed"
-    ],
-    "esp32h2": [
-      "espressif:esp32:esp32h2:PartitionScheme=zigbee,ZigbeeMode=ed"
-    ]
-  },
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
+  "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_On_Off_Switch/ci.json b/libraries/Zigbee/examples/Zigbee_On_Off_Switch/ci.json
@@ -1,16 +1,6 @@
 {
-  "fqbn": {
-    "esp32c6": [
-      "espressif:esp32:esp32c6:PartitionScheme=zigbee_zczr,ZigbeeMode=zczr"
-    ],
-    "esp32h2": [
-      "espressif:esp32:esp32h2:PartitionScheme=zigbee_zczr,ZigbeeMode=zczr"
-    ]
-  },
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
+  "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json b/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json
@@ -1,16 +1,6 @@
 {
-  "fqbn": {
-    "esp32c6": [
-      "espressif:esp32:esp32c6:PartitionScheme=zigbee,ZigbeeMode=ed"
-    ],
-    "esp32h2": [
-      "espressif:esp32:esp32h2:PartitionScheme=zigbee,ZigbeeMode=ed"
-    ]
-  },
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
+  "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json
@@ -1,16 +1,6 @@
 {
-  "fqbn": {
-    "esp32c6": [
-      "espressif:esp32:esp32c6:PartitionScheme=zigbee,ZigbeeMode=ed"
-    ],
-    "esp32h2": [
-      "espressif:esp32:esp32h2:PartitionScheme=zigbee,ZigbeeMode=ed"
-    ]
-  },
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
+  "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }
diff --git a/libraries/Zigbee/examples/Zigbee_Thermostat/ci.json b/libraries/Zigbee/examples/Zigbee_Thermostat/ci.json
@@ -1,4 +1,5 @@
 {
+  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
   "fqbn": {
     "esp32c6": [
       "espressif:esp32:esp32c6:PartitionScheme=zigbee_zczr,ZigbeeMode=zczr"
@@ -7,10 +8,7 @@
       "espressif:esp32:esp32h2:PartitionScheme=zigbee_zczr,ZigbeeMode=zczr"
     ]
   },
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32s2": false,
-    "esp32s3": false
-  }
+  "requires": [
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",`
`2`	`3`	`"fqbn": {`
`3`	`4`	`"esp32c6": [`
`4`	`5`	`"espressif:esp32:esp32c6:PartitionScheme=zigbee_zczr,ZigbeeMode=zczr"`
`@@ -7,10 +8,7 @@`
`7`	`8`	`"espressif:esp32:esp32h2:PartitionScheme=zigbee_zczr,ZigbeeMode=zczr"`
`8`	`9`	`]`
`9`	`10`	`},`
`10`		`- "targets": {`
`11`		`- "esp32": false,`
`12`		`- "esp32c3": false,`
`13`		`- "esp32s2": false,`
`14`		`- "esp32s3": false`
`15`		`- }`
	`11`	`+ "requires": [`
	`12`	`+ "CONFIG_SOC_IEEE802154_SUPPORTED=y"`
	`13`	`+ ]`
`16`	`14`	`}`