Skip to content

Commit fe10a33

Browse files
EddyK69EddyK69
committed
Merge pull request #114 from EddyK69/master
Update from master
2 parents d63a760 + 3b6aef7 commit fe10a33

Some content is hidden

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

71 files changed

+1331
-671
lines changed

‎CMakeLists.txt‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ hardware/CurrentCostMeterSerial.cpp
200200
hardware/CurrentCostMeterTCP.cpp
201201
hardware/DavisLoggerSerial.cpp
202202
hardware/DomoticzHardware.cpp
203+
hardware/DomoticzInternal.cpp
203204
hardware/DomoticzTCP.cpp
204205
hardware/Dummy.cpp
205206
hardware/EcoDevices.cpp
@@ -501,18 +502,6 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
501502
ENDIF(USE_STATIC_LIBSTDCXX)
502503
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
503504

504-
# If it wasn't overridden from command line / cache.
505-
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
506-
set(CMAKE_INSTALL_PREFIX "/opt/${CPACK_PACKAGE_NAME}" CACHE PATH "Install path prefix, prepended onto install directories." FORCE)
507-
endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
508-
509-
install(TARGETS domoticz DESTINATION /opt/domoticz)
510-
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/www DESTINATION /opt/domoticz USE_SOURCE_PERMISSIONS)
511-
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/License.txt DESTINATION /opt/domoticz)
512-
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/History.txt DESTINATION /opt/domoticz)
513-
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION /opt/domoticz USE_SOURCE_PERMISSIONS)
514-
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Config DESTINATION /opt/domoticz USE_SOURCE_PERMISSIONS)
515-
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/updatedomo DESTINATION /opt/domoticz PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ)
516505

517506
# build a CPack driven installer package
518507
INCLUDE(InstallRequiredSystemLibraries)
@@ -542,6 +531,16 @@ SET(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
542531

543532
INCLUDE(CPack)
544533

534+
set(CMAKE_INSTALL_PREFIX "/opt/${CPACK_PACKAGE_NAME}" CACHE PATH "Install path prefix, prepended onto install directories.")
535+
536+
install(TARGETS domoticz DESTINATION ${CMAKE_INSTALL_PREFIX})
537+
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/www DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS)
538+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/License.txt DESTINATION ${CMAKE_INSTALL_PREFIX})
539+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/History.txt DESTINATION ${CMAKE_INSTALL_PREFIX})
540+
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS)
541+
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Config DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS)
542+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/updatedomo DESTINATION ${CMAKE_INSTALL_PREFIX} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ)
543+
545544
INCLUDE(TestBigEndian)
546545

547546
TEST_BIG_ENDIAN(BIGENDIAN)

‎Config/eurotronic/eur_cometz.xml‎

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Product xmlns='http://code.google.com/p/open-zwave/'>
33

4-
<CommandClass id="38">
5-
<Instance index="1" />
6-
<Value type="byte" genre="user" instance="1" index="0" label="Valve" units="%" min="0" max="255"/>
7-
</CommandClass>
8-
<CommandClass id="49">
9-
<Instance index="1" />
10-
<Value type="decimal" genre="user" instance="1" index="1" label="Temperature" units="C" />
11-
</CommandClass>
124
<CommandClass id="64" >
135
<Instance index="1" />
14-
<Value type="list" genre="user" instance="1" index="0" label="Mode">
15-
<Item label="Frost Protection" value="0" />
16-
<Item label="Comfort" value="1" />
17-
<Item label="Energy Saving" value="11" />
18-
<Item label="Direct Valve Control" value="31" />
6+
<Value type="list" genre="user" instance="1" index="0" label="Mode" min="0" max="11" value="0" size="1">
7+
<Item label="Off" value="0" />
8+
<Item label="Heat" value="1" />
9+
<Item label="Heat Econ" value="11" />
1910
</Value>
2011
<SupportedModes>
21-
<Mode index="0" label="Frost Protection" />
22-
<Mode index="1" label="Comfort" />
23-
<Mode index="11" label="Energy Saving" />
24-
<Mode index="31" label="Direct Valve Control" />
12+
<Mode index="0" label="Off" />
13+
<Mode index="1" label="Heat" />
14+
<Mode index="11" label="Heat Econ" />
2515
</SupportedModes>
2616
</CommandClass>
2717
<CommandClass id="67" base="0">
2818
<Instance index="1" />
29-
<Value type="decimal" genre="user" instance="1" index="1" label="Comfort setpoint" units="C" />
30-
<Value type="decimal" genre="user" instance="1" index="11" label="Energy saving setpoint" units="C" />
31-
<!-- <Value instance="1" index="7" action="remove" /> -->
19+
<Value type="decimal" genre="user" instance="1" index="1" label="Comfort setpoint" units="C" value="0"/>
20+
<Value type="decimal" genre="user" instance="1" index="11" label="Energy saving setpoint" units="C" value="0"/>
3221
</CommandClass>
33-
<CommandClass id="128">
34-
<Instance index="1" />
35-
<Value type="byte" genre="user" instance="1" index="0" label="Battery Level" units="%" min="0" max="255" />
36-
</CommandClass>
3722
</Product>

