Skip to content

Commit

Permalink
DM XMLs: 1.3 0.7 recirculation ballot (#31980)
Browse files Browse the repository at this point in the history 
* DM XML: Scrape from 1.3 0.7 recrirculation ballot

* Manual fixes for aliased clusters (pending 1.2.4 fix in scraper)

* Manual fix for base device type

This broke again when I re-levelled the section headers. Will
fix in spec.
  • Loading branch information
@cecille
cecille authored Feb 13, 2024
1 parent f8d7d1d commit e63e9df
Show file tree
Hide file tree
Showing 41 changed files with 617 additions and 703 deletions.
2 changes: 1 addition & 1 deletion data_model/clusters/ConcentrationMeasurement.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,4 @@ Davis, CA 95616, USA
</mandatoryConform>
</attribute>
</attributes>
</cluster>
</cluster>
9 changes: 0 additions & 9 deletions data_model/clusters/DemandResponseLoadControl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,31 +248,26 @@ Davis, CA 95616, USA
</struct>
<struct name="LoadControlProgramStruct">
<field id="0" name="ProgramID" type="octstr" default="0">
<access read="true" write="true"/>
<mandatoryConform/>
<constraint type="maxLength" value="16"/>
</field>
<field id="1" name="Name" type="string">
<access read="true" write="true"/>
<mandatoryConform/>
<constraint type="maxLength" value="32"/>
</field>
<field id="2" name="EnrollmentGroup" type="uint8" default="null">
<access read="true" write="true"/>
<quality nullable="true"/>
<mandatoryConform>
<feature name="ENRLG"/>
</mandatoryConform>
<constraint type="between" from="0x01" to="0xFF"/>
</field>
<field id="3" name="RandomStartMinutes" type="uint8" default="null">
<access read="true" write="true"/>
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="between" from="0x00" to="0x3C"/>
</field>
<field id="4" name="RandomDurationMinutes" type="uint8" default="null">
<access read="true" write="true"/>
<quality nullable="true"/>
<mandatoryConform/>
<constraint type="between" from="0x00" to="0x3C"/>
Expand All @@ -286,31 +281,27 @@ Davis, CA 95616, USA
</struct>
<struct name="TemperatureControlStruct">
<field id="0" name="CoolingTempOffset" type="ref_TempDiff" default="null">
<access read="true" write="true"/>
<quality nullable="true"/>
<mandatoryConform>
<feature name="TEMPO"/>
</mandatoryConform>
<constraint type="between" from="0x00" to="0x0FE"/>
</field>
<field id="1" name="HeatingTempOffset" type="ref_TempDiff" default="null">
<access read="true" write="true"/>
<quality nullable="true"/>
<mandatoryConform>
<feature name="TEMPO"/>
</mandatoryConform>
<constraint type="between" from="0x00" to="0x0FE"/>
</field>
<field id="2" name="CoolingTempSetpoint" type="temperature" default="null">
<access read="true" write="true"/>
<quality nullable="true"/>
<mandatoryConform>
<feature name="TEMPS"/>
</mandatoryConform>
<constraint type="between" from="0x954D" to="0x7FFF"/>
</field>
<field id="3" name="HeatingTempSetpoint" type="temperature" default="null">
<access read="true" write="true"/>
<quality nullable="true"/>
<mandatoryConform>
<feature name="TEMPS"/>
Expand Down
55 changes: 6 additions & 49 deletions data_model/clusters/DeviceEnergyManagement.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ Davis, CA 95616, USA
</features>
<dataTypes>
<enum name="AdjustmentCauseEnum">
<item value="0" name="Local" summary="The adjustment is to optimize the local energy usage">
<item value="0" name="LocalOptimization" summary="The adjustment is to optimize the local energy usage">
<optionalConform/>
</item>
<item value="1" name="Grid" summary="The adjustment is to optimize the grid energy usage">
<item value="1" name="GridOptimization" summary="The adjustment is to optimize the grid energy usage">
<optionalConform/>
</item>
</enum>
Expand Down Expand Up @@ -237,13 +237,13 @@ Davis, CA 95616, USA
</item>
</enum>
<enum name="ForecastUpdateReasonEnum">
<item value="0" name="Internal" summary="The update was due to internal ESA device optimization">
<item value="0" name="InternalOptimization" summary="The update was due to internal ESA device optimization">
<optionalConform/>
</item>
<item value="1" name="Local" summary="The update was due to local EMS optimization">
<item value="1" name="LocalOptimization" summary="The update was due to local EMS optimization">
<optionalConform/>
</item>
<item value="2" name="Grid" summary="The update was due to grid optimization">
<item value="2" name="GridOptimization" summary="The update was due to grid optimization">
<optionalConform/>
</item>
</enum>
Expand All @@ -257,218 +257,178 @@ Davis, CA 95616, USA
<item value="2" name="GridOptOut" summary="The user has opted out of grid EMS optimizations only">
<mandatoryConform/>
</item>
<item value="3" name="OptOut" summary="The user has opted out of all optimizations">
<item value="3" name="OptOut" summary="The user has opted out of all external optimizations">
<mandatoryConform/>
</item>
</enum>
<struct name="ConstraintsStruct">
<field id="0" name="StartTime" type="epoch-s">
<access read="true" write="true"/>
<mandatoryConform/>
<constraint type="desc"/>
</field>
<field id="1" name="Duration" type="elapsed-s">
<access read="true" write="true"/>
<mandatoryConform/>
<constraint type="between" from="0" to="86400"/>
</field>
<field id="2" name="NominalPower" type="power-mW">
<access read="true" write="true"/>
<mandatoryConform>
<feature name="PFR"/>
</mandatoryConform>
<constraint type="desc"/>
</field>
<field id="3" name="MaximumEnergy" type="energy-mWh">
<access read="true" write="true"/>
<mandatoryConform>
<feature name="PFR"/>
</mandatoryConform>
</field>
<field id="4" name="LoadControl" type="int8">
<access read="true" write="true"/>
<mandatoryConform>
<feature name="SFR"/>
</mandatoryConform>
</field>
</struct>
<struct name="CostStruct">
<field id="0" name="CostType" type="CostTypeEnum" default="0">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="1" name="Value" type="int32" default="0">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="2" name="DecimalPoints" type="uint8" default="0">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="3" name="Currency" type="uint16" default="0">
<access read="true"/>
<optionalConform/>
<constraint type="max" value="999"/>
</field>
</struct>
<struct name="ForecastStruct">
<field id="0" name="ForecastId" type="uint16" default="0">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="1" name="ActiveSlotNumber" type="uint16" default="0">
<access read="true"/>
<quality nullable="true"/>
<mandatoryConform/>
</field>
<field id="2" name="StartTime" type="epoch-s">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="3" name="EndTime" type="epoch-s">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="4" name="EarliestStartTime" type="epoch-s">
<access read="true"/>
<quality nullable="true"/>
<mandatoryConform>
<feature name="STA"/>
</mandatoryConform>
</field>
<field id="5" name="LatestEndTime" type="epoch-s">
<access read="true"/>
<mandatoryConform>
<feature name="STA"/>
</mandatoryConform>
</field>
<field id="6" name="IsPauseable" type="bool">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="7" name="Slots" type="list">
<entry type="SlotStruct"/>
<access read="true"/>
<mandatoryConform/>
<constraint type="maxCount" value="10"/>
</field>
<field id="8" name="ForecastUpdateReason" type="ForecastUpdateReasonEnum">
<access read="true"/>
<mandatoryConform/>
</field>
</struct>
<struct name="PowerAdjustStruct">
<field id="0" name="MinPower" type="power-mW" default="0">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="1" name="MaxPower" type="power-mW" default="0">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="2" name="MinDuration" type="elapsed-s" default="0">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="3" name="MaxDuration" type="elapsed-s">
<access read="true"/>
<mandatoryConform/>
</field>
</struct>
<struct name="SlotAdjustmentStruct">
<field id="0" name="SlotIndex" type="uint8">
<access read="true" write="true"/>
<mandatoryConform/>
<constraint type="desc"/>
</field>
<field id="1" name="NominalPower" type="power-mW">
<access read="true" write="true"/>
<mandatoryConform/>
<constraint type="desc"/>
</field>
<field id="2" name="Duration" type="elapsed-s">
<access read="true" write="true"/>
<mandatoryConform/>
<constraint type="desc"/>
</field>
</struct>
<struct name="SlotStruct">
<field id="0" name="MinDuration" type="elapsed-s">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="1" name="MaxDuration" type="elapsed-s">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="2" name="DefaultDuration" type="elapsed-s">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="3" name="ElapsedSlotTime" type="elapsed-s">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="4" name="RemainingSlotTime" type="elapsed-s">
<access read="true"/>
<mandatoryConform/>
</field>
<field id="5" name="SlotIsPauseable" type="bool">
<access read="true"/>
<mandatoryConform>
<feature name="PAU"/>
</mandatoryConform>
</field>
<field id="6" name="MinPauseDuration" type="elapsed-s">
<access read="true"/>
<mandatoryConform>
<feature name="PAU"/>
</mandatoryConform>
</field>
<field id="7" name="MaxPauseDuration" type="elapsed-s">
<access read="true"/>
<mandatoryConform>
<feature name="PAU"/>
</mandatoryConform>
</field>
<field id="8" name="ManufacturerESAState" type="uint16">
<access read="true"/>
<mandatoryConform>
<feature name="SFR"/>
</mandatoryConform>
</field>
<field id="9" name="NominalPower" type="power-mW">
<access read="true"/>
<mandatoryConform>
<feature name="PFR"/>
</mandatoryConform>
</field>
<field id="10" name="MinPower" type="power-mW">
<access read="true"/>
<mandatoryConform>
<feature name="PFR"/>
</mandatoryConform>
</field>
<field id="11" name="MaxPower" type="power-mW">
<access read="true"/>
<mandatoryConform>
<feature name="PFR"/>
</mandatoryConform>
</field>
<field id="12" name="NominalEnergy" type="energy-mWh">
<access read="true"/>
<mandatoryConform>
<feature name="PFR"/>
</mandatoryConform>
</field>
<field id="13" name="Costs" type="list">
<entry type="CostStruct"/>
<access read="true"/>
<optionalConform/>
<constraint type="maxCount" value="5"/>
</field>
<field id="14" name="MinPowerAdjustment" type="power-mW">
<access read="true"/>
<mandatoryConform>
<andTerm>
<feature name="FA"/>
Expand All @@ -477,7 +437,6 @@ Davis, CA 95616, USA
</mandatoryConform>
</field>
<field id="15" name="MaxPowerAdjustment" type="power-mW">
<access read="true"/>
<mandatoryConform>
<andTerm>
<feature name="FA"/>
Expand All @@ -486,7 +445,6 @@ Davis, CA 95616, USA
</mandatoryConform>
</field>
<field id="16" name="MinDurationAdjustment" type="elapsed-s">
<access read="true"/>
<mandatoryConform>
<andTerm>
<feature name="FA"/>
Expand All @@ -498,7 +456,6 @@ Davis, CA 95616, USA
</mandatoryConform>
</field>
<field id="17" name="MaxDurationAdjustment" type="elapsed-s">
<access read="true"/>
<mandatoryConform>
<andTerm>
<feature name="FA"/>
Expand Down
Loading

0 comments on commit e63e9df

Please sign in to comment.