Merge from master

mike240se · Feb 19, 2017 · 92c4587 · 92c4587
2 parents 6f6b156 + e0892c5
commit 92c4587
Show file tree

Hide file tree

Showing 142 changed files with 4,736 additions and 1,138 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -118,6 +118,53 @@ Version 1.5
  - Pull Request #1006 Unknown: id=0176 Unknown: type=0005, id=0001 (Telldus TZDW-100 Magnet Switch) from ic3cool (Nechry)
  - Pull Request #1007 Fibaro_FGK10x from tobiasgraf (Nechry)
  - Pull Request #1008 Devolo devices from tobiasgraf (Nechry)
+ - Pull Request #1010 Suggestion for adding support for ID Lock 101 from christerr (Nechry)
+ - Pull Request #1024 - Added new device, zooz zse09 from DeviantEng (Nechry)
+ - Issue #1012 - New Telldus Plug-in Switch Configuration (Nechry)
+ - Add new id for FGFS101 Zwave+ Flood Sensor (Nechry)
+ - Pull Request #1021 - Added Zooz ZSE08 Contact Sensor from DeviantEng (Nechry)
+ - Pull Request #1023 - Add product type for ZXT-120US from daradib (Nechry)
+ - Pull Request #1024 - Added new device, zooz zse09 from DeviantEng (Nechry)
+ - Add CT30 Thermostat config file (Nechry)
+ - Add ZD2301 Multisensor 4in1 (Nechry)
+ - Add Ecolink Sensor specific configuration (Nechry)
+ - Add Zipato VS-ZD2102 Door/Window Sensor (Nechry)
+ - Issue #1047 - Add the Popp 012501 Strike Lock Control (Nechry)
+ - Issue #1044 - Fibaro FGWPE Wall Plug is now type="0602" id="1001" (Nechry)
+ - Issue #1031 - Neo CoolCam PIR sensor incomplete Config from fozzyg (Nechry)
+ - Add Kaipule IM20 Door/Window Sensor (Nechry)
+ - Add Add Yale door lock missing parameters (Nechry)
+ - Add Yale Keyless Connected Smart Lock (Nechry) 
+ - Add Yale variante for Keyless Connected Smart Lock (Nechry)
+ - Add add Heating Control variante (Nechry)
+ - Issue #1056 Added Configuration Variables for Telldus Plugin Switch TZWP-100 from fozzyg (Nechry)
+ - Add hank scene controllers from sarakha63 (Nechry)
+ - Add Vision Security ZF5201 Flood sensor (Nechry)
+ - Add Aeotec ZW116 Nano Switch (Nechry)
+ - Issue #1046 - Add Config for TZ45A from RCS (darrinsmart)
+ - Add Zipato ZP3102-EU Multisensor Duo (Nechry)
+ - Add homeseer hs-wd100plus (Nechry)
+ - Add Fibaro FGMS001-ZW5 Motion Sensor (Nechry)
+ - Pull Request #1086 - Add definitions for 3 Cooper Aspire RF devices from drkp (Nechry)
+ - Add Coolcam Siren Alarm NAS-AB01Z (Nechry)
+ - Add Ingersoll Rand DWZWAVE1 (Nechry)
+ - Pull Request #1087 - Add Schlage BE468 lock from webdestroya (Nechry)
+ - Add Philio PAN11 Smart Energy Plug In Switch from daniarv (Nechry)
+ - Add TKB TZ69E Smart energy plug in switch (Nechry)
+ - Pull Request #1107 - Typo in fgmszw5.xml from bobvanoijen (Nechry)
+ - Pull Request #1114 - Add GE 12729 Dimmer Switch from eiddor (Nechry)
+ - Pull Request #1113 - Add device configuration file for Linear WS15Z-1 Wall Switch from singularitycoder (Nechry)
+ - Pull Request #1112 - Add device configuration file for Linear WT00Z-1 3-Way Wall Accessory Switch from singularitycoder (Nechry)
+ - Pull Request #1111 - Typo's & indentation from bobvanoijen (Nechry)
+ - Pull Request #1109 - Add support for GE 12491 Z-Wave Plus switch from drkp  (Nechry)
+ - Add Aeotec ZW111 Nano Dimmer (Nechry)
+ - Pull Request #1120 - Add Ecolink TILTZWAVE2.5-ECO Garage Door Sensor from adreznec (Nechry)
+ - Add Ecolink Z-Wave Plus FireFighter (Nechry)
+ - Add Ecolink Ecolink Motion Detector (Nechry)
+ - Add Ecolink Door Window Sensor (Nechry)
+ - Pull Request #1105 - Replace some of the Explicit Locking with Scoped Locks (from tobiasgraf) - Also additional checking on the Unix Mutex Class to detect unbalanced Locking (Justin)
+ - If the TriggerRefreshValue XML is invalid, we could get into a infinite loop when trying to read the params (Justin)
+ - Add Fibaro FGKF601 Keyfob (Nechry)
 
 Dev Branch:
  - Rename zwcfg_*.xml to zwcache_*.xml to reflect its not a config file, but a cache. (Justin)

