Skip to content

Commit 7ab65dc

Browse files
benfrancisbenfrancis
authored
Merge pull request #1 from benfrancis/upgrade-and-patch
Rebase against latest upstream and patch to fix build workflow of zwave-adapter
2 parents 76e21d8 + 9df50bb commit 7ab65dc

File tree

533 files changed

+26658
-3184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

533 files changed

+26658
-3184
lines changed

‎.github/FUNDING.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# These are supported funding model platforms
22

3-
#github: [Fishwaldo, nechry]
3+
github: [Fishwaldo, nechry]
44
patreon: # Replace with a single Patreon username
55
open_collective: ozw
66
ko_fi: # Replace with a single Ko-fi username

‎.github/XMLTestMatcher.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "xmltest",
5+
"pattern": [
6+
{
7+
"regexp": "^(.*\/open.zwave\/)(.*):([0-9]*):.?(.*)$",
8+
"fromPath": 1,
9+
"file": 2,
10+
"line": 3,
11+
"message": 4
12+
}
13+
]
14+
},
15+
{
16+
"owner": "ConfigDatabase",
17+
"pattern": [
18+
{
19+
"regexp": "^Errors: [0-9]*\\. \\(Please Correct before Submitting to OZW\\)$"
20+
},
21+
{
22+
"regexp": "^(.*):.(.*)$",
23+
"file": 1,
24+
"message": 2,
25+
"loop": true
26+
}
27+
]
28+
}
29+
]
30+
}

‎.github/workflows/ConfigCheck.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Test Config Files
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- 'config/**'
7+
8+
jobs:
9+
ConfigTest:
10+
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
- name: install dependancies
16+
run: sudo apt update && sudo apt-get install libxml2-utils libxml-simple-perl
17+
- name: make xmltest
18+
run: |
19+
echo "::add-matcher::.github/XMLTestMatcher.json"
20+
make xmltest

