Run ZAP regen script

lazarkov · Jan 24, 2024 · 3bb2e83 · 3bb2e83
1 parent ce984fa
commit 3bb2e83
Show file tree

Hide file tree

Showing 587 changed files with 130,807 additions and 111,379 deletions.
diff --git a/docs/clusters.md b/docs/clusters.md
@@ -79,6 +79,7 @@ Generally regenerate using one of:
 |        129 |       0x81 | ValveConfigurationAndControl                            |
 |        145 |       0x91 | ElectricalEnergyMeasurement                             |
 |        150 |       0x96 | DemandResponseLoadControl                               |
+|        151 |       0x97 | Messages                                                |
 |        152 |       0x98 | DeviceEnergyManagement                                  |
 |        153 |       0x99 | EnergyEvse                                              |
 |        155 |       0x9B | EnergyPreference                                        |

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -3944,6 +3944,95 @@ provisional cluster ElectricalEnergyMeasurement = 145 {
   readonly attribute int16u clusterRevision = 65533;
 }
 
+/** This cluster provides an interface for passing messages to be presented by a device. */
+provisional cluster Messages = 151 {
+  revision 1;
+
+  enum FutureMessagePreferenceEnum : enum8 {
+    kAllowed = 0;
+    kIncreased = 1;
+    kReduced = 2;
+    kDisallowed = 3;
+    kBanned = 4;
+  }
+
+  enum MessagePriorityEnum : enum8 {
+    kLow = 0;
+    kMedium = 1;
+    kHigh = 2;
+    kCritical = 3;
+  }
+
+  bitmap Feature : bitmap32 {
+    kReceivedConfirmation = 0x1;
+    kConfirmationResponse = 0x2;
+    kConfirmationReply = 0x3;
+    kProtectedMessages = 0x4;
+  }
+
+  bitmap MessageControlBitmap : bitmap32 {
+    kConfirmationRequired = 0x1;
+    kResponseRequired = 0x2;
+    kReplyMessage = 0x3;
+    kMessageConfirmed = 0x4;
+    kMessageProtected = 0x5;
+  }
+
+  struct MessageResponseOptionStruct {
+    int32u messageResponseID = 0;
+    char_string<32> label = 1;
+  }
+
+  fabric_scoped struct MessageStruct {
+    octet_string<16> messageID = 0;
+    MessagePriorityEnum priority = 1;
+    MessageControlBitmap messageControl = 2;
+    nullable epoch_s startTime = 3;
+    nullable int16u duration = 4;
+    char_string<256> messageText = 5;
+    optional MessageResponseOptionStruct responses[] = 6;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event MessageQueued = 0 {
+    octet_string messageID = 0;
+  }
+
+  info event MessagePresented = 1 {
+    octet_string messageID = 0;
+  }
+
+  info event MessageComplete = 2 {
+    octet_string messageID = 0;
+    epoch_s timestamp = 2;
+    nullable int32u responseID = 3;
+    nullable long_char_string reply = 4;
+    nullable FutureMessagePreferenceEnum futureMessagesPref = 5;
+  }
+
+  readonly attribute MessageStruct messages[] = 0;
+  readonly attribute octet_string activeMessageIDs[] = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct PresentMessagesRequestRequest {
+    octet_string messages[] = 0;
+  }
+
+  request struct CancelMessagesRequestRequest {
+    octet_string messages[] = 0;
+  }
+
+  /** Command for requesting messages be presented */
+  command PresentMessagesRequest(PresentMessagesRequestRequest): DefaultSuccess = 0;
+  /** Command for cancelling message present requests */
+  command CancelMessagesRequest(CancelMessagesRequestRequest): DefaultSuccess = 1;
+}
+
 /** This cluster allows a client to manage the power draw of a device. An example of such a client could be an Energy Management System (EMS) which controls an Energy Smart Appliance (ESA). */
 provisional cluster DeviceEnergyManagement = 152 {
   revision 3;
@@ -8104,6 +8193,17 @@ endpoint 1 {
     ram      attribute clusterRevision default = 1;
   }
 
+  server cluster Messages {
+    callback attribute messages;
+    callback attribute activeMessageIDs;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 1;
+  }
+
   server cluster DeviceEnergyManagement {
     emits event PowerAdjustStart;
     emits event PowerAdjustEnd;

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -4372,6 +4372,95 @@ provisional cluster DemandResponseLoadControl = 150 {
   command ClearLoadControlEventsRequest(): DefaultSuccess = 4;
 }
 
+/** This cluster provides an interface for passing messages to be presented by a device. */
+provisional cluster Messages = 151 {
+  revision 1;
+
+  enum FutureMessagePreferenceEnum : enum8 {
+    kAllowed = 0;
+    kIncreased = 1;
+    kReduced = 2;
+    kDisallowed = 3;
+    kBanned = 4;
+  }
+
+  enum MessagePriorityEnum : enum8 {
+    kLow = 0;
+    kMedium = 1;
+    kHigh = 2;
+    kCritical = 3;
+  }
+
+  bitmap Feature : bitmap32 {
+    kReceivedConfirmation = 0x1;
+    kConfirmationResponse = 0x2;
+    kConfirmationReply = 0x3;
+    kProtectedMessages = 0x4;
+  }
+
+  bitmap MessageControlBitmap : bitmap32 {
+    kConfirmationRequired = 0x1;
+    kResponseRequired = 0x2;
+    kReplyMessage = 0x3;
+    kMessageConfirmed = 0x4;
+    kMessageProtected = 0x5;
+  }
+
+  struct MessageResponseOptionStruct {
+    int32u messageResponseID = 0;
+    char_string<32> label = 1;
+  }
+
+  fabric_scoped struct MessageStruct {
+    octet_string<16> messageID = 0;
+    MessagePriorityEnum priority = 1;
+    MessageControlBitmap messageControl = 2;
+    nullable epoch_s startTime = 3;
+    nullable int16u duration = 4;
+    char_string<256> messageText = 5;
+    optional MessageResponseOptionStruct responses[] = 6;
+    fabric_idx fabricIndex = 254;
+  }
+
+  info event MessageQueued = 0 {
+    octet_string messageID = 0;
+  }
+
+  info event MessagePresented = 1 {
+    octet_string messageID = 0;
+  }
+
+  info event MessageComplete = 2 {
+    octet_string messageID = 0;
+    epoch_s timestamp = 2;
+    nullable int32u responseID = 3;
+    nullable long_char_string reply = 4;
+    nullable FutureMessagePreferenceEnum futureMessagesPref = 5;
+  }
+
+  readonly attribute MessageStruct messages[] = 0;
+  readonly attribute octet_string activeMessageIDs[] = 1;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct PresentMessagesRequestRequest {
+    octet_string messages[] = 0;
+  }
+
+  request struct CancelMessagesRequestRequest {
+    octet_string messages[] = 0;
+  }
+
+  /** Command for requesting messages be presented */
+  command PresentMessagesRequest(PresentMessagesRequestRequest): DefaultSuccess = 0;
+  /** Command for cancelling message present requests */
+  command CancelMessagesRequest(CancelMessagesRequestRequest): DefaultSuccess = 1;
+}
+
 /** This cluster allows a client to manage the power draw of a device. An example of such a client could be an Energy Management System (EMS) which controls an Energy Smart Appliance (ESA). */
 provisional cluster DeviceEnergyManagement = 152 {
   revision 3;
@@ -4895,103 +4984,6 @@ provisional cluster DeviceEnergyManagementMode = 159 {
   command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
 }
 
-/** An interface for passing messages to be presented by a device. */
-provisional client cluster Messages = 151 {
-  enum FutureMessagePreferenceEnum : enum8 {
-    kAllowed = 0;
-    kIncreased = 1;
-    kReduced = 2;
-    kDisallowed = 3;
-    kBanned = 4;
-  }
-
-  enum MessagePriorityEnum : enum8 {
-    kLow = 0;
-    kMedium = 1;
-    kHigh = 2;
-    kCritical = 3;
-  }
-
-  bitmap Feature : bitmap32 {
-    kConfirmation = 0x1;
-    kConfirmationResponse = 0x2;
-    kConfirmationReply = 0x4;
-    kProtectedMessages = 0x8;
-  }
-
-  bitmap MessageControl : bitmap16 {
-    kConfirmationRequired = 0x1;
-    kResponseRequired = 0x2;
-    kReplyMessage = 0x4;
-    kMessageConfirmed = 0x8;
-    kMessageProtected = 0x10;
-  }
-
-  struct MessageResponseOptionStruct {
-    int32u messageResponseID = 0;
-    char_string<32> label = 1;
-  }
-
-  struct PresentMessageRequestStruct {
-    octet_string<16> messageID = 0;
-    MessagePriorityEnum priority = 1;
-    MessageControl messageControl = 2;
-    epoch_s startTime = 3;
-    int16u duration = 4;
-    long_char_string<512> messageText = 5;
-    MessageResponseOptionStruct responses[] = 6;
-  }
-
-  fabric_scoped struct MessageStruct {
-    octet_string<16> messageID = 0;
-    MessagePriorityEnum priority = 1;
-    MessageControl messageControl = 2;
-    epoch_s startTime = 3;
-    int16u duration = 4;
-    long_char_string<512> messageText = 5;
-    MessageResponseOptionStruct responses[] = 6;
-    fabric_idx fabricIndex = 254;
-  }
-
-  info event MessageQueued = 0 {
-    octet_string messageID = 0;
-  }
-
-  info event MessagePresented = 1 {
-    octet_string messageID = 0;
-  }
-
-  info event MessageComplete = 2 {
-    octet_string messageID = 0;
-    epoch_s timestamp = 2;
-    nullable int32u responseID = 3;
-    nullable long_char_string reply = 4;
-    nullable FutureMessagePreferenceEnum futureMessagesPref = 5;
-  }
-
-  readonly attribute MessageStruct messages[] = 0;
-  readonly attribute octet_string<16> activeMessageIDs = 1;
-  readonly attribute command_id generatedCommandList[] = 65528;
-  readonly attribute command_id acceptedCommandList[] = 65529;
-  readonly attribute event_id eventList[] = 65530;
-  readonly attribute attrib_id attributeList[] = 65531;
-  readonly attribute bitmap32 featureMap = 65532;
-  readonly attribute int16u clusterRevision = 65533;
-
-  request struct PresentMessagesRequestRequest {
-    PresentMessageRequestStruct messages[] = 0;
-  }
-
-  request struct CancelMessagesRequestRequest {
-    octet_string messages[] = 0;
-  }
-
-  /** Command for requesting messages be presented */
-  command PresentMessagesRequest(PresentMessagesRequestRequest): DefaultSuccess = 0;
-  /** Command for cancelling message present requests */
-  command CancelMessagesRequest(CancelMessagesRequestRequest): DefaultSuccess = 1;
-}
-
 /** An interface to a generic way to secure a door */
 cluster DoorLock = 257 {
   revision 7;