Skip to content

Commit 338137c

Browse files
gmarcosbgmarcosb
committed
Revert "Fixes to reflect updated spec"
This reverts commit 01c4f87.
1 parent e772ad1 commit 338137c

File tree

4 files changed

+34
-83
lines changed

4 files changed

+34
-83
lines changed

‎src/app/zap-templates/zcl/data-model/chip/global-bitmaps.xml

+5-17
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,23 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17+
1718
<!--
1819
TODO: Make these structures global rather than defining them for each cluster.
1920
This depends on the ability to define global structs via XML tags.
2021
see: https://github.com/project-chip/connectedhomeip/issues/29818
2122
-->
23+
2224
<configurator>
2325
<domain name="CHIP"/>
26+
2427
<!--
2528
These are test global items (no cluster attached) for testing only.
2629
Their usage is defined for UnitTestCluster only.
2730
-->
2831
<bitmap name="TestGlobalBitmap" type="bitmap32">
29-
<field mask="0x00000002" name="FirstBit"/>
30-
<field mask="0x00000004" name="SecondBit"/>
32+
<field mask="0x01" name="FirstBit" />
33+
<field mask="0x02" name="SecondBit" />
3134
</bitmap>
3235

33-
<bitmap name="WebRTCMetadataOptions" type="bitmap8">
34-
<field name="DataTLV" mask="0x01"/>
35-
</bitmap>
36-
37-
<bitmap name="WildcardPathFlagsBitmap" type="bitmap8">
38-
<field name="WildcardSkipRootNode" mask="0x01"/>
39-
<field name="WildcardSkipGlobalAttributes" mask="0x02"/>
40-
<field name="WildcardSkipAttributeList" mask="0x04"/>
41-
<field name="Reserved" mask="0x08"/>
42-
<field name="WildcardSkipCommandLists" mask="0x10"/>
43-
<field name="WildcardSkipCustomElements" mask="0x20"/>
44-
<field name="WildcardSkipFixedAttributes" mask="0x40"/>
45-
<field name="WildcardSkipChangesOmittedAttributes" mask="0x80"/>
46-
<field name="WildcardSkipDiagnosticsClusters" mask="0x100"/>
47-
</bitmap>
4836
</configurator>

‎src/app/zap-templates/zcl/data-model/chip/global-structs.xml

+9-64
Original file line numberDiff line numberDiff line change
@@ -14,84 +14,29 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
17+
1718
<configurator>
1819
<domain name="CHIP"/>
20+
1921
<struct name="AtomicAttributeStatusStruct">
20-
<item fieldId="0" name="AttributeID" type="attrib_id"/>
22+
<item fieldId="0" name="AttributeID" type="attrib_id" />
2123
<item fieldId="1" name="StatusCode" type="status"/>
2224
</struct>
2325

24-
<struct name="AttributionData" apiMaturity="provisional" isFabricScoped="true">
25-
<item fieldId="0" name="ContextInformation" type="enum8"/>
26-
<item fieldId="1" name="SourceContext" type="int32u" optional="true" isFabricSensitive="true"/>
27-
<item fieldId="2" name="NodeID" type="node_id" optional="true" isFabricSensitive="true"/>
28-
<item fieldId="3" name="GroupD" type="group_id" optional="true" isFabricSensitive="true"/>
29-
<item fieldId="4" name="SystemTimeStamp" type="systime_ms" optional="true"/>
30-
<item fieldId="5" name="EpochTimeStamp" type="posix_ms" optional="true"/>
31-
<item fieldId="254" name="FabricIndex" type="fabric_idx" isNullable="true"/>
32-
</struct>
33-
34-
<struct name="Date" apiMaturity="provisional">
35-
<item fieldId="0" name="Year" type="int8u" isNullable="true"/>
36-
<item fieldId="1" name="Month" type="int8u" isNullable="true" min="1" max="12"/>
37-
<item fieldId="2" name="Day" type="int8u" isNullable="true" min="1" max="31"/>
38-
<item fieldId="3" name="DayOfWeek" type="int8u" isNullable="true" min="1" max="7"/>
39-
</struct>
40-
4126
<struct name="LocationDescriptorStruct">
42-
<item fieldId="0" name="LocationName" type="char_string" length="128"/>
43-
<item fieldId="1" name="FloorNumber" type="int16s" isNullable="true"/>
44-
<item fieldId="2" name="AreaType" type="tag" isNullable="true"/>
27+
<item fieldId="0" name="LocationName" type="char_string" length="128" isNullable="false" optional="false"/>
28+
<item fieldId="1" name="FloorNumber" type="int16s" isNullable="true" optional="false"/>
29+
<item fieldId="2" name="AreaType" type="AreaTypeTag" isNullable="true" optional="false"/>
4530
</struct>
4631

