Merge remote-tracking branch 'origin/camera-webrtc-provider' into cam…

…era-webrtc-provider # Conflicts: # .github/workflows/tests.yaml # docs/zap_clusters.md # scripts/rules.matterlint # src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml # src/app/zap-templates/zcl/zcl-with-test-extensions.json # src/app/zap-templates/zcl/zcl.json # src/app/zap_cluster_list.json # src/controller/data_model/controller-clusters.matter # src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java # src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java # src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java # src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java # src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java # src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java # src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni # src/controller/java/generated/java/matter/controller/cluster/files.gni # src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp # src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp # src/controller/python/chip/clusters/CHIPClusters.py # src/controller/python/chip/clusters/Objects.py # src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm # src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm # src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h # src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm # src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h # src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm # src/darwin/Framework/CHIP/zap-generated/MTRClusters.h # src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm # src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h # src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm # src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h # src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm # src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm # src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h # src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm # zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp # zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h # zzz_generated/app-common/app-common/zap-generated/callback.h # zzz_generated/app-common/app-common/zap-generated/cluster-enums.h # zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp # zzz_generated/app-common/app-common/zap-generated/cluster-objects.h # zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h # zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h # zzz_generated/app-common/app-common/zap-generated/ids/Commands.h # zzz_generated/chip-tool/zap-generated/cluster/Commands.h # zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h # zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp # zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h # zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp # zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
gmarcosb · Oct 17, 2024 · efaff8c · efaff8c
2 parents 531f2c3 + 57ca2b2
commit efaff8c
Show file tree

Hide file tree

Showing 51 changed files with 13,822 additions and 62,598 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -16,9 +16,8 @@ name: Tests
 
 on:
     push:
-        branches:
-            - master
-            - 'v*-branch'
+        branches-ignore:
+            - 'dependabot/**'
     pull_request:
     merge_group:
     workflow_dispatch:
@@ -111,7 +110,6 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml \
-                      src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/chip-ota.xml \
                       src/app/zap-templates/zcl/data-model/chip/chip-types.xml \
                       src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml \
@@ -200,7 +198,6 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml \
-                      src/app/zap-templates/zcl/data-model/chip/webrtc-requestor-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml \
@@ -211,7 +208,6 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/sample-mei-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml \
-                      src/app/zap-templates/zcl/data-model/chip/zone-management-cluster.xml \
                     "
             - name: Build Apps
               run: |
@@ -597,7 +593,7 @@ jobs:
                    "
             - name: Run Tests
               run: |
-                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/darwin-x64-all-clusters-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factory-reset --quiet --app-args "--discriminator 3840 --interface-id -1" --script-args "-t 3600 --disable-test ClusterObjectTests.TestTimedRequestTimeout"'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/darwin-x64-all-clusters-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --quiet --app-args "--discriminator 3840 --interface-id -1" --script-args "-t 3600 --disable-test ClusterObjectTests.TestTimedRequestTimeout"'
             - name: Uploading core files
               uses: actions/upload-artifact@v4
               if: ${{ failure() && !env.ACT }}

diff --git a/docs/zap_clusters.md b/docs/zap_clusters.md
@@ -129,10 +129,7 @@ Generally regenerate using one of:
 |       1294 |      0x50E | AccountLogin                                            |
 |       1295 |      0x50F | ContentControl                                          |
 |       1296 |      0x510 | ContentAppObserver                                      |
-|       1360 |      0x550 | ZoneManagement                                          |
-|       1361 |      0x551 | CameraAvStreamManagement                                |
 |       1363 |      0x553 | WebRTCTransportProvider                                 |
-|       1364 |      0x554 | WebRTCTransportRequestor                                |
 |       1366 |      0x556 | Chime                                                   |
 |       1872 |      0x750 | EcosystemInformation                                    |
 |       1873 |      0x751 | CommissionerControl                                     |

diff --git a/scripts/rules.matterlint b/scripts/rules.matterlint
@@ -14,7 +14,6 @@ load "../src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml";
-load "../src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/chime-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/chip-ota.xml";
@@ -109,7 +108,6 @@ load "../src/app/zap-templates/zcl/data-model/chip/wake-on-lan-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/washer-controls-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/water-heater-management-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/water-heater-mode-cluster.xml";
-load "../src/app/zap-templates/zcl/data-model/chip/webrtc-requestor-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/wifi-network-diagnostics-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/wifi-network-management-cluster.xml";
@@ -121,7 +119,6 @@ load "../src/app/zap-templates/zcl/data-model/chip/resource-monitoring-cluster.x
 load "../src/app/zap-templates/zcl/data-model/chip/sample-mei-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/electrical-energy-measurement-cluster.xml";
 load "../src/app/zap-templates/zcl/data-model/chip/electrical-power-measurement-cluster.xml";
