Skip to content

Commit f1a0907

Browse files
committed
Remove automated alchemy changes for shared structures included elsewhere
1 parent 338137c commit f1a0907

File tree

2 files changed

+13
-49
lines changed

2 files changed

+13
-49
lines changed

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

+3-49
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@ 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
<enum name="AtomicRequestTypeEnum" type="enum8">
2528
<item name="BeginWrite" value="0x00"/>
2629
<item name="CommitWrite" value="0x01"/>
@@ -31,59 +34,10 @@ TODO: Make these structures global rather than defining them for each cluster.
3134
These are test global items (no cluster attached) for testing only.
3235
Their usage is defined for UnitTestCluster only.
3336
-->
34-
<enum name="MeasurementTypeEnum" type="enum16">
35-
<item name="Unspecified" value="0x0000"/>
36-
<item name="Voltage" value="0x0001"/>
37-
<item name="ActiveCurrent" value="0x0002"/>
38-
<item name="ReactiveCurrent" value="0x0003"/>
39-
<item name="ApparentCurrent" value="0x0004"/>
40-
<item name="ActivePower" value="0x0005"/>
41-
<item name="ReactivePower" value="0x0006"/>
42-
<item name="ApparentPower" value="0x0007"/>
43-
<item name="RMSVoltage" value="0x0008"/>
44-
<item name="RMSCurrent" value="0x0009"/>
45-
<item name="RMSPower" value="0x000A"/>
46-
<item name="Frequency" value="0x000B"/>
47-
<item name="PowerFactor" value="0x000C"/>
48-
<item name="NeutralCurrent" value="0x000D"/>
49-
<item name="ElectricalEnergy" value="0x000E"/>
50-
</enum>
51-
52-
<enum name="ServerAttributionContextInformation" type="enum8">
53-
<item name="ServerAutomationRule" value="0x0B"/>
54-
<item name="ServerSchedule" value="0x0C"/>
55-
<item name="ServerTimer" value="0x0D"/>
56-
<item name="Security" value="0x0D"/>
57-
<item name="DemandResponseEventOrSimilarServiceProviderSignalling" value="0x0E"/>
58-
<item name="PhysicalInteractionOnDevice" value="0x0F"/>
59-
<item name="InteractionViaAProtocolNotDefinedInThisSpecification" value="0x10"/>
60-
</enum>
61-
62-
<enum name="SoftwareVersionCertificationStatusEnum" type="enum8">
63-
<item name="dev-test" value="0x00"/>
64-
<item name="provisional" value="0x01"/>
65-
<item name="certified" value="0x02"/>
66-
<item name="revoked" value="0x03"/>
67-
</enum>
68-
69-
<enum name="SuppliedAttributionContextInformation" type="enum8">
70-
<item name="DefaultClientAction" value="0x00"/>
71-
<item name="UserInteraction" value="0x01"/>
72-
<item name="ClientAutomationRule" value="0x02"/>
73-
<item name="ClientSchedule" value="0x03"/>
74-
<item name="ClientTimer" value="0x04"/>
75-
</enum>
76-
7737
<enum name="TestGlobalEnum" type="enum8">
7838
<item name="SomeValue" value="0x00"/>
7939
<item name="SomeOtherValue" value="0x01"/>
8040
<item name="FinalValue" value="0x02"/>
8141
</enum>
8242

83-
<enum name="ThreeLevelAutoEnum" type="enum8">
84-
<item name="Low" value="0x00"/>
85-
<item name="Medium" value="0x01"/>
86-
<item name="High" value="0x02"/>
87-
<item name="Auto" value="0x03"/>
88-
</enum>
8943
</configurator>

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

+10
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@ limitations under the License.
2929
<item fieldId="2" name="AreaType" type="AreaTypeTag" isNullable="true" optional="false"/>
3030
</struct>
3131

32+
<struct name="WebRTCSessionStruct" apiMaturity="provisional">
33+
<item fieldId="1" name="ID" type="WebRTCSessionID"/>
34+
<item fieldId="2" name="PeerNodeId" type="node_id"/>
35+
<item fieldId="3" name="PeerFabricIndex" type="fabric_idx"/>
36+
<item fieldId="4" name="StreamType" type="StreamTypeEnum" min="0x00" max="0x03"/>
37+
<item fieldId="5" name="VideoStreamID" type="VideoStreamID" isNullable="true"/>
38+
<item fieldId="6" name="AudioStreamID" type="AudioStreamID" isNullable="true"/>
39+
<item fieldId="7" name="MetadataOptions" type="WebRTCMetadataOptions" default="0x00" min="0x00" max="0x01"/>
40+
</struct>
41+
3242
<!--
3343
These are test global items (no cluster attached) for testing only.
3444
Their usage is defined for UnitTestCluster only.

0 commit comments

Comments
 (0)