From 90c230baed4a9a3b3723ecb55ba95e1df2d62c25 Mon Sep 17 00:00:00 2001 From: Rob Bultman Date: Wed, 22 May 2024 08:58:55 -0400 Subject: [PATCH 1/4] Removed provisional from MWO --- .../all-clusters-common/all-clusters-app.matter | 4 +--- .../zcl/data-model/chip/microwave-oven-control-cluster.xml | 2 +- .../zcl/data-model/chip/microwave-oven-mode-cluster.xml | 2 +- src/controller/data_model/controller-clusters.matter | 5 ++--- 4 files changed, 5 insertions(+), 8 deletions(-) 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 2c54d75c7e6b06..14e8647a33eb6a 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 @@ -3334,7 +3334,7 @@ cluster DishwasherAlarm = 93 { } /** Attributes and commands for selecting a mode from a list of supported options. */ -provisional cluster MicrowaveOvenMode = 94 { +cluster MicrowaveOvenMode = 94 { revision 1; enum ModeTag : enum16 { @@ -9254,5 +9254,3 @@ endpoint 65534 { handle command ReorderNetwork; } } - - diff --git a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml index 5567bc99461893..5578fcb747241d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml @@ -18,7 +18,7 @@ limitations under the License. - + Microwave Oven Control Appliances Attributes and commands for configuring the microwave oven control, and reporting cooking stats. diff --git a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml index b26f022f3cc9b4..3e4e9cfe84d86c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml @@ -23,7 +23,7 @@ limitations under the License. - + General Microwave Oven Mode 0x005E diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 4e99c7ebe5d260..6f6e7e030926f5 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3526,7 +3526,7 @@ cluster DishwasherAlarm = 93 { } /** Attributes and commands for selecting a mode from a list of supported options. */ -provisional cluster MicrowaveOvenMode = 94 { +cluster MicrowaveOvenMode = 94 { revision 1; enum ModeTag : enum16 { @@ -3560,7 +3560,7 @@ provisional cluster MicrowaveOvenMode = 94 { } /** Attributes and commands for configuring the microwave oven control, and reporting cooking stats. */ -provisional cluster MicrowaveOvenControl = 95 { +cluster MicrowaveOvenControl = 95 { revision 1; // NOTE: Default/not specifically set bitmap Feature : bitmap32 { @@ -9410,4 +9410,3 @@ cluster SampleMei = 4294048800 { /** Command that takes two uint8 arguments and returns their sum. */ command AddArguments(AddArgumentsRequest): AddArgumentsResponse = 2; } - From 45a10bed2fb32f5d6676695bc8e5749d0cd98fd2 Mon Sep 17 00:00:00 2001 From: Rob Bultman Date: Wed, 22 May 2024 09:42:34 -0400 Subject: [PATCH 2/4] Commit after regen --- .../microwave-oven-common/microwave-oven-app.matter | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter index 40b3087bb836e3..bc4a43383fa2a9 100644 --- a/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter +++ b/examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter @@ -1012,7 +1012,7 @@ cluster GroupKeyManagement = 63 { } /** Attributes and commands for selecting a mode from a list of supported options. */ -provisional cluster MicrowaveOvenMode = 94 { +cluster MicrowaveOvenMode = 94 { revision 1; enum ModeTag : enum16 { @@ -1046,7 +1046,7 @@ provisional cluster MicrowaveOvenMode = 94 { } /** Attributes and commands for configuring the microwave oven control, and reporting cooking stats. */ -provisional cluster MicrowaveOvenControl = 95 { +cluster MicrowaveOvenControl = 95 { revision 1; // NOTE: Default/not specifically set bitmap Feature : bitmap32 { From a966a28cfd7a03b6e4b720fad2cfcd8ea5684dd7 Mon Sep 17 00:00:00 2001 From: Rob Bultman Date: Wed, 22 May 2024 11:04:54 -0400 Subject: [PATCH 3/4] Commit after regen --- .../all-clusters-common/all-clusters-app.matter | 2 ++ src/controller/data_model/controller-clusters.matter | 1 + 2 files changed, 3 insertions(+) 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 14e8647a33eb6a..bd038a11eab93a 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 @@ -9254,3 +9254,5 @@ endpoint 65534 { handle command ReorderNetwork; } } + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 6f6e7e030926f5..cda97be1817cf8 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -9410,3 +9410,4 @@ cluster SampleMei = 4294048800 { /** Command that takes two uint8 arguments and returns their sum. */ command AddArguments(AddArgumentsRequest): AddArgumentsResponse = 2; } + From a279128940995aee610b498bd5918e179da101bd Mon Sep 17 00:00:00 2001 From: Rob Bultman Date: Fri, 24 May 2024 15:56:24 -0400 Subject: [PATCH 4/4] Make some attributes provisional --- .../zcl/data-model/chip/microwave-oven-control-cluster.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml index 5578fcb747241d..954bd898b6aa00 100644 --- a/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml @@ -47,8 +47,8 @@ limitations under the License. MinPower MaxPower PowerStep - SupportedWatts - SelectedWattIndex + SupportedWatts + SelectedWattIndex WattRating