diff --git a/Makefile b/Makefile
@@ -17,8 +17,8 @@ PREFIX ?= /usr/local
 export PREFIX
 
 all: 
-	CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS)
-	CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS)
+	LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS)
+	LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS)
 
 install:
 	$(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS)
@@ -29,7 +29,7 @@ clean:
 	$(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS)
 
 cpp/src/vers.cpp:
-	CPPFLAGS=$(CPPFLAGS) $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(top_srcdir)/cpp/src/vers.cpp
+	LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(top_srcdir)/cpp/src/vers.cpp
 
 check: xmltest
 

diff --git a/config/2gig/ct30.xml b/config/2gig/ct30.xml
@@ -2,6 +2,95 @@
 
 <Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
   <!-- This thermostat's setpoint descriptions are 0 based, not 1 -->
-  <CommandClass id="67" base="0" />
-
+  <CommandClass id="67" base="0"/>
+  <CommandClass id="112">
+    <Value type="list" index="1" genre="config" label="Temperature Reporting Threshold" units="" min="0" max="4" value="0" size="1">
+      <Help>
+        The Temperature Reporting Threshold Configuration Set Command sets the reporting threshold for changes in the ambient temperature as detected by the thermostat.
+      </Help>
+      <Item label="Disabled" value="0"/>
+      <Item label="0.5F" value="1"/>
+      <Item label="1.0F" value="2"/>
+      <Item label="1.5F" value="3"/>
+      <Item label="2.0F" value="4"/>
+    </Value>
+    <Value type="byte" index="2" genre="config" label="HVAC Settings" read_only="true" units="" min="0" max="31" value="0" size="1">
+      <Help>
+        Read-only parameter
+        0 - 7 -> HVAC Setup: Normal (0x01) or Heat Pump (0x02)
+        8 - 11 -> Number of Auxiliary Stages (Heat Pump) / Number of Heat Stages (Normal)
+        12 - 15 -> Aux Setup: Gas (0x01) or Electric (0x02)
+        16 - 23 -> Number of Heat Pump Stages
+        24 - 31 -> Number of Cool Stages
+      </Help>
+    </Value>
+    <Value type="list" index="3" genre="config" label="Utility Lock" units="" min="0" max="1" value="0" size="1">
+      <Help>
+        The Utility Lock Configuration Set command enables or disables the utility lock. If the utility lock is enabled, the setpoint cannot be modified directly via the thermostat screen.
+      </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value type="short" index="4" genre="config" label="C-Wire/Battery Status" read_only="true" units="" min="0" max="31" value="0" size="1">
+      <Help>
+        Read-only parameter
+        1 -> C-Wire
+        2 -> Battery
+      </Help>
+    </Value>
+    <Value type="list" index="5" genre="config" label="Humidity Reporting Threshold" units="" min="0" max="3" value="0" size="1">
+      <Help>
+        The Temperature Reporting Threshold Configuration Set Command sets the reporting threshold for changes in the ambient temperature as detected by the thermostat.
+      </Help>
+      <Item label="Disabled" value="0"/>
+      <Item label="3% RH" value="1"/>
+      <Item label="5% RH" value="2"/>
+      <Item label="10% RH" value="3"/>
+    </Value>
+    <Value type="list" index="6" genre="config" label="Auxiliary/Emergency heat" units="" min="0" max="1" value="0" size="1">
+      <Help>
+        The Auxiliary/Emergency configuration command enables or disables auxiliary / emergency heating in the thermostat. Auxiliary / emergency heating is only available if the thermostat is configured in heat pump mode and with at least one stage of auxiliary heating. This command enables auxiliary / emergency heating when the thermostat is in Auto mode. The Thermostat Set Mode command with mode Auxiliary/Emergency Heat will enable emergency heating but only if the thermostat is in
+        Heat mode. This command should only be used on thermsotats that support Auxiliary/Emergency Heat thermostat mode.
+      </Help>
+      <Item label="Disabled" value="0"/>
+      <Item label="Enabled" value="1"/>
+    </Value>
+    <Value type="list" index="7" genre="config" label="Thermostat Swing Temperature" units="" min="1" max="8" value="0" size="1">
+      <Help>
+        The Auxiliary/Emergency configuration command enables or disables auxiliary/emergency heating in the thermostat. Auxiliary/emergency heating is only available if the thermostat is configured in heat pump mode and with at least one stage of auxiliary heating. This command enables auxiliary / emergency heating when the thermostat is in Auto mode. The Thermostat Set Mode command with mode Auxiliary/Emergency Heat will enable emergency heating but only if the thermostat is in Heat
+        mode. This command should only be used on thermsotats that support Auxiliary/Emergency Heat thermostat mode.
+      </Help>
+      <Item label="0.05F" value="1"/>
+      <Item label="0.1F" value="2"/>
+      <Item label="4.0F" value="8"/>
+    </Value>
+    <Value type="list" index="8" genre="config" label="Thermostat Diff Temperature" units="" min="4" max="12" value="0" size="1">
+      <Help>
+        The Thermostat Differential Temperature configuration command sets the differential temperature for multi-stage HVAC systems. The differential temperature delta defines when the thermostat will turn on additional stages. There are two differential temperatures, one for multistage cool systems and one for multistage heat systems. If the thermostat is not configured for multistage HVAC systems then these parameters have no effect.
+      </Help>
+      <Item label="2.0F" value="4"/>
+      <Item label="4.0F" value="8"/>
+      <Item label="6.0F" value="12"/>
+    </Value>
+    <Value type="list" index="9" genre="config" label="Thermostat Recovery Mode" units="" min="4" max="12" value="1" size="1">
+      <Help>
+        The Thermostat Recovery Mode configuration command sets the HVAC recovery mode type. The recovery mode determines when additional HVAC stages are turned off as the ambient temperature returns to the target temperature. If the recovery mode is set to economy, the thermostat will turn off additional HVAC stages when the ambient temperature reaches the target temperature plus/minus the differential temperature. If the recovery mode is set to fast, the thermostat will leave all
+        stages on (assuming they were already on) until the ambient temperature reaches the target temperature.
+      </Help>
+      <Item label="Fast" value="1"/>
+      <Item label="Economy" value="2"/>
+    </Value>
+    <Value type="short" index="10" genre="config" label="Temperature Reporting Filter" units="F" min="0" max="124" value="124" size="1">
+      <Help>
+        The Temperature Reporting Filter configuration command sets upper and lower bounds of the ambient temperature reporting. The thermostat will not report ambient temperature changes if the ambient temperature falls between these bounds. For example, if the upper bound is 80F and the lower bound is 60F, the thermostat will not send SENSOR_MULTI_LEVEL_REPORTS for ambient temperature values between 60F and 80F. The thermostat will only send ambient temperature changes if the
+        thermostat has been added to an association group (see Command Class Association) and the temperature reporting threshold is non-zero (see Temperature Reporting Threshold).
+      </Help>
+    </Value>
+  </CommandClass>
+  <CommandClass id="133">
+    <Associations num_groups="1">
+      <Group index="1" max_associations="2" label="Reporting"/>
+    </Associations>
+  </CommandClass>
 </Product>
