Merge pull request #18 from domoticz/master

merge

Author: szczukot

CMakeLists.txt

@@ -231,6 +231,7 @@ hardware/CurrentCostMeterBase.cpp
 hardware/CurrentCostMeterSerial.cpp
 hardware/CurrentCostMeterTCP.cpp
 hardware/DavisLoggerSerial.cpp
+hardware/DenkoviSmartdenLan.cpp
 hardware/DomoticzHardware.cpp
 hardware/DomoticzInternal.cpp
 hardware/DomoticzTCP.cpp

Config/BeNext/1poleswitch.xml

@@ -16,7 +16,7 @@
       <Help>The time that a user has to activate the double button pressed scene, if time is passed then the single pressed button scene is notified. (value * 10 ms)</Help>
     </Value>
 
-    <Value type="byte" genre="config" instance="1" index="12" label="Temperature offset" value="0" size="2">
+    <Value type="short" genre="config" instance="1" index="12" label="Temperature offset" value="0" size="2">
       <Help>A signed integer to determine the offset of the temperature.</Help>
     </Value>
 
@@ -26,9 +26,9 @@
   <CommandClass id="133">
     <Associations num_groups="4">
       <Group index="1" max_associations="8" label="Group 1" auto="false"/>
-      <Group index="2" max_associations="8" label="Group 2" />
-      <Group index="3" max_associations="8" label="Group 3" />
-      <Group index="4" max_associations="8" label="Group 4" />
+      <Group index="2" max_associations="8" label="Group 2"/>
+      <Group index="3" max_associations="8" label="Group 3"/>
+      <Group index="4" max_associations="8" label="Group 4"/>
     </Associations>
   </CommandClass>
 

Config/BeNext/2poleswitch.xml

@@ -16,7 +16,7 @@
       <Help>The time that a user has to activate the double button pressed scene, if time is passed then the single pressed button scene is notified. (value * 10 ms)</Help>
     </Value>
 
-    <Value type="byte" genre="config" instance="1" index="12" label="Temperature offset" value="0" size="2">
+    <Value type="short" genre="config" instance="1" index="12" label="Temperature offset" value="0" size="2">
       <Help>A signed integer to determine the offset of the temperature.</Help>
     </Value>
 
@@ -26,9 +26,9 @@
   <CommandClass id="133">
     <Associations num_groups="4">
       <Group index="1" max_associations="8" label="Group 1" auto="false"/>
-      <Group index="2" max_associations="8" label="Group 2" />
-      <Group index="3" max_associations="8" label="Group 3" />
-      <Group index="4" max_associations="8" label="Group 4" />
+      <Group index="2" max_associations="8" label="Group 2"/>
+      <Group index="3" max_associations="8" label="Group 3"/>
+      <Group index="4" max_associations="8" label="Group 4"/>
     </Associations>
   </CommandClass>
 

Config/BeNext/AlarmSound.xml

@@ -56,7 +56,7 @@
 	<CommandClass id="133">
 		<Associations num_groups="2">
 			<Group index="1" max_associations="1" label="Group 1" auto="false"/>
-			<Group index="2" max_associations="1" label="Group 2" />
+			<Group index="2" max_associations="1" label="Group 2"/>
 		</Associations>
 	</CommandClass>
 </Product>

Config/BeNext/BuiltinDimmer.xml

@@ -27,7 +27,7 @@
       <Item label="Dimming enabled." value="2"/>
     </Value>
 
-    <Value type="byte" genre="config" instance="1" index="6" label="Maximum Powerload" value="200" size="2">
+    <Value type="short" genre="config" instance="1" index="6" label="Maximum Powerload" value="200" size="2">
       <Help>The maximum powerload in watts when light is turned on, when measured higher then this value the Inline Dimmer is automatically turned off.</Help>
     </Value>
 
@@ -70,7 +70,7 @@
     <Associations num_groups="3">
       <Group index="1" max_associations="8" label="Group 1: All nodes in this group will receive a BASIC_SET frame when light is set to a certain state with the button of the Built-in Dimmer (manual switching)." auto="false"/>
       <Group index="2" max_associations="1" label="Group 2: The node associated in this group will receive a SWITCH_MULTILEVEL_REPORT frame every time the level of light is changed, where the value represents the (changed) dim level. The status is reported after every change that means manual but also if changed by Z-Wave. The node in this group will also received the (auto) METER_REPORT." auto="true"/>
-      <Group index="3" max_associations="1" label="Group 3: If configured that the control mode is extern only (configuration param3, value 1) then a BASIC_SET frame is sent to the node in this group when the button is changed." />
+      <Group index="3" max_associations="1" label="Group 3: If configured that the control mode is extern only (configuration param3, value 1) then a BASIC_SET frame is sent to the node in this group when the button is changed."/>
     </Associations>
   </CommandClass>
 

Config/BeNext/DoorSensor.xml

@@ -52,8 +52,8 @@
   <!-- Association Groups -->
   <CommandClass id="133">
     <Associations num_groups="2">
-      <Group index="1" max_associations="5" label="Group 1: if the internal door contact (magnet) is triggered it sends a Z-Wave frame to every node in this group." />
-      <Group index="2" max_associations="5" label="Group 2: if the external door contact is triggered it sends a Z-Wave frame to every node in this group if it is configured (see configuration documentation param 2: external contact)." />
+      <Group index="1" max_associations="5" label="Internal door contact" />
+      <Group index="2" max_associations="5" label="External door contact" />
     </Associations>
   </CommandClass>
 

Config/BeNext/HeatingControl.xml

@@ -14,17 +14,17 @@
     </Value>
 
     <Value type="byte" genre="config" instance="1" index="3" label="T room update difference" value="1" size="1">
-      <Help>The value that the room temperature must differ (compared to his previous send value) before an unsolicited room temperature report is send to the associated node. Value in 0.1 °C. </Help>
+      <Help>The value that the room temperature must differ (compared to his previous send value) before an unsolicited room temperature report is send to the associated node. Value in 0.1C. </Help>
     </Value>
 
     <Value type="byte" genre="config" instance="1" index="4" label="T setpoint update difference" value="5" size="1">
-      <Help>The value that the temperature setpoint must differ (compared to his previous send value) before an unsolicited temperature setpoint report is send to the associated node. Value in 0.1 °C .</Help>
+      <Help>The value that the temperature setpoint must differ (compared to his previous send value) before an unsolicited temperature setpoint report is send to the associated node. Value in 0.1C .</Help>
     </Value>
 
     <Value type="list" genre="config" instance="1" index="5" label="Unsolicited CRC" value="1">
       <Help>TConfigure if the unsolicited reports are send with the CRC-16 encapsulation. Not that the receiving node should support this encapsulation to parse the Z-Wave frame!</Help>
       <Item label="0x00 (disabled)" value="0"/>
-      <Item label="0x01 – 0xFF: enabled" value="1"/>
+      <Item label="0x01 to 0xFF: enabled" value="1"/>
     </Value>
 
     <Value type="list" genre="config" instance="1" index="6" label="Type of 'special' thermostat" value="0">

Config/BeNext/Molite.xml

@@ -6,10 +6,10 @@
 		<Value type="byte" genre="config" instance="1" index="1" label="Set to Default" >
 			<Help>Set all configuration values to default values (factory settings).</Help>
 		</Value>
-		<Value type="int" genre="config" instance="1" index="2" label="Mode timeout" size="2" min="1" max="32767" value="900" units="seconds">
+		<Value type="short" genre="config" instance="1" index="2" label="Mode timeout" size="2" min="1" max="32767" value="900" units="seconds">
 			<Help>The time used in mode 2 to turn the sensor off. This Time will start running as soon as detection is seen.</Help>
 		</Value>
-		<Value type="int" genre="config" instance="1" index="3" label="Switch off time" size="2" min="1" max="32767" value="2700" units="seconds">
+		<Value type="short" genre="config" instance="1" index="3" label="Switch off time" size="2" min="1" max="32767" value="2700" units="seconds">
 			<Help>The switch off time will start running as soon as mode timeout is done. Motion sensor is turned on and when movement is detected again the mode timeout (cfg param 1) will start running all over again. When switch off time is done a basic off message is sent to the associated node.</Help>
 		</Value>
 		<Value type="byte" genre="config" instance="1" index="4" label="Sensitivity" size="1" min="0" max="127" value="80">
@@ -21,37 +21,37 @@
 			<Item label="normal operation mode: send on after detection and off after given time no detection" value="2"/>
 			<Item label="Z-Wave chip is always on to request e.g. version or manufacturer id" value="3"/>
 		</Value>		
-		<Value type="int" genre="config" instance="1" index="6" label="The temperature offset" size="2" min="0" max="32767" value="0">
+		<Value type="short" genre="config" instance="1" index="6" label="The temperature offset" size="2" min="0" max="32767" value="0">
 			<Help>An offset for the temperature</Help>
 		</Value>		
