diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 1674887eb64a04..90ffb595d8ae6e 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -4374,7 +4374,7 @@ provisional cluster DemandResponseLoadControl = 150 { /** This cluster provides an interface for passing messages to be presented by a device. */ provisional cluster Messages = 151 { - revision 1; + revision 3; enum FutureMessagePreferenceEnum : enum8 { kAllowed = 0; @@ -4394,8 +4394,8 @@ provisional cluster Messages = 151 { bitmap Feature : bitmap32 { kReceivedConfirmation = 0x1; kConfirmationResponse = 0x2; - kConfirmationReply = 0x3; - kProtectedMessages = 0x4; + kConfirmationReply = 0x4; + kProtectedMessages = 0x8; } bitmap MessageControlBitmap : bitmap32 { @@ -4456,9 +4456,9 @@ provisional cluster Messages = 151 { } /** Command for requesting messages be presented */ - command PresentMessagesRequest(PresentMessagesRequestRequest): DefaultSuccess = 0; + fabric command PresentMessagesRequest(PresentMessagesRequestRequest): DefaultSuccess = 0; /** Command for cancelling message present requests */ - command CancelMessagesRequest(CancelMessagesRequestRequest): DefaultSuccess = 1; + fabric 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). */ diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index ec51fb50c97a43..4af98fec5655a6 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -23210,8 +23210,8 @@ class Bitmaps: class Feature(IntFlag): kReceivedConfirmation = 0x1 kConfirmationResponse = 0x2 - kConfirmationReply = 0x3 - kProtectedMessages = 0x4 + kConfirmationReply = 0x4 + kProtectedMessages = 0x8 class MessageControlBitmap(IntFlag): kConfirmationRequired = 0x1 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index feebe551e0f075..3e751327913513 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -17634,8 +17634,8 @@ typedef NS_ENUM(uint8_t, MTRMessagesMessagePriority) { typedef NS_OPTIONS(uint32_t, MTRMessagesFeature) { MTRMessagesFeatureReceivedConfirmation MTR_PROVISIONALLY_AVAILABLE = 0x1, MTRMessagesFeatureConfirmationResponse MTR_PROVISIONALLY_AVAILABLE = 0x2, - MTRMessagesFeatureConfirmationReply MTR_PROVISIONALLY_AVAILABLE = 0x3, - MTRMessagesFeatureProtectedMessages MTR_PROVISIONALLY_AVAILABLE = 0x4, + MTRMessagesFeatureConfirmationReply MTR_PROVISIONALLY_AVAILABLE = 0x4, + MTRMessagesFeatureProtectedMessages MTR_PROVISIONALLY_AVAILABLE = 0x8, } MTR_PROVISIONALLY_AVAILABLE; typedef NS_OPTIONS(uint32_t, MTRMessagesMessageControlBitmap) { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 2c9dc3658a6051..6ccd23146057e1 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -2405,8 +2405,8 @@ enum class Feature : uint32_t { kReceivedConfirmation = 0x1, kConfirmationResponse = 0x2, - kConfirmationReply = 0x3, - kProtectedMessages = 0x4, + kConfirmationReply = 0x4, + kProtectedMessages = 0x8, }; // Bitmap for MessageControlBitmap diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 3277d859964b4f..58eb01287c7c43 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -29895,6 +29895,10 @@ bool CommandIsFabricScoped(ClusterId aCluster, CommandId aCommand) case Clusters::Messages::Id: { switch (aCommand) { + case Clusters::Messages::Commands::PresentMessagesRequest::Id: + return true; + case Clusters::Messages::Commands::CancelMessagesRequest::Id: + return true; default: return false; }