rik/mimis
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 a605e79f40
commit 80f639474b
56 changed files with 3229 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
java/src/mimis/device/wiimote/WiimoteDevice.java
View File

@@ -25,8 +25,9 @@ import wiiusej.wiiusejevents.physicalevents.WiimoteButtonsEvent;
public class WiimoteDevice extends Device implements GestureListener {
protected static final String TITLE = "Wiimote";
protected static final int RUMBLE = 50;
protected static final int TIMEOUT = 200;
protected static final int LED_SLEEP = 50;
protected static final int CONNECTED_TIMEOUT = 500;
protected static final int LED_TIMEOUT = 1000;
protected static final int LED_SLEEP = 20;
protected static WiimoteService wiimoteService;
protected WiimoteEventMapCycle eventMapCycle;
@@ -36,6 +37,7 @@ public class WiimoteDevice extends Device implements GestureListener {
protected GestureDevice gestureDevice;
protected int gestureId;
protected LedWorker ledWorker;
protected boolean disconnect;
static {
WiimoteDevice.wiimoteService = new WiimoteService();
@@ -55,34 +57,32 @@ public class WiimoteDevice extends Device implements GestureListener {
/* Worker */
protected void activate() throws ActivateException {
add(eventMapCycle.player);
connect();
wiimote = null;
try {
wiimote = wiimoteService.getDevice(this);
ledWorker.start();
connect();
} catch (DeviceNotFoundException e) {
log.error(e);
throw new ActivateException();
wiimoteDiscovery.start();
}
super.activate();
}
public boolean active() {
public synchronized boolean active() {
if (wiimote != null) {
if (!ledWorker.active()) {
ledWorker.start();
}
connected = false;
wiimote.getStatus();
synchronized (this) {
try {
wait(TIMEOUT);
} catch (InterruptedException e) {
log.error(e);
}
try {
wait(CONNECTED_TIMEOUT);
} catch (InterruptedException e) {
log.error(e);
}
if (!connected) {
active = false;
ledWorker.stop();
if (!connected) {
try {
log.debug("!");
connect();
} catch (DeviceNotFoundException e) {
disconnect = true;
stop();
}
}
}
return active;
@@ -90,16 +90,25 @@ public class WiimoteDevice extends Device implements GestureListener {
protected void deactivate() throws DeactivateException {
super.deactivate();
ledWorker.deactivate();
wiimoteDiscovery.deactivate();
ledWorker.stop();
wiimoteDiscovery.stop();
if (disconnect) {
if (wiimote != null) {
wiimote.disconnect();
}
wiimoteDiscovery.disconnect();
disconnect = false;
//start();
}
}
public void exit() {
super.exit();
ledWorker.exit();
/*if (wiimote != null) {
disconnect();
}*/
if (wiimote != null) {
wiimote.disconnect();
wiimote = null;
}
wiimoteService.exit();
wiimoteDiscovery.exit();
}
@@ -109,13 +118,13 @@ public class WiimoteDevice extends Device implements GestureListener {
switch (action) {
case SHIFT:
log.debug("Shift");
/*reset();
reset();
add(eventMapCycle.mimis);
add(eventMapCycle.like);*/
add(eventMapCycle.like);
break;
case UNSHIFT:
log.debug("Unshift");
//reset();
reset();
add(eventMapCycle.player);
break;
case TRAIN:
@@ -159,36 +168,11 @@ public class WiimoteDevice extends Device implements GestureListener {
}
/* Connectivity */
public void connect() throws ActivateException {
wiimote = null;
try {
wiimote = wiimoteService.getDevice(this);
ledWorker.start();
} catch (DeviceNotFoundException e) {
wiimoteDiscovery.activate();
}
}
public void connected() {
try {
wiimote = wiimoteService.getDevice(this);
wiimoteDiscovery.stop();
} catch (DeviceNotFoundException e) {
log.error(e);
}
}
public void disconnect() {
wiimote.disconnect();
wiimote = null;
}
public void disconnected() {
try {
wiimoteDiscovery.activate();
} catch (ActivateException e) {
log.error(e);
}
public void connect() throws DeviceNotFoundException {
wiimote = wiimoteService.getDevice(this);
log.debug("Connected");
wiimoteDiscovery.stop();
ledWorker.start();
}
/* Listeners */
@@ -200,10 +184,10 @@ public class WiimoteDevice extends Device implements GestureListener {
Button button = WiimoteButton.create(pressed);
log.trace("Press: " + button);
add(new Press(button));
} else if (pressed == 0 && released != 0) {
} else if (pressed == 0 && released != 0) {
Button button = WiimoteButton.create(released);
log.trace("Release: " + button);
add(new Release(button));
add(new Release(button));
}
} catch (UnknownButtonException e) {}
}
@@ -223,6 +207,7 @@ public class WiimoteDevice extends Device implements GestureListener {
public LedWorker() {
ledCycle = new ArrayCycle<Integer>();
ledCycle.add(1);
ledCycle.add(3);
ledCycle.add(6);
ledCycle.add(12);
@@ -230,9 +215,15 @@ public class WiimoteDevice extends Device implements GestureListener {
ledCycle.add(12);
ledCycle.add(6);
ledCycle.add(3);
ledCycle.add(1);
}
public void deactivate() throws DeactivateException {
public void activate() throws ActivateException {
sleep(LED_TIMEOUT);
super.activate();
}
public void deactivate() throws DeactivateException {
super.deactivate();
setLeds(1);
}
@@ -244,12 +235,8 @@ public class WiimoteDevice extends Device implements GestureListener {
protected void setLeds(int leds) {
if (wiimote != null) {
wiimote.setLeds(
(leds & 1) > 0,
(leds & 2) > 0,
(leds & 4) > 0,
(leds & 8) > 0);
sleep(leds == 8 ? 200 : 100);
wiimote.setLeds((leds & 1) > 0, (leds & 2) > 0, (leds & 4) > 0, (leds & 8) > 0);
sleep((leds == 8 ? 2 : 1) * LED_SLEEP);
}
}
}

38
java/src/mimis/device/wiimote/WiimoteDiscovery.java
View File

@@ -4,24 +4,27 @@ import java.io.IOException;
import java.util.Scanner;
import mimis.Worker;
import mimis.exception.device.DeviceNotFoundException;
import mimis.exception.worker.ActivateException;
import mimis.exception.worker.DeactivateException;
public class WiimoteDiscovery extends Worker {
protected static final int TIMEOUT = 1000;
protected WiimoteDevice wiimoteDevice;
protected Process process;
protected boolean disconnect;
public WiimoteDiscovery(WiimoteDevice wiimoteDevice) {
this.wiimoteDevice = wiimoteDevice;
disconnect = true;
}
protected boolean connect() {
return execute("-c nintendo");
log.debug("Connect");
return execute("-c nintendo"); // Nintendo RVL-CNT-01 RVL-WBC-01
}
protected boolean disconnect() {
log.debug("Disconnect");
return execute("-d nintendo");
}
@@ -31,7 +34,11 @@ public class WiimoteDiscovery extends Worker {
process = Runtime.getRuntime().exec(command);
Scanner scanner = new Scanner(process.getInputStream());
while (scanner.hasNext()) {
if (scanner.next().equals("[OK]")) {
String line = scanner.nextLine();
if (line.contains("error: BluetoothSetServiceState()")) {
disconnect = true;
return false;
} else if (line.contains("[OK]")) {
return true;
}
}
@@ -43,15 +50,6 @@ public class WiimoteDiscovery extends Worker {
return false;
}
protected void work() {
if (connect()) {
wiimoteDevice.connected();
} else if (disconnect) {
disconnect();
disconnect = false;
}
}
public void activate() throws ActivateException {
super.activate();
}
@@ -62,4 +60,20 @@ public class WiimoteDiscovery extends Worker {
process.destroy();
}
}
protected void work() {
if (disconnect) {
disconnect();
disconnect = false;
}
if (connect()) {
log.debug("Connected");
try {
sleep(TIMEOUT);
wiimoteDevice.connect();
} catch (DeviceNotFoundException e) {
disconnect = true;
}
}
}
}

10
java/src/mimis/device/wiimote/WiimoteService.java
View File

@@ -27,6 +27,14 @@ import wiiusej.wiiusejevents.wiiuseapievents.StatusEvent;
public class WiimoteService extends WiiUseApiManager implements WiimoteListener {
protected Log log = LogFactory.getLog(getClass());
public static void main(String[] args) {
Log log = LogFactory.getLog(WiimoteService.class);
WiimoteService wiimoteService = new WiimoteService();
for (Wiimote wm : wiimoteService.getWiimotes(1, false)) {
log.debug(wm);
}
}
protected final boolean RUMBLE = false;
@@ -57,8 +65,8 @@ public class WiimoteService extends WiiUseApiManager implements WiimoteListener
wiimote.addWiiMoteEventListeners(this);
wiimoteList.add(id);
wiimoteDeviceMap.put(id, wiimoteDevice);
return wiimote;
}
return wiimote;
}
throw new DeviceNotFoundException();
}

BIN
java/wiiscan-bb.exe Normal file
View File

Binary file not shown.

BIN
java/wiiuse.dll
View File

Binary file not shown.

BIN
java/wiiusej.dll
View File

Binary file not shown.