Skip to content

Commit fd21842

Browse files
szczukotszczukot
committed
Merge pull request #12 from domoticz/master
merge
2 parents 719f516 + 3deac62 commit fd21842

File tree

114 files changed

+5897
-2021
lines changed

Some content is hidden

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

114 files changed

+5897
-2021
lines changed

‎CMakeLists.txt‎

Lines changed: 12 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
@@ -227,6 +228,7 @@ hardware/MQTT.cpp
227228
hardware/MySensorsBase.cpp
228229
hardware/MySensorsSerial.cpp
229230
hardware/MySensorsTCP.cpp
231+
hardware/NefitEasy.cpp
230232
hardware/Nest.cpp
231233
hardware/Netatmo.cpp
232234
hardware/OpenZWave.cpp
@@ -501,18 +503,6 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
501503
ENDIF(USE_STATIC_LIBSTDCXX)
502504
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
503505

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)
516506

517507
# build a CPack driven installer package
518508
INCLUDE(InstallRequiredSystemLibraries)
@@ -542,6 +532,16 @@ SET(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
542532

543533
INCLUDE(CPack)
544534

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

547547
TEST_BIG_ENDIAN(BIGENDIAN)

‎Config/eneco/ed20.xml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Product xmlns='http://code.google.com/p/open-zwave/'>
3+
4+
<!-- ED2.0 Meter Adapter -->
5+
6+
<!-- Configuration -->
7+
<CommandClass id="112">
8+
<Value type="list" genre="config" instance="0" index="1" label="Gas Metering" size="1">
9+
<Help>Enable and disable gas metering</Help>
10+
<Item label="Enabled" value="1" />
11+
<Item label="Disabled" value="0" />
12+
</Value>
13+
14+
<Value type="short" genre="config" instance="1" index="2" label="Gas Meter resolution" min="0" max="9999" value="400" size="2">
15+
<Help>The resolution of the analog gas meter (revolutions per m³) in unsigned Q14.2 notation.</Help>
16+
</Value>
17+
18+
<Value type="list" genre="config" instance="2" index="3" label="Electricity metering" size="1">
19+
<Help>Set Gas Metering mode</Help>
20+
<Item label="Enabled" value="1" />
21+
<Item label="Disabled" value="0" />
22+
</Value>
23+
24+
<Value type="short" genre="config" instance="3" index="4" label="Electricity meter resolution" min="0" max="9999" value="400" size="2">
25+
<Help>The resolution of the analog electricity meter (revolutions per kWh) in unsigned Q14.2 notation.</Help>
26+
</Value>
27+
</CommandClass>
28+
29+
<!-- Association Groups -->
30+
31+
<!-- Remove COMMAND_CLASS_BASIC -->
32+
<CommandClass id="32" action="remove" />
33+
34+
<!-- Map endpoints to instances -->
35+
<CommandClass id="96" mapping="endpoints" />
36+
37+
<!-- Association Groups -->
38+
<CommandClass id="133">
39+
<Associations num_groups="1">
40+
<Group index="1" max_associations="1" label="Lifeline" auto="true"/>
41+
</Associations>
42+
</CommandClass>
43+
44+
</Product>

‎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: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@
223223
<Product type="0002" id="0001" name="EUR_COMETZ Wall Radiator Thermostat Valve Control" config="eurotronic/eur_cometz.xml"/>
224224
</Manufacturer>
225225
<Manufacturer id="0128" name="Eneco">
226-
<Product type="0000" id="0000" name="ED2.0 Meter Adapter"/>
226+
<Product type="0000" id="0000" name="ED2.0 Meter Adapter" config="eneco/ed20.xml"/>
227227
<Product type="0128" id="0000" name="ED2.0 Display"/>
228228
</Manufacturer>
229229
<Manufacturer id="011a" name="Enerwave">
@@ -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,7 +589,9 @@
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"/>
594+
<Product type="0004" id="0051" name="ZMNHJD1 Flush Pilot Wire Dimmer" config="qubino/ZMNHJD1.xml"/>
592595
<Product type="0005" id="0001" name="ZMNHIA2 Flush on/off thermostat" config="qubino/ZMNHIA2.xml"/>
593596
</Manufacturer>
594597
<Manufacturer id="0130" name="Quby">
@@ -633,6 +636,9 @@
633636
</Manufacturer>
634637
<Manufacturer id="0043" name="Senmatic A/S">
635638
</Manufacturer>
639+
<Manufacturer id="019a" name="Sensative AB">
640+
<Product type="0003" id="0003" name="Strips-MAZW" config="sensative/strips-mazw.xml" />
641+
</Manufacturer>
636642
<Manufacturer id="0044" name="Sequoia Tech">
637643
</Manufacturer>
638644
<Manufacturer id="0151" name="Sercomm">
@@ -768,7 +774,8 @@
768774
<Product type="0100" id="0001" name="ZME_KFOB 4 Button Key Fob" config="zwave.me/kfob.xml"/>
769775
<Product type="0100" id="0004" name="ZME_WCD2 Double Paddle Wall Controller" config="zwave.me/ZME_WCD2.xml"/>
770776
<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"/>
777+
<Product type="0100" id="0102" name="ZME_KFOB-S 4 Button Key Fob" config="zwave.me/ZME_KFOB-S.xml" />
778+
<Product type="0100" id="0103" name="ZME_KFOB-C 4 Button Key Fob" config="zwave.me/ZME_KFOB-S.xml" />
772779
<Product type="0100" id="0200" name="Smoke Detector"/>
773780
<Product type="0100" id="0201" name="Smoke Detector"/>
774781
<Product type="0200" id="0001" name="iTemp Temperature Sensor" config="zwave.me/iTemp.xml"/>
@@ -780,6 +787,7 @@
780787
<Product type="1000" id="0002" name="ZME_06433/05433 Wall Flush-Mountable Dimmer" config="zwave.me/ZME_06433.xml"/>
781788
<Product type="1000" id="0003" name="ZME_06436 Motor Control" config="zwave.me/ZME_06436.xml" />
782789
<Product type="1000" id="0004" name="ZME_064435 Wall Controller" config="zwave.me/ZME_064435.xml"/>
790+
<Product type="1000" id="0200" name="ZME_064381 IP44 Plug-in Switch" config="zwave.me/ZME_064381.xml"/>
783791
<Product type="1100" id="0002" name="PLDE Plug-in Dimmer"/>
784792
</Manufacturer>
785793
<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/options.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@
1515
Devices) This option will make the UserCode CC stop on the first
1616
"available" usercode slot rather than retrieve every one -->
1717
<Option name="RefreshAllUserCodes" value="false" />
18+
<Option name="ThreadTerminateTimeout" value="5000" />
1819
</Options>

0 commit comments

Comments
 (0)