Remove provisional annotations from derived cluster inherited enum va…

…lues. (#36819) Looks like having the base enum just inlined in the derived cluster is here to stay, at least in terms of what API consumers want in terms of ergonomics. So just go ahead and expose it.
project-chip · Dec 13, 2024 · 728e3e3 · 728e3e3
1 parent 07f755f
commit 728e3e3
Show file tree

Hide file tree

Showing 2 changed files with 185 additions and 197 deletions.
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -9874,44 +9874,6 @@
                   - RequiredTCNotAccepted
                   - TCAcknowledgementsNotReceived
                   - TCMinVersionNotMet
-          RVCCleanMode:
-              # Not clear whether these will stay in the XML
-              ModeTag:
-                  - Auto
-                  - Quick
-                  - Quiet
-                  - LowNoise
-                  - LowEnergy
-                  - Min
-                  - Max
-                  - Night
-                  - Day
-                  - Vacation
-          RVCOperationalState:
-              # Not clear whether these will stay in the XML
-              ErrorStateEnum:
-                  - NoError
-                  - UnableToStartOrResume
-                  - UnableToCompleteOperation
-                  - CommandInvalidInState
-              OperationalStateEnum:
-                  - Stopped
-                  - Running
-                  - Paused
-                  - Error
-          RVCRunMode:
-              # Not clear whether these will stay in the XML
-              ModeTag:
-                  - Auto
-                  - Quick
-                  - Quiet
-                  - LowNoise
-                  - LowEnergy
-                  - Vacation
-                  - Min
-                  - Max
-                  - Night
-                  - Day
       bitmaps:
           AccessControl:
               # Targeting 1.4
@@ -10370,11 +10332,24 @@
               - NumberOfRinsesEnum
           LaundryWasherMode:
               - ModeTag
+          OvenCavityOperationalState:
+              - ErrorStateEnum
+              - OperationalStateEnum
           RefrigeratorAndTemperatureControlledCabinetMode:
               - ModeTag
       enum values:
           DishwasherMode:
               ModeTag:
+                  - Auto
+                  - Quick
+                  - Quiet
+                  - LowNoise
+                  - LowEnergy
+                  - Vacation
+                  - Min
+                  - Max
+                  - Night
+                  - Day
                   - Normal
                   - Heavy
                   - Light
@@ -10400,16 +10375,57 @@
                   - Max
           LaundryWasherMode:
               ModeTag:
+                  - Auto
+                  - Quick
+                  - Quiet
+                  - LowNoise
+                  - LowEnergy
+                  - Vacation
+                  - Min
+                  - Max
+                  - Night
+                  - Day
                   - Normal
                   - Delicate
                   - Heavy
                   - Whites
           MicrowaveOvenMode:
               ModeTag:
+                  - Auto
+                  - Quick
+                  - Quiet
+                  - LowNoise
+                  - LowEnergy
+                  - Vacation
+                  - Min
+                  - Max
+                  - Night
+                  - Day
                   - Normal
                   - Defrost
+          OvenCavityOperationalState:
+              ErrorStateEnum:
+                  - NoError
+                  - UnableToStartOrResume
+                  - UnableToCompleteOperation
+                  - CommandInvalidInState
+              OperationalStateEnum:
+                  - Stopped
+                  - Running
+                  - Paused
+                  - Error
           OvenMode:
               ModeTag:
+                  - Auto
+                  - Quick
+                  - Quiet
+                  - LowNoise
+                  - LowEnergy
+                  - Vacation
+                  - Min
+                  - Max
+                  - Night
+                  - Day
                   - Bake
                   - Convection
                   - Grill
@@ -10422,10 +10438,53 @@
                   - Steam
           RefrigeratorAndTemperatureControlledCabinetMode:
               ModeTag:
+                  - Auto
+                  - Quick
+                  - Quiet
+                  - LowNoise
+                  - LowEnergy
+                  - Vacation
+                  - Min
+                  - Max
+                  - Night
+                  - Day
                   - RapidCool
                   - RapidFreeze
+          RVCCleanMode:
+              ModeTag:
+                  - Auto
+                  - Quick
+                  - Quiet
+                  - LowNoise
+                  - LowEnergy
+                  - Min
+                  - Max
+                  - Night
+                  - Day
+                  - Vacation
+          RVCOperationalState:
+              ErrorStateEnum:
+                  - NoError
+                  - UnableToStartOrResume
+                  - UnableToCompleteOperation
+                  - CommandInvalidInState
+              OperationalStateEnum:
+                  - Stopped
+                  - Running
+                  - Paused
+                  - Error
           RVCRunMode:
               ModeTag:
+                  - Auto
+                  - Quick
+                  - Quiet
+                  - LowNoise
+                  - LowEnergy
+                  - Vacation
+                  - Min
+                  - Max
+                  - Night
+                  - Day
                   - Mapping
       bitmaps:
           DishwasherAlarm:
@@ -10503,77 +10562,6 @@
               SetCookingParameters:
                   # wattSettingIndex is provisional because WATTS is provisional in Matter 1.4
                   - wattSettingIndex
-      enums:
-          OvenCavityOperationalState:
-              # Not clear whether these will stay in the XML
-              - ErrorStateEnum
-              - OperationalStateEnum
-      enum values:
-          DishwasherMode:
-              # Not clear whether these will stay in the XML
-              ModeTag:
-                  - Auto
-                  - Quick
-                  - Quiet
-                  - LowNoise
-                  - LowEnergy
-                  - Vacation
-                  - Min
-                  - Max
-                  - Night
-                  - Day
-          LaundryWasherMode:
-              # Not clear whether these will stay in the XML
-              ModeTag:
-                  - Auto
-                  - Quick
-                  - Quiet
-                  - LowNoise
-                  - LowEnergy
-                  - Vacation
-                  - Min
-                  - Max
-                  - Night
-                  - Day
-          MicrowaveOvenMode:
-              # Not clear whether these will stay in the XML
-              ModeTag:
-                  - Auto
-                  - Quick
-                  - Quiet
-                  - LowNoise
-                  - LowEnergy
-                  - Vacation
-                  - Min
-                  - Max
-                  - Night
-                  - Day
-          OvenMode:
-              # Not clear whether these will stay in the XML
-              ModeTag:
-                  - Auto
-                  - Quick
-                  - Quiet
-                  - LowNoise
-                  - LowEnergy
-                  - Vacation
-                  - Min
-                  - Max
-                  - Night
-                  - Day
-          RefrigeratorAndTemperatureControlledCabinetMode:
-              # Not clear whether these will stay in the XML
-              ModeTag:
-                  - Auto
-                  - Quick
-                  - Quiet
-                  - LowNoise
-                  - LowEnergy
-                  - Vacation
-                  - Min
-                  - Max
-                  - Night
-                  - Day
       bitmap values:
           DishwasherAlarm:
               AlarmBitmap: