Skip to content

Commit 25b739f

Browse files
szczukotszczukot
committed
Merge pull request #5 from domoticz/master
merge
2 parents d6f4f83 + 473d98f commit 25b739f

File tree

99 files changed

+3378
-2271
lines changed

Some content is hidden

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

99 files changed

+3378
-2271
lines changed

‎.travis.yml

Lines changed: 55 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,65 @@
11
branches:
22
except:
33
- /^[0-9]/
4+
45
language: cpp
6+
57
compiler:
68
- gcc
9+
10+
os:
11+
- linux
12+
- osx
13+
14+
cache:
15+
- apt
16+
17+
addons:
18+
apt:
19+
sources:
20+
- ubuntu-toolchain-r-test
21+
- boost-latest
22+
packages:
23+
- gcc-4.9
24+
- g++-4.9
25+
- libboost1.55-all-dev
26+
- cmake
27+
- libsqlite3-dev
28+
- curl
29+
- libcurl4-openssl-dev
30+
- libusb-dev
31+
- zlib1g-dev
32+
- libssl-dev
33+
- libudev-dev
34+
- git
35+
on:
36+
os: linux
37+
38+
update-alternatives:
39+
- install /usr/bin/gcc gcc /usr/bin/gcc-4.9 50
40+
- install /usr/bin/g++ g++ /usr/bin/g++-4.9 50
41+
42+
sources:
43+
- trusty
44+
745
before_install:
8-
- sudo apt-get update -qq
9-
- sudo apt-get install -y build-essential
10-
- sudo apt-get install -y nano cmake libboost1.48-all-dev libsqlite3-dev curl libcurl4-openssl-dev libusb-dev zlib1g-dev libssl-dev libudev-dev git
11-
- git clone https://github.com/OpenZWave/open-zwave.git
12-
- ln -s open-zwave open-zwave-read-only
46+
- if [ ${TRAVIS_OS_NAME} == "linux" ]; then git clone https://github.com/OpenZWave/open-zwave.git; fi
47+
- if [ ${TRAVIS_OS_NAME} == "linux" ]; then ln -s open-zwave open-zwave-read-only; fi
48+
- if [ ${TRAVIS_OS_NAME} == "osx" ]; then brew install cmake; fi
49+
- if [ ${TRAVIS_OS_NAME} == "osx" ]; then brew install boost || true; fi
50+
- if [ ${TRAVIS_OS_NAME} == "osx" ]; then brew install libusb; fi
51+
- if [ ${TRAVIS_OS_NAME} == "osx" ]; then brew install libusb-compat; fi
52+
- if [ ${TRAVIS_OS_NAME} == "osx" ]; then brew install zlib || true; fi
53+
- if [ ${TRAVIS_OS_NAME} == "osx" ]; then brew install openssl; fi
54+
- if [ ${TRAVIS_OS_NAME} == "osx" ]; then brew link openssl --force; fi
55+
- if [ ${TRAVIS_OS_NAME} == "osx" ]; then export LDFLAGS=-L/usr/local/opt/openssl/lib; fi
56+
- if [ ${TRAVIS_OS_NAME} == "osx" ]; then export CPPFLAGS=-I/usr/local/opt/openssl/include; fi
1357
- git fetch --unshallow
58+
1459
script:
15-
- (cd open-zwave-read-only; make)
16-
- cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_PATH=open-zwave-read-only
60+
- if [ ${TRAVIS_OS_NAME} == "linux" ]; then (cd open-zwave-read-only; make); fi
61+
- if [ ${TRAVIS_OS_NAME} == "linux" ]; then cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_PATH=open-zwave-read-only; fi
62+
- if [ ${TRAVIS_OS_NAME} == "osx" ]; then cmake -DCMAKE_BUILD_TYPE=Release; fi
1763
- make
18-
- tar czf domoticz_${TRAVIS_OS_NAME}_x86_64.tgz domoticz History.txt License.txt domoticz.sh server_cert.pem updatebeta updaterelease --exclude .svn www/ scripts/ Config/
64+
- if [ ${TRAVIS_OS_NAME} == "linux" ]; then tar czf domoticz_${TRAVIS_OS_NAME}_x86_64.tgz domoticz History.txt License.txt domoticz.sh server_cert.pem updatebeta updaterelease --exclude .svn www/ scripts/ Config/; fi
65+
- if [ ${TRAVIS_OS_NAME} == "osx" ]; then tar czf domoticz_${TRAVIS_OS_NAME}_x86_64.tgz domoticz History.txt License.txt domoticz.sh server_cert.pem updatebeta updaterelease; fi

‎Config/aeotec/multisensor6.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<Value type="int" index="113" genre="config" label="Group 3 Interval" units="seconds" min="1" max="2678400" value="3600">
9898
<Help>The interval of sending report group 3. 1 to 2678400 seconds</Help>
9999
</Value>
100-
<Value type="short" index="201" genre="config" label="Temerature Calibration" value="0">
100+
<Value type="short" index="201" genre="config" label="Temperature Calibration" value="0">
101101
<Help>The calibration value = standard value ‐ measure value.
102102
E.g. If measure value =25.3°C and the standard value = 23.2°C, so the calibration value= 23.2°C ‐ 25.3°C= ‐2.1°C (0xFFEB).
103103
If the measure value =30.1°C and the standard value = 33.2°C, so the calibration value= 33.2°C ‐ 30.1°C=3.1°C (0x001F).

‎Config/device_classes.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
<DeviceType key="0x0c0b" label="Clock Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30"/>
192192
<DeviceType key="0x0cff" label="MultiDevice Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30"/>
193193
<DeviceType key="0x0d00" label="Multilevel Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
194-
<DeviceType key="0x0d01" label="Air Temerature Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
194+
<DeviceType key="0x0d01" label="Air Temperature Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
195195
<DeviceType key="0x0d02" label="General Purpose Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
196196
<DeviceType key="0x0d03" label="Luminance Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
197197
<DeviceType key="0x0d04" label="Power Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
@@ -213,7 +213,7 @@
213213
<DeviceType key="0x0d14" label="Distance Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
214214
<DeviceType key="0x0d15" label="Angle Postition Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
215215
<DeviceType key="0x0d16" label="Rotation Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
216-
<DeviceType key="0x0d17" label="Water Temerature Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
216+
<DeviceType key="0x0d17" label="Water Temperature Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
217217
<DeviceType key="0x0d18" label="Soil Temperature Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
218218
<DeviceType key="0x0d19" label="Seismic Intensity Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
219219
<DeviceType key="0x0d1a" label="Seismic Magnitude Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
@@ -224,7 +224,7 @@
224224
<DeviceType key="0x0b1f" label="Moisture Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
225225
<DeviceType key="0x0b20" label="Frequency Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
226226
<DeviceType key="0x0b21" label="Time Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
227-
<DeviceType key="0x0b22" label="Target Temerature Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
227+
<DeviceType key="0x0b22" label="Target Temperature Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
228228
<DeviceType key="0x0bff" label="MultiDevice Sensor" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x30,0x31"/>
229229
<DeviceType key="0x0e00" label="Set Top Box" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86,0x56,0x60,0x8e,0x84,0x22"/>
230230
<DeviceType key="0x0f00" label="Siren" command_classes="0x5a,0x5e,0x59,0x72,0x73,0x85,0x86"/>

‎Config/manufacturer_specific.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@
7373
<!-- US-market products start with type prefix "01" -->
7474
<Product type="0101" id="005a" name="Z-Stick Gen5" config="aeotec/zstickgen5.xml"/>
7575
<Product type="0102" id="0059" name="Recessed Door Sensor Gen5" config="aeotec/recessed_doorsensor_gen5.xml"/>
76+
<Product type="0104" id="0038" name="DoorBell Gen5" />
77+
<Product type="0102" id="0061" name="Dry Contact Sensor Gen5" />
7678
<!-- AU-market products start with type prefix "02" -->
7779
<Product type="0202" id="0059" name="Recessed Door Sensor Gen5" config="aeotec/recessed_doorsensor_gen5.xml"/>
7880
<Product type="0003" id="0060" name="Smart Switch 6" config="aeotec/ss6.xml" />
@@ -563,7 +565,9 @@
563565
<Manufacturer id="0159" name="Qubino">
564566
<Product type="0001" id="0001" name="ZMNHDA2 Flush Dimmer" config="qubino/ZMNHDA2.xml"/>
565567
<Product type="0002" id="0001" name="ZMNHBA2 Flush 2 Relays" config="qubino/ZMNHBA2.xml"/>
568+
<Product type="0002" id="0051" name="ZMNHBD2 Flush 2 Relays" config="qubino/ZMNHBD2.xml"/>
566569
<Product type="0002" id="0002" name="ZMNHAA2 Flush 1 Relay" config="qubino/ZMNHAA2.xml"/>
570+
<Product type="0002" id="0052" name="ZMNHAD1 Flush 1 Relay" config="qubino/ZMNHAD1.xml"/>
567571
<Product type="0003" id="0002" name="ZMNHCA2 Flush Shutter" config="qubino/ZMNHCA2.xml"/>
568572
<Product type="0004" id="0001" name="ZMNHJA2 Flush Dimmer Fil Pilote" config="qubino/ZMNHJA2.xml"/>
569573
<Product type="0005" id="0001" name="ZMNHIA2 Flush on/off thermostat" config="qubino/ZMNHIA2.xml"/>

‎Config/qubino/ZMNHAD1.xml

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Product xmlns='http://code.google.com/p/open-zwave/'>
3+
4+
<!-- Qubino: ZMNHAD1 Flush 1 Relay -->
5+
6+
<!-- Configuration -->
7+
<CommandClass id="112">
8+
<Value type="list" genre="config" instance="1" index="1" label="Input 1 switch type" size="1" min="0" max="1" value="1">
9+
<Help/>
10+
<Item label="Mono-stable switch type (push button)" value="0" />
11+
<Item label="Bi-stable switch type" value="1" />
12+
</Value>
13+
14+
<Value type="list" genre="config" instance="1" index="2" label="Input 2 contact type" size="1" min="0" max="1" value="0">
15+
<Help/>
16+
<Item label="NO (normaly open) input type" value="0"/>
17+
<Item label="NC (normaly close) input type" value="1"/>
18+
</Value>
19+
20+
<Value type="list" genre="config" instance="1" index="3" label="Input 3 contact type" size="1" min="0" max="1" value="0">
21+
<Help/>
22+
<Item label="NO (normaly open) input type" value="0"/>
23+
<Item label="NC (normaly close) input type" value="1"/>
24+
</Value>
25+
26+
<Value type="list" genre="config" instance="1" index="10" label="Activate / deactivate functions ALL ON/ALL OFF" size="1" min="0" max="255" value="255">
27+
<Help>Flush 1 relay module responds to commands ALL ON / ALL OFF that may be sent by the main controller or by other controller belonging to the system.</Help>
28+
<Item label="ALL ON active, ALL OFF active" value="255" />
29+
<Item label="ALL ON is not active ALL OFF is not active" value="0" />
30+
<Item label="ALL ON is not active ALL OFF active" value="1" />
31+
<Item label="ALL ON active ALL OFF is not active" value="2" />
32+
</Value>
33+
34+
<Value type="short" genre="config" instance="1" index="11" label="Automatic turning off relay after set time" min="0" max="32535" value="0">
35+
<Help>0 => Auto OFF disabled. 1 - 32535 => 1 second (0,01s) - 32535 seconds (325,35s). Auto OFF enabled with define time, step is 1s or 10ms according to parameter 15. Default value 0</Help>
36+
</Value>
37+
38+
<Value type="short" genre="config" instance="1" index="12" label="Automatic turning on relay after set time" min="0" max="32535" value="0">
39+
<Help>0 - Auto OFF disabled. 1 - 32535 => 1 second (0,01s) - 32535 seconds (325,35s). Auto ON enabled with define time, step is 1s or 10ms according to parameter 15. Default value 0</Help>
40+
</Value>
41+
42+
<Value type="list" genre="config" instance="1" index="15" label="Automatic turning on/off seconds or milliseconds selection" min="0" max="1" value="0">
43+
<Help/>
44+
<Item label="seconds" value="0" />
45+
<Item label="milliseconds" value="1" />
46+
</Value>
47+
48+
<Value type="list" genre="config" instance="1" index="30" label="Saving the state of the relay after a power failure" size="1" min="0" max="1" value="0">
49+
<Help/>
50+
<Item label="Flush 1 relay module saves its state before power failure (it returns to the last position saved before a power failure)" value="0" />
51+
<Item label="Flush 1 relay module does not save the state after a power failure, it returns to off position." value="1" />
52+
</Value>
53+
54+
<Value type="byte" genre="config" instance="1" index="40" label="Power reporting in Watts on power change" size="1" min="0" max="100" value="10">
55+
<Help>Set value from 0 - 100 (0%- 100%). 0 = Reporting Disabled. 1 - 100 = 1% - 100% and reporting enabled. Power report is send (push) only when actual power in Watts in real time change for more than set percentage comparing to previous actual power in Watts, step is 1%. Default value 10%</Help>
56+
</Value>
57+
58+
<Value type="short" genre="config" instance="1" index="42" label="Power reporting in Watts by time interval" min="0" max="32535" value="300">
59+
<Help>Set value means time interval (0 - 32535) in seconds, when power report is send. 0 = Reporting Disabled. 1 - 32535 = 1 second - 32535 seconds and reporting enabled. Power report is send with time interval set by entered value. Default value 300 (power report in Watts is send each 300s)</Help>
60+
</Value>
61+
62+
63+
<Value type="list" genre="config" instance="1" index="63" label="Output switch selection" size="1" min="0" max="1" value="0">
64+
<Help/>
65+
<Item label="When system is turned off the output is 0V (NC)" value="0" />
66+
<Item label="When system is turned off the output is 230V or 24V (NO)" value="1" />
67+
</Value>
68+
69+
70+
<Value type="list" genre="config" instance="1" index="100" label="Enable / Disable Endpoints I2 or select notification type and event" size="1" min="0" max="9" value="1">
71+
<Help/>
72+
<Item label="Endpoint, I2 disabled" value="0" />
73+
<Item label="Home Security; Motion Detection, unknown location" value="1" />
74+
<Item label="Carbon Monoxide; Carbon Monoxide detected, unknown location" value="2" />
75+
<Item label="Carbon Dioxide; Carbon Dioxide detected, unknown location" value="3" />
76+
<Item label="Water Alarm; Water Leak detected, unknown location" value="4" />
77+
<Item label="Heat Alarm; Overheat detected, unknown location" value="5" />
78+
<Item label="Smoke Alarm; Smoke detected, unknown location" value="6" />
79+
<Item label="Sensor binary" value="9" />
80+
</Value>
81+
82+
83+
84+
<Value type="list" genre="config" instance="1" index="101" label="Enable / Disable Endpoints I3 or select notification type and event" size="1" min="0" max="9" value="1">
85+
<Help/>
86+
<Item label="Endpoint, I3 disabled" value="0" />
87+
<Item label="Home Security; Motion Detection, unknown location" value="1" />
88+
<Item label="Carbon Monoxide; Carbon Monoxide detected, unknown location" value="2" />
89+
<Item label="Carbon Dioxide; Carbon Dioxide detected, unknown location" value="3" />
90+
<Item label="Water Alarm; Water Leak detected, unknown location" value="4" />
91+
<Item label="Heat Alarm; Overheat detected, unknown location" value="5" />
92+
<Item label="Smoke Alarm; Smoke detected, unknown location" value="6" />
93+
<Item label="Sensor binary" value="9" />
94+
</Value>
95+
96+
97+
<Value type="short" genre="config" instance="1" index="110" label="Temperature sensor offset settings" min="0" max="32535" value="32535">
98+
<Help>Set value is added or subtracted to actual measured value by sensor. Available configuration parameters : default value 32536. 32536 offset is 0.0C. From 1 to 100 = value from 0.1°C to 10.0°C is added to actual measured temperature. From 1001 to 1100 = value from -0.1 °C to -10.0 °C is subtracted to actual measured temperature.</Help>
99+
</Value>
100+
101+
<Value type="byte" genre="config" instance="1" index="120" label="Digital temperature sensor reporting" min="0" max="127" value="5">
102+
<Help>If digital temperature sensor is connected, module reports measured temperature on temperature change defined by this parameter. Available configuration parameters : 0 = reporting disabled. 1 to 127 = 0,1°C to 12,7°C, step is 0,1°C. Default value is 5 = 0,5°C</Help>
103+
</Value>
104+
105+
106+
</CommandClass>
107+
108+
<!-- Association Groups -->
109+
<CommandClass id="133">
110+
<Associations num_groups="8">
111+
<Group index="1" max_associations="1" label="Lifeline" auto="true"/>
112+
<Group index="2" max_associations="16" label="Basic on/off for Q" auto="true" />
113+
<Group index="3" max_associations="16" label="Basic on/off for I2" auto="true"/>
114+
<Group index="4" max_associations="16" label="Notification report for I2 state" auto="true"/>
115+
<Group index="5" max_associations="16" label="Binary sensor state of I2" auto="true"/>
116+
<Group index="6" max_associations="16" label="Basic on/off for I3" auto="true"/>
117+
<Group index="7" max_associations="16" label="Notification report for I3 state" auto="true"/>
118+
<Group index="8" max_associations="16" label="Binary sensor state of I3" auto="true"/>
119+
</Associations>
120+
</CommandClass>
121+
122+
<!-- Remove COMMAND_CLASS_BASIC -->
123+
<CommandClass id="32" action="remove" />
124+
125+
</Product>

0 commit comments

Comments
 (0)