Skip to content

Commit 11ef66a

Browse files
gizmocuzgizmocuz
committed
Updated openzwave config files
Fixed translation problem in Meter setup Removed debug message in webserver class Updated translations
1 parent ca2a41a commit 11ef66a

30 files changed

+237
-8
lines changed

‎Config/manufacturer_specific.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,9 @@
563563
<Manufacturer id="0159" name="Qubino">
564564
<Product type="0001" id="0001" name="ZMNHDA2 Flush Dimmer" config="qubino/ZMNHDA2.xml"/>
565565
<Product type="0002" id="0001" name="ZMNHBA2 Flush 2 Relays" config="qubino/ZMNHBA2.xml"/>
566+
<Product type="0002" id="0051" name="ZMNHBD2 Flush 2 Relays" config="qubino/ZMNHBD2.xml"/>
566567
<Product type="0002" id="0002" name="ZMNHAA2 Flush 1 Relay" config="qubino/ZMNHAA2.xml"/>
568+
<Product type="0002" id="0052" name="ZMNHAD1 Flush 1 Relay" config="qubino/ZMNHAD1.xml"/>
567569
<Product type="0003" id="0002" name="ZMNHCA2 Flush Shutter" config="qubino/ZMNHCA2.xml"/>
568570
<Product type="0004" id="0001" name="ZMNHJA2 Flush Dimmer Fil Pilote" config="qubino/ZMNHJA2.xml"/>
569571
<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>

