Merge pull request #395 from hpxmlwg/spa_fixes

Portable Electric Spa Fixes
hpxmlwg · Oct 5, 2023 · 3ee070f · 3ee070f
2 parents 3b6e69a + 8a87187
commit 3ee070f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/merged_schema/HPXMLMerged.xsd b/merged_schema/HPXMLMerged.xsd
@@ -4463,7 +4463,7 @@
 											<xs:documentation>[W] Maximum standby power allowed for this size spa under ANSI/APSP/ICC-14</xs:documentation>
 										</xs:annotation>
 									</xs:element>
-									<xs:element name="TotalAnnualPowerConsumptionInStandbyMode" minOccurs="0" type="EnergyAndWaterUseTypeDescription">
+									<xs:element name="TotalAnnualPowerConsumptionInStandbyMode" minOccurs="0" type="RatedAnnualkWh">
 										<xs:annotation>
 											<xs:documentation>[kWh] Total annual power consumption in standby mode, based on test procedure in ANSI/APSP/ICC-14. Typically standby power * 8760. </xs:documentation>
 										</xs:annotation>
@@ -4481,11 +4481,6 @@
 											<xs:documentation>Months per year portable spa is in operation.</xs:documentation>
 										</xs:annotation>
 									</xs:element>
-									<xs:element minOccurs="0" name="FilterType" type="PoolFilterType">
-										<xs:annotation>
-											<xs:documentation>Type of filter used, if any.</xs:documentation>
-										</xs:annotation>
-									</xs:element>
 									<xs:element minOccurs="0" ref="extension"/>
 								</xs:sequence>
 								<xs:attribute name="dataSource" type="DataSource"/>

diff --git a/schemas/HPXMLBaseElements.xsd b/schemas/HPXMLBaseElements.xsd
@@ -4449,7 +4449,7 @@
 											<xs:documentation>[W] Maximum standby power allowed for this size spa under ANSI/APSP/ICC-14</xs:documentation>
 										</xs:annotation>
 									</xs:element>
-									<xs:element name="TotalAnnualPowerConsumptionInStandbyMode" minOccurs="0" type="EnergyAndWaterUseTypeDescription">
+									<xs:element name="TotalAnnualPowerConsumptionInStandbyMode" minOccurs="0" type="RatedAnnualkWh">
 										<xs:annotation>
 											<xs:documentation>[kWh] Total annual power consumption in standby mode, based on test procedure in ANSI/APSP/ICC-14. Typically standby power * 8760. </xs:documentation>
 										</xs:annotation>
@@ -4467,11 +4467,6 @@
 											<xs:documentation>Months per year portable spa is in operation.</xs:documentation>
 										</xs:annotation>
 									</xs:element>
-									<xs:element minOccurs="0" name="FilterType" type="PoolFilterType">
-										<xs:annotation>
-											<xs:documentation>Type of filter used, if any.</xs:documentation>
-										</xs:annotation>
-									</xs:element>
 									<xs:element minOccurs="0" ref="extension"/>
 								</xs:sequence>
 								<xs:attribute name="dataSource" type="DataSource"/>