rik/jlibwiiuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Rik Veenboer
2011-10-15 14:54:34 +00:00
parent ac6ce59de7
commit 0ce1264917
5 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.cproject
View File

@@ -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>

2
.project
View File

@@ -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>

BIN
Release/libwiiusej.dll
View File

Binary file not shown.

35
src/wiiuse.h → include/wiiuse.h
View File

@@ -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;
/**

BIN
lib/wiiuse.lib
View File

Binary file not shown.