‎Config/fibaro/fgd212.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ Default setting: 10 (0,1 kWh)</Help>
267267
<Item label="approximation based on the calibration data" value="1" />
268268
<Item label="approximation based on the control angle" value="2" />
269269
</Value>
270-
<Value type="short" size="2" genre="config" instance="1" index="53" label="Approximated power at the maximum brightness level" min="0" max="500" units="Watt" value="0">
270+
<Value type="short" size="2" genre="config" instance="1" index="59" label="Approximated power at the maximum brightness level" min="0" max="500" units="Watt" value="0">
271271
<Help>This parameter determines the approximate value of the power that will be reported by the device at its maximum brightness level. This parameter works only when parameter 58 has a value other than 0. Available settings: 0-500 (0-500W) - power consumed by the load at the maximum brightness level. Default setting: 0</Help>
272272
</Value>
273273
</CommandClass>

‎Config/manufacturer_specific.xml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@
299299
<Product type="0300" id="0107" name="FGR221 Roller Shutter Controller" config="fibaro/fgr221.xml"/>
300300
<Product type="0300" id="0109" name="FGR221 Roller Shutter Controller" config="fibaro/fgr221.xml"/>
301301
<Product type="0301" id="1001" name="FGRM222 Roller Shutter Controller 2" config="fibaro/fgrm222.xml"/>
302+
<Product type="0302" id="1000" name="FGRM222 Roller Shutter Controller 2" config="fibaro/fgrm222.xml"/>
302303
<Product type="0400" id="0104" name="FGS211 Switch 3kW" config="fibaro/fgs211.xml" />
303304
<Product type="0400" id="0105" name="FGS211 Switch 3kW" config="fibaro/fgs211.xml" />
304305
<Product type="0400" id="0106" name="FGS211 Switch 3kW" config="fibaro/fgs211.xml" />
@@ -354,6 +355,7 @@
354355
<Product type="0311" id="010b" name="SSA1 / SSA2 - Siren/Strobe Light Alarm"/>
355356
<Product type="0313" id="010b" name="SSA2USR - Siren/Strobe Light Alarm"/>
356357
<Product type="0331" id="010b" name="SSA3 - Siren/Strobe Light Alarm"/>
358+
<Product type="0453" id="0110" name="MIMOlite Wireless Interface/Bridge Module" config="fortrezz/mimolite.xml"/>
357359
</Manufacturer>
358360
<Manufacturer id="0017" name="HiTech Automation">
359361
</Manufacturer>
@@ -497,6 +499,7 @@
497499
<Manufacturer id="007a" name="Merten">
498500
<Product type="8001" id="0001" name="Plug-in Appliance Module"/>
499501
<Product type="8002" id="0001" name="Plug-in Dimmer Module"/>
502+
<Product type="8003" id="0001" name="Plug-in Roller Shutter Module" config="merten/507801.xml"/>
500503
<Product type="4003" id="0001" name="Wall Dimmer Module"/>
501504
<Product type="4002" id="0001" name="Wall Appliance Module"/>
502505
<Product type="4004" id="0001" name="Wall Roller Shutter Module" config="merten/50x5xx.xml"/>
@@ -554,9 +557,7 @@
554557
<Product type="1100" id="0002" name="123580 Plug-in Dimmer" config="popp/123580.xml" />
555558
<Product type="0001" id="0001" name="123658 Plug-in Switch plus Power Meter" config="popp/123658.xml" />
556559
<Product type="0003" id="0001" name="POPE009105 Wall Plug switch Schuko (IP44) - Gen 5" config="popp/POPE009105.xml" />
557-
</Manufacturer>
558-
<Manufacturer id="0169" name="Popp">
559-
<Product type="0001" id="0001" name="ZWeather" config="popp/zweather.xml" />
560+
<Product type="0100" id="0101" name="Battery Wall Switch Z-Wave+" config="popp/POP009303.xml" />
560561
</Manufacturer>
561562
<Manufacturer id="0064" name="Popp / Duwi">
562563
<Product type="0001" id="0000" name="ZW EDAN 300 Flush Mounted Dimmer" />
@@ -588,6 +589,7 @@
588589
<Product type="0002" id="0052" name="ZMNHAD1 Flush 1 Relay" config="qubino/ZMNHAD1.xml"/>
589590
<Product type="0002" id="0053" name="ZMNHND1 Flush 1D relay" config="qubino/ZMNHND1.xml"/>
590591
<Product type="0003" id="0002" name="ZMNHCA2 Flush Shutter" config="qubino/ZMNHCA2.xml"/>
592+
<Product type="0003" id="0052" name="ZMNHCD Flush Shutter" config="qubino/ZMNHCD.xml"/>
591593
<Product type="0004" id="0001" name="ZMNHJA2 Flush Dimmer Fil Pilote" config="qubino/ZMNHJA2.xml"/>
592594
<Product type="0005" id="0001" name="ZMNHIA2 Flush on/off thermostat" config="qubino/ZMNHIA2.xml"/>
593595
</Manufacturer>
@@ -633,6 +635,9 @@
633635
</Manufacturer>
634636
<Manufacturer id="0043" name="Senmatic A/S">
635637
</Manufacturer>
638+
<Manufacturer id="019a" name="Sensative AB">
639+
<Product type="0003" id="0003" name="Strips-MAZW" config="sensative/strips-mazw.xml" />
640+
</Manufacturer>
636641
<Manufacturer id="0044" name="Sequoia Tech">
637642
</Manufacturer>
638643
<Manufacturer id="0151" name="Sercomm">
@@ -768,7 +773,8 @@
768773
<Product type="0100" id="0001" name="ZME_KFOB 4 Button Key Fob" config="zwave.me/kfob.xml"/>
769774
<Product type="0100" id="0004" name="ZME_WCD2 Double Paddle Wall Controller" config="zwave.me/ZME_WCD2.xml"/>
770775
<Product type="0100" id="0101" name="ZME_WALLC-S Secure Wall Controller" config="zwave.me/ZME_WALLC-S.xml" />
771-
<Product type="0100" id="0102" name="ZME_KFOB-S 4 Button Key Fob"/>
776+
<Product type="0100" id="0102" name="ZME_KFOB-S 4 Button Key Fob" config="zwave.me/ZME_KFOB-S.xml" />
777+
<Product type="0100" id="0103" name="ZME_KFOB-C 4 Button Key Fob" config="zwave.me/ZME_KFOB-S.xml" />
772778
<Product type="0100" id="0200" name="Smoke Detector"/>
773779
<Product type="0100" id="0201" name="Smoke Detector"/>
774780
<Product type="0200" id="0001" name="iTemp Temperature Sensor" config="zwave.me/iTemp.xml"/>
@@ -780,6 +786,7 @@
780786
<Product type="1000" id="0002" name="ZME_06433/05433 Wall Flush-Mountable Dimmer" config="zwave.me/ZME_06433.xml"/>
781787
<Product type="1000" id="0003" name="ZME_06436 Motor Control" config="zwave.me/ZME_06436.xml" />
782788
<Product type="1000" id="0004" name="ZME_064435 Wall Controller" config="zwave.me/ZME_064435.xml"/>
789+
<Product type="1000" id="0200" name="ZME_064381 IP44 Plug-in Switch" config="zwave.me/ZME_064381.xml"/>
783790
<Product type="1100" id="0002" name="PLDE Plug-in Dimmer"/>
784791
</Manufacturer>
785792
<Manufacturer id="0147" name="Z-Wave.Me">

