From b7556aaf72101986983bc63f99a1a5c810dadd26 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Fri, 22 Mar 2013 16:55:38 +0100
Subject: [PATCH] added wiipair, allowing for permanent pairing of wiimotes.
 Modified WiimoteDevice to stop using old WiimoteDiscovery method with
 wiiscan.

---
 java/WiiPair.exe                              | Bin 0 -> 10752 bytes
 .../mimis/device/wiimote/WiimoteDevice.java   |  35 +++++++++---------
 .../mimis/device/wiimote/WiimoteService.java  |   7 ++--
 3 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 java/WiiPair.exe

diff --git a/java/WiiPair.exe b/java/WiiPair.exe
new file mode 100644
index 0000000000000000000000000000000000000000..f16c97dcf33022d4ade77604f40f35d8b02dc473
GIT binary patch
literal 10752
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

literal 0
HcmV?d00001

diff --git a/java/src/mimis/device/wiimote/WiimoteDevice.java b/java/src/mimis/device/wiimote/WiimoteDevice.java
index 77259bf..1d4b04e 100644
--- a/java/src/mimis/device/wiimote/WiimoteDevice.java
+++ b/java/src/mimis/device/wiimote/WiimoteDevice.java
@@ -35,7 +35,6 @@ public class WiimoteDevice extends Component implements Device, GestureListener
 
     protected static WiimoteService wiimoteService;
     protected WiimoteTaskMapCycle taskMapCycle;
-    protected WiimoteDiscovery wiimoteDiscovery;
     protected Wiimote wiimote;
     protected boolean connected;
     protected GestureDevice gestureDevice;
@@ -52,7 +51,6 @@ public class WiimoteDevice extends Component implements Device, GestureListener
     public WiimoteDevice() {
         super(TITLE);
         taskMapCycle = new WiimoteTaskMapCycle();
-        wiimoteDiscovery = new WiimoteDiscovery(this);
         gestureDevice = new GestureDevice();
         gestureDevice.add(this);
         motionDevice = new MotionDevice(this);
@@ -62,14 +60,15 @@ public class WiimoteDevice extends Component implements Device, GestureListener
 
     /* Worker */
     protected void activate() throws ActivateException {
-        motionDevice.setRouter(router);
-        motionDevice.start();
-        parser(Action.ADD, taskMapCycle.player);
-        wiimote = null;
+    	if (wiimote == null) {
+            motionDevice.setRouter(router);
+            motionDevice.start();
+            parser(Action.ADD, taskMapCycle.player);
+        }
         try {
             connect();
         } catch (DeviceNotFoundException e) {
-            wiimoteDiscovery.start();
+            log.warn(e);
         }
         super.activate();
     }
@@ -98,13 +97,9 @@ public class WiimoteDevice extends Component implements Device, GestureListener
     protected void deactivate() throws DeactivateException {
         super.deactivate();
         ledWorker.stop();
-        wiimoteDiscovery.stop();
         motionDevice.stop();
-        if (disconnect) {
-            if (wiimote != null) {
-                wiimote.disconnect();
-            }
-            wiimoteDiscovery.disconnect();
+        if (disconnect && wiimote != null) {
+            wiimote.disconnect();
             disconnect = false;
         }
     }
@@ -117,7 +112,6 @@ public class WiimoteDevice extends Component implements Device, GestureListener
             wiimote = null;
         }
         wiimoteService.exit();
-        wiimoteDiscovery.exit();
         motionDevice.exit();
     }
 
@@ -182,22 +176,24 @@ public class WiimoteDevice extends Component implements Device, GestureListener
 
     public void feedback(Feedback feedback) {
         if (wiimote != null && active()) {
-            //log.debug("Wiimote rumble feedback");
-            //wiimote.rumble(RUMBLE);
+            log.debug("Wiimote rumble feedback");
+            wiimote.rumble(RUMBLE);
         }
     }
 
     /* Connectivity */
     public synchronized void connect() throws DeviceNotFoundException {
         wiimote = wiimoteService.getDevice(this);
-        //wiimote.activateContinuous();
+        wiimote.activateContinuous();
         wiimote.activateMotionSensing();
-        wiimoteDiscovery.stop();
         ledWorker.start();
     }
 
     /* Listeners */
     public void onButtonsEvent(WiimoteButtonsEvent event) {
+    	if (!active) {
+    		return;
+    	}
         int pressed = event.getButtonsJustPressed() - event.getButtonsHeld();
         int released = event.getButtonsJustReleased();
         try {
@@ -214,6 +210,9 @@ public class WiimoteDevice extends Component implements Device, GestureListener
     }
 
     public void onMotionSensingEvent(MotionSensingEvent event) {
+    	if (!active) {
+    		return;
+    	}
         gestureDevice.add(event.getGforce());
         motionDevice.add(event);
     }
diff --git a/java/src/mimis/device/wiimote/WiimoteService.java b/java/src/mimis/device/wiimote/WiimoteService.java
index 6ff2480..2d905be 100644
--- a/java/src/mimis/device/wiimote/WiimoteService.java
+++ b/java/src/mimis/device/wiimote/WiimoteService.java
@@ -30,12 +30,12 @@ import wiiusej.wiiusejevents.wiiuseapievents.StatusEvent;
 public class WiimoteService extends WiiUseApiManager implements WiimoteListener {
     protected Log log = LogFactory.getLog(getClass());
     
-    public static void main(String[] args) {
+    /*public static void main(String[] args) {
         Log log = LogFactory.getLog(WiimoteService.class);
         for (Wiimote wm : WiiUseApiManager.getWiimotes(1, false)) {
             log.debug(wm);
         }
-    }
+    }*/
 
     protected final boolean RUMBLE = false;
 
@@ -81,10 +81,11 @@ public class WiimoteService extends WiiUseApiManager implements WiimoteListener
     }
 
     public void onButtonsEvent(WiimoteButtonsEvent event) {
-        getWiimoteDevice(event).onButtonsEvent(event);
+    	getWiimoteDevice(event).onButtonsEvent(event);
     }
 
     public void onMotionSensingEvent(MotionSensingEvent event) {
+
         getWiimoteDevice(event).onMotionSensingEvent(event);
     }