4732
<!--
4833
These are test global items (no cluster attached) for testing only.
4934
Their usage is defined for UnitTestCluster only.
5035
-->
51-
<struct name="MeasurementAccuracyRangeStruct" apiMaturity="provisional">
52-
<item fieldId="0" name="RangeMin" type="int64s" min="-4611686018427387904" max="4611686018427387904"/>
53-
<item fieldId="1" name="RangeMax" type="int64s" min="-4611686018427387904" max="4611686018427387904"/>
54-
<item fieldId="2" name="PercentMax" type="percent100ths" optional="true"/>
55-
<item fieldId="3" name="PercentMin" type="percent100ths" optional="true"/>
56-
<item fieldId="4" name="PercentTypical" type="percent100ths" optional="true"/>
57-
<item fieldId="5" name="FixedMax" type="int64u" optional="true" max="4611686018427387903"/>
58-
<item fieldId="6" name="FixedMin" type="int64u" optional="true" max="4611686018427387903"/>
59-
<item fieldId="7" name="FixedTypical" type="int64u" optional="true" max="4611686018427387903"/>
60-
</struct>
61-
62-
<struct name="MeasurementAccuracyStruct" apiMaturity="provisional">
63-
<item fieldId="0" name="MeasurementType" type="MeasurementTypeEnum" min="0x0000" max="0x000E"/>
64-
<item fieldId="1" name="Measured" type="boolean" default="0"/>
65-
<item fieldId="2" name="MinMeasuredValue" type="int64s" min="-4611686018427387904" max="4611686018427387904"/>
66-
<item fieldId="3" name="MaxMeasuredValue" type="int64s" min="-4611686018427387904" max="4611686018427387904"/>
67-
<item fieldId="4" name="AccuracyRanges" array="true" type="MeasurementAccuracyRangeStruct" minLength="1"/>
68-
</struct>
69-
70-
<struct name="SemanticTagStruct" apiMaturity="provisional">
71-
<item fieldId="0" name="MfgCode" type="vendor_id" isNullable="true"/>
72-
<item fieldId="1" name="NamespaceID" type="namespace"/>
73-
<item fieldId="2" name="Tag" type="tag"/>
74-
<item fieldId="3" name="Label" type="char_string" isNullable="true" optional="true" length="64"/>
75-
</struct>
76-
77-
<struct name="SuppliedAttributionData" apiMaturity="provisional" isFabricScoped="true">
78-
<item fieldId="0" name="ContextInformation" type="enum8"/>
79-
<item fieldId="1" name="SourceContext" type="int32u" optional="true"/>
80-
</struct>
81-
36+
8237
<struct name="TestGlobalStruct">
83-
<item fieldId="0" name="Name" type="char_string" length="128"/>
84-
<item fieldId="1" name="MyBitmap" type="TestGlobalBitmap" isNullable="true"/>
38+
<item fieldId="0" name="Name" type="char_string" length="128" isNullable="false" optional="false"/>
39+
<item fieldId="1" name="MyBitmap" type="TestGlobalBitmap" isNullable="true" optional="false"/>
8540
<item fieldId="2" name="MyEnum" type="TestGlobalEnum" isNullable="true" optional="true"/>
8641
</struct>
87-
88-
<struct name="WebRTCSessionStruct" apiMaturity="provisional">
89-
<item fieldId="1" name="ID" type="WebRTCSessionID"/>
90-
<item fieldId="2" name="PeerNodeId" type="node_id"/>
91-
<item fieldId="3" name="PeerFabricIndex" type="fabric_idx"/>
92-
<item fieldId="4" name="StreamType" type="StreamTypeEnum" min="0x00" max="0x03"/>
93-
<item fieldId="5" name="VideoStreamID" type="VideoStreamID" isNullable="true"/>
94-
<item fieldId="6" name="AudioStreamID" type="AudioStreamID" isNullable="true"/>
95-
<item fieldId="7" name="MetadataOptions" type="WebRTCMetadataOptions" default="0x00" min="0x00" max="0x01"/>
96-
</struct>
9742
</configurator>

‎src/app/zap-templates/zcl/data-model/draft/web-rtc-provider-cluster.xml

+19-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,16 @@ limitations under the License.
1818
XML generated by Alchemy; DO NOT EDIT.
1919
Source: src/app_clusters/WebRTC_Provider.adoc
2020
Parameters: in-progress
21-
Git: 0.7-fall2024-ncr-1156-g1517df816-dirty
21+
Git: 0.7-fall2024-ncr-1155-g78ec59e8a-dirty
2222
-->
2323
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
2424
<domain name="General"/>
25+
<bitmap name="WebRTCMetadataOptions" type="bitmap8">
26+
<cluster code="0x0553"/>
27+
<cluster code="0x0554"/>
28+
<field name="DataTLV" mask="0x01"/>
29+
</bitmap>
30+
2531
<enum name="WebRTCEndReasonEnum" type="enum8">
2632
<cluster code="0x0553"/>
2733
<cluster code="0x0554"/>
@@ -48,6 +54,18 @@ Git: 0.7-fall2024-ncr-1156-g1517df816-dirty
4854
<item fieldId="4" name="CAID" type="int16u" optional="true"/>
4955
</struct>
5056

57+
<struct name="WebRTCSessionStruct" apiMaturity="provisional">
58+
<cluster code="0x0553"/>
59+
<cluster code="0x0554"/>
60+
<item fieldId="1" name="ID" type="WebRTCSessionID"/>
61+
<item fieldId="2" name="PeerNodeId" type="node_id"/>
62+
<item fieldId="3" name="PeerFabricIndex" type="fabric_idx"/>
63+
<item fieldId="4" name="StreamType" type="StreamTypeEnum" min="0x00" max="0x03"/>
64+
<item fieldId="5" name="VideoStreamID" type="VideoStreamID" isNullable="true"/>
65+
<item fieldId="6" name="AudioStreamID" type="AudioStreamID" isNullable="true"/>
66+
<item fieldId="7" name="MetadataOptions" type="WebRTCMetadataOptions" default="0x00" min="0x00" max="0x01"/>
67+
</struct>
68+
5169
<cluster>
5270
<domain name="General"/>
5371
<name>WebRTC Transport Provider</name>

‎src/app/zap-templates/zcl/data-model/draft/web-rtc-requestor-cluster.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ 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.7-fall2024-ncr-1156-g1517df816-dirty
21+
Git: 0.7-fall2024-ncr-1155-g78ec59e8a-dirty
2222
-->
2323
<configurator xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../zcl.xsd">
2424
<domain name="General"/>

0 commit comments

Comments
 (0)