Skip to content

Commit

Permalink
[nrf fromtree] DM XMLs 1.4 tag (project-chip#36154)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
cecille authored and adigie committed Nov 28, 2024
1 parent fa3a52c commit 6b1f61d
Show file tree
Hide file tree
Showing 34 changed files with 53 additions and 1,305 deletions.
453 changes: 0 additions & 453 deletions data_model/1.4/clusters/DemandResponseLoadControl.xml

This file was deleted.

8 changes: 1 addition & 7 deletions data_model/1.4/clusters/DeviceEnergyManagement.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ Davis, CA 95616, USA
<revision revision="4" summary="Updates to feature conformance. Corrected ForecastID type"/>
</revisionHistory>
<clusterIds>
<clusterId id="0x0098" name="Device Energy Management">
<provisionalConform/>
</clusterId>
<clusterId id="0x0098" name="Device Energy Management"/>
</clusterIds>
<classification hierarchy="base" role="application" picsCode="DEM" scope="Endpoint"/>
<features>
Expand Down Expand Up @@ -566,7 +564,6 @@ Davis, CA 95616, USA
</field>
<field id="1" name="Cause" type="AdjustmentCauseEnum">
<mandatoryConform/>
<constraint type="desc"/>
</field>
</command>
<command id="0x03" name="PauseRequest" direction="commandToServer" response="Y">
Expand All @@ -580,7 +577,6 @@ Davis, CA 95616, USA
</field>
<field id="1" name="Cause" type="AdjustmentCauseEnum">
<mandatoryConform/>
<constraint type="desc"/>
</field>
</command>
<command id="0x04" name="ResumeRequest" direction="commandToServer" response="Y">
Expand All @@ -604,7 +600,6 @@ Davis, CA 95616, USA
</field>
<field id="2" name="Cause" type="AdjustmentCauseEnum">
<mandatoryConform/>
<constraint type="desc"/>
</field>
</command>
<command id="0x06" name="RequestConstraintBasedForecast" direction="commandToServer" response="Y">
Expand All @@ -619,7 +614,6 @@ Davis, CA 95616, USA
</field>
<field id="1" name="Cause" type="AdjustmentCauseEnum">
<mandatoryConform/>
<constraint type="desc"/>
</field>
</command>
<command id="0x07" name="CancelRequest" direction="commandToServer" response="Y">
Expand Down
1 change: 0 additions & 1 deletion data_model/1.4/clusters/DiagnosticsGeneral.xml
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ Davis, CA 95616, USA
<mandatoryConform/>
</attribute>
<attribute id="0x0009" name="DoNotUse">
<access read="true" readPrivilege="view"/>
<disallowConform/>
</attribute>
</attributes>
Expand Down
10 changes: 8 additions & 2 deletions data_model/1.4/clusters/DiagnosticsThread.xml
Original file line number Diff line number Diff line change
Expand Up @@ -669,12 +669,18 @@ Davis, CA 95616, USA
<attribute id="0x003F" name="ExtAddress" type="uint64">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
<otherwiseConform>
<provisionalConform/>
<mandatoryConform/>
</otherwiseConform>
</attribute>
<attribute id="0x0040" name="Rloc16" type="uint16">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
<otherwiseConform>
<provisionalConform/>
<mandatoryConform/>
</otherwiseConform>
</attribute>
</attributes>
<commands>
Expand Down
5 changes: 1 addition & 4 deletions data_model/1.4/clusters/DoorLock.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Davis, CA 95616, USA
<revision revision="5" summary="CCB 3472 3474 3338"/>
<revision revision="6" summary="New data model format and notation. Added User features. General cleanup of functionality"/>
<revision revision="7" summary="Added support for European door locks (unbolt feature)"/>
<revision revision="8" summary="Removed LOG feature, fixed constraints on NumberOf*Schedules attributes.
<revision revision="8" summary="Removed LOG and NOT feature, fixed constraints on NumberOf*Schedules attributes.
and added support for Aliro credential provisioning"/>
</revisionHistory>
<clusterIds>
Expand Down Expand Up @@ -600,9 +600,6 @@ Davis, CA 95616, USA
<bitfield name="LockFactoryReset" bit="1" summary="Lock Reset to Factory Defaults">
<optionalConform/>
</bitfield>
<bitfield name="N/A" bit="2" summary="Reserved">
<optionalConform/>
</bitfield>
<bitfield name="LockRadioPowerCycled" bit="3" summary="RF Module Power Cycled">
<optionalConform/>
</bitfield>
Expand Down
287 changes: 0 additions & 287 deletions data_model/1.4/clusters/EnergyCalendar.xml

This file was deleted.

6 changes: 1 addition & 5 deletions data_model/1.4/clusters/EnergyEVSE.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,7 @@ Davis, CA 95616, USA
<classification hierarchy="base" role="application" picsCode="EEVSE" scope="Endpoint"/>
<features>
<feature bit="0" code="PREF" name="ChargingPreferences" summary="EVSE supports storing user charging preferences">
<otherwiseConform>
<provisionalConform/>
<mandatoryConform/>
</otherwiseConform>
<mandatoryConform/>
</feature>
<feature bit="1" code="SOC" name="SoCReporting" summary="EVSE supports reporting of vehicle State of Charge (SoC)">
<otherwiseConform>
Expand Down Expand Up @@ -240,7 +237,6 @@ Davis, CA 95616, USA
<struct name="ChargingTargetScheduleStruct">
<field id="0" name="DayOfWeekForSequence" type="TargetDayOfWeekBitmap">
<mandatoryConform/>
<constraint type="desc"/>
</field>
<field id="1" name="ChargingTargets" type="list">
<entry type="ChargingTargetStruct"/>
Expand Down
Loading

0 comments on commit 6b1f61d

Please sign in to comment.