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

somme fixes on new version. Acceleration threshold is an int.

Browse Source 
git-svn-id: http://wiiusej.googlecode.com/svn/trunk@54 ae48ae66-6a45-0410-b38e-211266189506
This commit is contained in:
guilhem.duche
2008-02-15 14:26:50 +00:00
parent f2829ca27f
commit dc13f8feee
5 changed files with 96 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
WiiUseJ/src/wiiusej/WiiUseApiManager.java
View File

@@ -1,6 +1,5 @@
package wiiusej;
package wiiusej;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -10,6 +9,7 @@ import wiiusej.wiiuseapievents.EventsGatherer;
import wiiusej.wiiuseapievents.WiiUseApiEvent;
import wiiusej.wiiuseapievents.WiiUseApiListener;
import wiiusej.wiiuseapirequest.FloatValueRequest;
import wiiusej.wiiuseapirequest.IntValueRequest;
import wiiusej.wiiuseapirequest.LedsRequest;
import wiiusej.wiiuseapirequest.WiiUseApiRequest;
@@ -98,9 +98,9 @@ public class WiiUseApiManager extends Thread {
* @param id
* id of the wiimote to disconnect.
*/
public void closeConnection(int id) {
public void closeConnection(int id) {
removeWiiUseApiListener(wiimotes[id]);
wiimotes[id] = null;
wiimotes[id] = null;
requests.add(new WiiUseApiRequest(id,
WiiUseApiRequest.WIIUSE_CLOSE_CONNECTION_REQUEST));
System.out.println("Wiimote " + id + " disconnected !");
@@ -273,8 +273,8 @@ public class WiiUseApiManager extends Thread {
* @param th
* threshold
*/
public void setAccelerationThreshold(int id, float th) {
requests.add(new FloatValueRequest(id,
public void setAccelerationThreshold(int id, int th) {
requests.add(new IntValueRequest(id,
WiiUseApiRequest.WIIUSE_ACCEL_THRESHOLHD_REQUEST, th));
}
@@ -291,6 +291,16 @@ public class WiiUseApiManager extends Thread {
WiiUseApiRequest.WIIUSE_ALPHA_SMOOTHING_REQUEST, th));
}
/**
* Try to resync with the wiimote by starting a new handshake.
* @TODO not used yet !!
* @param id
* id of the wiimote
*/
public void reSync(int id) {
requests.add(new WiiUseApiRequest(id, WiiUseApiRequest.WIIUSE_RESYNC));
}
/**
* Get Status for the wiimote for the given id.
*
@@ -318,11 +328,12 @@ public class WiiUseApiManager extends Thread {
if (req.getRequestType() == WiiUseApiRequest.WIIUSE_CLOSE_CONNECTION_REQUEST) {
/* Close connections requests */
wiiuse.closeConnection(id);
connected--;
if (connected == 0) {// stop this thread if there is
// no more wiimotes connected.
System.out.println("No more wiimotes connected !!!");
System.out
.println("No more wiimotes connected !!!");
shutdown();
}
} else if (req.getRequestType() == WiiUseApiRequest.WIIUSE_STATUS_REQUEST) {
@@ -369,12 +380,15 @@ public class WiiUseApiManager extends Thread {
((FloatValueRequest) req).getFloatValue());
} else if (req.getRequestType() == WiiUseApiRequest.WIIUSE_ACCEL_THRESHOLHD_REQUEST) {
/* set acceleration threshold request */
wiiuse.setOrientThreshold(req.getId(),
((FloatValueRequest) req).getFloatValue());
wiiuse.setAccelThreshold(req.getId(),
((IntValueRequest) req).getIntValue());
} else if (req.getRequestType() == WiiUseApiRequest.WIIUSE_ALPHA_SMOOTHING_REQUEST) {
/* set alpha smoothing request */
wiiuse.setOrientThreshold(req.getId(),
wiiuse.setAlphaSmoothing(req.getId(),
((FloatValueRequest) req).getFloatValue());
} else if (req.getRequestType() == WiiUseApiRequest.WIIUSE_RESYNC) {
/* set resync request */
wiiuse.reSync(req.getId());
} else {
System.out.println("Bad request to Wiiuse API !!!!!");
}
@@ -398,7 +412,7 @@ public class WiiUseApiManager extends Thread {
.println("There is an event with id == -1 ??? there is a problem !!! : "
+ evt);
}
}
}
gather.clearEvents();
}
} else {
@@ -446,7 +460,7 @@ public class WiiUseApiManager extends Thread {
*/
private void notifyWiiUseApiListener(WiiUseApiEvent evt) {
for (WiiUseApiListener listener : getWiiUseApiListeners()) {
listener.wiiUseApiEvent(evt);
listener.wiiUseApiEvent(evt);
}
}