Add ids/Events.h (#13689)

* Add ids/Events.h

* Update generated code

src/app/common/templates/templates.json

@@ -104,6 +104,11 @@
             "name": "Commands Ids header",
             "output": "ids/Commands.h"
         },
+        {
+            "path": "../../zap-templates/templates/app/ids/Events.zapt",
+            "name": "Events Ids header",
+            "output": "ids/Events.h"
+        },
         {
             "path": "../../zap-templates/templates/app/cluster-objects.zapt",
             "name": "Cluster objects header for Interaction Model",

src/app/zap-templates/templates/app/cluster-objects.zapt

@@ -12,9 +12,10 @@
 #include <lib/support/BitFlags.h>
 #include <protocols/interaction_model/Constants.h>
 #include <app-common/zap-generated/enums.h>
-#include <app-common/zap-generated/ids/Commands.h>
-#include <app-common/zap-generated/ids/Clusters.h>
 #include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app-common/zap-generated/ids/Commands.h>
+#include <app-common/zap-generated/ids/Events.h>
 
 namespace chip {
 namespace app {
@@ -187,7 +188,6 @@ namespace Events {
 {{/first}}
 namespace {{asUpperCamelCase name}} {
 static constexpr PriorityLevel kPriorityLevel = PriorityLevel::{{asUpperCamelCase priority}};
-static constexpr EventId kEventId = {{asMEI manufacturerCode code}};
 
 enum class Fields {
     {{#zcl_event_fields}}
@@ -199,7 +199,7 @@ struct Type
 {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::{{asUpperCamelCase name}}::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::{{asUpperCamelCase parent.name}}::Id; }
 
     {{#zcl_event_fields}}
@@ -212,7 +212,7 @@ public:
 struct DecodableType {
 public:
     static constexpr PriorityLevel GetPriorityLevel() { return kPriorityLevel; }
-    static constexpr EventId GetEventId() { return kEventId; }
+    static constexpr EventId GetEventId() { return Events::{{asUpperCamelCase name}}::Id; }
     static constexpr ClusterId GetClusterId() { return Clusters::{{asUpperCamelCase parent.name}}::Id; }
 
     {{#zcl_event_fields}}

src/app/zap-templates/templates/app/ids/Events.zapt

@@ -0,0 +1,32 @@
+{{> header}}
+
+#pragma once
+
+#include <app/util/basic-types.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+
+{{#zcl_clusters}}
+{{#zcl_events}}
+{{#first}}
+namespace {{asUpperCamelCase parent.label}} {
+namespace Events {
+
+{{/first}}
+namespace {{asUpperCamelCase name}} {
+static constexpr EventId Id = {{asMEI manufacturerCode code}};
+} // namespace {{asUpperCamelCase name}}
+
+{{#last}}
+} // namespace Events
+} // namespace {{asUpperCamelCase parent.label}}
+
+{{/last}}
+{{/zcl_events}}
+{{/zcl_clusters}}
+
+} // namespace Clusters
+} // namespace app
+} // namespace chip

src/platform/Linux/PlatformManagerImpl.cpp

@@ -25,6 +25,7 @@
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 #include <app-common/zap-generated/enums.h>
+#include <app-common/zap-generated/ids/Events.h>
 #include <lib/support/CHIPMem.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/DeviceControlServer.h>
@@ -88,19 +89,19 @@ void SignalHandler(int signum)
         err = CHIP_ERROR_REBOOT_SIGNAL_RECEIVED;
         break;
     case SIGTRAP:
-        PlatformMgrImpl().HandleSoftwareFault(SoftwareDiagnostics::Events::SoftwareFault::kEventId);
+        PlatformMgrImpl().HandleSoftwareFault(SoftwareDiagnostics::Events::SoftwareFault::Id);
         break;
     case SIGILL:
-        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::HardwareFaultChange::kEventId);
+        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::HardwareFaultChange::Id);
         break;
     case SIGALRM:
-        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::RadioFaultChange::kEventId);
+        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::RadioFaultChange::Id);
         break;
     case SIGVTALRM:
-        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::NetworkFaultChange::kEventId);
+        PlatformMgrImpl().HandleGeneralFault(GeneralDiagnostics::Events::NetworkFaultChange::Id);
         break;
     case SIGIO:
-        PlatformMgrImpl().HandleSwitchEvent(Switch::Events::SwitchLatched::kEventId);
+        PlatformMgrImpl().HandleSwitchEvent(Switch::Events::SwitchLatched::Id);
         break;
     default:
         break;
@@ -385,7 +386,7 @@ void PlatformManagerImpl::HandleGeneralFault(uint32_t EventId)
         return;
     }
 
-    if (EventId == GeneralDiagnostics::Events::HardwareFaultChange::kEventId)
+    if (EventId == GeneralDiagnostics::Events::HardwareFaultChange::Id)
     {
         GeneralFaults<kMaxHardwareFaults> previous;
         GeneralFaults<kMaxHardwareFaults> current;
@@ -402,7 +403,7 @@ void PlatformManagerImpl::HandleGeneralFault(uint32_t EventId)
 #endif
         delegate->OnHardwareFaultsDetected(previous, current);
     }
-    else if (EventId == GeneralDiagnostics::Events::RadioFaultChange::kEventId)
+    else if (EventId == GeneralDiagnostics::Events::RadioFaultChange::Id)
     {
         GeneralFaults<kMaxRadioFaults> previous;
         GeneralFaults<kMaxRadioFaults> current;
@@ -419,7 +420,7 @@ void PlatformManagerImpl::HandleGeneralFault(uint32_t EventId)
 #endif
         delegate->OnRadioFaultsDetected(previous, current);
     }
-    else if (EventId == GeneralDiagnostics::Events::NetworkFaultChange::kEventId)
+    else if (EventId == GeneralDiagnostics::Events::NetworkFaultChange::Id)
     {
         GeneralFaults<kMaxNetworkFaults> previous;
         GeneralFaults<kMaxNetworkFaults> current;
@@ -470,7 +471,7 @@ void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
         return;
     }
 
-    if (EventId == Switch::Events::SwitchLatched::kEventId)
+    if (EventId == Switch::Events::SwitchLatched::Id)
     {
         uint8_t newPosition = 0;
 
@@ -479,7 +480,7 @@ void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
 #endif
         delegate->OnSwitchLatched(newPosition);
     }
-    else if (EventId == Switch::Events::InitialPress::kEventId)
+    else if (EventId == Switch::Events::InitialPress::Id)
     {
         uint8_t newPosition = 0;
 
@@ -488,7 +489,7 @@ void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
 #endif
         delegate->OnInitialPressed(newPosition);
     }
-    else if (EventId == Switch::Events::LongPress::kEventId)
+    else if (EventId == Switch::Events::LongPress::Id)
     {
         uint8_t newPosition = 0;
 
@@ -497,7 +498,7 @@ void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
 #endif
         delegate->OnLongPressed(newPosition);
     }
-    else if (EventId == Switch::Events::ShortRelease::kEventId)
+    else if (EventId == Switch::Events::ShortRelease::Id)
     {
         uint8_t previousPosition = 0;
 
@@ -506,7 +507,7 @@ void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
 #endif
         delegate->OnShortReleased(previousPosition);
     }
-    else if (EventId == Switch::Events::LongRelease::kEventId)
+    else if (EventId == Switch::Events::LongRelease::Id)
     {
         uint8_t previousPosition = 0;
 
@@ -515,7 +516,7 @@ void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
 #endif
         delegate->OnLongReleased(previousPosition);
     }
-    else if (EventId == Switch::Events::MultiPressOngoing::kEventId)
+    else if (EventId == Switch::Events::MultiPressOngoing::Id)
     {
         uint8_t newPosition                   = 0;
         uint8_t currentNumberOfPressesCounted = 0;
@@ -526,7 +527,7 @@ void PlatformManagerImpl::HandleSwitchEvent(uint32_t EventId)
 #endif
         delegate->OnMultiPressOngoing(newPosition, currentNumberOfPressesCounted);
     }
-    else if (EventId == Switch::Events::MultiPressComplete::kEventId)
+    else if (EventId == Switch::Events::MultiPressComplete::Id)
     {
         uint8_t newPosition                 = 0;
         uint8_t totalNumberOfPressesCounted = 0;