-		<Value type="int" genre="config" instance="1" index="7" label="Light Table 100" size="2" min="1" max="32767" value="17">
+		<Value type="short" genre="config" instance="1" index="7" label="Light Table 100" size="2" min="1" max="32767" value="17">
 			<Help>If a LDR resistance measured lower then this value the returned light percentage is 100%. See chapter light table for more information.</Help>
 		</Value>
-		<Value type="int" genre="config" instance="1" index="8" label="Light Table 90" size="2" min="1" max="32767" value="38">
+		<Value type="short" genre="config" instance="1" index="8" label="Light Table 90" size="2" min="1" max="32767" value="38">
 			<Help>If a LDR resistance measured lower then this value the returned light percentage is 90%. See chapter light table for more information.</Help>
 		</Value>
-		<Value type="int" genre="config" instance="1" index="9" label="Light Table 80" size="2" min="1" max="32767" value="85">
+		<Value type="short" genre="config" instance="1" index="9" label="Light Table 80" size="2" min="1" max="32767" value="85">
 			<Help>If a LDR resistance measured lower then this value the returned light percentage is 80%. See chapter light table for more information.</Help>
 		</Value>
-		<Value type="int" genre="config" instance="1" index="10" label="Light Table 70" size="2" min="1" max="32767" value="186">
+		<Value type="short" genre="config" instance="1" index="10" label="Light Table 70" size="2" min="1" max="32767" value="186">
 			<Help>If a LDR resistance measured lower then this value the returned light percentage is 70%. See chapter light table for more information.</Help>
 		</Value>
-		<Value type="int" genre="config" instance="1" index="11" label="Light Table 60" size="2" min="1" max="32767" value="407">
+		<Value type="short" genre="config" instance="1" index="11" label="Light Table 60" size="2" min="1" max="32767" value="407">
 			<Help>If a LDR resistance measured lower then this value the returned light percentage is 60%. See chapter light table for more information.</Help>
 		</Value>
-		<Value type="int" genre="config" instance="1" index="12" label="Light Table 50" size="2" min="1" max="32767" value="891">
+		<Value type="short" genre="config" instance="1" index="12" label="Light Table 50" size="2" min="1" max="32767" value="891">
 			<Help>If a LDR resistance measured lower then this value the returned light percentage is 50%. See chapter light table for more information.</Help>
 		</Value>
-		<Value type="int" genre="config" instance="1" index="13" label="Light Table 40" size="2" min="1" max="32767" value="1949">
+		<Value type="short" genre="config" instance="1" index="13" label="Light Table 40" size="2" min="1" max="32767" value="1949">
 			<Help>If a LDR resistance measured lower then this value the returned light percentage is 40%. See chapter light table for more information.</Help>
 		</Value>
-		<Value type="int" genre="config" instance="1" index="14" label="Light Table 30" size="2" min="1" max="32767" value="4265">
+		<Value type="short" genre="config" instance="1" index="14" label="Light Table 30" size="2" min="1" max="32767" value="4265">
 			<Help>If a LDR resistance measured lower then this value the returned light percentage is 30%. See chapter light table for more information.</Help>
 		</Value>
-		<Value type="int" genre="config" instance="1" index="15" label="Light Table 20" size="2" min="1" max="32767" value="9332">
+		<Value type="short" genre="config" instance="1" index="15" label="Light Table 20" size="2" min="1" max="32767" value="9332">
 			<Help>If a LDR resistance measured lower then this value the returned light percentage is 20%. See chapter light table for more information.</Help>
 		</Value>
-		<Value type="int" genre="config" instance="1" index="16" label=". Light Table 10" size="2" min="1" max="32767" value="20417">
+		<Value type="short" genre="config" instance="1" index="16" label=". Light Table 10" size="2" min="1" max="32767" value="20417">
 			<Help>If a LDR resistance measured lower then this value the returned light percentage is 10%. See chapter light table for more information.</Help>
 		</Value>
 
@@ -62,7 +62,7 @@
 	<!-- Association Groups -->
 	<CommandClass id="133">
 		<Associations num_groups="1">
-			<Group index="1" max_associations="5" label="Group 1"/>
+			<Group index="1" max_associations="5" label="LifeLine"/>
 		</Associations>
 	</CommandClass>
 </Product>

Config/BeNext/PluginDimmer.xml

@@ -20,7 +20,7 @@
       <Item label="Dimming enabled." value="2"/>
     </Value>
 
-    <Value type="byte" genre="config" instance="1" index="6" label="Maximum Power load" value="125" size="2">
+    <Value type="short" genre="config" instance="1" index="6" label="Maximum Power load" value="125" size="2">
       <Help>The maximum power load in watts when light is turned on, when measured higher then this value the Inline Dimmer is automatically turned off.</Help>
     </Value>