+
diff --git a/config/BeNext/HeatingControl.xml b/config/BeNext/HeatingControl.xml
@@ -2,11 +2,32 @@
 <!--http://www.benext.eu/static/manual/heatingcontrol.pdf-->
 <Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="2">
 
+  <CommandClass id="64" name="COMMAND_CLASS_THERMOSTAT_MODE">
+    <Value type="list" genre="user" instance="1" index="0" label="Mode" units="" read_only="false" write_only="false" min="0" max="0" value="0">
+      <Item label="Heat" value="1"/>
+      <Item label="Energy Heat" value="11"/>
+    </Value>
+    <SupportedModes>
+      <Mode index="1" label="Heat"/>
+      <Mode index="11" label="Energy Heat"/>
+    </SupportedModes>
+  </CommandClass>
+
+  <CommandClass id="67" name="COMMAND_CLASS_THERMOSTAT_SETPOINT" version="1" request_flags="4" create_vars="true" base="0">
+    <Instance index="1"/>
+    <Value type="decimal" genre="user" instance="1" index="1" label="Heating" units="C" read_only="false" write_only="false" min="0" max="0" value="20"/>
+    <Value type="decimal" genre="user" instance="1" index="11" label="Energy Heat" units="C" read_only="false" write_only="false" min="0" max="0" value="16"/>
+  </CommandClass>
+
   <!-- Configuration -->
   <CommandClass id="112">
