From 0ce12649176ee872c030c3764404b00d3cf1de77 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Sat, 15 Oct 2011 14:54:34 +0000
Subject: [PATCH] Diverse Wiimotegerelateerde aanpassingen. Projectinstellingen
 Wiiuse en Wiiusej nogmaals aangepast. Getracht Wiiscan te compileren, maar
 dit geeft vooralsnog problemen. De bedoeling is om bij de -c -d en -a
 argumenten ook waarden met spaties (op een of andere manier) te accepteren.
 Dit zou het mogelijk maken om behalve wiimotes ook het balance board te
 pairen. Voorlopig opgelost door een handmatige aanpassing in wiiscan.exe,
 opgeslagen als wiiscan-bb.exe.

---
 .cproject                 |   9 +++++++--
 .project                  |   2 +-
 Release/libwiiusej.dll    | Bin 62016 -> 62016 bytes
 {src => include}/wiiuse.h |  35 ++++++++++++++++++++++++++++++++++-
 lib/wiiuse.lib            | Bin 27590 -> 27590 bytes
 5 files changed, 42 insertions(+), 4 deletions(-)
 rename {src => include}/wiiuse.h (92%)

diff --git a/.cproject b/.cproject
index 80c883a..7d4e8d1 100644
--- a/.cproject
+++ b/.cproject
@@ -48,6 +48,7 @@
 								<option id="gnu.c.compiler.option.include.paths.486668115" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${jdk}/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${jdk}/include/win32&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.820612620" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
@@ -62,7 +63,8 @@
 								<option id="gnu.cpp.link.option.libs.102697521" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
 									<listOptionValue builtIn="false" value="wiiuse"/>
 								</option>
-								<option id="gnu.cpp.link.option.flags.2098946116" superClass="gnu.cpp.link.option.flags" value="-static-libgcc" valueType="string"/>
+								<option id="gnu.cpp.link.option.flags.2098946116" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,--kill-at -static-libgcc" valueType="string"/>
+								<option id="gnu.cpp.link.option.strip.193866268" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" value="true" valueType="boolean"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1307869739" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -120,6 +122,7 @@
 								<option id="gnu.c.compiler.option.include.paths.13176781" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${jdk}/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${jdk}/include/win32&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.839631863" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
 							</tool>
@@ -134,7 +137,8 @@
 								<option id="gnu.cpp.link.option.libs.173366246" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
 									<listOptionValue builtIn="false" value="wiiuse"/>
 								</option>
-								<option id="gnu.cpp.link.option.flags.1334245987" superClass="gnu.cpp.link.option.flags" value="-static-libgcc" valueType="string"/>
+								<option id="gnu.cpp.link.option.flags.1334245987" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,--kill-at -static-libgcc" valueType="string"/>
+								<option id="gnu.cpp.link.option.strip.611886908" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" value="true" valueType="boolean"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.790138545" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -165,4 +169,5 @@
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="refreshScope"/>
 </cproject>
diff --git a/.project b/.project
index 5d0c701..0b1461f 100644
--- a/.project
+++ b/.project
@@ -27,7 +27,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.buildLocation</key>
-					<value>${workspace_loc:/WiiuseJ/Release}</value>
+					<value>${workspace_loc:/WiiuseJ/Debug}</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.contents</key>
diff --git a/Release/libwiiusej.dll b/Release/libwiiusej.dll
index 0d194a45de494397e86e9ab5a12aad790163f1ed..0e213fab5d3d149567c13aefe00a04e313a5d3b8 100644
GIT binary patch
delta 31
lcmX@`g!#Y|<_R6lD(zDzcKb59T5Y_gr3>P1X4kVk0sz`G44wc0