‎Config/qubino/ZMNHBD2.xml

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Product xmlns='http://code.google.com/p/open-zwave/'>
3+
4+
<!-- Qubino: ZMNHBD2 Flush 2 Relay -->
5+
<!-- http://www.vesternet.com/downloads/dl/file/id/636/z_wave_qubino_flush_relay_x_2_plus_manual.pdf -->
6+
7+
<!-- Configuration -->
8+
<CommandClass id="112">
9+
<Value type="list" genre="config" instance="1" index="1" label="Input 1 switch type" size="1" min="0" max="1" value="1">
10+
<Help/>
11+
<Item label="Mono-stable switch type (push button)" value="0" />
12+
<Item label="Bi-stable switch type" value="1" />
13+
</Value>
14+
15+
<Value type="list" genre="config" instance="1" index="2" label="Input 2 switch type" size="1" min="0" max="1" value="1">
16+
<Help/>
17+
<Item label="Mono-stable switch type (push button)" value="0" />
18+
<Item label="Bi-stable switch type" value="1" />
19+
</Value>
20+
21+
<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">
22+
<Help>Flush 2 relays 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>
23+
<Item label="ALL ON active, ALL OFF active" value="255" />
24+
<Item label="ALL ON is not active ALL OFF is not active" value="0" />
25+
<Item label="ALL ON is not active ALL OFF active" value="1" />
26+
<Item label="ALL ON active ALL OFF is not active" value="2" />
27+
</Value>
28+
29+
<Value type="short" genre="config" instance="1" index="11" label="Turn off Q1 after set time" min="0" max="32535" value="0">
30+
<Help>When Q1 relay is ON it goes automatically OFF after set time. The timer is reset to zero every time the module receives an ON command from any source. Value is in 1s or 10ms depending on parameter 15</Help>
31+
</Value>
32+
33+
<Value type="short" genre="config" instance="1" index="12" label="Turn on Q1 after set time" min="0" max="32535" value="0">
34+
<Help>When Q1 relay is OFF it goes automatically ON after set time. The timer is reset to zero every time the module receives an OFF command from any source. Value is in 1s or 10ms depending on parameter 15</Help>
35+
</Value>
36+
37+
<Value type="short" genre="config" instance="1" index="13" label="Turning off Q2 after set time" min="0" max="32535" value="0">
38+
<Help>When Q2 relay is ON it goes automatically OFF after set time. The timer is reset to zero every time the module receives an ON command from any source. Value is in 1s or 10ms depending on parameter 15</Help>
39+
</Value>
40+
41+
<Value type="short" genre="config" instance="1" index="14" label="Turning on Q2 after set time" min="0" max="32535" value="0">
42+
<Help>When Q2 relay is OFF it goes automatically ON after set time. The timer is reset to zero every time the module receives an OFF command from any source. Value is in 1s or 10ms depending on parameter 15</Help>
43+
</Value>
44+
45+
<Value type="list" size="1" genre="config" instance="1" index="15" label="Turning on/off s or ms selection" min="0" max="1" value="0">
46+
<Help>Select the time units for auto on/off configuration. Applies tot he whole device</Help>
47+
<Item label="1 Second" value="0" />
48+
<Item label="10 Milliseconds" value="1" />
49+
</Value>
50+
51+
<Value type="list" genre="config" instance="1" index="30" label="Saving the state of the 2 relays after a power failure" size="1" min="0" max="1" value="0">
52+
<Help/>
53+
<Item label="Flush 2 relays module saves its state before power failure (it returns to the last position saved before a power failure)" value="0" />
54+
<Item label="Flush 2 relays module does not save the state after a power failure, it returns to off position." value="1" />
55+
</Value>
56+
57+
<Value type="byte" genre="config" instance="1" index="40" label="Power reporting in Watts on power change for Q1" size="1" min="0" max="100" value="1">
58+
<Help>Set value from 0 - 100 (0%- 100%). 0 - Reporting Disabled. 1 - 100 = 1% - 100% 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 1</Help>
59+
</Value>
60+
61+
<Value type="byte" genre="config" instance="1" index="41" label="Power reporting in Watts on power change for Q2" size="1" min="0" max="100" value="1">
62+
<Help>Set value from 0 - 100 (0%- 100%). 0 - Reporting Disabled. 1 - 100 = 1% - 100% 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 1</Help>
63+
</Value>
64+
65+
<Value type="short" genre="config" instance="1" index="42" label="Power reporting in Watts by time interval for Q1" min="0" max="65535" value="300">
66+
<Help>Set value means time interval (0 1 65535) in seconds, when power report is send. 0 - Reporting Disabled. 1 - 65535 = 1 second - 65535 seconds. 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>
67+
</Value>
68+
69+
<Value type="short" genre="config" instance="1" index="43" label="Power reporting in Watts by time interval for Q2" min="0" max="65535" value="300">
70+
<Help>Set value means time interval (0 1 65535) in seconds, when power report is send. 0 - Reporting Disabled. 1 - 65535 = 1 second - 65535 seconds. 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>
71+
</Value>
72+
73+
<Value type="list" genre="config" instance="1" index="63" label="Output Q1 switch selection" min="0" size="1" max="1" value="0">
74+
<Help>Type of device that is connected to the output (NC or NO)</Help>
75+
<Item label="When the switch is turned off the output is 0V (NC)" value="0" />
76+
<Item label="When the switch is turned off the output is 230V or 24V (NO)" value="1" />
77+
</Value>
78+
79+
<Value type="list" genre="config" instance="1" index="64" label="Output Q2 switch selection" min="0" size="1" max="1" value="0">
80+
<Help>Type of device that is connected to the output (NC or NO)</Help>
81+
<Item label="When the switch is turned off the output is 0V (NC)" value="0" />
82+
<Item label="When the switch is turned off the output is 230V or 24V (NO)" value="1" />
83+
</Value>
84+
85+
</CommandClass>
86+
87+
<!-- Association Groups -->
88+
<CommandClass id="133">
89+
<Associations num_groups="8">
90+
<Group index="1" max_associations="1" label="Lifeline (reserved for communication with the controller)" auto="true"/>
91+
<Group index="2" max_associations="16" label="Basic on/off triggered at the change of output Q1 and reflecting its state" auto="false" />
92+
<Group index="3" max_associations="16" label="Switch binary report triggered at the changes of output Q1 and reflecting its state" auto="true" />
93+
<Group index="4" max_associations="16" label="Power meter report triggered at the changes of output Q1 and reflecting its state" auto="true" />
94+
<Group index="5" max_associations="16" label="Basic on/off triggered at the change of output Q2 and reflecting its state" auto="false" />
95+
<Group index="6" max_associations="16" label="Switch binary report triggered at the changes of output Q2 and reflecting its state" auto="true" />
96+
<Group index="7" max_associations="16" label="Power meter report triggered at the changes of output Q2 and reflecting its state" auto="true" />
97+
<Group index="8" max_associations="16" label="Multilevel sensor report" auto="true"/>
98+
</Associations>
99+
</CommandClass>
100+
101+
<!-- Remove COMMAND_CLASS_BASIC -->
102+
<CommandClass id="32" action="remove" />
103+
104+
<!-- Map endpoints to instances -->
105+
<CommandClass id="96" mapping="endpoints" />
106+
107+
</Product>

‎main/WebServer.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7155,11 +7155,6 @@ namespace http {
71557155
std::string typeOfThisOne = RFX_Type_Desc(dType, 1);
71567156
if (typeOfThisOne == root["result"][ii-1]["Type"].asString()) {
71577157
root["result"][ii-1]["PlanIDs"].append(atoi(sd[26].c_str()));
7158-
#ifdef _DEBUG
7159-
Json::StyledWriter jsonWriter;
7160-
std::string plansString = jsonWriter.write(root["result"][ii-1]["PlanIDs"]);
7161-
_log.Log(LOG_NORM, "Duplicate found idx %s (Type %s): %s in plans %s", sd[0].c_str(), typeOfThisOne.c_str(), sd[3].c_str(), plansString.c_str());
7162-
#endif
71637158
continue;
71647159
}
71657160
}

‎www/html5.appcache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CACHE MANIFEST
2-
# ref 1074
2+
# ref 1075
33

44
CACHE:
55
# CSS

‎www/i18n/domoticz-bg.json.gz

0 Bytes
Binary file not shown.

‎www/i18n/domoticz-cs.json.gz

0 Bytes
Binary file not shown.

‎www/i18n/domoticz-da.json.gz

23 Bytes
Binary file not shown.

‎www/i18n/domoticz-de.json.gz

38 Bytes
Binary file not shown.

‎www/i18n/domoticz-el.json.gz

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)