-
-    <Value type="byte" genre="config" instance="1" index="1" label="Set to Default" value="-1">
-      <Help>Set all configuration values to default values (factory settings).</Help>
+    <Value type="byte" genre="config" instance="1" index="1" label="Reset to Default" size="1" value="0">
+      <Help>0xFF: Set all configuration values to default values (factory settings).
+        CONFIGURATION_REPORT
+        0x55: Configuration settings of the device are altered.
+        0xAA: Configuration of the device is untouched.
+        Note that this value will not change to 0x55 upon modifying the wake up interval and that re-setting the value to 0xAA will always reset the wake up interval.
+      </Help>
     </Value>
 
     <Value type="byte" genre="config" instance="1" index="2" label="Data request interval" value="20" size="1">
@@ -21,23 +42,29 @@
       <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">
+    <Value type="list" genre="config" instance="1" index="5" label="Unsolicited CRC" size="1" 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 to 0xFF: enabled" value="1"/>
+      <Item label="Disabled" value="0"/>
+      <Item label="Enabled" value="255"/>
     </Value>
 
-    <Value type="list" genre="config" instance="1" index="6" label="Type of 'special' thermostat" value="0">
+    <Value type="list" genre="config" instance="1" index="6" label="Type of 'special' thermostat" size="1" value="0">
       <Help>Type of 'special' thermostat: NOTE: when remeha Celcia 20 support is set then any other thermostat can not be set (!) NOTE2: when Remeha Celcia 20 gives 'Fout 203' send cfg value again</Help>
-    <Item label="0x00: No special" value="0"/>
-    <Item label="0x01: Remeha Celcia 20" value="1"/>
-    <Item label="0x02: Honeywell (rounded temperatures)" value="2"/>
+    <Item label="No special" value="0"/>
+    <Item label="Remeha Celcia 20" value="1"/>
+    <Item label="Honeywell (rounded temperatures)" value="2"/>
+    </Value>
+
+    <Value type="list" genre="config" instance="1" index="7" label="Status auto report" size="1" value="0">
+      <Help>Status auto report boiler/thermostat report</Help>
+      <Item label="Disabled" value="0"/>
+      <Item label="Enabled" value="255"/>
     </Value>
 
-     <Value type="list" genre="config" instance="1" index="9" label="Enable/Disable thermostat schedule" value="0">
-      <Help>Enable/Disable thermostat schedule inside the heatingcontroller.</Help>
-      <Item label="0x00: Disable thermostat schedule" value="0"/>
-      <Item label="0x01 - OFF: Enable thermostat schedule" value="1"/>
+     <Value type="list" genre="config" instance="1" index="9" label="Thermostat schedule" size="1" value="0">
+      <Help>Enable/Disable thermostat schedule inside the heating controller.</Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="255"/>
     </Value>
 
   </CommandClass>
@@ -48,7 +75,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>
 

diff --git a/config/BeNext/PluginDimmer.xml b/config/BeNext/PluginDimmer.xml
@@ -56,10 +56,9 @@
 
   <!-- Association Groups -->
   <CommandClass id="133">
-    <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: Lifeline" auto="true"/>
-      <Group index="3" max_associations="1" label="Group 3: If configured that the control mode is external only (configuration param3, value 1) then a BASIC_SET frame is sent to the node in this group when the button is changed." auto="true"/>
+    <Associations num_groups="2">
+      <Group index="1" max_associations="8" label="BASIC Report on manual switching" auto="false"/>
+      <Group index="2" max_associations="1" label="Lifeline" auto="true"/>
     </Associations>
   </CommandClass>