‎.github/workflows/PRTest.yml‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,4 @@ ozw_config
5555
ozw_config
5656
gtest-main
5757
cpp/src/command_classes/\.DS_Store
58+
.DS_Store

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ xmltest: $(XMLLINT)
5757
@$(XMLLINT) --noout --schema $(top_srcdir)/config/NotificationCCTypes.xsd $(top_srcdir)/config/NotificationCCTypes.xml
5858
@$(XMLLINT) --noout --schema $(top_srcdir)/config/SensorMultiLevelCCTypes.xsd $(top_srcdir)/config/SensorMultiLevelCCTypes.xml
5959
@$(XMLLINT) --noout --schema $(top_srcdir)/config/device_configuration.xsd $(top_srcdir)/config/*/*.xml
60-
-@cpp/build/testconfig.pl
60+
@cpp/build/testconfig.pl
6161
endif
6262
fulltest:
63-
-@cpp/build/testconfig.pl --printwarnings
63+
@cpp/build/testconfig.pl --printwarnings
6464

6565

6666

‎README.md‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
![Open-ZWave Library](https://github.com/OpenZWave/open-zwave-web/raw/master/gfx/OZW_SF.png)
22
==================
33

4-
*Last Updated: 4 October 2019*
4+
*Last Updated: 17 November 2022*
5+
6+
* * *
7+
8+
## NOTICE: This project is no longer being maintained. :warning:
9+
openzwave has no more maintainers, are there any motivated to continue the development of the library?
10+
11+
## Introduction
512

613
Our goal is to create free software library that interfaces with Z-Wave controllers, allowing anyone to create applications to control devices on a Z-Wave network, without requiring in-depth knowledge of the Z-Wave protocol. OpenZWave is not about creating Z-Wave devices (nodes). The project consists of the main library, written in C++ and wrappers and supporting projects, to interface different languages and protocol(s).
714

@@ -102,6 +109,8 @@ Become a financial contributor and help us sustain our community. [[Contribute](
102109

103110
<a href="https://opencollective.com/ozw"><img src="https://opencollective.com/ozw/individuals.svg?width=890"></a>
104111

112+
(We also have many users that support us via Github Sponsors program!)
113+
105114
#### Organizations
106115

107116
Support this project with your organization. Your logo will show up here with a link to your website. [[Contribute](https://opencollective.com/ozw/contribute)]
@@ -116,3 +125,13 @@ Support this project with your organization. Your logo will show up here with a
116125
<a href="https://opencollective.com/ozw/organization/7/website"><img src="https://opencollective.com/ozw/organization/7/avatar.svg"></a>
117126
<a href="https://opencollective.com/ozw/organization/8/website"><img src="https://opencollective.com/ozw/organization/8/avatar.svg"></a>
118127
<a href="https://opencollective.com/ozw/organization/9/website"><img src="https://opencollective.com/ozw/organization/9/avatar.svg"></a>
128+
129+
### Sponsors
130+
131+
The Following Organisations Sponsor OpenZWave Development by donating hardware for testing and support
132+
133+
<a href="https://www.aeotec.com/"><img height="47px" width="152px" src="https://aeotec.com/images/aeotec-logo.svg"></a>
134+
135+
<a href="https://qubino.com/"><img height="47px" width="152px" src="https://qubino.com/wp-content/uploads/2019/02/qubino_logo.png"></a>
136+
137+
<a href="https://www.heatit.com/"><img height="47px" width="152px" src="http://utvikling.thermofloor.no/TFWP/wp-content/uploads/2017/07/Heatit_Controls_RGB.png"></a>

‎config/2gig/ct200.xml‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
2+
<MetaData>
3+
<MetaDataItem name="Name">Vivint Element</MetaDataItem>
4+
<MetaDataItem name="Description">The Vivint Element Smart Thermostat has an elegantly simple design making it easy for anyone to use. It's hidden display comes to life when you need it, providing clear information and simple controls. This simplicity purposefully masks Element's true intelligence. Element works in concert with the Vivint SkyControl system, leveraging an unmatched understanding of home routines and activity levels. Element automatically and dynamically adjusts to match home activities and ensure a personalized balance of comfort and energy savings. </MetaDataItem>
5+
<MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0098:0022:c801</MetaDataItem>
6+
<MetaDataItem name="ProductPic">images/2gig/ct200.png</MetaDataItem>
7+
<MetaDataItem id="0022" name="ZWProductPage" type="c801">https://products.z-wavealliance.org/products/1678</MetaDataItem>
8+
<MetaDataItem id="0022" name="FrequencyName" type="c801">U.S. / Canada / Mexico </MetaDataItem>
9+
<MetaDataItem id="0022" name="Identifier" type="c801">CT200</MetaDataItem>
10+
<ChangeLog>
11+
<Entry author="srirams" date="11 Nov 2020" revision="1">Initial</Entry>
12+
</ChangeLog>
13+
<MetaDataItem id="0022" name="ZWProductPage" type="c801">https://products.z-wavealliance.org/products/1678/</MetaDataItem>
14+
<MetaDataItem name="ResetDescription">Press and hold the side button until you reach settings. Navigate to Installer / Reset. Use this procedure only in the event that the network primary controller is missing or otherwise inoperable.</MetaDataItem>
15+
<MetaDataItem id="0022" name="Identifier" type="c801">CT200</MetaDataItem>
16+
<MetaDataItem name="ExclusionDescription">Same process as inclusion.</MetaDataItem>
17+
<MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=&amp;filename=MarketCertificationFiles/1678/CT200_UserGuide_20160308.pdf</MetaDataItem>
18+
<MetaDataItem id="0022" name="FrequencyName" type="c801">U.S. / Canada / Mexico</MetaDataItem>
19+
<MetaDataItem name="WakeupDescription">When included into a Z-Wave network on battery power, this device is a FLiRS device. The Thermostat will wake up for communication when it receives a valid Z-Wave beam. </MetaDataItem>
20+
<MetaDataItem name="InclusionDescription">Hold the side button until you reach settings. Navigate to Installer / Network</MetaDataItem>
21+
</MetaData>
22+
<!--
23+
Radio Thermostat Company of America CT200 Thermostat manual available at:
24+
https://products.z-wavealliance.org/ProductManual/File?folder=&filename=MarketCertificationFiles/1678/CT200_UserGuide_20160308.pdf
25+
Additional information:
26+
https://products.z-wavealliance.org/products/1678
27+
-->
28+
<CommandClass id="112">
29+
<Value genre="config" instance="1" index="1" value="2" label="Temperature Reporting Threshold (8-bit)" units="" size="1" min="0" max="4" type="list">
30+
<Help>This value determines the reporting threshold</Help>
31+
<Item value="0" label="Disabled"/>
32+
<Item value="1" label="Also Disabled"/>
33+
<Item value="2" label="0.5 degrees F"/>
34+
<Item value="3" label="1.0 degrees F"/>
35+
<Item value="4" label="1.5 degrees F"/>
36+
</Value>
37+
<Value genre="config" instance="1" index="2" value="0" label="HVAC Settings" units="" size="4" min="0" max="0" type="int">
38+
<Help>Retrieves the HVAC Settings</Help>
39+
</Value>
40+
<Value genre="config" instance="1" index="3" value="0" label="Utility Lock" units="" size="1" min="0" max="255" type="byte">
41+
<Help>Enable or Disable the Utility Lock</Help>
42+
</Value>
43+
<Value genre="config" instance="1" index="4" value="0" label="C-Wire/Battery Status" units="" size="1" min="0" max="0" type="list">
44+
<Help>Query power which source is in use</Help>
45+
<Item value="1" label="Powered by C-Wire"/>
46+
<Item value="2" label="Powered by battery"/>
47+
</Value>
48+
<Value genre="config" instance="1" index="5" value="2" label="Humidity Reporting Threshold" units="" size="1" min="0" max="3" type="byte">
49+
<Help>This value determines the reporting threshold</Help>
50+
</Value>
51+
<Value genre="config" instance="1" index="6" value="0" label="Auxiliary/Emergency" units="" size="1" min="0" max="1" type="byte">
52+
<Help>Auxiliary / Emergency Heat Pump Mode</Help>
53+
</Value>
54+
<Value genre="config" instance="1" index="7" value="2" label="Thermostat Swing Temp" units="degrees Fahrenheit" size="1" min="1" max="8" type="list">
55+
<Help>Temperature spread between the on and off temperatures</Help>
56+
<Item value="1" label="0.5 degrees Fahrenheit"/>
57+
<Item value="2" label="1.0 degrees Fahrenheit"/>
58+
<Item value="3" label="1.5 degrees Fahrenheit"/>
59+
<Item value="4" label="2.0 degrees Fahrenheit"/>
60+
<Item value="5" label="2.5 degrees Fahrenheit"/>
61+
<Item value="6" label="3.0 degrees Fahrenheit"/>
62+
<Item value="7" label="3.5 degrees Fahrenheit"/>
63+
<Item value="8" label="4.0 degrees Fahrenheit"/>
64+
</Value>
65+
<Value genre="config" instance="1" index="8" value="4" label="Thermostat Diff Temp" units="" size="1" min="4" max="12" type="list">
66+
<Help>How far off from target temp before turning on unit</Help>
67+
<Item value="4" label="2.0 degrees Fahrenheit"/>
68+
<Item value="6" label="3.0 degrees Fahrenheit"/>
69+
<Item value="8" label="4.0 degrees Fahrenheit"/>
70+
<Item value="10" label="5.0 degrees Fahrenheit"/>
71+
<Item value="12" label="6.0 degrees Fahrenheit"/>
72+
</Value>
73+
<Value genre="config" instance="1" index="9" value="2" label="Thermostat Recovery Mode" units="" size="1" min="1" max="2" type="list">
74+
<Help>Bring a space back to a normal occupied temp</Help>
75+
<Item value="1" label="Fast Recovery Mode"/>
76+
<Item value="2" label="Economy Recovery Mode"/>
77+
</Value>
78+
<Value genre="config" instance="1" index="11" value="1" label="Simple UI Mode" units="" size="1" min="0" max="1" type="list">
79+
<Help>Toggle Simple UI Mode</Help>
80+
<Item value="0" label="Disabled"/>
81+
<Item value="1" label="Enabled"/>
82+
</Value>
83+
<Value genre="config" instance="1" index="12" value="0" label="Multicast" units="" size="1" min="0" max="1" type="list">
84+
<Help>Toggle Multicast Mode</Help>
85+
<Item value="0" label="Disabled"/>
86+
<Item value="1" label="Enabled"/>
87+
</Value>
88+
<Value genre="config" instance="1" index="13" value="1" label="Main Display Selection" units="" size="1" min="1" max="2" type="list">
89+
<Help>Control which info is displayed in the main display area</Help>
90+
<Item value="1" label="Show Temperature"/>
91+
<Item value="2" label="Show (unknown)"/>
92+
</Value>
93+
<Value genre="config" instance="1" index="14" value="2" label="Save Energy Mode Type" units="" size="1" min="1" max="255" type="byte">
94+
<Help>Save Energy Mode behavior</Help>
95+
</Value>
96+
<Value genre="config" instance="1" index="15" value="0" label="Fan Timer" units="" size="1" min="0" max="60" type="byte">
97+
<Help>Activate Fan w/ auto shutoff timer</Help>
98+
</Value>
99+
<Value genre="config" instance="1" index="17" value="0" label="Temperature Calibration" units="" size="1" min="-6" max="6" type="byte">
100+
<Help>Temperature Calibration / Offset</Help>
101+
</Value>
102+
<Value genre="config" instance="1" index="18" value="0" label="Display Units" units="" size="1" min="0" max="1" type="list">
103+
<Help>Celsius or Fahrenheit</Help>
104+
<Item value="0" label="Fahrenheit"/>
105+
<Item value="1" label="Celcius"/>
106+
</Value>
107+
</CommandClass>
108+
109+
<!-- This thermostat's setpoint descriptions are 0 based, not 1 -->
110+
<CommandClass id="67">
111+
<Compatibility>
112+
<Base>0</Base>
113+
<AltTypeInterpretation>true</AltTypeInterpretation>
114+
</Compatibility>
115+
</CommandClass>
116+
117+
<CommandClass id="96">
118+
<Compatibility>
119+
<MapRootToEndpoint>true</MapRootToEndpoint>
120+
</Compatibility>
121+
</CommandClass>
122+
123+
</Product>

‎config/2gig/ct32.xml‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Product Revision="5" xmlns="https://github.com/OpenZWave/open-zwave">
1+
<Product Revision="6" xmlns="https://github.com/OpenZWave/open-zwave">
22
<MetaData>
33
<MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0098:0100:2002</MetaDataItem>
44
<MetaDataItem name="ProductPic">images/2gig/ct32.png</MetaDataItem>
@@ -16,6 +16,7 @@
1616
<Entry author="Justin Hammond - [email protected]" date="03 May 2019" revision="3">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1046/xml</Entry>
1717
<Entry author="Justin Hammond - [email protected]" date="08 May 2019" revision="4">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/1330/xml</Entry>
1818
<Entry author="Keith Pine - [email protected]" date="05 Dec 2019" revision="5">Force root instance to map to first endpoint via compat flag MapRootToEndpoint</Entry>
19+
<Entry author="Keith Pine - [email protected]" date="21 Jan 2020" revision="6">Force Setpoint Interpretion A and update some config parameters.</Entry>
1920
</ChangeLog>
2021
</MetaData>
2122
<!--
@@ -26,6 +27,7 @@
2627
<CommandClass id="67">
2728
<Compatibility>
2829
<Base>0</Base>
30+
<AltTypeInterpretation>false</AltTypeInterpretation>
2931
</Compatibility>
3032
</CommandClass>
3133
<CommandClass id="96">
@@ -34,7 +36,7 @@
3436
</Compatibility>
3537
</CommandClass>
3638
<CommandClass id="112">
37-
<Value genre="config" index="1" label="Temperature Reporting Threshold" max="4" min="0" size="1" type="list" units="" value="0">
39+
<Value genre="config" index="1" label="Temperature Reporting Threshold" max="4" min="0" size="1" type="list" units="" value="2">
3840
<Help>
3941
The Temperature Reporting Threshold Configuration Set Command sets the reporting threshold for changes in the ambient temperature as detected by the thermostat.
4042
</Help>
@@ -115,9 +117,7 @@
115117
<Item label="HVAC: Normal, Aux Stages: 2, Aux Setup: Elec, Heat Pump Stages: 2, Cool Stages: 2" value="19005954"/>
116118
<!-- 0x01,0x2,0x2,0x02,0x02 -->
117119
<Item label="HVAC: Heat Pump, Aux Stages: 2, Aux Setup: Elec, Heat Pump Stages: 2, Cool Stages: 2" value="35783170"/>
118-
119-
120-
<!-- 0x02,0x2,0x2,0x02,0x02 -->
120+
<!-- 0x02,0x2,0x2,0x02,0x02 -->
121121
</Value>
122122
<Value genre="config" index="3" label="Utility Lock" max="1" min="0" size="1" type="list" units="" value="0">
123123
<Help>
@@ -135,9 +135,9 @@
135135
<Item label="C-Wire" value="1"/>
136136
<Item label="Battery" value="2"/>
137137
</Value>
138-
<Value genre="config" index="5" label="Humidity Reporting Threshold" max="3" min="0" size="1" type="list" units="" value="0">
138+
<Value genre="config" index="5" label="Humidity Reporting Threshold" max="3" min="0" size="1" type="list" units="" value="2">
139139
<Help>
140-
The Temperature Reporting Threshold Configuration Set Command sets the reporting threshold for changes in the ambient temperature as detected by the thermostat.
140+
The Humidity Reporting Threshold Configuration Set Command sets the reporting threshold for changes in the ambient humidity as detected by the thermostat.
141141
</Help>
142142
<Item label="Disabled" value="0"/>
143143
<Item label="3% RH" value="1"/>
@@ -155,13 +155,17 @@
155155
<Item label="Disabled" value="0"/>
156156
<Item label="Enabled" value="1"/>
157157
</Value>
158-
<Value genre="config" index="7" label="Thermostat Swing Temperature" max="8" min="1" size="1" type="list" units="" value="0">
158+
<Value genre="config" index="7" label="Thermostat Swing Temperature" max="8" min="1" size="1" type="list" units="" value="2">
159159
<Help>
160-
The Auxiliary/Emergency configuration command enables or disables auxiliary/emergency heating in the thermostat. Auxiliary/emergency heating is only available if the thermostat is configured in heat pump mode and with at least one stage of auxiliary heating. This command enables auxiliary / emergency heating when the thermostat is in Auto mode. The Thermostat Set Mode command with mode Auxiliary/Emergency Heat will enable emergency heating but only if the thermostat is in Heat
161-
mode. This command should only be used on thermsotats that support Auxiliary/Emergency Heat thermostat mode.
160+
The Temperate Swing (HVAC cycling rate) is the desired variance in temperature between the thermostat setting and the room temperature required before the heating or cooling system will turn on.
162161
</Help>
163-
<Item label="0.05F" value="1"/>
164-
<Item label="0.1F" value="2"/>
162+
<Item label="0.5F" value="1"/>
163+
<Item label="1.0F" value="2"/>
164+
<Item label="1.5F" value="3"/>
165+
<Item label="2.0F" value="4"/>
166+
<Item label="2.5F" value="5"/>
167+
<Item label="3.0F" value="6"/>
168+
<Item label="3.5F" value="7"/>
165169
<Item label="4.0F" value="8"/>
166170
</Value>
167171
<Value genre="config" index="8" label="Thermostat Differential Temperature" max="32767" min="2" size="2" type="list" units="F" value="4">
@@ -217,14 +221,14 @@
217221
</Value>
218222
<Value genre="config" index="11" label="Simple UI Mode" max="1" min="0" size="1" type="list" units="" value="1">
219223
<Help>
220-
Simple UI Mode Enable/Disable
224+
If the value is set to Disable then Normal Mode is enabled. If the value is set to Enable then Simple Mode is enabled.
221225
</Help>
222226
<Item label="Enable" value="0"/>
223227
<Item label="Disable" value="1"/>
224228
</Value>
225229
<Value genre="config" index="12" label="Multicast" max="1" min="0" size="1" type="byte" units="" value="0">
226230
<Help>
227-
Multicasting Enable/Disable
231+
If set to 0, multicast is disabled, if set to 1, will enable the multicast.
228232
</Help>
229233
</Value>
230234
</CommandClass>

0 commit comments

Comments
 (0)