fix(matter): add correct guard for ci

Author: SuGlider

libraries/Matter/src/Matter.cpp

@@ -1,7 +1,7 @@
-#include <Matter.h>
-#if DEVICE_HAS_MATTER
+#include <sdkconfig.h>
+#ifdef CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
 
-#include <Arduino.h>
+#include <Matter.h>
 #include <app/server/Server.h>
 #include "MatterEndPoint.h"
 
@@ -156,4 +156,4 @@ void ArduinoMatter::decommission() {
 // Global Matter Object
 ArduinoMatter Matter;
 
-#endif /* DEVICE_HAS_MATTER */
+#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

libraries/Matter/src/Matter.h

@@ -1,13 +1,9 @@
 #pragma once
+#include <sdkconfig.h>
+#ifdef CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
+
 #include <Arduino.h>
 #include <esp_matter.h>
-#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION || CHIP_DEVICE_CONFIG_ENABLE_THREAD
-#define DEVICE_HAS_MATTER 1
-#else
-#define DEVICE_HAS_MATTER 0
-#endif
-
-#if DEVICE_HAS_MATTER
 
 using namespace esp_matter;
 
@@ -36,4 +32,4 @@ class ArduinoMatter {
 
 extern ArduinoMatter Matter;
 
-#endif /* DEVICE_HAS_MATTER */
+#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

libraries/Matter/src/MatterEndPoint.h

@@ -1,8 +1,8 @@
 #pragma once
+#include <sdkconfig.h>
+#ifdef CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
 
 #include <Matter.h>
-#if DEVICE_HAS_MATTER
-
 #include <functional>
 
 // Matter Endpoint Base Class. Controls the endpoint ID and allows the child class to overwrite attribute change call
@@ -20,4 +20,4 @@ class MatterEndPoint {
   protected:
     uint16_t endpoint_id = 0;
 };
-#endif /* DEVICE_HAS_MATTER */
+#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

libraries/Matter/src/MatterOnOffLight.cpp

@@ -1,7 +1,7 @@
-#include <Matter.h>
-#if DEVICE_HAS_MATTER
+#include <sdkconfig.h>
+#ifdef CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
 
-#include <Arduino.h>
+#include <Matter.h>
 #include <app/server/Server.h>
 #include <MatterOnOffLight.h>
 
@@ -105,4 +105,4 @@ MatterOnOffLight::operator bool() {
 void MatterOnOffLight::operator=(bool newState) {
   setOnOff(newState);
 }
-#endif /* DEVICE_HAS_MATTER */
+#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */

libraries/Matter/src/MatterOnOffLight.h

@@ -1,8 +1,8 @@
 #pragma once
+#include <sdkconfig.h>
+#ifdef CONFIG_ESP_MATTER_ENABLE_DATA_MODEL
 
 #include <Matter.h>
-#if DEVICE_HAS_MATTER
-
 #include <MatterEndPoint.h>
 
 class MatterOnOffLight : public MatterEndPoint {
@@ -31,4 +31,4 @@ class MatterOnOffLight : public MatterEndPoint {
     bool state = false;   // default initial state is off, but it can be changed by begin(bool)
     EndPointCB _onChangeCB = NULL;
 };
-#endif /* DEVICE_HAS_MATTER */
+#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */