mreged in changes from trunk to fully support the template Makefile

svn path=/branches/externals/hardware/wiimote-0.3/; revision=13821

8 files changed, 82 insertions, 5 deletions

diff --git a/CHANGES b/CHANGES
new file mode 100644
index 0000000..cc123bf
--- /dev/null
+++ b/CHANGES
@@ -0,0 +1 @@
+initial release 0.3
diff --git a/Makefile b/Makefile
index 2b04372..acd55f5 100644
--- a/Makefile
+++ b/Makefile
@@ -18,12 +18,14 @@ SOURCES_Windows =
 #
 #------------------------------------------------------------------------------#
 
+VERSION=0.3.1
+
 # where Pd lives
 PD_PATH = ../../pd
 # where to install the library
 objectsdir = $(PD_PATH)/extra
 
-CFLAGS = -DPD -I$(PD_PATH)/src -Wall -W -g
+CFLAGS = -DPD -I$(PD_PATH)/src -Wall -W -g -DVERSION=\"$(VERSION)\"
 LDFLAGS =  
 LIBS = -lcwiid -lbluetooth -lpthread
 
@@ -102,8 +104,8 @@ single_install: $(LIBRARY_NAME) install-doc install-exec
 
 install-doc:
 	install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
-#	install -m644 -p $(SOURCES:.c=-help.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
-	install -m644 -p $(wildcard *.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+	install -m644 -p $(SOURCES:.c=-help.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+#	install -m644 -p $(wildcard *.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
 	install -m644 -p README $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt
 	install -m644 -p VERSION $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/VERSION.txt
 	install -m644 -p CHANGES $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/CHANGES.txt
diff --git a/README b/README
new file mode 100644
index 0000000..bc28f88
--- /dev/null
+++ b/README
@@ -0,0 +1,48 @@
+wiimote for Pd
+==============
+
+[wiimote] is a Pd-object that allows to read data from a Wii Remote Controller
+it depends on libcwiid, which is currently only available on linux
+
+
+random notes
+============
+
+extensions
+----------
+the external is known to support the nunchuck, classic, motionplus extensions
+the balance extension might work, but is currently untested (if it doesn't work
+and you need it, contact me to and send me the hardware)
+
+motionplus
+----------
+the motionplus extension for the wiimote is supported (out of the box, see
+above).
+however, older releases of libcwiid are inaccurate at detecting rotation speed
+(the wii remote reports whether the controller is turned fast or slow; this info
+is missing in libcwiid).
+if you have such a version of libcwiid and need higher precision, you have to
+patch the sources of libcwiid:
+$ cd /path/to/cwiid/libcwiid
+$ patch < /path/to/wiimote/patches/cwiid201_motionplus_sensitivity.patch
+$ cd /path/to/cwiid/
+$ make (read README to see how to patch libcwiid)
+
+once you have done that, you need to make the external aware of the new feature.
+for this create a file 
+/path/to/wiimote/Make.local
+and add the following line:
+CFLAGS += -DHAVE_CWIID_MOTIONPLUS_LOWSPEED
+
+then recompile wiimote
+
+multiple bluetooth dongles
+--------------------------
+[LATER describe that]
+
+
+contact
+=======
+get in contact with me either via the pd-list
+(http://lists.puredata.info/listinfo/pd-list) or directly via
+zmoelnig[at]iem[.]at
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..9e11b32
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+0.3.1
diff --git a/version_update.sh b/version_update.sh
new file mode 100644
index 0000000..0425b55
--- /dev/null
+++ b/version_update.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+VERSION=$(cat VERSION)
+
+echo updating to version: $VERSION
+
+sed -e "s|^VERSION=.*$|VERSION=${VERSION}|" -i Makefile
+sed -e "s| VERSION .*;$| VERSION ${VERSION};|" -i wiimote-meta.pd
+
+
+
diff --git a/wiimote-help.pd b/wiimote-help.pd
index 71ac3ec..0993f28 100644
--- a/wiimote-help.pd
+++ b/wiimote-help.pd
@@ -2,7 +2,7 @@
 #N struct NC-stick float x float y;
 #N struct cc-left-stick float x float y;
 #N struct cc-right-stick float x float y;
-#N canvas 133 45 830 538 10;
+#N canvas 432 145 830 538 10;
 #X text 8 9 IN ORDER TO CONNECT: First put the wiimote into discover
 mode (press buttons 1 and 2 simultaneously).;
 #X text 16 364 You can also specify the address as a creation argument:
@@ -642,6 +642,8 @@ empty -2 -8 0 10 -203904 -1 -1 0 1;
 #X connect 1 0 3 0;
 #X connect 3 0 2 0;
 #X restore 667 502 pd Balance;
+#X text 18 472 (c) 2007-2010 Mike Wozniewski \, IOhannes m zmoelnig
+& Roman Haefeli;
 #X connect 20 0 19 0;
 #X connect 21 0 19 0;
 #X connect 22 0 19 0;
diff --git a/wiimote-meta.pd b/wiimote-meta.pd
new file mode 100644
index 0000000..0d919c4
--- /dev/null
+++ b/wiimote-meta.pd
@@ -0,0 +1,8 @@
+#N canvas 16 114 200 200 10;
+#N canvas 488 184 420 300 META 1;
+#X text 13 41 NAME wiimote;
+#X text 10 25 AUTHOR Mike Wozniewski + Florian Krebs + IOhannes m zmoelnig
+;
+#X text 10 10 VERSION 0.3.1;
+#X obj 163 144 wiimote;
+#X restore 10 10 pd META;
diff --git a/wiimote.c b/wiimote.c
index e6391a1..79bddf2 100644
--- a/wiimote.c
+++ b/wiimote.c
@@ -1144,5 +1144,9 @@ void wiimote_setup(void)
    post("	(c) 2007 Mike Wozniewski");
    post("	(c) 2008-2009 Florian Krebs");
    post("	(c) 2009-2010 IOhannes m zmoelnig");
-   post("	version 0.3 published under the GNU General Public License");
+#ifdef VERSION
+   post("	version " VERSION " published under the GNU General Public License");
+#else
+   post("	published under the GNU General Public License");
+#endif
 }