delta 31
lcmX@`g!#Y|<_R6l8!k+o*zL;{dUoS2EnN_AGrOMU5dixs4&wj-

diff --git a/src/wiiuse.h b/include/wiiuse.h
similarity index 92%
rename from src/wiiuse.h
rename to include/wiiuse.h
index b27637f..bd3c27f 100644
--- a/src/wiiuse.h
+++ b/include/wiiuse.h
@@ -128,6 +128,7 @@
 #define EXP_NUNCHUK						1
 #define EXP_CLASSIC						2
 #define EXP_GUITAR_HERO_3				3
+#define EXP_BALANCE_BOARD				4
 
 /* IR correction types */
 typedef enum ir_position_t {
@@ -462,6 +463,34 @@ typedef struct guitar_hero_3_t {
 } guitar_hero_3_t;
 
 
+/**
+ *	@struct balance_board_data_t
+ *	@brief Balance board l/r, t/b corner data data.
+ */
+typedef struct balance_board_data_t {
+	int tr;
+	int br;
+	int tl;
+	int bl;
+} balance_board_data_t;
+
+
+/**
+ *	@struct balance_board_t
+ *	@brief Balance board expansion device.
+ */
+typedef struct balance_board_t {
+	float tr;		/** Top Right weight */
+	float br;		/** Bottom Right weight */
+	float tl;		/** Top Left weight */
+	float bl;		/** Bottom Left weight */
+	struct balance_board_data_t raw;	/** Raw actual values */
+	struct balance_board_data_t cal_0;	/** Calibration values at 0kg */
+	struct balance_board_data_t cal_17;	/** Calibration values at 17kg */
+	struct balance_board_data_t cal_34;	/** Calibration values at 34kg */
+} balance_board_t;
+
+
 /**
  *	@struct expansion_t
  *	@brief Generic expansion device plugged into wiimote.
@@ -473,6 +502,7 @@ typedef struct expansion_t {
 		struct nunchuk_t nunchuk;
 		struct classic_ctrl_t classic;
 		struct guitar_hero_3_t gh3;
+		struct balance_board_t bb;
 	};
 } expansion_t;
 
@@ -503,6 +533,7 @@ typedef struct wiimote_state_t {
 	struct vec3b_t exp_accel;
 	float exp_r_shoulder;
 	float exp_l_shoulder;
+	struct balance_board_data_t exp_bb_raw;
 
 	/* ir_t */
 	int ir_ax;
@@ -533,7 +564,9 @@ typedef enum WIIUSE_EVENT_TYPE {
 	WIIUSE_CLASSIC_CTRL_INSERTED,
 	WIIUSE_CLASSIC_CTRL_REMOVED,
 	WIIUSE_GUITAR_HERO_3_CTRL_INSERTED,
-	WIIUSE_GUITAR_HERO_3_CTRL_REMOVED
+	WIIUSE_GUITAR_HERO_3_CTRL_REMOVED,
+	WIIUSE_BALANCE_BOARD_CTRL_INSERTED,
+	WIIUSE_BALANCE_BOARD_CTRL_REMOVED
 } WIIUSE_EVENT_TYPE;
 
 /**
diff --git a/lib/wiiuse.lib b/lib/wiiuse.lib
index 29d3a0f33d46b7098befde0412d385dfb67c7307..a23c43d2c61fd8bad45f0c1ee1bd7345b1301282 100644
GIT binary patch
delta 778
zcmX?ho$=Up#tG8w7G{QqrUs@Pl`1)5?8y$oVw-nx$}*w|eBz2n77*W@&!fkLq(Xf2
zZaxi!fPs|6W+p*%xWHxyVM_$3K{ODVBgDA*m4rRq_{|1Vz6fapDWLQ;S!;xJgD6OY
zJhBEwgn5%2L?t#aP_~DgFgd|fV)H*$SGWMse4qg_n&?Ju&_);uGG+1s!(W>@^xWY#
zPX_raPv01B64<T-hK>jU2VwEe@+N+$0^Me5r~>?!DX0Pyt+fyWKwBo~>Hpe%#m*98
zHP922|Ed1ktmf#A5CnO3f)m24z)%MI?1ig3LJ7!0y6!q~(>Eu0Cc`;!U*7RS_!6iB
zXo!t}Alwj$vC9Gx#zI7%1tUZz11*}Y>;8MQT9_eRBT!Ic@`Qw6n+qb8;ewmN@wX-l
zDX?M6SYi>%;08LxqZ+t*LV_&Z2avctmW+r?kiO0Gsc4BaI~^%;f}FaW@Au|4SyGGu
Db$!aw

delta 778
zcmX?ho$=Up#tG8w=0*l4=0=7al`1)5?8y$oVw-nx$}*w|eBz2n77*W@&!fkLq(Xf2
zZaxi!fPs|6W+p*%xWHxyVM_$3K{ODVBgDA*m4rRq_{|1Vz6fapDWLQ;S!;xJgD6OY
zJhBEwgn5%2L?t#aP_~DgFgd|fV)H*$SGWMse4qg_n&?Ju&_);uGG+1s!(W>@^xWY#
zPX_raPv01B64<T-hK>jU2VwEe@+N+$0^Me5r~>?!DX0Pyt+fyWKwBo~>Hpe%#m*98
zHP922|Ed1ktmf#A5CnO3f)m24z)%MI?1ig3LJ7!0y6!q~(>Eu0Cc`;!U*7RS_!6iB
zXo!t}Alwj$vC9Gx#zI7%1tUZz11*}Y>;8MQT9_eRBT!Ic@`Qw6n+qb8;ewmN@wX-l
zDX?M6SYi>%;08LxqZ+t*LV_&Z2avctmW+r?kiO0Gsc4BaI~^%;f}FaW@Au|4SyGGu
DqoK-8