8000 Home Automation by nmerket · Pull Request #198 · hpxmlwg/hpxml · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Home Automation #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 22, 2019
Merged

Home Automation #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36fe358
adding ConnectedDevice elements
Oct 2, 2019
5555fcd
adding DR and occupancy sensor
Oct 4, 2019
68d6d2f
making CommunicationProtocol unbounded
Oct 9, 2019
770d41d
Merge branch 'master' into 169_home_automation
Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions schemas/BaseElements.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@
<xs:complexType name="ApplianceTypeSummaryInfo">
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element minOccurs="0" ref="AttachedToSpace"/>
<xs:element name="NumberofUnits" type="IntegerGreaterThanOrEqualToZero" minOccurs="0"/>
<xs:element name="Manufacturer" type="Manufacturer" minOccurs="0"/>
Expand Down Expand Up @@ -1171,6 +1172,7 @@
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element minOccurs="0" name="Manufacturer" type="xs:string"/>
<xs:element minOccurs="0" name="SerialNumber" type="xs:string"/>
<xs:element minOccurs="0" name="FanType" type="VentilationFanType"/>
Expand Down Expand Up @@ -1295,6 +1297,7 @@
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element minOccurs="0" ref="AttachedToZone"/>
<xs:element minOccurs="0" name="AttachedToCAZ" type="LocalReference"/>
<xs:element name="FuelType" type="FuelType" minOccurs="0"/>
Expand Down Expand Up @@ -1564,6 +1567,7 @@
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element minOccurs="0" name="Manufacturer" type="xs:string"/>
<xs:element minOccurs="0" name="ModelNumber" type="xs:string"/>
<xs:element minOccurs="0" ref="AttachedToZone"/>
Expand Down Expand Up @@ -1650,6 +1654,7 @@
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element minOccurs="0" name="Location" type="PVSystemLocation"/>
<xs:element minOccurs="0" name="Ownership" type="PVSystemOwnership"/>
<xs:element minOccurs="0" name="ModuleType">
Expand Down Expand Up @@ -1804,6 +1809,7 @@
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element minOccurs="0" name="Fixture" type="LocalReference">
<xs:annotation>
<xs:documentation>The LightingFixture that this is attached to</xs:documentation>
Expand Down Expand Up @@ -1855,6 +1861,7 @@
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element maxOccurs="unbounded" 10000 minOccurs="0" name="ThirdPartyCertification" type="LightingFixtureThirdPartyCertification"/>
<xs:element minOccurs="0" ref="extension"/>
</xs:sequence>
Expand All @@ -1864,6 +1871,7 @@
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element minOccurs="0" name="AttachedToLightingGroup" type="LocalReference"/>
<xs:element name="LightingControlType" type="LightingControls" minOccurs="0"> </xs:element>
<xs:element name="NumberofLightingControls" type="IntegerGreaterThanOrEqualToZero" minOccurs="0"/>
Expand All @@ -1876,6 +1884,7 @@
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element maxOccurs="3" minOccurs="0" name="Airflow">
<xs:annotation>
<xs:documentation/>
Expand Down Expand Up @@ -2039,6 +2048,7 @@
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element minOccurs="0" name="Type" type="PoolPumpType"/>
<xs:element minOccurs="0" name="Manufacturer" type="xs:string">
<xs:annotation>
Expand Down Expand Up @@ -2135,6 +2145,7 @@
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element minOccurs="0" name="Type" type="PoolCleanerType">
<xs:annotation>
<xs:documentation>Type of pool cleaner used, if any.</xs:documentation>
Expand All @@ -2145,13 +2156,15 @@
<xs:documentation>Hours per day pool cleaner is used. </xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" ref="extension"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="Heater">
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element minOccurs="0" name="Type" type="PoolHeaterType">
<xs:annotation>
<xs:documentation>Type of heater used to heat pool, if any.</xs:documentation>
Expand All @@ -2162,6 +2175,7 @@
<xs:documentation>Hours per day pool heater is used.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" ref="extension"/>
</xs:sequence>
</xs:complexType>
</xs:element>
Expand All @@ -2177,6 +2191,8 @@
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element minOccurs="0" name="ControlsPlugLoad" type="LocalReference"/>
<xs:element minOccurs="0" ref="AttachedToSpace"/>
<xs:element name="Count" type="IntegerGreaterThanOrEqualToZero" minOccurs="0"/>
<xs:element name="PlugLoadControlType" minOccurs="0" type="PlugLoadControlType"/>
Expand All @@ -2188,6 +2204,7 @@
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element minOccurs="0" ref="AttachedToSpace"/>
<xs:element name="PlugLoadType" type="PlugLoadType" minOccurs="0"/>
<xs:element minOccurs="0" name="Location" type="PlugLoadLocation"/>
Expand Down Expand Up @@ -4417,6 +4434,7 @@
<xs:complexType name="HVACControlType">
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" ref="ConnectedDevice"/>
<xs:element minOccurs="0" ref="AttachedToZone"/>
<xs:element name="ControlType" type="ThermostatType" minOccurs="0"/>
<xs:element name="SetpointTempHeatingSeason" type="Temperature" minOccurs="0">
Expand Down Expand Up @@ -4830,4 +4848,19 @@
<xs:attribute name="id" use="required"/>
</xs:complexType>
</xs:element>
<xs:element name="ConnectedDevice">
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element name="IsConnected" type="xs:boolean"/>
<xs:element maxOccurs="unbounded" minOccurs="0" name="CommunicatesWith"
type="LocalReference"/>
<xs:element minOccurs="0" name="CommunicationProtocol"
type="ConnectedDeviceCommunicationProtocol" maxOccurs="unbounded"/>
<xs:element minOccurs="0" name="DemandResponseCapability" type="xs:boolean"/>
<xs:element minOccurs="0" name="OccupancySensor" type="xs:boolean"/>
<xs:element minOccurs="0" ref="extension"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
13 changes: 13 additions & 0 deletions schemas/HPXMLDataTypes.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,7 @@
<xs:enumeration value="advanced power strip for AV"/>
<xs:enumeration value="advanced power strip for IT"/>
<xs:enumeration value="whole-house energy management system"/>
<xs:enumeration value="smart plug"/>
<xs:enumeration value="other"/>
</xs:restriction>
</xs:simpleType>
Expand Down Expand Up @@ -2186,4 +2187,16 @@
<xs:enumeration value="nominal"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="ConnectedDeviceCommunicationProtocol">
<xs:restriction base="xs:string">
<xs:enumeration value="Wi-Fi"/>
<xs:enumeration value="Zigbee"/>
<xs:enumeration value="Z-wave"/>
<xs:enumeration value="Ethernet"/>
<xs:enumeration value="Bluetooth"/>
<xs:enumeration value="LTE"/>
<xs:enumeration value="cellular modem"/>
<xs:enumeration value="other"/>
</xs:restriction>
</xs:simpleType>
</xs:schema>
0