Skip to content

Commit afc47c2

Browse files
yufengwangcayufengwangca
committed
Generate the xml from Alchemy
1 parent ab195c6 commit afc47c2

File tree

7 files changed

+43
-20
lines changed

7 files changed

+43
-20
lines changed

‎scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
#define MATTER_DM_CAMERA_AV_STREAM_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
144144
#define MATTER_DM_CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
145145
#define MATTER_DM_WEBRTC_TRANSPORT_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (0)
146-
#define MATTER_DM_WEBRTC_TRANSPORT_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (0)
146+
#define MATTER_DM_WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (0)
147147
#define MATTER_DM_PUSH_AV_STREAM_TRANSPORT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
148148
#define MATTER_DM_CHIME_CLUSTER_SERVER_ENDPOINT_COUNT (0)
149149
#define MATTER_DM_ECOSYSTEM_INFORMATION_CLUSTER_SERVER_ENDPOINT_COUNT (0)
@@ -275,7 +275,7 @@
275275
#define MATTER_DM_CAMERA_AV_STREAM_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
276276
#define MATTER_DM_CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
277277
#define MATTER_DM_WEBRTC_TRANSPORT_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
278-
#define MATTER_DM_WEBRTC_TRANSPORT_REQUESTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
278+
#define MATTER_DM_WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
279279
#define MATTER_DM_PUSH_AV_STREAM_TRANSPORT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
280280
#define MATTER_DM_CHIME_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
281281
#define MATTER_DM_ECOSYSTEM_INFORMATION_CLUSTER_CLIENT_ENDPOINT_COUNT (0)

‎scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
#define MATTER_DM_CAMERA_AV_STREAM_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
144144
#define MATTER_DM_CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
145145
#define MATTER_DM_WEBRTC_TRANSPORT_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (0)
146-
#define MATTER_DM_WEBRTC_TRANSPORT_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (0)
146+
#define MATTER_DM_WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (0)
147147
#define MATTER_DM_PUSH_AV_STREAM_TRANSPORT_CLUSTER_SERVER_ENDPOINT_COUNT (0)
148148
#define MATTER_DM_CHIME_CLUSTER_SERVER_ENDPOINT_COUNT (0)
149149
#define MATTER_DM_ECOSYSTEM_INFORMATION_CLUSTER_SERVER_ENDPOINT_COUNT (0)
@@ -275,7 +275,7 @@
275275
#define MATTER_DM_CAMERA_AV_STREAM_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
276276
#define MATTER_DM_CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
277277
#define MATTER_DM_WEBRTC_TRANSPORT_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
278-
#define MATTER_DM_WEBRTC_TRANSPORT_REQUESTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
278+
#define MATTER_DM_WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
279279
#define MATTER_DM_PUSH_AV_STREAM_TRANSPORT_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
280280
#define MATTER_DM_CHIME_CLUSTER_CLIENT_ENDPOINT_COUNT (0)
281281
#define MATTER_DM_ECOSYSTEM_INFORMATION_CLUSTER_CLIENT_ENDPOINT_COUNT (0)

‎src/app/zap-templates/zcl/data-model/chip/webrtc-requestor-cluster.xml

+11-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<!--
3-
Copyright (c) 2024 Project CHIP Authors
3+
Copyright (c) 2025 Project CHIP Authors
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -18,42 +18,46 @@ limitations under the License.
1818
XML generated by Alchemy; DO NOT EDIT.
1919
Source: src/app_clusters/WebRTC_Requestor.adoc
2020
Parameters: in-progress
21-
Git: 0.9-fall2024-228-g54b1ae035
21+
Git: 0.7-summer-2025-5-g06c4d5596
2222
-->
2323
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
2424
<domain name="Cameras"/>
2525
<cluster apiMaturity="provisional">
2626
<domain>Cameras</domain>
2727
<name>WebRTC Transport Requestor</name>
2828
<code>0x0554</code>
29-
<define>WEBRTC_TRANSPORT_REQUESTOR_CLUSTER</define>
30-
<description>The WebRTC transport requestor cluster provides a way for stream consumers (e.g. Matter Stream Viewer) to establish a WebRTC connection with a stream provider.</description>
29+
<define>WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER</define>
30+
<description/>
3131
<client init="false" tick="false">true</client>
3232
<server init="false" tick="false">true</server>
3333
<globalAttribute code="0xFFFD" side="either" value="1"/>
3434
<attribute code="0x0000" side="server" define="CURRENT_SESSIONS" type="array" entryType="WebRTCSessionStruct" default="0">CurrentSessions</attribute>
3535
<command code="0x01" source="client" name="Offer" optional="false">
36-
<description>This command provides the stream requestor with WebRTC session details. It is sent following the receipt of a SolicitOffer command or a re-Offer initiated by the Provider.</description>
36+
<description>This command provides the stream requestor with WebRTC session details.</description>
37+
<quality largeMessage="true"/>
3738
<arg id="1" name="WebRTCSessionID" type="int16u"/>
3839
<arg id="2" name="SDP" type="char_string"/>
3940
<arg id="3" name="ICEServers" array="true" type="ICEServerStruct" optional="true"/>
4041
<arg id="4" name="ICETransportPolicy" type="char_string" optional="true"/>
4142
</command>
4243

