From fe2a4548759379962dd9f0a8f557f2c2d7813f44 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Sat, 9 Jul 2016 12:14:32 +0100 Subject: [PATCH] Add stubs for balance board implementation --- ...ource.ide.eclipse.gradle.core.import.prefs | 10 - ...springsource.ide.eclipse.gradle.core.prefs | 4 - ...ingsource.ide.eclipse.gradle.refresh.prefs | 9 - build.gradle | 2 +- src/main/c/wiiusej_WiiUseApi.h | 364 ++++++++++++++++++ src/main/java/wiiusej/WiiUseApi.java | 1 - .../AccelerationExpansionEventPanel.java | 14 + .../utils/AccelerationWiimoteEventPanel.java | 14 + .../java/wiiusej/utils/ButtonsEventPanel.java | 14 + .../ClassicControllerButtonsEventPanel.java | 10 + .../utils/GForceExpansionEventPanel.java | 3 +- src/main/java/wiiusej/utils/GForcePanel.java | 12 + .../utils/GForceWiimoteEventPanel.java | 2 - .../utils/GuitarHero3ButtonsEventPanel.java | 11 + .../utils/GuitarHeroJoystickEventPanel.java | 2 +- src/main/java/wiiusej/utils/IRPanel.java | 12 + .../wiiusej/utils/JoystickEventPanel.java | 12 + .../java/wiiusej/utils/OrientationPanel.java | 12 + .../wiiusejevents/utils/WiimoteListener.java | 13 + .../test/ClassicControllerGuiTest.java | 10 + .../java/wiiusej/test/GuitarHero3GuiTest.java | 11 + .../java/wiiusej/test/NunchukGuiTest.java | 12 + src/test/java/wiiusej/test/Tests.java | 10 + .../java/wiiusej/test/WiiuseJGuiTest.java | 12 + 24 files changed, 547 insertions(+), 29 deletions(-) delete mode 100644 .settings/gradle/org.springsource.ide.eclipse.gradle.core.import.prefs delete mode 100644 .settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs delete mode 100644 .settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs create mode 100644 src/main/c/wiiusej_WiiUseApi.h diff --git a/.settings/gradle/org.springsource.ide.eclipse.gradle.core.import.prefs b/.settings/gradle/org.springsource.ide.eclipse.gradle.core.import.prefs deleted file mode 100644 index b3edc8b..0000000 --- a/.settings/gradle/org.springsource.ide.eclipse.gradle.core.import.prefs +++ /dev/null @@ -1,10 +0,0 @@ -#org.springsource.ide.eclipse.gradle.core.preferences.GradleImportPreferences -#Mon Nov 24 22:50:21 GMT 2014 -addResourceFilters=true -afterTasks=afterEclipseImport; -beforeTasks=cleanEclipse;eclipse; -enableAfterTasks=true -enableBeforeTasks=true -enableDSLD=false -enableDependendencyManagement=true -projects=; diff --git a/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs b/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs deleted file mode 100644 index a148614..0000000 --- a/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#org.springsource.ide.eclipse.gradle.core.preferences.GradleProjectPreferences -#Mon Nov 24 22:50:22 GMT 2014 -org.springsource.ide.eclipse.gradle.linkedresources= -org.springsource.ide.eclipse.gradle.rootprojectloc= diff --git a/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs b/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs deleted file mode 100644 index c1eff12..0000000 --- a/.settings/gradle/org.springsource.ide.eclipse.gradle.refresh.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#org.springsource.ide.eclipse.gradle.core.actions.GradleRefreshPreferences -#Mon Nov 24 22:50:21 GMT 2014 -addResourceFilters=true -afterTasks=afterEclipseImport; -beforeTasks=cleanEclipse;eclipse; -enableAfterTasks=true -enableBeforeTasks=true -enableDSLD=false -useHierarchicalNames=false diff --git a/build.gradle b/build.gradle index 1e1a67a..37c0387 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ dependencies { group = 'com.github.boukefalos' project.archivesBaseName = 'jlibwiiuse' -version = '0.12' +version = '0.13' task wrapper(type: Wrapper) { gradleVersion = '1.12' diff --git a/src/main/c/wiiusej_WiiUseApi.h b/src/main/c/wiiusej_WiiUseApi.h new file mode 100644 index 0000000..9842e88 --- /dev/null +++ b/src/main/c/wiiusej_WiiUseApi.h @@ -0,0 +1,364 @@ +#include + +/* Header for class wiiusej_WiiUseApi */ +#ifndef _Included_wiiusej_WiiUseApi +#define _Included_wiiusej_WiiUseApi +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: wiiusej_WiiUseApi + * Method: connect + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_connect + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: find + * Signature: (II)I + */ +JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_find + (JNIEnv *, jobject, jint, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: init + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_init + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: closeConnection + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_closeConnection + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: getUnId + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_wiiusej_WiiUseApi_getUnId + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: cleanUp + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_cleanUp + (JNIEnv *, jobject); + +/* + * Class: wiiusej_WiiUseApi + * Method: activateRumble + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateRumble + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: deactivateRumble + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateRumble + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: activateIRTracking + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateIRTracking + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: deactivateIRTracking + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateIRTracking + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: activateMotionSensing + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateMotionSensing + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: deactivateMotionSensing + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateMotionSensing + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: setLeds + * Signature: (IZZZZ)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setLeds + (JNIEnv *, jobject, jint, jboolean, jboolean, jboolean, jboolean); + +/* + * Class: wiiusej_WiiUseApi + * Method: setOrientThreshold + * Signature: (IF)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setOrientThreshold + (JNIEnv *, jobject, jint, jfloat); + +/* + * Class: wiiusej_WiiUseApi + * Method: setAccelThreshold + * Signature: (II)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setAccelThreshold + (JNIEnv *, jobject, jint, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: setAlphaSmoothing + * Signature: (IF)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setAlphaSmoothing + (JNIEnv *, jobject, jint, jfloat); + +/* + * Class: wiiusej_WiiUseApi + * Method: reSync + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_reSync + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: activateSmoothing + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateSmoothing + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: deactivateSmoothing + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateSmoothing + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: activateContinuous + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateContinuous + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: deactivateContinuous + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_deactivateContinuous + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: setScreenRatio43 + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setScreenRatio43 + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: setScreenRatio169 + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setScreenRatio169 + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: setSensorBarAboveScreen + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSensorBarAboveScreen + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: setSensorBarBelowScreen + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSensorBarBelowScreen + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: setVirtualScreenResolution + * Signature: (III)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setVirtualScreenResolution + (JNIEnv *, jobject, jint, jint, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: getStatus + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_getStatus + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: setTimeout + * Signature: (ISS)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setTimeout + (JNIEnv *, jobject, jint, jshort, jshort); + +/* + * Class: wiiusej_WiiUseApi + * Method: setIrSensitivity + * Signature: (II)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setIrSensitivity + (JNIEnv *, jobject, jint, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: setNunchukOrientationThreshold + * Signature: (IF)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setNunchukOrientationThreshold + (JNIEnv *, jobject, jint, jfloat); + +/* + * Class: wiiusej_WiiUseApi + * Method: setNunchukAccelerationThreshold + * Signature: (II)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setNunchukAccelerationThreshold + (JNIEnv *, jobject, jint, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: windowsSetBluetoothStack + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_windowsSetBluetoothStack + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: specialPoll + * Signature: (Lwiiusej/wiiusejevents/utils/EventsGatherer;)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_specialPoll + (JNIEnv *, jobject, jobject); + +/* + * Class: wiiusej_WiiUseApi + * Method: enableSpeaker + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_enableSpeaker + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: disableSpeaker + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_disableSpeaker + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: muteSpeaker + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_muteSpeaker + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: unmuteSpeaker + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_unmuteSpeaker + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: activateSpeaker + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_activateSpeaker + (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: setSpeakerFormat + * Signature: (IB)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerFormat + (JNIEnv *, jobject, jint, jbyte); + +/* + * Class: wiiusej_WiiUseApi + * Method: setSpeakerRate + * Signature: (II)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerRate + (JNIEnv *, jobject, jint, jbyte, jbyte); + +/* + * Class: wiiusej_WiiUseApi + * Method: setSpeakerVolume + * Signature: (ID)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerVolume + (JNIEnv *, jobject, jint, jdouble); + +/* + * Class: wiiusej_WiiUseApi + * Method: setSpeakerConfig + * Signature: (IBID)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_setSpeakerConfig + (JNIEnv *, jobject, jint); + +/* + * Class: wiiusej_WiiUseApi + * Method: streamSpeakerData + * Signature: (I[B)V + */ +JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_streamSpeakerData + (JNIEnv *, jobject, jint, jbyteArray); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/src/main/java/wiiusej/WiiUseApi.java b/src/main/java/wiiusej/WiiUseApi.java index ccacfea..981adad 100644 --- a/src/main/java/wiiusej/WiiUseApi.java +++ b/src/main/java/wiiusej/WiiUseApi.java @@ -348,7 +348,6 @@ public class WiiUseApi { */ native void specialPoll(EventsGatherer gath); - /** * Speaker */ diff --git a/src/main/java/wiiusej/utils/AccelerationExpansionEventPanel.java b/src/main/java/wiiusej/utils/AccelerationExpansionEventPanel.java index 5fa8cee..06d7cee 100644 --- a/src/main/java/wiiusej/utils/AccelerationExpansionEventPanel.java +++ b/src/main/java/wiiusej/utils/AccelerationExpansionEventPanel.java @@ -19,6 +19,8 @@ package wiiusej.utils; import wiiusej.values.RawAcceleration; import wiiusej.wiiusejevents.GenericEvent; import wiiusej.wiiusejevents.physicalevents.NunchukEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; /** * Panel to display Acceleration in a MotionSensingEvent from an expansion. @@ -36,4 +38,16 @@ public class AccelerationExpansionEventPanel extends AccelerationPanel { return null; } + @Override + public void onBalanceBoardInsertedEvent(BalanceBoardInsertedEvent e) { + // TODO Auto-generated method stub + + } + + @Override + public void onBalanceBoardRemovedEvent(BalanceBoardRemovedEvent e) { + // TODO Auto-generated method stub + + } + } diff --git a/src/main/java/wiiusej/utils/AccelerationWiimoteEventPanel.java b/src/main/java/wiiusej/utils/AccelerationWiimoteEventPanel.java index d4166e3..ed65e6d 100644 --- a/src/main/java/wiiusej/utils/AccelerationWiimoteEventPanel.java +++ b/src/main/java/wiiusej/utils/AccelerationWiimoteEventPanel.java @@ -19,6 +19,8 @@ package wiiusej.utils; import wiiusej.values.RawAcceleration; import wiiusej.wiiusejevents.GenericEvent; import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; /** * Panel to display Acceleration in a MotionSensingEvent from a wiimote. @@ -34,4 +36,16 @@ public class AccelerationWiimoteEventPanel extends AccelerationPanel { return null; } + @Override + public void onBalanceBoardInsertedEvent(BalanceBoardInsertedEvent e) { + // TODO Auto-generated method stub + + } + + @Override + public void onBalanceBoardRemovedEvent(BalanceBoardRemovedEvent e) { + // TODO Auto-generated method stub + + } + } diff --git a/src/main/java/wiiusej/utils/ButtonsEventPanel.java b/src/main/java/wiiusej/utils/ButtonsEventPanel.java index 7aeb016..e9064fd 100644 --- a/src/main/java/wiiusej/utils/ButtonsEventPanel.java +++ b/src/main/java/wiiusej/utils/ButtonsEventPanel.java @@ -31,6 +31,8 @@ import wiiusej.wiiusejevents.physicalevents.IREvent; import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; import wiiusej.wiiusejevents.utils.WiimoteListener; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerInsertedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.DisconnectionEvent; @@ -379,4 +381,16 @@ public class ButtonsEventPanel extends javax.swing.JPanel implements }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables // End of variables declaration//GEN-END:variables + + @Override + public void onBalanceBoardInsertedEvent(BalanceBoardInsertedEvent e) { + // TODO Auto-generated method stub + + } + + @Override + public void onBalanceBoardRemovedEvent(BalanceBoardRemovedEvent e) { + // TODO Auto-generated method stub + + } } diff --git a/src/main/java/wiiusej/utils/ClassicControllerButtonsEventPanel.java b/src/main/java/wiiusej/utils/ClassicControllerButtonsEventPanel.java index 9bec5a9..23b4c1a 100644 --- a/src/main/java/wiiusej/utils/ClassicControllerButtonsEventPanel.java +++ b/src/main/java/wiiusej/utils/ClassicControllerButtonsEventPanel.java @@ -33,6 +33,8 @@ import wiiusej.wiiusejevents.physicalevents.JoystickEvent; import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; import wiiusej.wiiusejevents.utils.WiimoteListener; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerInsertedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.DisconnectionEvent; @@ -435,6 +437,14 @@ public class ClassicControllerButtonsEventPanel extends javax.swing.JPanel imple clearView(); } + public void onBalanceBoardInsertedEvent(BalanceBoardInsertedEvent arg0) { + //do nothing + } + + public void onBalanceBoardRemovedEvent(BalanceBoardRemovedEvent arg0) { + //do nothing + } + public Color getHeldColor() { return heldColor; } diff --git a/src/main/java/wiiusej/utils/GForceExpansionEventPanel.java b/src/main/java/wiiusej/utils/GForceExpansionEventPanel.java index d5852b0..fd2e640 100644 --- a/src/main/java/wiiusej/utils/GForceExpansionEventPanel.java +++ b/src/main/java/wiiusej/utils/GForceExpansionEventPanel.java @@ -19,6 +19,8 @@ package wiiusej.utils; import wiiusej.values.GForce; import wiiusej.wiiusejevents.GenericEvent; import wiiusej.wiiusejevents.physicalevents.NunchukEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; /** * Panel to display GForce in a MotionSensingEvent from an expansion. @@ -34,5 +36,4 @@ public class GForceExpansionEventPanel extends GForcePanel{ } return null; } - } diff --git a/src/main/java/wiiusej/utils/GForcePanel.java b/src/main/java/wiiusej/utils/GForcePanel.java index d6cf570..a547e94 100644 --- a/src/main/java/wiiusej/utils/GForcePanel.java +++ b/src/main/java/wiiusej/utils/GForcePanel.java @@ -32,6 +32,8 @@ import wiiusej.wiiusejevents.physicalevents.IREvent; import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; import wiiusej.wiiusejevents.utils.WiimoteListener; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerInsertedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.DisconnectionEvent; @@ -222,6 +224,16 @@ public abstract class GForcePanel extends javax.swing.JPanel implements // nothing } + public void onBalanceBoardInsertedEvent( + BalanceBoardInsertedEvent arg0) { + // nothing + } + + public void onBalanceBoardRemovedEvent( + BalanceBoardRemovedEvent arg0) { + // nothing + } + private void draw(GenericEvent arg0) { if (values.size() >= getWidth()) { // if there are as many values as pixels in the width diff --git a/src/main/java/wiiusej/utils/GForceWiimoteEventPanel.java b/src/main/java/wiiusej/utils/GForceWiimoteEventPanel.java index 0dc1e3e..41c42d1 100644 --- a/src/main/java/wiiusej/utils/GForceWiimoteEventPanel.java +++ b/src/main/java/wiiusej/utils/GForceWiimoteEventPanel.java @@ -26,8 +26,6 @@ import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; * @author guiguito */ public class GForceWiimoteEventPanel extends GForcePanel { - - @Override public GForce getGForceValue(GenericEvent e) { if (e instanceof MotionSensingEvent) { return ((MotionSensingEvent) e).getGforce(); diff --git a/src/main/java/wiiusej/utils/GuitarHero3ButtonsEventPanel.java b/src/main/java/wiiusej/utils/GuitarHero3ButtonsEventPanel.java index fe03337..dec3bc7 100644 --- a/src/main/java/wiiusej/utils/GuitarHero3ButtonsEventPanel.java +++ b/src/main/java/wiiusej/utils/GuitarHero3ButtonsEventPanel.java @@ -23,6 +23,8 @@ import wiiusej.wiiusejevents.physicalevents.IREvent; import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; import wiiusej.wiiusejevents.utils.WiimoteListener; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerInsertedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.DisconnectionEvent; @@ -256,6 +258,15 @@ public class GuitarHero3ButtonsEventPanel extends javax.swing.JPanel implements public void onClassicControllerRemovedEvent(ClassicControllerRemovedEvent arg0) { //do nothing } + + public void onBalanceBoardInsertedEvent(BalanceBoardInsertedEvent arg0) { + //do nothing + } + + public void onBalanceBoardRemovedEvent(BalanceBoardRemovedEvent arg0) { + //do nothing + } + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JPanel RightPanel; private javax.swing.JToggleButton blueButton; diff --git a/src/main/java/wiiusej/utils/GuitarHeroJoystickEventPanel.java b/src/main/java/wiiusej/utils/GuitarHeroJoystickEventPanel.java index 6fd906f..96461cf 100644 --- a/src/main/java/wiiusej/utils/GuitarHeroJoystickEventPanel.java +++ b/src/main/java/wiiusej/utils/GuitarHeroJoystickEventPanel.java @@ -26,7 +26,7 @@ import wiiusej.wiiusejevents.physicalevents.JoystickEvent; * * @author guiguito */ -public class GuitarHeroJoystickEventPanel extends JoystickEventPanel{ +public class GuitarHeroJoystickEventPanel extends JoystickEventPanel { @Override public JoystickEvent getJoystickEvent(ExpansionEvent e) { diff --git a/src/main/java/wiiusej/utils/IRPanel.java b/src/main/java/wiiusej/utils/IRPanel.java index 3465c8c..2c6cde6 100644 --- a/src/main/java/wiiusej/utils/IRPanel.java +++ b/src/main/java/wiiusej/utils/IRPanel.java @@ -30,6 +30,8 @@ import wiiusej.wiiusejevents.physicalevents.IREvent; import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; import wiiusej.wiiusejevents.utils.WiimoteListener; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerInsertedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.DisconnectionEvent; @@ -215,6 +217,16 @@ public class IRPanel extends javax.swing.JPanel implements WiimoteListener { // nothing } + public void onBalanceBoardInsertedEvent( + BalanceBoardInsertedEvent arg0) { + // nothing + } + + public void onBalanceBoardRemovedEvent( + BalanceBoardRemovedEvent arg0) { + // nothing + } + public Color getBackgroundColor() { return backgroundColor; } diff --git a/src/main/java/wiiusej/utils/JoystickEventPanel.java b/src/main/java/wiiusej/utils/JoystickEventPanel.java index ead8493..4d2492a 100644 --- a/src/main/java/wiiusej/utils/JoystickEventPanel.java +++ b/src/main/java/wiiusej/utils/JoystickEventPanel.java @@ -30,6 +30,8 @@ import wiiusej.wiiusejevents.physicalevents.JoystickEvent; import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; import wiiusej.wiiusejevents.utils.WiimoteListener; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerInsertedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.DisconnectionEvent; @@ -191,6 +193,16 @@ public abstract class JoystickEventPanel extends javax.swing.JPanel implements // nothing } + public void onBalanceBoardInsertedEvent( + BalanceBoardInsertedEvent arg0) { + // nothing + } + + public void onBalanceBoardRemovedEvent( + BalanceBoardRemovedEvent arg0) { + // nothing + } + public Color getBackgroundColor() { return backgroundColor; } diff --git a/src/main/java/wiiusej/utils/OrientationPanel.java b/src/main/java/wiiusej/utils/OrientationPanel.java index 15c36a9..3c89e4d 100644 --- a/src/main/java/wiiusej/utils/OrientationPanel.java +++ b/src/main/java/wiiusej/utils/OrientationPanel.java @@ -32,6 +32,8 @@ import wiiusej.wiiusejevents.physicalevents.IREvent; import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; import wiiusej.wiiusejevents.utils.WiimoteListener; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerInsertedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.DisconnectionEvent; @@ -223,6 +225,16 @@ public abstract class OrientationPanel extends javax.swing.JPanel implements // nothing } + public void onBalanceBoardInsertedEvent( + BalanceBoardInsertedEvent arg0) { + // nothing + } + + public void onBalanceBoardRemovedEvent( + BalanceBoardRemovedEvent arg0) { + // nothing + } + private void draw(GenericEvent arg0) { if (values.size() >= getWidth()) { // if there are as many values as pixels in the width diff --git a/src/main/java/wiiusej/wiiusejevents/utils/WiimoteListener.java b/src/main/java/wiiusej/wiiusejevents/utils/WiimoteListener.java index 5417ecc..a51f86a 100644 --- a/src/main/java/wiiusej/wiiusejevents/utils/WiimoteListener.java +++ b/src/main/java/wiiusej/wiiusejevents/utils/WiimoteListener.java @@ -144,6 +144,19 @@ public interface WiimoteListener extends java.util.EventListener { */ void onClassicControllerRemovedEvent(ClassicControllerRemovedEvent e); + /** + * This is the method called when a BalanceBoardInsertedEvent occurs. + * + * @param e + * the BalanceBoardInsertedEvent. + */ void onBalanceBoardInsertedEvent(BalanceBoardInsertedEvent e); + + /** + * This is the method called when a BalanceBoardRemovedEvent occurs. + * + * @param e + * the BalanceBoardRemovedEvent. + */ void onBalanceBoardRemovedEvent(BalanceBoardRemovedEvent e); } diff --git a/src/test/java/wiiusej/test/ClassicControllerGuiTest.java b/src/test/java/wiiusej/test/ClassicControllerGuiTest.java index 4e55b90..00d36b8 100644 --- a/src/test/java/wiiusej/test/ClassicControllerGuiTest.java +++ b/src/test/java/wiiusej/test/ClassicControllerGuiTest.java @@ -25,6 +25,8 @@ import wiiusej.wiiusejevents.physicalevents.IREvent; import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; import wiiusej.wiiusejevents.utils.WiimoteListener; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerInsertedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.DisconnectionEvent; @@ -161,6 +163,14 @@ public class ClassicControllerGuiTest extends javax.swing.JFrame implements Wiim // nothing to do } + public void onBalanceBoardInsertedEvent(BalanceBoardInsertedEvent arg0) { + // nothing to do + } + + public void onBalanceBoardRemovedEvent(BalanceBoardRemovedEvent arg0) { + // nothing to do + } + public static void main(String[] args) { Wiimote[] wiimotes = WiiUseApiManager.getWiimotes(1, true); ClassicControllerGuiTest gui = null; diff --git a/src/test/java/wiiusej/test/GuitarHero3GuiTest.java b/src/test/java/wiiusej/test/GuitarHero3GuiTest.java index b0f1dd4..5d8b9fa 100644 --- a/src/test/java/wiiusej/test/GuitarHero3GuiTest.java +++ b/src/test/java/wiiusej/test/GuitarHero3GuiTest.java @@ -12,6 +12,8 @@ import wiiusej.wiiusejevents.physicalevents.IREvent; import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; import wiiusej.wiiusejevents.utils.WiimoteListener; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerInsertedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.DisconnectionEvent; @@ -158,6 +160,15 @@ public class GuitarHero3GuiTest extends javax.swing.JFrame implements WiimoteLis public void onClassicControllerRemovedEvent(ClassicControllerRemovedEvent arg0) { // nothing to do } + + public void onBalanceBoardInsertedEvent(BalanceBoardInsertedEvent arg0) { + // nothing to do + } + + public void onBalanceBoardRemovedEvent(BalanceBoardRemovedEvent arg0) { + // nothing to do + } + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JPanel bottomPanel; private javax.swing.JPanel buttonsEventPanel; diff --git a/src/test/java/wiiusej/test/NunchukGuiTest.java b/src/test/java/wiiusej/test/NunchukGuiTest.java index 3d22b01..6872b83 100644 --- a/src/test/java/wiiusej/test/NunchukGuiTest.java +++ b/src/test/java/wiiusej/test/NunchukGuiTest.java @@ -31,6 +31,8 @@ import wiiusej.wiiusejevents.physicalevents.NunchukButtonsEvent; import wiiusej.wiiusejevents.physicalevents.NunchukEvent; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; import wiiusej.wiiusejevents.utils.WiimoteListener; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerInsertedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.DisconnectionEvent; @@ -426,6 +428,16 @@ public class NunchukGuiTest extends javax.swing.JFrame implements // nothing } + public void onBalanceBoardInsertedEvent( + BalanceBoardInsertedEvent arg0) { + // nothing + } + + public void onBalanceBoardRemovedEvent( + BalanceBoardRemovedEvent arg0) { + // nothing + } + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton cButton; private javax.swing.JPanel gForcePanel; diff --git a/src/test/java/wiiusej/test/Tests.java b/src/test/java/wiiusej/test/Tests.java index 2256093..f8f2b8b 100644 --- a/src/test/java/wiiusej/test/Tests.java +++ b/src/test/java/wiiusej/test/Tests.java @@ -28,6 +28,8 @@ import wiiusej.wiiusejevents.physicalevents.IREvent; import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; import wiiusej.wiiusejevents.utils.WiimoteListener; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerInsertedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.DisconnectionEvent; @@ -369,6 +371,14 @@ public class Tests implements WiimoteListener { System.out.println(e); } + public void onBalanceBoardInsertedEvent(BalanceBoardInsertedEvent e) { + System.out.println(e); + } + + public void onBalanceBoardRemovedEvent(BalanceBoardRemovedEvent e) { + System.out.println(e); + } + /** * @param args */ diff --git a/src/test/java/wiiusej/test/WiiuseJGuiTest.java b/src/test/java/wiiusej/test/WiiuseJGuiTest.java index 1fc848c..a845628 100644 --- a/src/test/java/wiiusej/test/WiiuseJGuiTest.java +++ b/src/test/java/wiiusej/test/WiiuseJGuiTest.java @@ -39,6 +39,8 @@ import wiiusej.wiiusejevents.physicalevents.IREvent; import wiiusej.wiiusejevents.physicalevents.MotionSensingEvent; import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent; import wiiusej.wiiusejevents.utils.WiimoteListener; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardInsertedEvent; +import wiiusej.wiiusejevents.wiiuseapievents.BalanceBoardRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerInsertedEvent; import wiiusej.wiiusejevents.wiiuseapievents.ClassicControllerRemovedEvent; import wiiusej.wiiusejevents.wiiuseapievents.DisconnectionEvent; @@ -379,6 +381,16 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements } } + public void onBalanceBoardInsertedEvent( + BalanceBoardInsertedEvent arg0) { + // nothing + } + + public void onBalanceBoardRemovedEvent( + BalanceBoardRemovedEvent arg0) { + // nothing + } + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always