-load "../src/app/zap-templates/zcl/data-model/chip/zone-management-cluster.xml";
 
 all endpoints {
     // These attributes follow a different code path and do not have to be

diff --git a/src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml
@@ -23,6 +23,15 @@ Git: 0.9-fall2024-234-gf4d359001
 <configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
   <domain name="General"/>
 
+  <enum name="StreamTypeEnum" type="enum8">
+    <cluster code="0x0553"/>
+    <cluster code="0x0554"/>
+    <item name="Internal" value="0x00"/>
+    <item name="Recording" value="0x01"/>
+    <item name="Analysis" value="0x02"/>
+    <item name="LiveView" value="0x03"/>
+  </enum>
+
   <bitmap name="WebRTCMetadataOptions" type="bitmap8">
     <cluster code="0x0553"/>
     <cluster code="0x0554"/>

diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json
@@ -27,7 +27,6 @@
         "boolean-state-configuration-cluster.xml",
         "actions-cluster.xml",
         "bridged-device-basic-information.xml",
-        "camera-av-stream-management-cluster.xml",
         "chime-cluster.xml",
         "chip-ota.xml",
         "channel-cluster.xml",
@@ -133,16 +132,14 @@
         "water-heater-management-cluster.xml",
         "water-heater-mode-cluster.xml",
         "webrtc-provider-cluster.xml",
-        "webrtc-requestor-cluster.xml",
         "wifi-network-diagnostics-cluster.xml",
         "wifi-network-management-cluster.xml",
         "window-covering.xml",
         "matter-devices.xml",
         "sample-mei-cluster.xml",
         "types/door-lock.xml",
         "types/occupancy-sensing.xml",
-        "types/thermostat-user-interface-configuration.xml",
-        "zone-management-cluster.xml"
+        "types/thermostat-user-interface-configuration.xml"
     ],
     "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
     "options": {
@@ -669,19 +666,11 @@
             "ThreadNetworks",
             "ThreadNetworkTableSize"
         ],
-        "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"],
-        "Camera AV Stream Management": [
-            "VideoSensorParams",
-            "MinViewport",
-            "MicrophoneCapabilities",
-            "SpeakerCapabilities",
-            "CurrentSnapshotConfig",
-            "Viewport"
-        ]
+        "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
     },
     "mandatoryDeviceTypes": "0x0016",
     "defaultReportingPolicy": "mandatory",
-    "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT", "TYPEDEF"],
+    "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],
     "fabricHandling": {
         "automaticallyCreateFields": true,
         "indexFieldId": 254,

diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json
@@ -22,7 +22,6 @@
         "boolean-state-configuration-cluster.xml",
         "actions-cluster.xml",
         "bridged-device-basic-information.xml",
-        "camera-av-stream-management-cluster.xml",
         "chime-cluster.xml",
         "chip-ota.xml",
         "channel-cluster.xml",
@@ -127,16 +126,14 @@
         "water-heater-management-cluster.xml",
         "water-heater-mode-cluster.xml",
         "webrtc-provider-cluster.xml",
-        "webrtc-requestor-cluster.xml",
         "wifi-network-diagnostics-cluster.xml",
         "wifi-network-management-cluster.xml",
         "window-covering.xml",
         "matter-devices.xml",
         "sample-mei-cluster.xml",
         "types/door-lock.xml",
         "types/occupancy-sensing.xml",
-        "types/thermostat-user-interface-configuration.xml",
-        "zone-management-cluster.xml"
+        "types/thermostat-user-interface-configuration.xml"
     ],
     "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml",
     "options": {
@@ -663,19 +660,11 @@
             "ThreadNetworks",
             "ThreadNetworkTableSize"
         ],
-        "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"],
-        "Camera AV Stream Management": [
-            "VideoSensorParams",
-            "MinViewport",
-            "MicrophoneCapabilities",
-            "SpeakerCapabilities",
-            "CurrentSnapshotConfig",
-            "Viewport"
-        ]
+        "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
     },
     "mandatoryDeviceTypes": "0x0016",
     "defaultReportingPolicy": "mandatory",
-    "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT", "TYPEDEF"],
+    "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"],
     "fabricHandling": {
         "automaticallyCreateFields": true,
         "indexFieldId": 254,

diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json
@@ -16,7 +16,6 @@
         "BOOLEAN_STATE_CLUSTER": [],
         "BOOLEAN_STATE_CONFIGURATION_CLUSTER": [],
         "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [],
-        "CAMERA_AV_STREAM_MANAGEMENT_CLUSTER": [],
         "CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [],
         "CHANNEL_CLUSTER": [],
@@ -133,10 +132,8 @@
         "WATER_HEATER_MANAGEMENT_CLUSTER": [],
         "WATER_HEATER_MODE_CLUSTER": [],
         "WEB_RTC_PROVIDER_CLUSTER": [],
-        "WEBRTC_REQUESTOR_CLUSTER": [],
         "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
-        "WINDOW_COVERING_CLUSTER": [],
-        "ZONE_MANAGEMENT_CLUSTER": []
+        "WINDOW_COVERING_CLUSTER": []
     },
     "ServerDirectories": {
         "ACCESS_CONTROL_CLUSTER": ["access-control-server"],
@@ -163,7 +160,6 @@
         "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [
             "bridged-device-basic-information-server"
         ],
-        "CAMERA_AV_STREAM_MANAGEMENT_CLUSTER": [],
         "CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
             "concentration-measurement-server"
         ],
@@ -316,12 +312,10 @@
         "LAUNDRY_WASHER_CONTROLS_CLUSTER": ["laundry-washer-controls-server"],
         "LAUNDRY_DRYER_CONTROLS_CLUSTER": ["laundry-dryer-controls-server"],
         "WEB_RTC_PROVIDER_CLUSTER": [],
-        "WEBRTC_REQUESTOR_CLUSTER": [],
         "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": ["wifi-network-diagnostics-server"],
         "WIFI_NETWORK_MANAGEMENT_CLUSTER": ["wifi-network-management-server"],
         "WINDOW_COVERING_CLUSTER": ["window-covering-server"],
         "WATER_HEATER_MANAGEMENT_CLUSTER": ["water-heater-management-server"],
-        "WATER_HEATER_MODE_CLUSTER": ["mode-base-server"],
-        "ZONE_MANAGEMENT_CLUSTER": []
+        "WATER_HEATER_MODE_CLUSTER": ["mode-base-server"]
     }
 }