4344
<command code="0x02" source="client" name="Answer" optional="false">
44-
<description>This command provides the stream requestor with the WebRTC session details (i.e. Session ID and SDP answer). It is the next command in the Offer/Answer flow to the ProvideOffer command.</description>
45+
<description>This command provides the stream requestor with the WebRTC session details (i.e. Session ID and SDP answer), It is the next command in the Offer/Answer flow to the ProvideOffer command.</description>
46+
<quality largeMessage="true"/>
4547
<arg id="1" name="WebRTCSessionID" type="int16u"/>
4648
<arg id="2" name="SDP" type="char_string"/>
4749
</command>
4850

4951
<command code="0x03" source="client" name="ICECandidates" optional="false">
50-
<description>This command provides an ICE candidates to the stream requestor in a WebRTC session.</description>
52+
<description>This command allows for string based https://rfc-editor.org/rfc/rfc8839#section-5.1 generated after the initial Offer / Answer exchange, via a JSEP https://datatracker.ietf.org/doc/html/rfc9429#section-4.1.20 event, a DOM https://www.w3.org/TR/webrtc/#dom-rtcpeerconnectioniceevent event, or other WebRTC compliant implementations, to be added to a session during the gathering phase.</description>
53+
<quality largeMessage="true"/>
5154
<arg id="1" name="WebRTCSessionID" type="int16u"/>
5255
<arg id="2" name="ICECandidates" array="true" type="char_string" minLength="1"/>
5356
</command>
5457

5558
<command code="0x04" source="client" name="End" optional="false">
5659
<description>This command notifies the stream requestor that the provider has ended the WebRTC session.</description>
60+
<quality largeMessage="true"/>
5761
<arg id="1" name="WebRTCSessionID" type="int16u"/>
5862
<arg id="2" name="Reason" type="WebRTCEndReasonEnum" min="0x00" max="0x0B"/>
5963
</command>

‎src/controller/data_model/controller-clusters.matter

+4-4
Original file line numberDiff line numberDiff line change
@@ -10193,7 +10193,7 @@ provisional cluster WebRTCTransportProvider = 1363 {
1019310193
command EndSession(EndSessionRequest): DefaultSuccess = 7;
1019410194
}
1019510195

10196-
/** The WebRTC transport requestor cluster provides a way for stream consumers (e.g. Matter Stream Viewer) to establish a WebRTC connection with a stream provider. */
10196+
/** */
1019710197
provisional cluster WebRTCTransportRequestor = 1364 {
1019810198
revision 1;
1019910199

@@ -10270,11 +10270,11 @@ provisional cluster WebRTCTransportRequestor = 1364 {
1027010270
WebRTCEndReasonEnum reason = 1;
1027110271
}
1027210272

10273-
/** This command provides the stream requestor with WebRTC session details. It is sent following the receipt of a SolicitOffer command or a re-Offer initiated by the Provider. */
10273+
/** This command provides the stream requestor with WebRTC session details. */
1027410274
command Offer(OfferRequest): DefaultSuccess = 1;
10275-
/** This command provides the stream requestor with the WebRTC session details (i.e. Session ID and SDP answer). It is the next command in the Offer/Answer flow to the ProvideOffer command. */
10275+
/** This command provides the stream requestor with the WebRTC session details (i.e. Session ID and SDP answer), It is the next command in the Offer/Answer flow to the ProvideOffer command. */
1027610276
command Answer(AnswerRequest): DefaultSuccess = 2;
10277-
/** This command provides an ICE candidates to the stream requestor in a WebRTC session. */
10277+
/** This command allows for string based https://rfc-editor.org/rfc/rfc8839#section-5.1 generated after the initial Offer / Answer exchange, via a JSEP https://datatracker.ietf.org/doc/html/rfc9429#section-4.1.20 event, a DOM https://www.w3.org/TR/webrtc/#dom-rtcpeerconnectioniceevent event, or other WebRTC compliant implementations, to be added to a session during the gathering phase. */
1027810278
command ICECandidates(ICECandidatesRequest): DefaultSuccess = 3;
1027910279
/** This command notifies the stream requestor that the provider has ended the WebRTC session. */
1028010280
command End(EndRequest): DefaultSuccess = 4;

‎src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/darwin/Framework/CHIP/zap-generated/MTRClusters.h

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)