feat(matter): change to global event type

Author: SuGlider

libraries/Matter/examples/MatterEvents/MatterEvents.ino

@@ -25,17 +25,17 @@ const char *password = "your-password";  // Change this to your WiFi password
 MatterOnOffLight OnOffLight;
 
 // This function is called when a Matter event occurs
-void onMatterEvent(ArduinoMatter::matterEvent_t eventType, const chip::DeviceLayer::ChipDeviceEvent *eventInfo) {
+void onMatterEvent(matterEvent_t eventType, const chip::DeviceLayer::ChipDeviceEvent *eventInfo) {
   // Print the event type to Serial
   Serial.print("===> Got a Matter Event: ");
   switch (eventType) {
-    case ArduinoMatter::MATTER_WIFI_CONNECTIVITY_CHANGE:
+    case MATTER_WIFI_CONNECTIVITY_CHANGE:
       Serial.println("WiFi Connectivity Change");
       break;
-    case ArduinoMatter::MATTER_THREAD_CONNECTIVITY_CHANGE:
+    case MATTER_THREAD_CONNECTIVITY_CHANGE:
       Serial.println("Thread Connectivity Change");
       break;
-    case ArduinoMatter::MATTER_INTERNET_CONNECTIVITY_CHANGE: {
+    case MATTER_INTERNET_CONNECTIVITY_CHANGE: {
         bool newIPAddress = false;
         Serial.print("Internet Connectivity Change :: ");
         if (eventInfo->InternetConnectivityChange.IPv4 != chip::DeviceLayer::ConnectivityChange::kConnectivity_NoChange) {
@@ -77,40 +77,40 @@ void onMatterEvent(ArduinoMatter::matterEvent_t eventType, const chip::DeviceLay
         }
         break;
       }
-    case ArduinoMatter::MATTER_SERVICE_CONNECTIVITY_CHANGE:
+    case MATTER_SERVICE_CONNECTIVITY_CHANGE:
       Serial.println("Service Connectivity Change");
       break;
-    case ArduinoMatter::MATTER_SERVICE_PROVISIONING_CHANGE:
+    case MATTER_SERVICE_PROVISIONING_CHANGE:
       Serial.println("Service Provisioning Change");
       break;
-    case ArduinoMatter::MATTER_TIME_SYNC_CHANGE:
+    case MATTER_TIME_SYNC_CHANGE:
       Serial.println("Time Sync Change");
       break;
-    case ArduinoMatter::MATTER_CHIPOBLE_CONNECTION_ESTABLISHED:
+    case MATTER_CHIPOBLE_CONNECTION_ESTABLISHED:
       Serial.println("CHIPoBLE Connection Established");
       break;
-    case ArduinoMatter::MATTER_CHIPOBLE_CONNECTION_CLOSED:
+    case MATTER_CHIPOBLE_CONNECTION_CLOSED:
       Serial.println("CHIPoBLE Connection Closed");
       break;
-    case ArduinoMatter::MATTER_CLOSE_ALL_BLE_CONNECTIONS:
+    case MATTER_CLOSE_ALL_BLE_CONNECTIONS:
       Serial.println("Close All BLE Connections");
       break;
-    case ArduinoMatter::MATTER_WIFI_DEVICE_AVAILABLE:
+    case MATTER_WIFI_DEVICE_AVAILABLE:
       Serial.println("WiFi Device Available");
       break;
-    case ArduinoMatter::MATTER_OPERATIONAL_NETWORK_STARTED:
+    case MATTER_OPERATIONAL_NETWORK_STARTED:
       Serial.println("Operational Network Started");
       break;
-    case ArduinoMatter::MATTER_THREAD_STATE_CHANGE:
+    case MATTER_THREAD_STATE_CHANGE:
       Serial.println("Thread State Change");
       break;
-    case ArduinoMatter::MATTER_THREAD_INTERFACE_STATE_CHANGE:
+    case MATTER_THREAD_INTERFACE_STATE_CHANGE:
       Serial.println("Thread Interface State Change");
       break;
-    case ArduinoMatter::MATTER_CHIPOBLE_ADVERTISING_CHANGE:
+    case MATTER_CHIPOBLE_ADVERTISING_CHANGE:
       Serial.println("CHIPoBLE Advertising Change");
       break;
-    case ArduinoMatter::MATTER_INTERFACE_IP_ADDRESS_CHANGED:
+    case MATTER_INTERFACE_IP_ADDRESS_CHANGED:
       switch (eventInfo->InterfaceIpAddressChanged.Type) {
         case chip::DeviceLayer::InterfaceIpChangeType::kIpV4_Assigned:
           Serial.println("IPv4 Address Assigned");
@@ -126,61 +126,61 @@ void onMatterEvent(ArduinoMatter::matterEvent_t eventType, const chip::DeviceLay
           break;
       }
       break;
-    case ArduinoMatter::MATTER_COMMISSIONING_COMPLETE:
+    case MATTER_COMMISSIONING_COMPLETE:
       Serial.println("Commissioning Complete");
       break;
-    case ArduinoMatter::MATTER_FAIL_SAFE_TIMER_EXPIRED:
+    case MATTER_FAIL_SAFE_TIMER_EXPIRED:
       Serial.println("Fail Safe Timer Expired");
       break;
-    case ArduinoMatter::MATTER_OPERATIONAL_NETWORK_ENABLED:
+    case MATTER_OPERATIONAL_NETWORK_ENABLED:
       Serial.println("Operational Network Enabled");
       break;
-    case ArduinoMatter::MATTER_DNSSD_INITIALIZED:
+    case MATTER_DNSSD_INITIALIZED:
       Serial.println("DNS-SD Initialized");
       break;
-    case ArduinoMatter::MATTER_DNSSD_RESTART_NEEDED:
+    case MATTER_DNSSD_RESTART_NEEDED:
       Serial.println("DNS-SD Restart Needed");
       break;
-    case ArduinoMatter::MATTER_BINDINGS_CHANGED_VIA_CLUSTER:
+    case MATTER_BINDINGS_CHANGED_VIA_CLUSTER:
       Serial.println("Bindings Changed Via Cluster");
       break;
-    case ArduinoMatter::MATTER_OTA_STATE_CHANGED:
+    case MATTER_OTA_STATE_CHANGED:
       Serial.println("OTA State Changed");
       break;
-    case ArduinoMatter::MATTER_SERVER_READY:
+    case MATTER_SERVER_READY:
       Serial.println("Server Ready");
       break;
-    case ArduinoMatter::MATTER_BLE_DEINITIALIZED:
+    case MATTER_BLE_DEINITIALIZED:
       Serial.println("BLE Deinitialized");
       break;
-    case ArduinoMatter::MATTER_COMMISSIONING_SESSION_STARTED:
+    case MATTER_COMMISSIONING_SESSION_STARTED:
       Serial.println("Commissioning Session Started");
       break;
-    case ArduinoMatter::MATTER_COMMISSIONING_SESSION_STOPPED:
+    case MATTER_COMMISSIONING_SESSION_STOPPED:
       Serial.println("Commissioning Session Stopped");
       break;
-    case ArduinoMatter::MATTER_COMMISSIONING_WINDOW_OPEN:
+    case MATTER_COMMISSIONING_WINDOW_OPEN:
       Serial.println("Commissioning Window Opened");
       break;
-    case ArduinoMatter::MATTER_COMMISSIONING_WINDOW_CLOSED:
+    case MATTER_COMMISSIONING_WINDOW_CLOSED:
       Serial.println("Commissioning Window Closed");
       break;
-    case ArduinoMatter::MATTER_FABRIC_WILL_BE_REMOVED:
+    case MATTER_FABRIC_WILL_BE_REMOVED:
       Serial.println("Fabric Will Be Removed");
       break;
-    case ArduinoMatter::MATTER_FABRIC_REMOVED:
+    case MATTER_FABRIC_REMOVED:
       Serial.println("Fabric Removed");
       break;
-    case ArduinoMatter::MATTER_FABRIC_COMMITTED:
+    case MATTER_FABRIC_COMMITTED:
       Serial.println("Fabric Committed");
       break;
-    case ArduinoMatter::MATTER_FABRIC_UPDATED:
+    case MATTER_FABRIC_UPDATED:
       Serial.println("Fabric Updated");
       break;
-    case ArduinoMatter::MATTER_ESP32_SPECIFIC_EVENT:
+    case MATTER_ESP32_SPECIFIC_EVENT:
       Serial.println("Sending ESP32 Platform Specific Events");
       break;
-    case ArduinoMatter::MATTER_ESP32_PUBLIC_SPECIFIC_EVENT:
+    case MATTER_ESP32_PUBLIC_SPECIFIC_EVENT:
       Serial.println("Next Event Has Populated EventInfo");
       break;
     default:

libraries/Matter/src/Matter.cpp

@@ -125,7 +125,7 @@ static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg) {
   }
   // Check if the user-defined callback is set
   if (ArduinoMatter::_matterEventCB != nullptr) {
-    ArduinoMatter::_matterEventCB(static_cast<ArduinoMatter::matterEvent_t>(event->Type), event);
+    ArduinoMatter::_matterEventCB(static_cast<matterEvent_t>(event->Type), event);
   }
 }
 

libraries/Matter/src/Matter.h

@@ -34,10 +34,6 @@
 #include <MatterEndpoints/MatterOnOffPlugin.h>
 #include <MatterEndpoints/MatterThermostat.h>
 
-using namespace esp_matter;
-
-class ArduinoMatter {
-public:
   // Matter Event types used when there is a user callback for Matter Events
   enum matterEvent_t {
     // Starting from 0x8000, these events are public and can be used by applications.
@@ -155,6 +151,10 @@ class ArduinoMatter {
     MATTER_ESP32_PUBLIC_SPECIFIC_EVENT = (uint16_t) chip::DeviceLayer::DeviceEventType::kRange_PublicPlatformSpecific, // ESPSystemEvent
   };
 
+using namespace esp_matter;
+
+class ArduinoMatter {
+public:
   // Matter Event Callback type
   using matterEventCB = std::function<void(matterEvent_t, const chip::DeviceLayer::ChipDeviceEvent*)>;
   // Matter Event Callback