Remove Scenes stuff on Darwin, mark MatterScenes provisional.

lpbeliveau-silabs · Dec 16, 2023 · b025c11 · b025c11
1 parent 4c2dd2b
commit b025c11
Show file tree

Hide file tree

Showing 12 changed files with 171 additions and 1,892 deletions.
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -8203,6 +8203,7 @@
           - ContentControl
           - ContentAppObserver
           - DeviceEnergyManagement
+          - MatterScenes
       attributes:
           NetworkCommissioning:
               # Targeting Spring 2024 Matter release
@@ -8403,8 +8404,6 @@
                   - TextTracks
                   - AudioTracks
   renames:
-      clusters:
-          MatterScenes: Scenes
       structs:
           Thermostat:
               WeeklyScheduleTransitionStruct: ThermostatScheduleTransition
@@ -8456,6 +8455,11 @@
               Feature:
                   Watermarks: WaterMarks
   removed:
+      clusters:
+          # Should never have been exposed in the shape it was in, and now is
+          # getting renamed and getting a new cluster id, so just removing it
+          # seems like the most sensible thing.
+          - Scenes
       enum values:
           ContentLauncher:
               # The URLNotAvailable value got renamed at the same time

diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h