merge 2013-11-13 branch into trunk

mattlongman · Feb 14, 2014 · 4e0a719 · 4e0a719
1 parent b38e81f
commit 4e0a719
Show file tree

Hide file tree

Showing 148 changed files with 9,045 additions and 4,470 deletions.
diff --git a/INSTALL b/INSTALL
@@ -0,0 +1,82 @@
+Minimal Install Guide for OpenZWave!
+
+For Unix's (including Mac, bsd's etc)
+=================
+execute Make in the Top Level Directory
+make
+
+Libraries to link to (Static and Dynamic) will be in top level directory as
+well (but you can change that as detailed below with LIBDIR)
+
+To Install:
+make install
+
+Some Options you can set:
+"BUILD=(release|debug)" - Build a Release or Debug Version of the Library
+(Release is default)
+
+"PREFIX=(path)" - Prefix to install the shared library into - Defaults to
+/usr/local
+
+"LIBDIR=/tmp" - Path to place the libraries into after complication. A poor
+mans "make install" for simple Applications.
+
+To use the options, specify them on the commandline when executing make eg:
+"BUILD=debug PREFIX=/opt/local make"
+
+What Gets installed:
+When make install is called the following happens:
+
+* Documentation:
+	if you have DoxyGen, API documentation is installed into
+	(PREFIX)/share/doc/openzwave-(version)/
+
+* Shared Libary (libopenzwave.so.*):
+	The Shared Library is installed into either (prefix)/lib64 (on 64
+	bit platforms) or (prefix)/lib/ on 32 bit platforms)
+
+* Header Files:
+	Installed into (prefix)/include/openzwave/
+
+* pkg-config file:
+	Installed into (prefix)/lib(64)/pkgconfig/libopenzwave.pc
+
+* Config files and Device Databases (manufacturer_specific.xml et al)
+	Installed into (prefix)/etc/openzwave/
+
+* MinOZW example program:
+	Installed into (prefix)/bin/ directory
+
+The Static Version of the library is never installed, but will be created in
+cpp/lib directory after a successfull make.
+
+Windows Versions
+================
+
+Visual Studio Solution Files and Mingw32 Makefiles are present in
+cpp/build/windows/. Select the correct Visual Studio or Mingw32 directory
+depending on the versions you have. 
+
+(Note, if building DLL's on Windows (currently a option in the vs2010
+solution) - You have to ensure you application is compiled with exactly the
+same compiler options and versions as OpenZWave - Otherwise strange things
+might happen)
+
+For the .NET dll, the solution files exist in the dotnet/build/ directory
+
+Sample Programs
+===============
+
+For all platforms, there is a simple example program that will print out
+events as they happen on your ZWave network. This sample is called MinOZW
+and you can find the source in the cpp/examples directory. By default, these
+examples are built during the Make Install Stage. If you want compile them
+separately, you can use the "make examples" target.
+
+For the .NET wrapper, there is a OZWForm application in
+dotnet/examples/OZWForm/. Please read the README file in that directory for
+further instructions
+
+
+
+
diff --git a/Makefile b/Makefile
@@ -0,0 +1,46 @@
+#
+# Makefile for OpenzWave Mac OS X applications
+# Greg Satz
+
+# GNU make only
+
+# requires libudev-dev
+
+.SUFFIXES:	.d .cpp .o .a
+.PHONY:	default clean install
+
+
+top_srcdir := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+top_builddir ?= $(CURDIR)
+export top_builddir
+PREFIX ?= /usr/local
+export PREFIX
+
+all: 
+	$(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) 
+	$(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) 
+
+install:
+	$(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS)
+	$(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS)
+
+clean:
+	$(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) $(MAKECMDGOALS)
+	$(MAKE) -C $(top_srcdir)/cpp/examples/MinOZW/ -$(MAKEFLAGS) $(MAKECMDGOALS)
+
+cpp/src/vers.cpp:
+	$(MAKE) -C $(top_srcdir)/cpp/build/ -$(MAKEFLAGS) cpp/src/vers.cpp
+
+check:
+
+include $(top_srcdir)/cpp/build/support.mk
+
+dist-update:
+	@echo "Updating List of Distribition Files"
+	@$(SVN) --xml -v st > .distfiles
+	@$(top_srcdir)/makedist
+
+DIST_FORMATS ?= gzip
+
+include $(top_srcdir)/distfiles.mk
+include $(top_srcdir)/dist.mk
diff --git a/config/BeNext/AlarmSound.xml b/config/BeNext/AlarmSound.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns='http://code.google.com/p/open-zwave/'>
+  <!-- COMMAND_CLASS_ALARM AlarmCmd_Get not supported -->
+  <CommandClass id="113" getsupported="false" />
+
+	<!-- 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>
+		<Value type="byte" genre="config" instance="1" index="2" label="Destination routine enabled" value="255">
+			<Help>Enables an internal routine that periodically checks the Z-Wave device in assocication group 2</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="3" label="Destination routine success time" value="60">
+			<Help>Configure the time that the AlarmSound sends a new frame when previous frame was send successful</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="4" label="Destination routine failed time" value="240">
+			<Help>Configure the time that the AlarmSound sends a few frame when previous frame was send not successful</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="5" label="Temperature calibration offset (byte 1)" value="0">
+			<Help>A (signed) offset to calibrate the onboard temperature sensor</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="6" label="Temperature calibration offset (byte 2)" value="0">
+			<Help>A (signed) offset to calibrate the onboard temperature sensor</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="7" label="Select index sound/light mode" value="1">
+			<Help>The index of the sound mode when a switch binary/basic set frame is received</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="8" label="Power offline sound/light mode" value="6">
+			<Help>The index of the sound mode when the AlarmSound will start when it is unplugged</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="9" label="Error sound/light mode" value="5">
+			<Help>The index of the sound mode when the AlarmSound will play when it is unable to reach the device in association group 2</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="10" label="Sound/Light index 1" value="-1">
+			<Help>Params 10 until 27 are the values to configure the sound and light thtat are played when index 1 is selected</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="28" label="Sound/Light index 2" value="-1">
+			<Help>Params 28 until 45 are the values to configure the sound and light thtat are played when index 2 is selected</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="46" label="Sound/Light index 3" value="-1">
+			<Help>Params 46 until 63 are the values to configure the sound and light thtat are played when index 3 is selected</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="64" label="Sound/Light index 4" value="-1">
+			<Help>Params 64 until 81 are the values to configure the sound and light thtat are played when index 4 is selected</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="82" label="Sound/Light index 5" value="-1">
+			<Help>Params 82 until 99 are the values to configure the sound and light thtat are played when index 5 is selected</Help>
+		</Value>
+		<Value type="byte" genre="config" instance="1" index="100" label="Sound/Light index 6" value="-1">
+			<Help>Params 100 until 117 are the values to configure the sound and light thtat are played when index 6 is selected</Help>
+		</Value>
+	</CommandClass>
+
+	<!-- Association Groups -->
+	<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" auto="false"/>
+		</Associations>
+	</CommandClass>
+</Product>
diff --git a/config/aeon_labs/doorwindow.xml b/config/aeon_labs/doorwindow.xml
@@ -1,13 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Aeon Labs Door/Window Sensor -->
 <Product xmlns='http://code.google.com/p/open-zwave/'>
-	<!-- Configuration Parameters not supported -->
-	<!-- Association Groups -->
-	<CommandClass id="133">
-		<!-- Information from http://www.pepper1.net/zwavedb/uploads/resources/1804efacf71a36402c53209c0991c04f20b31588.pdf -->
-		<!-- Or is original entry correct?: max_associations="5" label="Report" -->
-		<Associations num_groups="1">
-			<Group index="1" max_associations="6" label="Reports" auto="true"/>
-		</Associations>
-	</CommandClass>
+    <!-- Configuration -->
+    <CommandClass id="112">
+        <Value type="byte" genre="config" instance="1" index="1" label="Toggle the sensor binary report value when the Magnet switch is opened/closed." min="0" max="1" value="0">
+            <Help>0, Open: FF, Close: 00; 1, Open: 00, Close: FF
+              Default setting: 0
+            </Help>
+        </Value>
+        <Value type="byte" genre="config" instance="1" index="2" label="Enable wake up 10 minutes when the power is switched on." min="0" max="1" value="0">
+            <Help>0: Disable; 1: Enable
+              Default setting: 0
+            </Help>
+        </Value>
+        <Value type="byte" genre="config" instance="1" index="3" label="Toggle the basic set value when Magnet switch is opened/closed." min="0" max="1" value="0">
+            <Help>0, Open: FF, Close: 00; 1, Open: 00, Close: FF;
+              Default setting: 0
+            </Help>
+        </Value>
+        <Value type="int" genre="config" instance="1" index="121" label="Determines which report will be sent when Magnet switch is opened/ closed." min="0" max="1" value="256">
+            <Help>Which reports need to send automatically in timing intervals for group 1
+				Bitsets:
+                0 -> Battery report
+                4 -> Sensor Binary
+                8 -> Basic Set
+              Default setting: 0x00000100 (Basic Set)
+            </Help>
+        </Value>
+        <Value type="short" index="254" genre="config" label="Device Tag" units="" min="0" max="255" value="0">
+			<Help>Device Tag</Help>
+		</Value>
+		<Value type="button" index="255" genre="config" label="Reset configuration settings to factory defaults" write_only="true" value="0" >
+			<Help>Reset to factory defaults.</Help>
+		</Value>
+    </CommandClass>
+    <!-- Basic set as report -->
+	<CommandClass id="32" setasreport="true"/>
+    <!-- Association Groups -->
+    <CommandClass id="133">
+        <!-- Information from http://www.pepper1.net/zwavedb/uploads/resources/1804efacf71a36402c53209c0991c04f20b31588.pdf -->
+        <!-- Or is original entry correct?: max_associations="5" label="Report" -->
+        <Associations num_groups="1">
+            <Group index="1" max_associations="6" label="Reports" auto="true"/>
+        </Associations>
+    </CommandClass>
 </Product>
diff --git a/config/eurotronic/eur_stellaz.xml b/config/eurotronic/eur_stellaz.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns='http://code.google.com/p/open-zwave/'>
+
+        <CommandClass id="64" >
+                <Instance index="1" />
+                <Value type="list" genre="user" instance="1" index="0" label="Mode">
+                        <Item label="Frost Protection" value="0" />
+                        <Item label="Comfort" value="1" />
+                        <Item label="Energy Saving" value="11" />
+                        <Item label="Direct Valve Control" value="31" />
+                </Value>
+                <SupportedModes>
+                        <Mode index="0" label="Frost Protection" />
+                        <Mode index="1" label="Comfort" />
+                        <Mode index="11" label="Energy Saving" />
+                        <Mode index="31" label="Direct Valve Control" />
+                </SupportedModes>
+        </CommandClass>
+        <CommandClass id="67" base="0">
+                <Instance index="1" />
+                <Value type="int" genre="user" instance="1" index="1" label="Comfort setpoint" units="C" />
+                <Value type="int" genre="user" instance="1" index="11" label="Energy saving setpoint" units="C" />
+                <!-- <Value instance="1" index="7" action="remove" /> -->
+        </CommandClass>
+
+</Product>