fix(matter): revert ci and guard changes

Author: SuGlider

libraries/Matter/examples/MatterCommissionTest/MatterCommissionTest.ino

@@ -1,10 +1,6 @@
-//#include <sdkconfig.h>
-//#ifdef CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
-#include <Arduino.h>
-#include <WiFi.h>
-
 // Matter Manager
 #include <Matter.h>
+#include <WiFi.h>
 
 // List of Matter Endpoints for this Node
 // On/Off Light Endpoint
@@ -66,9 +62,4 @@ void loop() {
   delay(30000);
   Matter.decommission();
   Serial.println("Matter Node is decommissioned. Commsssioning widget shall start over.");
-}
-
-//#else
-//void setup() {}
-//void loop() {}
-//#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */
+}

libraries/Matter/examples/MatterCommissionTest/ci.json

@@ -1,24 +1,8 @@
 {
-    "fqbn": {
-      "esp32s3": [
-        "espressif:esp32:esp32s3:PartitionScheme=huge_app,FlashMode=qio"
-      ],
-      "esp32s2": [
-        "espressif:esp32:esp32s2:PartitionScheme=huge_app,FlashMode=qio"
-      ],
-      "esp32": [
-        "espressif:esp32:esp32:PartitionScheme=huge_app,FlashMode=qio"
-      ],
-      "esp32c3": [
-        "espressif:esp32:esp32c3:PartitionScheme=huge_app,FlashMode=qio"
-      ],
-      "esp32c6": [
-        "espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=qio"
-      ]
-    },
-    "requires": [
-      "CONFIG_SOC_WIFI_SUPPORTED=y",
-      "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-    ]
+  "fqbn_append": "PartitionScheme=huge_app",
+  "requires": [
+    "CONFIG_SOC_WIFI_SUPPORTED=y",
+    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
+  ]
 }
 

libraries/Matter/examples/MatterComposedLights/MatterComposedLights.ino

@@ -1,10 +1,6 @@
-#include <sdkconfig.h>
-#ifdef CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
-#include <Arduino.h>
-#include <WiFi.h>
-
 // Matter Manager
 #include <Matter.h>
+#include <WiFi.h>
 
 // List of Matter Endpoints for this Node
 // There will be 3 On/Off Light Endpoints in the same Node
@@ -95,9 +91,4 @@ void loop() {
   Serial.printf("Matter Light #2 is %s\r\n", OnOffLight2.getOnOff() ? "ON" : "OFF");
   Serial.printf("Matter Light #3 is %s\r\n", OnOffLight3.getOnOff() ? "ON" : "OFF");
   delay(3000);
-}
-
-#else
-void setup() {}
-void loop() {}
-#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */
+}

libraries/Matter/examples/MatterComposedLights/ci.json

@@ -4,5 +4,4 @@
       "CONFIG_SOC_WIFI_SUPPORTED=y",
       "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
     ]
-}
-  
+}  

libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino

@@ -1,10 +1,6 @@
-#include <sdkconfig.h>
-#ifdef CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
-#include <Arduino.h>
-#include <WiFi.h>
-
 // Matter Manager
 #include <Matter.h>
+#include <WiFi.h>
 
 // List of Matter Endpoints for this Node
 // On/Off Light Endpoint
@@ -102,9 +98,4 @@ void loop() {
     lastMillis = millis();
     OnOffLight.toggle();  // Matter Controller also can see the change
   }
-}
-
-#else
-void setup() {}
-void loop() {}
-#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */
+}

libraries/Matter/examples/MatterOnOffLight/ci.json

@@ -4,5 +4,4 @@
       "CONFIG_SOC_WIFI_SUPPORTED=y",
       "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
     ]
-}
-  
+}