Merge branch 'MyDomoticz' of /home/domoshare into MyDomoticz

Author: rkluwen

CMakeLists.txt

@@ -228,6 +228,7 @@ hardware/RFXComSerial.cpp
 hardware/RFXComTCP.cpp
 hardware/S0MeterBase.cpp
 hardware/S0MeterSerial.cpp
+hardware/SatelIntegra.cpp
 hardware/SBFSpot.cpp
 hardware/serial/serial.cpp
 hardware/serial/impl/unix.cpp
@@ -431,7 +432,7 @@ else()
   message(STATUS "Not building on Raspberry Pi. GPIO support disabled.")
 ENDIF(RaspberryPi)
 
-target_link_libraries(domoticz ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} pthread lua mqtt sqlite ${CMAKE_DL_LIBS})
+target_link_libraries(domoticz -lrt ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${CURL_LIBRARIES} pthread lua mqtt sqlite ${CMAKE_DL_LIBS})
 
 ADD_PRECOMPILED_HEADER(domoticz "main/stdafx.h")
 

Config/everspring/st812.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns='http://code.google.com/p/open-zwave/'>
+	<!-- Configuration Parameters -->
+	<CommandClass id="112">
+		<Value type="byte" index="1" genre="config" label="Basic Set Level" units="%" min="0" max="99" value="99">
+			<Help>
+				Defines the level in the Basic Set event sent to group 2 when the sensor is triggered.  Default is 99 (full brightness for a Z-Wave dimmer). 0 disables.
+			</Help>
+		</Value>		
+	</CommandClass>
+
+	<!-- COMMAND_CLASS_ASSOCIATION. Groups -->
+	<CommandClass id="133">
+		<Associations num_groups="2">
+			<Group index="1" max_associations="1" label="Reports" auto="true" />
+			<Group index="2" max_associations="3" label="Basic" />
+		</Associations>
+	</CommandClass>
+	<CommandClass id="96" mapping="endpoints" />
+</Product>
+

Config/manufacturer_specific.xml

@@ -217,7 +217,7 @@
 		<Product type="0006" id="0001" name="ST814 Temperature and Humidity Sensor" config="everspring/st814.xml"/>
 		<Product type="0007" id="0001" name="ST815 Illumination Sensor" config="everspring/st815.xml"/>
 		<Product type="0009" id="0001" name="TSE03 Door Bell" config="everspring/tse03.xml"/>
-		<Product type="000b" id="0001" name="ST812 Flood Detector"/>
+		<Product type="000b" id="0001" name="ST812 Flood Detector" config="everspring/st812.xml"/>
 		<Product type="000c" id="0001" name="SE812 Siren" config="everspring/se812.xml"/>
 		<Product type="000d" id="0001" name="SF812 Smoke Alarm" config="everspring/sf812.xml"/>
 		<Product type="0010" id="0001" name="HAC01 In-wall Remote Module"/>
@@ -462,7 +462,7 @@
 		<Product type="8002" id="0001" name="Plug-in Dimmer Module"/>
 		<Product type="4003" id="0001" name="Wall Dimmer Module"/>
 		<Product type="4002" id="0001" name="Wall Appliance Module"/>
-		<Product type="4004" id="0001" name="Wall Roller Shutter Module"/>
+		<Product type="4004" id="0001" name="Wall Roller Shutter Module" config="merten/50x5xx.xml"/>
 		<Product type="8001" id="8001" name="Receiver Flush-Mounted 1-Gang Switch"/>
 		<Product type="0003" id="0004" name="Transmitter Flush-Mounted 4-Gang Switch"/>
 		<Product type="0001" id="0002" name="Transmitter 1-Gang Switch"/>

Config/merten/50x5xx.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--http://www.pepper1.net/zwavedb/device/85-->
+<Product xmlns='http://code.google.com/p/open-zwave/'>
+  <!-- Configuration -->
+  <CommandClass id="112">
+
+    <Value type="byte" genre="config" instance="1" index="1" label="Switching additional CONNECT radio receivers" value="1">
+      <Help>To configure if other radio recivers from Merten should be switched as well.</Help>
+    </Value>
+
+    <Value type="byte" genre="config" instance="1" index="176" label="Changeover delay (motor protection)" value="100">
+      <Help>To configure the time the motor waits before switching direction.</Help>
+    </Value>
+
+    <Value type="byte" genre="config" instance="1" index="177" label="Raising time input 1" value="100">
+      <Help>To configure input 1 of the raising time calculation (256 * Input 1 + Input 2) * 0.1 sec</Help>
+    </Value>
+
+    <Value type="byte" genre="config" instance="1" index="178" label="Raising time input 2" value="100">
+      <Help>To configure input 1 of the raising time calculation (256 * Input 1 + Input 2) * 0.1 sec</Help>
+    </Value>
+
+    <Value type="byte" genre="config" instance="1" index="179" label="Lowering time input 1" value="100">
+      <Help>To configure input 1 of the lowering time calculation (256 * Input 1 + Input 2) * 0.1 sec</Help>
+    </Value>
+
+    <Value type="byte" genre="config" instance="1" index="180" label="Lowering time input 2" value="100">
+      <Help>To configure input 1 of the lowering time calculation (256 * Input 1 + Input 2) * 0.1 sec</Help>
+    </Value>
+
+    <Value type="list" genre="config" instance="1" index="181" label="Light sensor" value="0" size="1">
+      <Help>To configure use of light sensor. Default: 0 .</Help>
+      <Item label="0 - Auto" value="0"/>
+      <Item label="1 - On" value="1"/>
+      <Item label="2 - Off" value="1"/>
+    </Value>
+
+    <Value type="byte" genre="config" instance="1" index="182" label="Brightness threshold for light sensor" value="1">
+      <Help>To configure brightness threshold for light sensor.</Help>
+    </Value>
+
+    <Value type="byte" genre="config" instance="1" index="183" label="Sensor raising reaction threshold input 1" value="1">
+      <Help>To configure input 1 of reaction threshold for raising shutter time calculation (256 * Input 1 + Input 2) * 0.1 sec</Help>
+    </Value>
+
+    <Value type="byte" genre="config" instance="1" index="184" label="Sensor raising reaction threshold input 1" value="100">
+      <Help>To configure input 2 of reaction threshold for raising shutter time calculation (256 * Input 1 + Input 2) * 0.1 sec</Help>
+    </Value>
+
+    <Value type="byte" genre="config" instance="1" index="185" label="Sensor lowering reaction threshold input 1" value="1">
+      <Help>To configure input 1 of reaction threshold for lowering shutter time calculation (256 * Input 1 + Input 2) * 0.1 sec</Help>
+    </Value>
+
+    <Value type="byte" genre="config" instance="1" index="186" label="Sensor lowering reaction threshold input 1" value="100">
+      <Help>To configure input 2 of reaction threshold for lowering shutter time calculation (256 * Input 1 + Input 2) * 0.1 sec</Help>
+    </Value>
+
+	</CommandClass>
+  
+  <!-- COMMAND_CLASS_ALARM AlarmCmd_Get not supported -->
+  <CommandClass id="113" getsupported="false" />
+
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" max_associations="5" label="Group 1" auto="true"/>
+    </Associations>
+  </CommandClass>
+
+</Product>

History.txt

@@ -1,4 +1,4 @@
-Version 3.xxx (xxxx 2015)
+Version 2.xxx (xxxx 2015)
 - Implemented: Notifications, new option "Ignore Interval"
 - Improved: Notifications
 - Implemented: MySensors added support for S_SMOKE/S_DIMMER
@@ -83,6 +83,17 @@ Version 3.xxx (xxxx 2015)
 - Implemented: Option to add a log message via the json api (see wiki)
 - Fixed: MySensors, S_LIGHT now creates an initial switch again
 - Fixed: Netatmo, Rain Sensor
+- Fixed: upgrading via the web interface (some users had experienced a problem)
+- Implemented: Satel Integra hardware support (big thanks to Fantom)
+- Fixed: Icon Uploader, uploading went wrong with large files
+- Implemented: Icon Uploader, now possible to upload zip files with multiple folders
+- Implemented: Icon Uploader, now possible to edit name and description
+- Changed: Switch icon picker now has a fixed height
+- Fixed: Counter Incremental small icon display on devices tab
+- Changed: forced fixed icon sizes on some locations (in case of to big user defined icons)
+- Fixed: Weather tab, nofications
+- Changed: EnOcean rocker inclusion (thanks to zorgluf!)
+- Implemented: Icons for RFXMeter Gas/Water
 
 Version 2.2563 (June 14th 2015)
 - Implemented: WebServer, native SSL and keep-alive, big thanks to chimit!!!!