‎Config/merten/507801.xml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--http://www.pepper1.net/zwavedb/device/72-->
3+
<Product xmlns='http://code.google.com/p/open-zwave/'>
4+
<!-- Configuration -->
5+
<CommandClass id="112">
6+
7+
<Value type="byte" genre="config" instance="1" index="176" label="Changeover delay (motor protection)" value="100">
8+
<Help>To configure the time (value * 0.1 sec) the motor waits before switching direction.</Help>
9+
</Value>
10+
11+
<Value type="byte" genre="config" instance="1" index="177" label="Raising time input 1" value="100">
12+
<Help>To configure input 1 of the raising time calculation (256 * Input 1 + Input 2) * 0.1 sec</Help>
13+
</Value>
14+
15+
<Value type="byte" genre="config" instance="1" index="178" label="Raising time input 2" value="100">
16+
<Help>To configure input 1 of the raising time calculation (256 * Input 1 + Input 2) * 0.1 sec</Help>
17+
</Value>
18+
19+
<Value type="byte" genre="config" instance="1" index="179" label="Lowering time input 1" value="100">
20+
<Help>To configure input 1 of the lowering time calculation (256 * Input 1 + Input 2) * 0.1 sec</Help>
21+
</Value>
22+
23+
<Value type="byte" genre="config" instance="1" index="180" label="Lowering time input 2" value="100">
24+
<Help>To configure input 1 of the lowering time calculation (256 * Input 1 + Input 2) * 0.1 sec</Help>
25+
</Value>
26+
27+
</CommandClass>
28+
29+
<!-- COMMAND_CLASS_ALARM AlarmCmd_Get not supported -->
30+
<CommandClass id="113" getsupported="false" />
31+
32+
<!-- Association Groups -->
33+
<CommandClass id="133">
34+
<Associations num_groups="1">
35+
<Group index="1" max_associations="12" label="Group 1" auto="true"/>
36+
</Associations>
37+
</CommandClass>
38+
39+
</Product>

