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 index 34c5d04bbc92a8..c16b9b9557cace 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -3648,7 +3648,7 @@ cluster SmokeCoAlarm = 92 { /** Attributes and commands for configuring the Dishwasher alarm. */ cluster DishwasherAlarm = 93 { - revision 1; // NOTE: Default/not specifically set + revision 1; bitmap AlarmBitmap : bitmap32 { kInflowError = 0x1; @@ -3664,10 +3664,10 @@ cluster DishwasherAlarm = 93 { } info event Notify = 0 { - AlarmBitmap active = 0; - AlarmBitmap inactive = 1; - AlarmBitmap state = 2; - AlarmBitmap mask = 3; + AlarmBitmap active = 1; + AlarmBitmap inactive = 2; + AlarmBitmap state = 3; + AlarmBitmap mask = 4; } readonly attribute AlarmBitmap mask = 0; @@ -3689,9 +3689,9 @@ cluster DishwasherAlarm = 93 { AlarmBitmap mask = 0; } - /** Reset alarm */ + /** This command resets active and latched alarms (if possible). */ command Reset(ResetRequest): DefaultSuccess = 0; - /** Modify enabled alarms */ + /** This command allows a client to request that an alarm be enabled or suppressed at the server. */ command ModifyEnabledAlarms(ModifyEnabledAlarmsRequest): DefaultSuccess = 1; } diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter index 40b1d2e60444d7..b0c86b26be740d 100644 --- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter +++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.matter @@ -1512,7 +1512,7 @@ cluster DishwasherMode = 89 { /** Attributes and commands for configuring the Dishwasher alarm. */ cluster DishwasherAlarm = 93 { - revision 1; // NOTE: Default/not specifically set + revision 1; bitmap AlarmBitmap : bitmap32 { kInflowError = 0x1; @@ -1528,10 +1528,10 @@ cluster DishwasherAlarm = 93 { } info event Notify = 0 { - AlarmBitmap active = 0; - AlarmBitmap inactive = 1; - AlarmBitmap state = 2; - AlarmBitmap mask = 3; + AlarmBitmap active = 1; + AlarmBitmap inactive = 2; + AlarmBitmap state = 3; + AlarmBitmap mask = 4; } readonly attribute AlarmBitmap mask = 0; @@ -1553,9 +1553,9 @@ cluster DishwasherAlarm = 93 { AlarmBitmap mask = 0; } - /** Reset alarm */ + /** This command resets active and latched alarms (if possible). */ command Reset(ResetRequest): DefaultSuccess = 0; - /** Modify enabled alarms */ + /** This command allows a client to request that an alarm be enabled or suppressed at the server. */ command ModifyEnabledAlarms(ModifyEnabledAlarmsRequest): DefaultSuccess = 1; } diff --git a/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml index f460f42a1971ae..1dd54b3369b44c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml @@ -1,6 +1,6 @@ - + + - - - - - - - - + + + + + + + - + Dishwasher Alarm Appliances Attributes and commands for configuring the Dishwasher alarm. 0x005D DISHWASHER_ALARM_CLUSTER - true true - + - - - - - + Mask + + Latch - - - - - - - + State + Supported - Reset alarm - + This command resets active and latched alarms (if possible). + - Modify enabled alarms - + This command allows a client to request that an alarm be enabled or suppressed at the server. + - - Notify - - - - - + + This event SHALL be generated when one or more alarms change state, and SHALL have these fields: + + + + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index a707dee5fe7f9b..a0175d71523970 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3866,7 +3866,7 @@ cluster SmokeCoAlarm = 92 { /** Attributes and commands for configuring the Dishwasher alarm. */ cluster DishwasherAlarm = 93 { - revision 1; // NOTE: Default/not specifically set + revision 1; bitmap AlarmBitmap : bitmap32 { kInflowError = 0x1; @@ -3882,10 +3882,10 @@ cluster DishwasherAlarm = 93 { } info event Notify = 0 { - AlarmBitmap active = 0; - AlarmBitmap inactive = 1; - AlarmBitmap state = 2; - AlarmBitmap mask = 3; + AlarmBitmap active = 1; + AlarmBitmap inactive = 2; + AlarmBitmap state = 3; + AlarmBitmap mask = 4; } readonly attribute AlarmBitmap mask = 0; @@ -3907,9 +3907,9 @@ cluster DishwasherAlarm = 93 { AlarmBitmap mask = 0; } - /** Reset alarm */ + /** This command resets active and latched alarms (if possible). */ command Reset(ResetRequest): DefaultSuccess = 0; - /** Modify enabled alarms */ + /** This command allows a client to request that an alarm be enabled or suppressed at the server. */ command ModifyEnabledAlarms(ModifyEnabledAlarmsRequest): DefaultSuccess = 1; } diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index b5f3a3bd560926..e7ab5a54ea27b8 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -18493,10 +18493,10 @@ def event_id(cls) -> int: def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="active", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="inactive", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="state", Tag=2, Type=uint), - ClusterObjectFieldDescriptor(Label="mask", Tag=3, Type=uint), + ClusterObjectFieldDescriptor(Label="active", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="inactive", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="state", Tag=3, Type=uint), + ClusterObjectFieldDescriptor(Label="mask", Tag=4, Type=uint), ]) active: uint = 0 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index f4d3255dd8cb8f..c4082ce88015c1 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -5578,13 +5578,13 @@ MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4)) /** * Command Reset * - * Reset alarm + * This command resets active and latched alarms (if possible). */ - (void)resetWithParams:(MTRDishwasherAlarmClusterResetParams *)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4)); /** * Command ModifyEnabledAlarms * - * Modify enabled alarms + * This command allows a client to request that an alarm be enabled or suppressed at the server. */ - (void)modifyEnabledAlarmsWithParams:(MTRDishwasherAlarmClusterModifyEnabledAlarmsParams *)params completion:(MTRStatusCompletion)completion MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4)); diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 09167426d29f51..3372ab38f06815 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -17181,10 +17181,10 @@ static constexpr PriorityLevel kPriorityLevel = PriorityLevel::Info; enum class Fields : uint8_t { - kActive = 0, - kInactive = 1, - kState = 2, - kMask = 3, + kActive = 1, + kInactive = 2, + kState = 3, + kMask = 4, }; struct Type