From 66e02d0479853b4cebeb712ec1ff4c48441f6198 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Tue, 15 Feb 2011 14:59:52 +0000 Subject: [PATCH] Calibratie toegevoegd aan WiiuseJ --- lib/wiiuse.lib | Bin 10344 -> 10344 bytes msvc/WiiUseJ.suo | Bin 19456 -> 19968 bytes msvc/WiiUseJ.vcxproj | 1 + msvc/WiiUseJ.vcxproj.filters | 3 +++ wiiusej_Calibration.c | 21 +++++++++++++++++++ wiiusej_WiiUseApi.c | 2 +- wiiusej_WiiUseApi.def | 34 ------------------------------- wiiusej_WiiUseApi.h | 38 +++-------------------------------- 8 files changed, 29 insertions(+), 70 deletions(-) create mode 100644 wiiusej_Calibration.c delete mode 100644 wiiusej_WiiUseApi.def diff --git a/lib/wiiuse.lib b/lib/wiiuse.lib index 98aeaa3243b335cc2e7ca93cbc7f43e7f7c8d5f3..93409c6339e05df5ad1faf58cac35cf661205275 100644 GIT binary patch delta 1057 zcmY+Dzi-n(6vtgfEwu_wTgN`9j^neN*b%5oJEWl?1OYKHRCtAjNKA|jY(XXP`nLb> zinPaH_xtuu`V5Ccz=xG`=~Msy{+E@rnTbTe&q{d~=R5DA?M2|bzluKwo)N8kF^dkx zMP&rf#WtZd`ZF2jp@2&*N0aybt3;~t%cf(iL}^)82_E<^{O}V3j;qGKTkX(Dwf`O( ztJhVwBJ#p2lY@p4KUuv_VxoResG{H9fc*x65s!i{iD{J8c$9~RdR4nkl-lWAV*1%( zZ!$LI(~!w=@`Bnv#O=%0JbavUV5u%iMUfBd9678TqtEq%w}8=_iR?wUNUWMXN*wJU zp}&Lv!zCAvBKB7mmZecXWi^@UCg|~8p%oXx)jBFs{X(WY%I4UB$ zapk<)uZ4)P<}Jw2g+-=#S_{e4Mp#|HmuJZ}axBuP(=aekcZoJpz#%Q236U>ZN=5SF! wC*@2Ec#(1d-TB{??_6c>WTt(LP7URBy6C~1uyB>;U3|^>8kLOxb-h;h9~z-1-T(jq delta 1057 zcmY+Dzi-n(6vvICmRg0Ttz(~4$MM-s?5GGO3{_eXf`AwpD$K~#NKA|!y0xm1kQf{E z{(weE?4T|%M3g^(0SN{s5E9S@b*zvWcz2ig;%v#w=lkQ`T~71Ud{CRcw%O@!Y(U@k z-&~jW`0H`szC)kkLXG_lQzEeN9Y1 zJM2xyhTIRC94F7K?L*wYY|X)kSqB#Dl2jD=xXzKox-t4#FL(|D7o-jcF0^I|HeoM5lKAWcT8R@zbg97Zbv*bZfau=n< zBhp<`L~5$b?U?}1SDB%cz2D#-^n^wYenQHr+BDVL&8fr24!ZHHCO1X{ota=}tTKlS y0@hQ`q=4rs2hg4WP5I7M=2m9f$LQ2hPG<`qybKFhY2L+`jIUA2=wH`sW&Z*B_#t!v diff --git a/msvc/WiiUseJ.suo b/msvc/WiiUseJ.suo index 93a5e57ea0f5759a6291a6e27f769bad4415bb2e..1032800f8d61a04d593b70d4a02625513febd4bb 100644 GIT binary patch delta 474 zcmZpe!Pqc|aYGLirz!&j!@vLk|Nq+H}ptfq3#n zeT~UqcmgOdYFTtsFW3uD>jjmpxK zHz;{cPSp|s8pZ;YtpSTIkn)?XX(TjxnxfL=1yT-^Z|h2J?o%@3;}8KVQG*%s#UO-* zg$v4?Tw)qBSx`@B^A}Tg7RITQ|5zqS&H&2I1mamh4D#C?AUzkv-dt)W#Ll{ak%2*U zbC0756XU$ejLzAU3&go5w43JPQ}*-=YuvYx9NV-L{K>dBWhg(ml@s!Uc;3Yq*sif{57CyC8( zTw|EPjxF&BVC2vN8e#y%pupYy#gm6=l8FMN(PTw?Wfnt_Fwj@r(}9d5Knw(v|Enrb iRB3_l+5@z*nryAU`Bi~2w`F2f$}Don1-;3z@<#tSr|`G z{$rUiF+^o^gB3eFE68Tq%{`7LOp`U7#JNF^g@Vb7c5;(+u1$8*>6vVx&BDky+1{yj b^BdO~CKi355|IBkmv{s)f}Q)tlZOca|2|L5 diff --git a/msvc/WiiUseJ.vcxproj b/msvc/WiiUseJ.vcxproj index 65fe5f8..ea82aed 100644 --- a/msvc/WiiUseJ.vcxproj +++ b/msvc/WiiUseJ.vcxproj @@ -92,6 +92,7 @@ + diff --git a/msvc/WiiUseJ.vcxproj.filters b/msvc/WiiUseJ.vcxproj.filters index cc1e8b3..380ac77 100644 --- a/msvc/WiiUseJ.vcxproj.filters +++ b/msvc/WiiUseJ.vcxproj.filters @@ -29,5 +29,8 @@ Source Files + + Source Files + \ No newline at end of file diff --git a/wiiusej_Calibration.c b/wiiusej_Calibration.c new file mode 100644 index 0000000..2456fee --- /dev/null +++ b/wiiusej_Calibration.c @@ -0,0 +1,21 @@ +#include "wiiusej_WiiUseApi.h" +#include "wiiuse.h" + +static wiimote** wiimotes; +static int nbMaxWiimotes; + + +JNIEXPORT jshortArray JNICALL Java_wiiusej_WiiUseApi_getCalibration +(JNIEnv *env, jobject obj, jint id) { + struct wiimote_t* wm = wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id); + const accel_t* accel = &wm->accel_calib; + const vec3b_t* zero = &accel->cal_zero; + const vec3b_t* g = &accel->cal_g; + short calibration[] = { + zero->x, zero->y, zero->z, + g->x, g->y, g->z}; + int size = 6; + jshortArray jShorts = (*env)->NewShortArray(env, size); + (*env)->SetShortArrayRegion(env, jShorts, 0, size, calibration); + return jShorts; +} \ No newline at end of file diff --git a/wiiusej_WiiUseApi.c b/wiiusej_WiiUseApi.c index 8d43e93..d5215ae 100644 --- a/wiiusej_WiiUseApi.c +++ b/wiiusej_WiiUseApi.c @@ -339,7 +339,7 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_getStatus */ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setTimeout (JNIEnv *env, jobject obj, jint id, jshort normalTimeout, jshort expansionTimeout) { - wiiuse_set_timeout(wiimotes, nbMaxWiimotes, normalTimeout, expansionTimeout); + wiiuse_set_timeout(wiimotes, nbMaxWiimotes, (byte) normalTimeout, (byte) expansionTimeout); } /** diff --git a/wiiusej_WiiUseApi.def b/wiiusej_WiiUseApi.def deleted file mode 100644 index e7aebd3..0000000 --- a/wiiusej_WiiUseApi.def +++ /dev/null @@ -1,34 +0,0 @@ -EXPORTS -Java_wiiusej_WiiUseApi_connect -Java_wiiusej_WiiUseApi_find -Java_wiiusej_WiiUseApi_init -Java_wiiusej_WiiUseApi_closeConnection -Java_wiiusej_WiiUseApi_getUnId -Java_wiiusej_WiiUseApi_cleanUp -Java_wiiusej_WiiUseApi_activateRumble -Java_wiiusej_WiiUseApi_deactivateRumble -Java_wiiusej_WiiUseApi_activateIRTracking -Java_wiiusej_WiiUseApi_deactivateIRTracking -Java_wiiusej_WiiUseApi_activateMotionSensing -Java_wiiusej_WiiUseApi_deactivateMotionSensing -Java_wiiusej_WiiUseApi_setLeds -Java_wiiusej_WiiUseApi_setOrientThreshold -Java_wiiusej_WiiUseApi_setAccelThreshold -Java_wiiusej_WiiUseApi_setAlphaSmoothing -Java_wiiusej_WiiUseApi_reSync -Java_wiiusej_WiiUseApi_activateSmoothing -Java_wiiusej_WiiUseApi_deactivateSmoothing -Java_wiiusej_WiiUseApi_activateContinuous -Java_wiiusej_WiiUseApi_deactivateContinuous -Java_wiiusej_WiiUseApi_setScreenRatio43 -Java_wiiusej_WiiUseApi_setScreenRatio169 -Java_wiiusej_WiiUseApi_setSensorBarAboveScreen -Java_wiiusej_WiiUseApi_setSensorBarBelowScreen -Java_wiiusej_WiiUseApi_setVirtualScreenResolution -Java_wiiusej_WiiUseApi_getStatus -Java_wiiusej_WiiUseApi_setTimeout -Java_wiiusej_WiiUseApi_setIrSensitivity -Java_wiiusej_WiiUseApi_setNunchukOrientationThreshold -Java_wiiusej_WiiUseApi_setNunchukAccelerationThreshold -Java_wiiusej_WiiUseApi_windowsSetBluetoothStack -Java_wiiusej_WiiUseApi_specialPoll diff --git a/wiiusej_WiiUseApi.h b/wiiusej_WiiUseApi.h index 031958b..29dde3f 100644 --- a/wiiusej_WiiUseApi.h +++ b/wiiusej_WiiUseApi.h @@ -273,44 +273,12 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_specialPoll /* * Class: wiiusej_WiiUseApi - * Method: activateSpeaker - * Signature: (I)V + * Method: getCalibration + * Signature: (I)[S */ -JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateSpeaker +JNIEXPORT jshortArray JNICALL Java_wiiusej_WiiUseApi_getCalibration (JNIEnv *, jobject, jint); -/* - * Class: wiiusej_WiiUseApi - * Method: deactivateSpeaker - * Signature: (I)V - */ -JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateSpeaker - (JNIEnv *, jobject, jint); - -/* - * Class: wiiusej_WiiUseApi - * Method: setSpeakerVolume - * Signature: (IS)V - */ -JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerVolume - (JNIEnv *, jobject, jint, jshort); - -/* - * Class: wiiusej_WiiUseApi - * Method: setSpeakerFrequency - * Signature: (II)V - */ -JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerFrequency - (JNIEnv *, jobject, jint, jint); - -/* - * Class: wiiusej_WiiUseApi - * Method: streamSpeakerData - * Signature: (I[S)V - */ -JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_streamSpeakerData - (JNIEnv *, jobject, jint, jshortArray); - #ifdef __cplusplus } #endif