Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Definition of the Camera AV StreamManagement Cluster. #35841

Merged
merged 3 commits into from
Oct 13, 2024
Merged

Definition of the Camera AV StreamManagement Cluster. #35841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a75b4a
Definition of the Camera AV StreamManagement Cluster.
pidarped Sep 29, 2024
c5b2879
Keep the jclass and its corresponding constructor jmethod inside a sc…
pidarped Oct 13, 2024
8638d24
Auto-generated files from zap-regen for Camera AV Stream Management.
pidarped Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ 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 \
Expand Down
1 change: 1 addition & 0 deletions docs/zap_clusters.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ Generally regenerate using one of:
| 1295 | 0x50F | ContentControl |
| 1296 | 0x510 | ContentAppObserver |
| 1360 | 0x550 | ZoneManagement |
| 1361 | 0x551 | CameraAvStreamManagement |
| 1363 | 0x553 | WebRTCTransportProvider |
| 1364 | 0x554 | WebRTCTransportRequestor |
| 1366 | 0x556 | Chime |
Expand Down
1 change: 1 addition & 0 deletions scripts/rules.matterlint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ 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";
Expand Down
478 changes: 478 additions & 0 deletions src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml
View file
Open in desktop
pidarped marked this conversation as resolved.
Show resolved Hide resolved

Large diffs are not rendered by default.

13 changes: 12 additions & 1 deletion src/app/zap-templates/zcl/data-model/chip/global-enums.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@ TODO: Make these structures global rather than defining them for each cluster.
<item name="High" value="0x02"/>
<item name="Automatic" value="0x03"/>
</enum>

<enum name="StreamTypeEnum" type="enum8">
pidarped marked this conversation as resolved.
Show resolved Hide resolved
<cluster code="0x0551"/>
<cluster code="0x0553"/>
<cluster code="0x0554"/>
<cluster code="0x0555"/>
<item name="Internal" value="0x00"/>
<item name="Recording" value="0x01"/>
<item name="Analysis" value="0x02"/>
<item name="LiveView" value="0x03"/>
</enum>

<!--
These are test global items (no cluster attached) for testing only.
Their usage is defined for UnitTestCluster only.
Expand All @@ -43,5 +55,4 @@ TODO: Make these structures global rather than defining them for each cluster.
<item name="SomeOtherValue" value="0x01"/>
<item name="FinalValue" value="0x02"/>
</enum>

</configurator>
9 changes: 0 additions & 9 deletions src/app/zap-templates/zcl/data-model/chip/webrtc-provider-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,6 @@ 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"/>
Expand Down
11 changes: 10 additions & 1 deletion src/app/zap-templates/zcl/zcl-with-test-extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"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",
Expand Down Expand Up @@ -668,7 +669,15 @@
"ThreadNetworks",
"ThreadNetworkTableSize"
],
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"],
"Camera AV Stream Management": [
"VideoSensorParams",
"MinViewport",
"MicrophoneCapabilities",
"SpeakerCapabilities",
"CurrentSnapshotConfig",
"Viewport"
]
},
"mandatoryDeviceTypes": "0x0016",
"defaultReportingPolicy": "mandatory",
Expand Down
11 changes: 10 additions & 1 deletion src/app/zap-templates/zcl/zcl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"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",
Expand Down Expand Up @@ -662,7 +663,15 @@
"ThreadNetworks",
"ThreadNetworkTableSize"
],
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"]
"Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"],
"Camera AV Stream Management": [
"VideoSensorParams",
"MinViewport",
"MicrophoneCapabilities",
"SpeakerCapabilities",
"CurrentSnapshotConfig",
"Viewport"
]
},
"mandatoryDeviceTypes": "0x0016",
"defaultReportingPolicy": "mandatory",
Expand Down
2 changes: 2 additions & 0 deletions src/app/zap_cluster_list.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"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": [],
Expand Down Expand Up @@ -162,6 +163,7 @@
"BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [
"bridged-device-basic-information-server"
],
"CAMERA_AV_STREAM_MANAGEMENT_CLUSTER": [],
"CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [
"concentration-measurement-server"
],
Expand Down
Loading
Loading