‎Config/popp/POP009303.xml‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
<Product xmlns="http://code.google.com/p/open-zwave/">
2+
3+
<!-- Popp Battery Wall Switch Z-Wave+ -->
4+
5+
<!-- Configuration Parameters -->
6+
<CommandClass id="112">
7+
<Value type="list" index="1" genre="config" label="Button 1 and 3 pair mode" min="0" max="2" size="1" value="1">
8+
<Help>In separate mode button 1 works with Group A, button 3 with Group C. Click is ON, Hold is dimming UP, Double click is OFF, Click-Hold is dimming DOWN. In pair button 1/3 are UP/DOWN correspondingly. Click is ON/OFF, Hold is dimming UP/DOWN. Single clicks works with Group A, double click with Group C.</Help>
9+
<Item label="Separately" value="0"/>
10+
<Item label="In pair without double clicks (default)" value="1"/>
11+
<Item label="In pair with double clicks" value="2"/>
12+
</Value>
13+
<Value type="list" index="2" genre="config" label="Button 2 and 4 pair mode" min="0" max="2" size="1" value="1">
14+
<Help>In separate mode button 2 works with control group B, button 4 with control group D. Click is ON, Hold is dimming UP, Double click is OFF, Click-Hold is dimming DOWN. In pair button B/D are UP/DOWN correspondingly. Click is ON/OFF, Hold is dimming UP/DOWN. Single clicks works with Group B, double click with Group D.</Help>
15+
<Item label="Separately" value="0"/>
16+
<Item label="In pair without double clicks (default)" value="1"/>
17+
<Item label="In pair with double clicks" value="2"/>
18+
</Value>
19+
<Value type="list" index="11" genre="config" label="Command to control Group A" min="0" max="8" size="1" value="8">
20+
<Help>This parameter defines the command to be sent to devices of control group A when the related button is pressed.</Help>
21+
<Item label="Disable" value="0"/>
22+
<Item label="Switch on/off and Dim (send Basic Set and Switch Multilevel)" value="1"/>
23+
<Item label="Switch on/off only (send Basic Set)" value="2"/>
24+
<Item label="Switch all" value="3"/>
25+
<Item label="Send scenes" value="4"/>
26+
<Item label="Send preconfigured scenes" value="5"/>
27+
<Item label="Control devices in proximity" value="6"/>
28+
<Item label="Control door lock" value="7"/>
29+
<Item label="Central scene to gateway (default)" value="8"/>
30+
</Value>
31+
<Value type="list" index="12" genre="config" label="Command to control Group B" min="0" max="8" size="1" value="8">
32+
<Help>This parameter defines the command to be sent to devices of control group B when the related button is pressed.</Help>
33+
<Item label="Disable" value="0"/>
34+
<Item label="Switch on/off and Dim (send Basic Set and Switch Multilevel)" value="1"/>
35+
<Item label="Switch on/off only (send Basic Set)" value="2"/>
36+
<Item label="Switch all" value="3"/>
37+
<Item label="Send scenes" value="4"/>
38+
<Item label="Send preconfigured scenes" value="5"/>
39+
<Item label="Control devices in proximity" value="6"/>
40+
<Item label="Control door lock" value="7"/>
41+
<Item label="Central scene to gateway (default)" value="8"/>
42+
</Value>
43+
<Value type="list" index="13" genre="config" label="Command to control Group C" min="0" max="8" size="1" value="8">
44+
<Help>This parameter defines the command to be sent to devices of control group C when the related button is pressed.</Help>
45+
<Item label="Disable" value="0"/>
46+
<Item label="Switch on/off and Dim (send Basic Set and Switch Multilevel)" value="1"/>
47+
<Item label="Switch on/off only (send Basic Set)" value="2"/>
48+
<Item label="Switch all" value="3"/>
49+
<Item label="Send scenes" value="4"/>
50+
<Item label="Send preconfigured scenes" value="5"/>
51+
<Item label="Control devices in proximity" value="6"/>
52+
<Item label="Control door lock" value="7"/>
53+
<Item label="Central scene to gateway (default)" value="8"/>
54+
</Value>
55+
<Value type="list" index="14" genre="config" label="Command to control Group D" min="0" max="8" size="1" value="8">
56+
<Help>This parameter defines the command to be sent to devices of control group D when the related button is pressed.</Help>
57+
<Item label="Disable" value="0"/>
58+
<Item label="Switch on/off and Dim (send Basic Set and Switch Multilevel)" value="1"/>
59+
<Item label="Switch on/off only (send Basic Set)" value="2"/>
60+
<Item label="Switch all" value="3"/>
61+
<Item label="Send scenes" value="4"/>
62+
<Item label="Send preconfigured scenes" value="5"/>
63+
<Item label="Control devices in proximity" value="6"/>
64+
<Item label="Control door lock" value="7"/>
65+
<Item label="Central scene to gateway (default)" value="8"/>
66+
</Value>
67+
<Value type="list" index="21" genre="config" label="Send the following switch all commands" min="0" max="255" size="1" value="1">
68+
<Help></Help>
69+
<Item label="Switch off only (default)" value="1"/>
70+
<Item label="Switch on only" value="2"/>
71+
<Item label="Switch all on and off" value="255"/>
72+
</Value>
73+
<Value type="list" index="22" genre="config" label="Invert buttons" min="0" max="1" size="1" value="0">
74+
<Help></Help>
75+
<Item label="No (default)" value="0"/>
76+
<Item label="Yes" value="1"/>
77+
</Value>
78+
<Value type="list" index="25" genre="config" label="Blocks wake up even when Wake Up Interval is set" min="0" max="1" size="1" value="0">
79+
<Help>If the Wall Controller wakes up and there is no controller nearby, several unsuccessful communication attempts will drain battery.</Help>
80+
<Item label="Wake up is blocked (default)" value="0"/>
81+
<Item label="Wake up is possible if configured accordingly" value="1"/>
82+
</Value>
83+
<Value type="list" index="30" genre="config" label="Send unsolicited battery report on Wake Up" min="0" max="2" size="1" value="1">
84+
<Help>If the Wall Controller wakes up and there is no controller nearby, several unsuccessful communication attempts will drain battery.</Help>
85+
<Item label="No" value="0"/>
86+
<Item label="To same node as Wake Up Notification (default)" value="1"/>
87+
<Item label="Broadcast to neighbors" value="2"/>
88+
</Value>
89+
</CommandClass>
90+
<!-- Association Groups -->
91+
<CommandClass id="133">
92+
<Associations num_groups="5">
93+
<Group index="1" max_associations="10" label="Lifeline" />
94+
<Group index="2" max_associations="10" label="Control Group A, controlled by button 1 or single clicks of buttons 1 and 3" />
95+
<Group index="3" max_associations="10" label="Control Group B, controlled by button 2 or single clicks of buttons 2 and 4" />
96+
<Group index="4" max_associations="10" label="Control Group C, controlled by button 3 or double clicks of buttons 1 and 3" />
97+
<Group index="5" max_associations="10" label="Control Group D, controlled by button 4 or double clicks of buttons 2 and 4" />
98+
</Associations>
99+
</CommandClass>
100+
</Product>

0 commit comments

Comments
 (0)