Skip to content

Commit 6b1f61d

Browse files
cecilleadigie
authored andcommitted
[nrf fromtree] DM XMLs 1.4 tag (project-chip#36154)
* DM XMLs 1.4 tag * Update to head One of the other DM PRs wasn't picked over, so this scrape also contains those changes. This was scraped from master vs. picking. (cherry picked from commit bfff495) Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
1 parent fa3a52c commit 6b1f61d

34 files changed

+53
-1305
lines changed

data_model/1.4/clusters/DemandResponseLoadControl.xml

-453
This file was deleted.

data_model/1.4/clusters/DeviceEnergyManagement.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ Davis, CA 95616, USA
6565
<revision revision="4" summary="Updates to feature conformance. Corrected ForecastID type"/>
6666
</revisionHistory>
6767
<clusterIds>
68-
<clusterId id="0x0098" name="Device Energy Management">
69-
<provisionalConform/>
70-
</clusterId>
68+
<clusterId id="0x0098" name="Device Energy Management"/>
7169
</clusterIds>
7270
<classification hierarchy="base" role="application" picsCode="DEM" scope="Endpoint"/>
7371
<features>
@@ -566,7 +564,6 @@ Davis, CA 95616, USA
566564
</field>
567565
<field id="1" name="Cause" type="AdjustmentCauseEnum">
568566
<mandatoryConform/>
569-
<constraint type="desc"/>
570567
</field>
571568
</command>
572569
<command id="0x03" name="PauseRequest" direction="commandToServer" response="Y">
@@ -580,7 +577,6 @@ Davis, CA 95616, USA
580577
</field>
581578
<field id="1" name="Cause" type="AdjustmentCauseEnum">
582579
<mandatoryConform/>
583-
<constraint type="desc"/>
584580
</field>
585581
</command>
586582
<command id="0x04" name="ResumeRequest" direction="commandToServer" response="Y">
@@ -604,7 +600,6 @@ Davis, CA 95616, USA
604600
</field>
605601
<field id="2" name="Cause" type="AdjustmentCauseEnum">
606602
<mandatoryConform/>
607-
<constraint type="desc"/>
608603
</field>
609604
</command>
610605
<command id="0x06" name="RequestConstraintBasedForecast" direction="commandToServer" response="Y">
@@ -619,7 +614,6 @@ Davis, CA 95616, USA
619614
</field>
620615
<field id="1" name="Cause" type="AdjustmentCauseEnum">
621616
<mandatoryConform/>
622-
<constraint type="desc"/>
623617
</field>
624618
</command>
625619
<command id="0x07" name="CancelRequest" direction="commandToServer" response="Y">

data_model/1.4/clusters/DiagnosticsGeneral.xml

-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ Davis, CA 95616, USA
263263
<mandatoryConform/>
264264
</attribute>
265265
<attribute id="0x0009" name="DoNotUse">
266-
<access read="true" readPrivilege="view"/>
267266
<disallowConform/>
268267
</attribute>
269268
</attributes>

data_model/1.4/clusters/DiagnosticsThread.xml

+8-2
Original file line numberDiff line numberDiff line change
@@ -669,12 +669,18 @@ Davis, CA 95616, USA
669669
<attribute id="0x003F" name="ExtAddress" type="uint64">
670670
<access read="true" readPrivilege="view"/>
671671
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
672-
<mandatoryConform/>
672+
<otherwiseConform>
673+
<provisionalConform/>
674+
<mandatoryConform/>
675+
</otherwiseConform>
673676
</attribute>
674677
<attribute id="0x0040" name="Rloc16" type="uint16">
675678
<access read="true" readPrivilege="view"/>
676679
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
677-
<mandatoryConform/>
680+
<otherwiseConform>
681+
<provisionalConform/>
682+
<mandatoryConform/>
683+
</otherwiseConform>
678684
</attribute>
679685
</attributes>
680686
<commands>

data_model/1.4/clusters/DoorLock.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Davis, CA 95616, USA
6666
<revision revision="5" summary="CCB 3472 3474 3338"/>
6767
<revision revision="6" summary="New data model format and notation. Added User features. General cleanup of functionality"/>
6868
<revision revision="7" summary="Added support for European door locks (unbolt feature)"/>
69-
<revision revision="8" summary="Removed LOG feature, fixed constraints on NumberOf*Schedules attributes.
69+
<revision revision="8" summary="Removed LOG and NOT feature, fixed constraints on NumberOf*Schedules attributes.
7070
and added support for Aliro credential provisioning"/>
7171
</revisionHistory>
7272
<clusterIds>
@@ -600,9 +600,6 @@ Davis, CA 95616, USA
600600
<bitfield name="LockFactoryReset" bit="1" summary="Lock Reset to Factory Defaults">
601601
<optionalConform/>
602602
</bitfield>
603-
<bitfield name="N/A" bit="2" summary="Reserved">
604-
<optionalConform/>
605-
</bitfield>
606603
<bitfield name="LockRadioPowerCycled" bit="3" summary="RF Module Power Cycled">
607604
<optionalConform/>
608605
</bitfield>

data_model/1.4/clusters/EnergyCalendar.xml

-287
This file was deleted.

data_model/1.4/clusters/EnergyEVSE.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ Davis, CA 95616, USA
6969
<classification hierarchy="base" role="application" picsCode="EEVSE" scope="Endpoint"/>
7070
<features>
7171
<feature bit="0" code="PREF" name="ChargingPreferences" summary="EVSE supports storing user charging preferences">
72-
<otherwiseConform>
73-
<provisionalConform/>
74-
<mandatoryConform/>
75-
</otherwiseConform>
72+
<mandatoryConform/>
7673
</feature>
7774
<feature bit="1" code="SOC" name="SoCReporting" summary="EVSE supports reporting of vehicle State of Charge (SoC)">
7875
<otherwiseConform>
@@ -240,7 +237,6 @@ Davis, CA 95616, USA
240237
<struct name="ChargingTargetScheduleStruct">
241238
<field id="0" name="DayOfWeekForSequence" type="TargetDayOfWeekBitmap">
242239
<mandatoryConform/>
243-
<constraint type="desc"/>
244240
</field>
245241
<field id="1" name="ChargingTargets" type="list">
246242
<entry type="ChargingTargetStruct"/>

0 commit comments

Comments
 (0)