From d55ddcdddec0167fa1406db22746d0de9d81a641 Mon Sep 17 00:00:00 2001
From: "guilhem.duche" <guilhem.duche@ae48ae66-6a45-0410-b38e-211266189506>
Date: Sat, 8 Mar 2008 01:06:45 +0000
Subject: [PATCH] added infos on IR event motion sensing event (raw
 acceleration) and support for more wiiuse functions

git-svn-id: http://wiiusej.googlecode.com/svn/trunk@75 ae48ae66-6a45-0410-b38e-211266189506
---
 WiiUseJ/libWiiuseJ.dll                        | Bin 22771 -> 25448 bytes
 WiiUseJ/src/wiiusej/WiiUseApi.java            |  38 ++-
 WiiUseJ/src/wiiusej/WiiUseApiManager.java     |  96 +++++++-
 WiiUseJ/src/wiiusej/Wiimote.java              |  54 ++++-
 WiiUseJ/src/wiiusej/test/Tests.java           |  12 +-
 WiiUseJ/src/wiiusej/values/GForce.java        |  21 --
 WiiUseJ/src/wiiusej/values/IRSource.java      | 109 +++++++++
 WiiUseJ/src/wiiusej/values/Orientation.java   |  20 +-
 ...int2DInteger.java => RawAcceleration.java} |  58 +++--
 .../wiiusej/wiiuseapievents/ButtonsEvent.java |  49 +++-
 .../wiiuseapievents/EventsGatherer.java       |  61 ++++-
 .../wiiusej/wiiuseapievents/GenericEvent.java |  87 +++++--
 .../src/wiiusej/wiiuseapievents/IREvent.java  | 227 +++++++++++++++++-
 .../wiiuseapievents/MotionSensingEvent.java   |  33 ++-
 .../wiiusej/wiiuseapievents/StatusEvent.java  |  48 ++++
 .../wiiuseapievents/WiiUseApiEvent.java       |   8 +-
 .../wiiuseapirequest/IntValueRequest.java     |   9 +-
 .../wiiuseapirequest/WiiUseApiRequest.java    |   5 +
 18 files changed, 808 insertions(+), 127 deletions(-)
 create mode 100644 WiiUseJ/src/wiiusej/values/IRSource.java
 rename WiiUseJ/src/wiiusej/values/{Point2DInteger.java => RawAcceleration.java} (53%)

diff --git a/WiiUseJ/libWiiuseJ.dll b/WiiUseJ/libWiiuseJ.dll
index 604fa63d469d9913a74a2ae859a73c3bef1a2f51..d1c51cc1f529bec3dd4625205911b8a76351d7dd 100644
GIT binary patch
literal 25448
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
ba*3Cwt?1siq#Y3Sy@XE7%V{R8wyXaJ&H@1$

literal 22771
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
Vkt>`O1FL&ACa>eMIHbD6e*=Wj1*iZ3

diff --git a/WiiUseJ/src/wiiusej/WiiUseApi.java b/WiiUseJ/src/wiiusej/WiiUseApi.java
index 4c580e1..cb91767 100644
--- a/WiiUseJ/src/wiiusej/WiiUseApi.java
+++ b/WiiUseJ/src/wiiusej/WiiUseApi.java
@@ -158,6 +158,40 @@ public class WiiUseApi {
      * @param id the id of the wiimote concerned
      */
     native void deactivateContinuous(int id);
+        
+    /**
+     * Notify wiiuse that your screen has an aspect ratio of 4/3.
+     * @param id the id of the wiimote of which we want the status.
+     */
+    native void setScreenRatio43(int id);
+    
+    /**
+     * Notify wiiuse that your screen has an aspect ratio of 16/9.
+     * @param id the id of the wiimote of which we want the status.
+     */
+    native void setScreenRatio169(int id);
+    
+    /**
+     * Notify wiiuse that the sensor bar is above your screen.
+     * @param id the id of the wiimote of which we want the status.
+     */
+    native void setSensorBarAboveScreen(int id);
+    
+    /**
+     * Notify wiiuse that the sensor bar is below your screen.
+     * @param id the id of the wiimote of which we want the status.
+     */
+    native void setSensorBarBelowScreen(int id);
+        
+    /**
+     * Set virtual screen resolution. It is used to automatically 
+     * compute the position of a cursor on this virtual screen
+     *  using the sensor bar. These results come in the IREvent.
+     * @param id the id of the wiimote of which we want the status.
+     * @param x x resolution.
+     * @param y y resolution.
+     */
+    native void setVirtualScreenResolution(int id, int x, int y);
 	
 	/**
 	 * Get status and values from the wiimotes and send it through callbacks.
@@ -171,6 +205,8 @@ public class WiiUseApi {
 	 * 
 	 * @param gath the object where we store all the new events.
 	 */
-	native void specialPoll(EventsGatherer gath);	   
+	native void specialPoll(EventsGatherer gath);
+	
+		
 
 }
diff --git a/WiiUseJ/src/wiiusej/WiiUseApiManager.java b/WiiUseJ/src/wiiusej/WiiUseApiManager.java
index 1f5bb4c..35549cb 100644
--- a/WiiUseJ/src/wiiusej/WiiUseApiManager.java
+++ b/WiiUseJ/src/wiiusej/WiiUseApiManager.java
@@ -27,6 +27,7 @@ import wiiusej.wiiuseapievents.WiiUseApiListener;
 import wiiusej.wiiuseapirequest.FloatValueRequest;
 import wiiusej.wiiuseapirequest.IntValueRequest;
 import wiiusej.wiiuseapirequest.LedsRequest;
+import wiiusej.wiiuseapirequest.TwoIntValueRequest;
 import wiiusej.wiiuseapirequest.WiiUseApiRequest;
 
 /**
@@ -72,7 +73,7 @@ public class WiiUseApiManager extends Thread {
 			manager.wiimotes = new Wiimote[nbWiimotes];
 			for (int i = 1; i <= nbWiimotes; i++) {
 				Wiimote wim = new Wiimote(i, manager);
-				manager.wiimotes[i-1] = wim;
+				manager.wiimotes[i - 1] = wim;
 				manager.addWiiUseApiListener(wim);
 			}
 		}
@@ -113,9 +114,9 @@ public class WiiUseApiManager extends Thread {
 	 * @param id
 	 *            id of the wiimote to disconnect.
 	 */
-	public void closeConnection(int id) {		
-		removeWiiUseApiListener(wiimotes[id-1]);
-		wiimotes[id-1] = null;
+	public void closeConnection(int id) {
+		removeWiiUseApiListener(wiimotes[id - 1]);
+		wiimotes[id - 1] = null;
 		requests.add(new WiiUseApiRequest(id,
 				WiiUseApiRequest.WIIUSE_CLOSE_CONNECTION_REQUEST));
 		System.out.println("Wiimote " + id + " disconnected !");
@@ -308,6 +309,7 @@ public class WiiUseApiManager extends Thread {
 
 	/**
 	 * Try to resync with the wiimote by starting a new handshake.
+	 * 
 	 * @TODO not used yet !!
 	 * @param id
 	 *            id of the wiimote
@@ -316,6 +318,67 @@ public class WiiUseApiManager extends Thread {
 		requests.add(new WiiUseApiRequest(id, WiiUseApiRequest.WIIUSE_RESYNC));
 	}
 
+	/**
+	 * Set screen aspect ratio to 4/3 for the given id.
+	 * 
+	 * @param id
+	 *            id of the wiimote
+	 */
+	public void setScreenAspectRatio43(int id) {
+		requests.add(new WiiUseApiRequest(id,
+				WiiUseApiRequest.WIIUSE_ASPECT_RATIO_4_3));
+	}
+
+	/**
+	 * Set screen aspect ratio to 16/9 for the given id.
+	 * 
+	 * @param id
+	 *            id of the wiimote
+	 */
+	public void setScreenAspectRatio169(int id) {
+		requests.add(new WiiUseApiRequest(id,
+				WiiUseApiRequest.WIIUSE_ASPECT_RATIO_16_9));
+	}
+
+	/**
+	 * Set the sensor bar to be above the screen.
+	 * 
+	 * @param id
+	 *            id of the wiimote
+	 */
+	public void setSensorBarAboveScreen(int id) {
+		requests.add(new WiiUseApiRequest(id,
+				WiiUseApiRequest.WIIUSE_SENSOR_BAR_ABOVE));
+	}
+
+	/**
+	 * Set the sensor bar to be below the screen.
+	 * 
+	 * @param id
+	 *            id of the wiimote
+	 */
+	public void setSensorBarBelowScreen(int id) {
+		requests.add(new WiiUseApiRequest(id,
+				WiiUseApiRequest.WIIUSE_SENSOR_BAR_BELOW));
+	}
+
+	/**
+	 * Set virtual resolution. It is used to automatically compute the position
+	 * of a cursor on this virtual screen using the sensor bar. These results
+	 * come in the IREvent.
+	 * 
+	 * @param id
+	 *            id of the wiimote
+	 * @param x
+	 *            x resolution
+	 * @param y
+	 *            y resolution
+	 */
+	public void setVirtualResolution(int id, int x, int y) {
+		requests.add(new TwoIntValueRequest(id,
+				WiiUseApiRequest.WIIUSE_SET_VIRTUAL_RESOLUTION, x, y));
+	}
+
 	/**
 	 * Get Status for the wiimote for the given id.
 	 * 
@@ -336,8 +399,8 @@ public class WiiUseApiManager extends Thread {
 			EventsGatherer gather = new EventsGatherer(nbMaxWiimotes);
 
 			// Start polling and tell the observers when there Wiimote events
-			while (running.get() &&  connected > 0) {
-				
+			while (running.get() && connected > 0) {
+
 				/* Polling */
 				wiiuse.specialPoll(gather);
 
@@ -358,8 +421,8 @@ public class WiiUseApiManager extends Thread {
 					}
 				}
 				gather.clearEvents();
-				
-				/* deal with request done to wiiuse API*/
+
+				/* deal with request done to wiiuse API */
 				WiiUseApiRequest req = requests.poll();
 				if (req != null) {// there is a request for the wiiuse api
 					int id = req.getId();
@@ -427,6 +490,23 @@ public class WiiUseApiManager extends Thread {
 					} else if (req.getRequestType() == WiiUseApiRequest.WIIUSE_RESYNC) {
 						/* set resync request */
 						wiiuse.reSync(req.getId());
+					} else if (req.getRequestType() == WiiUseApiRequest.WIIUSE_ASPECT_RATIO_4_3) {
+						/* set screen aspect ratio to 4/3 */
+						wiiuse.setScreenRatio43(req.getId());
+					} else if (req.getRequestType() == WiiUseApiRequest.WIIUSE_ASPECT_RATIO_16_9) {
+						/* set screen aspect ratio to 16/9 */
+						wiiuse.setScreenRatio169(req.getId());
+					} else if (req.getRequestType() == WiiUseApiRequest.WIIUSE_SENSOR_BAR_ABOVE) {
+						/* set sensor bar above the screen */
+						wiiuse.setSensorBarAboveScreen(req.getId());
+					} else if (req.getRequestType() == WiiUseApiRequest.WIIUSE_SENSOR_BAR_BELOW) {
+						/* set sensor bar above the screen */
+						wiiuse.setSensorBarBelowScreen(req.getId());
+					} else if (req.getRequestType() == WiiUseApiRequest.WIIUSE_SET_VIRTUAL_RESOLUTION) {
+						/* set virtual resolution */
+						wiiuse.setVirtualScreenResolution(req.getId(),
+								((TwoIntValueRequest) req).getIntValue(),
+								((TwoIntValueRequest) req).getSecondIntValue());
 					} else {
 						System.out.println("Bad request to Wiiuse API !!!!!");
 					}
diff --git a/WiiUseJ/src/wiiusej/Wiimote.java b/WiiUseJ/src/wiiusej/Wiimote.java
index 0179f60..4108c70 100644
--- a/WiiUseJ/src/wiiusej/Wiimote.java
+++ b/WiiUseJ/src/wiiusej/Wiimote.java
@@ -170,9 +170,48 @@ public class Wiimote implements WiiUseApiListener {
 	 * @param th
 	 *            threshold
 	 */
-	public void setAlphaSmoothingValue(int th) {
+	public void setAlphaSmoothingValue(float th) {
 		manager.setAlphaSmoothing(id,th);
 	}
+	
+	/**
+	 * Set the screen aspect ratio to be considered as 4/3.
+	 */
+	public void setScreenAspectRatio43() {
+		manager.setScreenAspectRatio43(id);
+	}
+	
+	/**
+	 * Set the screen aspect ratio to be considered as 16/9.
+	 */
+	public void setScreenAspectRatio169() {
+		manager.setScreenAspectRatio169(id);
+	}
+	
+	/**
+	 * Set the sensor bar to be considered above the screen.
+	 */
+	public void setSensorBarAboveScreen() {
+		manager.setSensorBarAboveScreen(id);
+	}
+	
+	/**
+	 * Set the sensor bar to be considered below the screen.
+	 */
+	public void setSensorBarBelowScreen() {
+		manager.setSensorBarBelowScreen(id);
+	}
+	
+	/**
+	 * Set the screen resolution of the you are pointing at 
+	 * with your wiimote.
+	 * 
+	 * @param x x resolution.
+	 * @param y y resolution.
+	 */
+	public void setVirtualResolution(int x, int y) {
+		manager.setVirtualResolution(id, x ,y);
+	}
 
 	//TODO resync ?
 
@@ -185,12 +224,21 @@ public class Wiimote implements WiiUseApiListener {
 		manager.getStatus(id);
 	}
 	
-	
+	/**
+	 * Method called when a WiiUseApiEvent occurs.
+	 * @param e the WiiUseApiEvent.
+	 */
 	public void onWiiUseApiEvent(WiiUseApiEvent e) {
 		if (e.getWiimoteId() == id){			
 			if (e.getEventType() == WiiUseApiEvent.GENERIC_EVENT){
 				notifyWiiMoteEventListeners((GenericEvent)e);
-			}else if (e.getEventType() == WiiUseApiEvent.STATUS_EVENT){
+			}else if (e.getEventType() == WiiUseApiEvent.STATUS_EVENT
+					||e.getEventType() == WiiUseApiEvent.WIIUSE_NUNCHUK_INSERTED
+					||e.getEventType() == WiiUseApiEvent.WIIUSE_NUNCHUK_REMOVED
+					||e.getEventType() == WiiUseApiEvent.WIIUSE_CLASSIC_CTRL_INSERTED
+					||e.getEventType() == WiiUseApiEvent.WIIUSE_CLASSIC_CTRL_REMOVED
+					||e.getEventType() == WiiUseApiEvent.WIIUSE_GUITAR_HERO_3_CTRL_INSERTED
+					||e.getEventType() == WiiUseApiEvent.WIIUSE_GUITAR_HERO_3_CTRL_REMOVED){
 				notifyStatusEventListeners((StatusEvent)e);
 			}else if (e.getEventType() == WiiUseApiEvent.DISCONNECTION_EVENT){
 				notifyDisconnectionEventListeners((DisconnectionEvent)e);
diff --git a/WiiUseJ/src/wiiusej/test/Tests.java b/WiiUseJ/src/wiiusej/test/Tests.java
index ded66b8..6926be0 100644
--- a/WiiUseJ/src/wiiusej/test/Tests.java
+++ b/WiiUseJ/src/wiiusej/test/Tests.java
@@ -22,7 +22,7 @@ import java.awt.event.InputEvent;
 
 import wiiusej.WiiUseApiManager;
 import wiiusej.Wiimote;
-import wiiusej.values.Point2DInteger;
+import wiiusej.values.IRSource;
 import wiiusej.wiiuseapievents.ButtonsEvent;
 import wiiusej.wiiuseapievents.DisconnectionEvent;
 import wiiusej.wiiuseapievents.IREvent;
@@ -343,17 +343,11 @@ public class Tests implements WiimoteListener {
 
 	public void onIrEvent(IREvent e) {
 		if (dump == DISPLAY_EACH_VALUE) {
-			/* display ir points */
-			Point2DInteger[] list = e.getIRPoints();
-			for (int i = 0; i < list.length; i++) {
-				if (list[i] != null)
-					System.out.print("Point :(" + list[i].getX() + ","
-							+ list[i].getY() + ") ");
-			}
+			System.out.println(e);
 		} else if (dump == DUMP) {
 			System.out.println(e);
 		} else if (dump == MOVE_MOUSE) {
-			Point2DInteger[] list = e.getIRPoints();
+			IRSource[] list = e.getIRPoints();
 			if (list.length > 0) {
 				int x1 = (int) list[0].getX();
 				int y1 = (int) list[0].getY();
diff --git a/WiiUseJ/src/wiiusej/values/GForce.java b/WiiUseJ/src/wiiusej/values/GForce.java
index 144024e..9732121 100644
--- a/WiiUseJ/src/wiiusej/values/GForce.java
+++ b/WiiUseJ/src/wiiusej/values/GForce.java
@@ -54,13 +54,6 @@ public class GForce {
 		return x;
 	}
 
-	/**
-	 * @param x the x to set
-	 */
-	public void setX(float x) {
-		this.x = x;
-	}
-
 	/**
 	 * @return the y
 	 */
@@ -68,26 +61,12 @@ public class GForce {
 		return y;
 	}
 
-	/**
-	 * @param y the y to set
-	 */
-	public void setY(float y) {
-		this.y = y;
-	}
-
 	/**
 	 * @return the z
 	 */
 	public float getZ() {
 		return z;
 	}
-
-	/**
-	 * @param z the z to set
-	 */
-	public void setZ(float z) {
-		this.z = z;
-	}
 	
 	@Override
 	public String toString() {
diff --git a/WiiUseJ/src/wiiusej/values/IRSource.java b/WiiUseJ/src/wiiusej/values/IRSource.java
new file mode 100644
index 0000000..7caef55
--- /dev/null
+++ b/WiiUseJ/src/wiiusej/values/IRSource.java
@@ -0,0 +1,109 @@
+/**
+ * This file is part of WiiuseJ.
+ *
+ *  WiiuseJ is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  WiiuseJ is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with WiiuseJ.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package wiiusej.values;
+
+/**
+ * Class used for IR sources.
+ * @author guiguito
+ */
+public class IRSource{
+	
+	private int x;
+	private int y;
+	private short rx;
+	private short ry;
+	private short size;
+	
+	/**
+	 * Build an IR source with all details.
+	 * 
+	 * @param xx
+	 *            xx interpolated coordinates.
+	 * @param yy
+	 *            yy interpolated coordinates.
+	 * @param rxx
+	 *            raw X coordinate (0-1023).
+	 * @param ryy
+	 *            raw Y coordinate (0-1023).
+	 * @param si
+	 *            size of the IR dot (0-15).
+	 */
+	public IRSource(int xx, int yy, short rxx, short ryy, short si) {		
+		x = xx;
+		y = yy;
+		rx = rxx;
+		ry = ryy;
+		size = si;
+	}
+		
+	
+	/**
+	 * Return x interpolated coordinates.
+	 * @return the x
+	 */
+	public int getX() {
+		return x;
+	}
+
+
+
+	/**
+	 * Return y interpolated coordinates.
+	 * @return the y
+	 */
+	public int getY() {
+		return y;
+	}
+
+
+
+	/**
+	 * Return raw X coordinate (0-1023).
+	 * @return the rx
+	 */
+	public short getRx() {
+		return rx;
+	}
+
+
+
+	/**
+	 * Return raw Y coordinate (0-1023).
+	 * @return the ry
+	 */
+	public short getRy() {
+		return ry;
+	}
+
+
+
+	/**
+	 * Return size of the IR dot (0-15).
+	 * @return the size
+	 */
+	public short getSize() {
+		return size;
+	}
+
+
+
+	@Override
+	public String toString() {
+		return "Interpolated coordinates ("+x+","+y+"), Raw coordinates("+rx+","+ry+"), source size : "+size+")";
+	}
+
+}
diff --git a/WiiUseJ/src/wiiusej/values/Orientation.java b/WiiUseJ/src/wiiusej/values/Orientation.java
index 7afe928..4c4f741 100644
--- a/WiiUseJ/src/wiiusej/values/Orientation.java
+++ b/WiiUseJ/src/wiiusej/values/Orientation.java
@@ -53,36 +53,20 @@ public class Orientation {
 		public float getRoll() {
 			return roll;
 		}
-		/**
-		 * @param roll the roll to set
-		 */
-		public void setRoll(float roll) {
-			this.roll = roll;
-		}
+
 		/**
 		 * @return the pitch
 		 */
 		public float getPitch() {
 			return pitch;
 		}
-		/**
-		 * @param pitch the pitch to set
-		 */
-		public void setPitch(float pitch) {
-			this.pitch = pitch;
-		}
+
 		/**
 		 * @return the yaw
 		 */
 		public float getYaw() {
 			return yaw;
 		}
-		/**
-		 * @param yaw the yaw to set
-		 */
-		public void setYaw(float yaw) {
-			this.yaw = yaw;
-		}
 		
 		@Override
 		public String toString() {
diff --git a/WiiUseJ/src/wiiusej/values/Point2DInteger.java b/WiiUseJ/src/wiiusej/values/RawAcceleration.java
similarity index 53%
rename from WiiUseJ/src/wiiusej/values/Point2DInteger.java
rename to WiiUseJ/src/wiiusej/values/RawAcceleration.java
index a717882..903a51c 100644
--- a/WiiUseJ/src/wiiusej/values/Point2DInteger.java
+++ b/WiiUseJ/src/wiiusej/values/RawAcceleration.java
@@ -16,40 +16,60 @@
  */
 package wiiusej.values;
 
-import java.awt.geom.Point2D;
-
 /**
- * Class used for IR sources.
+ * Represents raw acceleration on each axis.
  * @author guiguito
  */
-public class Point2DInteger extends Point2D {
-	private int x;
-	private int y;
+public class RawAcceleration {
 	
-	public Point2DInteger(int xx, int yy) {
-		super();
-		setLocation(xx,yy);
+	private short x;
+	private short y;
+	private short z;
+	
+	/**
+	 * Default constructor;
+	 */
+	public RawAcceleration() {
+		x = 0;
+		y = 0;
+		z = 0;
+	}
+	
+	/**
+	 * Constructor with raw acceleration on each axis.
+	 * @param xx x value
+	 * @param yy x value
+	 * @param zz x value
+	 */
+	public RawAcceleration(short xx, short yy, short zz) {
+		x = xx;
+		y = yy;
+		z = zz;
 	}
 
-	@Override
-	public double getX() {
+	/**
+	 * @return the x
+	 */
+	public short getX() {
 		return x;
 	}
-	
-	@Override
-	public double getY() {
+	/**
+	 * @return the y
+	 */
+	public short getY() {
 		return y;
 	}
 
-	@Override
-	public void setLocation(double xx, double yy) {
-		this.x = (int)xx;
-		this.y = (int)yy;
+	/**
+	 * @return the z
+	 */
+	public short getZ() {
+		return z;
 	}
 	
 	@Override
 	public String toString() {
-		return "("+x+","+y+")";
+		return "Raw acceleration : ("+x+", "+y+","+z+")";
 	}
 
 }
diff --git a/WiiUseJ/src/wiiusej/wiiuseapievents/ButtonsEvent.java b/WiiUseJ/src/wiiusej/wiiuseapievents/ButtonsEvent.java
index b79818e..ce78551 100644
--- a/WiiUseJ/src/wiiusej/wiiuseapievents/ButtonsEvent.java
+++ b/WiiUseJ/src/wiiusej/wiiuseapievents/ButtonsEvent.java
@@ -119,7 +119,10 @@ public class ButtonsEvent extends WiimoteEvent{
 	private boolean isButtonHeld(short buttonBitsDefinition) {
 		return buttonTest(buttonBitsDefinition, buttonsHeld);
 	}
-
+	
+	private boolean isButtonPressed(short buttonBitsDefinition) {
+		return isButtonHeld(buttonBitsDefinition)||isButtonJustPressed(buttonBitsDefinition);
+	}
 	/* Button ONE */
 
 	public boolean isButtonOneJustPressed() {
@@ -133,6 +136,10 @@ public class ButtonsEvent extends WiimoteEvent{
 	public boolean isButtonOneHeld() {
 		return isButtonHeld(WIIMOTE_BUTTON_ONE);
 	}
+	
+	public boolean isButtonOnePressed() {
+		return isButtonPressed(WIIMOTE_BUTTON_ONE);
+	}
 
 	/* Button TWO */
 
@@ -147,6 +154,10 @@ public class ButtonsEvent extends WiimoteEvent{
 	public boolean isButtonTwoHeld() {
 		return isButtonHeld(WIIMOTE_BUTTON_TWO);
 	}
+	
+	public boolean isButtonTwoPressed() {
+		return isButtonPressed(WIIMOTE_BUTTON_TWO);
+	}
 
 	/* Button A */
 
@@ -161,6 +172,10 @@ public class ButtonsEvent extends WiimoteEvent{
 	public boolean isButtonAHeld() {
 		return isButtonHeld(WIIMOTE_BUTTON_A);
 	}
+	
+	public boolean isButtonAPressed() {
+		return isButtonPressed(WIIMOTE_BUTTON_A);
+	}
 
 	/* Button B */
 
@@ -175,6 +190,10 @@ public class ButtonsEvent extends WiimoteEvent{
 	public boolean isButtonBHeld() {
 		return isButtonHeld(WIIMOTE_BUTTON_B);
 	}
+	
+	public boolean isButtonBPressed() {
+		return isButtonPressed(WIIMOTE_BUTTON_B);
+	}
 
 	/* Button LEFT */
 
@@ -189,6 +208,10 @@ public class ButtonsEvent extends WiimoteEvent{
 	public boolean isButtonLeftHeld() {
 		return isButtonHeld(WIIMOTE_BUTTON_LEFT);
 	}
+	
+	public boolean isButtonLeftPressed() {
+		return isButtonPressed(WIIMOTE_BUTTON_LEFT);
+	}
 
 	/* Button RIGHT */
 
@@ -203,6 +226,10 @@ public class ButtonsEvent extends WiimoteEvent{
 	public boolean isButtonRightHeld() {
 		return isButtonHeld(WIIMOTE_BUTTON_RIGHT);
 	}
+	
+	public boolean isButtonRightPressed() {
+		return isButtonPressed(WIIMOTE_BUTTON_RIGHT);
+	}
 
 	/* Button UP */
 
@@ -217,6 +244,10 @@ public class ButtonsEvent extends WiimoteEvent{
 	public boolean isButtonUpHeld() {
 		return isButtonHeld(WIIMOTE_BUTTON_UP);
 	}
+	
+	public boolean isButtonUpPressed() {
+		return isButtonPressed(WIIMOTE_BUTTON_UP);
+	}
 
 	/* Button DOWN */
 
@@ -231,6 +262,10 @@ public class ButtonsEvent extends WiimoteEvent{
 	public boolean isButtonDownHeld() {
 		return isButtonHeld(WIIMOTE_BUTTON_DOWN);
 	}
+	
+	public boolean isButtonDownPressed() {
+		return isButtonPressed(WIIMOTE_BUTTON_DOWN);
+	}
 
 	/* Button - */
 
@@ -245,6 +280,10 @@ public class ButtonsEvent extends WiimoteEvent{
 	public boolean isButtonMinusHeld() {
 		return isButtonHeld(WIIMOTE_BUTTON_MINUS);
 	}
+	
+	public boolean isButtonMinusPressed() {
+		return isButtonPressed(WIIMOTE_BUTTON_MINUS);
+	}
 
 	/* Button + */
 
@@ -259,6 +298,10 @@ public class ButtonsEvent extends WiimoteEvent{
 	public boolean isButtonPlusHeld() {
 		return isButtonHeld(WIIMOTE_BUTTON_PLUS);
 	}
+	
+	public boolean isButtonPlusPressed() {
+		return isButtonPressed(WIIMOTE_BUTTON_PLUS);
+	}
 
 	/* Button HOME */
 
@@ -274,6 +317,10 @@ public class ButtonsEvent extends WiimoteEvent{
 		return isButtonHeld(WIIMOTE_BUTTON_HOME);
 	}
 	
+	public boolean isButtonHomePressed() {
+		return isButtonPressed(WIIMOTE_BUTTON_HOME);
+	}
+	
 	@Override
 	public String toString() {
 		String out = "";
diff --git a/WiiUseJ/src/wiiusej/wiiuseapievents/EventsGatherer.java b/WiiUseJ/src/wiiusej/wiiuseapievents/EventsGatherer.java
index 5014901..7fcb57c 100644
--- a/WiiUseJ/src/wiiusej/wiiuseapievents/EventsGatherer.java
+++ b/WiiUseJ/src/wiiusej/wiiuseapievents/EventsGatherer.java
@@ -16,7 +16,6 @@
  */
 package wiiusej.wiiuseapievents;
 
-
 /**
  * This class is used to gather events during a call to the Wiiuse API.
  * 
@@ -44,7 +43,7 @@ public class EventsGatherer {
 	 * @param e
 	 *            the event to add.
 	 */
-	private void addEvent(WiiUseApiEvent e) {		
+	private void addEvent(WiiUseApiEvent e) {
 		events[index] = e;
 		index++;
 	}
@@ -67,6 +66,39 @@ public class EventsGatherer {
 				buttonsJustReleased, buttonsHeld);
 	}
 
+	/**
+	 * Prepare an IR event to populate.
+	 * 
+	 * @param x
+	 *            calculated X coordinate.
+	 * @param y
+	 *            calculated Y coordinate.
+	 * @param z
+	 *            calculated distance.
+	 * @param ax
+	 *            absolute X coordinate.
+	 * @param ay
+	 *            absolute Y coordinate
+	 * @param xVRes
+	 *            IR virtual screen x resolution.
+	 * @param yVRes
+	 *            IR virtual screen y resolution.
+	 * @param xOffset
+	 *            IR X correction offset.
+	 * @param yOffset
+	 *            IR Y correction offset.
+	 * @param sensorBarPostion
+	 *            aspect ratio of the screen.
+	 * @param screenAsPectRatio
+	 *            IR sensor bar position.
+	 */
+	public void prepareIRevent(int x, int y, int z, int ax, int ay,
+			int xVRes, int yVRes, int xOffset, int yOffset,
+			short sensorBarPostion, short screenAsPectRatio) {
+		genericEvent.prepareIRevent(x, y, z, ax, ay, xVRes,
+				yVRes, xOffset, yOffset, sensorBarPostion, screenAsPectRatio);
+
+	}
 
 	/**
 	 * Add an IR point to the WiiMoteEvent prepared
@@ -75,13 +107,20 @@ public class EventsGatherer {
 	 *            x coordinates
 	 * @param y
 	 *            y coordinates
+	 * @param rxx
+	 *            raw X coordinate (0-1023).
+	 * @param ryy
+	 *            raw Y coordinate (0-1023).
+	 * @param si
+	 *            size of the IR dot (0-15).
 	 */
-	public void addIRPointToPreparedWiiMoteEvent(int x, int y) {		
-		if (genericEvent != null) {			
-			genericEvent.addIRpoint(x, y);
+	public void addIRPointToPreparedWiiMoteEvent(int x, int y, short rx,
+			short ry, short size) {
+		if (genericEvent != null) {
+			genericEvent.addIRpoint(x, y, rx, ry, size);
 		}
 	}
-	
+
 	/**
 	 * Set orientation and gravity force of the prepared event.
 	 * 
@@ -97,11 +136,17 @@ public class EventsGatherer {
 	 *            gravity force on y axis
 	 * @param z
 	 *            gravity force on z axis
+	 * @param xx
+	 *            raw acceleration on x axis
+	 * @param yy
+	 *            raw acceleration on y axis
+	 * @param zz
+	 *            raw acceleration on z axis
 	 */
 	public void addMotionSensingValues(float r, float p, float ya, float x,
-			float y, float z) {
+			float y, float z, short xx, short yy, short zz) {
 		if (genericEvent != null) {
-			genericEvent.setMotionSensingEvent(r, p, ya, x, y, z);
+			genericEvent.setMotionSensingEvent(r, p, ya, x, y, z, xx, yy, zz);
 		}
 	}
 
diff --git a/WiiUseJ/src/wiiusej/wiiuseapievents/GenericEvent.java b/WiiUseJ/src/wiiusej/wiiuseapievents/GenericEvent.java
index f534ff0..0671ff8 100644
--- a/WiiUseJ/src/wiiusej/wiiuseapievents/GenericEvent.java
+++ b/WiiUseJ/src/wiiusej/wiiuseapievents/GenericEvent.java
@@ -16,7 +16,6 @@
  */
 package wiiusej.wiiuseapievents;
 
-
 /**
  * Class that is a bean to be filled by the wiiuse API.
  * 
@@ -77,6 +76,7 @@ public class GenericEvent extends WiiUseApiEvent {
 
 	/**
 	 * Get buttons event.
+	 * 
 	 * @return the buttons event.
 	 */
 	public ButtonsEvent getButtonsEvent() {
@@ -85,6 +85,7 @@ public class GenericEvent extends WiiUseApiEvent {
 
 	/**
 	 * Get IR event.
+	 * 
 	 * @return the IR event if there is one or null.
 	 */
 	public IREvent getIREvent() {
@@ -93,6 +94,7 @@ public class GenericEvent extends WiiUseApiEvent {
 
 	/**
 	 * Get motion sensing event.
+	 * 
 	 * @return the motion sensing event if there is one or null.
 	 */
 	public MotionSensingEvent getMotionSensingEvent() {
@@ -100,19 +102,61 @@ public class GenericEvent extends WiiUseApiEvent {
 	}
 	
 	/**
-	 * Add an IR point to the generic event.
-	 * Create an IR Event if it's not created yet.
-	 * @param x x coordinates.
-	 * @param y y coordinates
+	 * Prepare an IR event to populate.
+	 * 
+	 * @param x
+	 *            calculated X coordinate.
+	 * @param y
+	 *            calculated Y coordinate.
+	 * @param z
+	 *            calculated distance.
+	 * @param ax
+	 *            absolute X coordinate.
+	 * @param ay
+	 *            absolute Y coordinate
+	 * @param xVRes
+	 *            IR virtual screen x resolution.
+	 * @param yVRes
+	 *            IR virtual screen y resolution.
+	 * @param xOffset
+	 *            IR X correction offset.
+	 * @param yOffset
+	 *            IR Y correction offset.
+	 * @param sensorBarPostion
+	 *            aspect ratio of the screen.
+	 * @param screenAsPectRatio
+	 *            IR sensor bar position.
 	 */
-	public void addIRpoint(int x,int y){
-		//@TODO add points size
-		if (infraredEvent == null){
-			infraredEvent = new IREvent(getWiimoteId());
+	public void prepareIRevent(int x, int y, int z, int ax, int ay, int xVRes,
+			int yVRes, int xOffset, int yOffset, short sensorBarPostion,
+			short screenAsPectRatio) {
+		if (infraredEvent == null) {
+			infraredEvent = new IREvent(getWiimoteId(), x, y, z, ax, ay, xVRes,
+					yVRes, xOffset, yOffset, sensorBarPostion,
+					screenAsPectRatio);
 		}
-		infraredEvent.addIRpoint(x, y);
 	}
-	
+
+	/**
+	 * Add an IR point to the generic event. Create an IR Event if it's not
+	 * created yet.
+	 * 
+	 * @param x
+	 *            x coordinates.
+	 * @param y
+	 *            y coordinates
+	 * @param rxx
+	 *            raw X coordinate (0-1023).
+	 * @param ryy
+	 *            raw Y coordinate (0-1023).
+	 * @param si
+	 *            size of the IR dot (0-15).
+	 */
+	public void addIRpoint(int x, int y, short rx, short ry, short size) {
+		if (infraredEvent != null)
+			infraredEvent.addIRpoint(x, y, rx, ry, size);
+	}
+
 	/**
 	 * Set the Motion Sensing Event.
 	 * 
@@ -128,13 +172,18 @@ public class GenericEvent extends WiiUseApiEvent {
 	 *            gravity force on y axis
 	 * @param z
 	 *            gravity force on z axis
+	 * @param xx
+	 *            raw acceleration on x axis
+	 * @param yy
+	 *            raw acceleration on y axis
+	 * @param zz
+	 *            raw acceleration on z axis
 	 */
-	public void setMotionSensingEvent(float r, float p, float ya, float x, float y,
-			float z){
-		motionSensingEvent = new MotionSensingEvent(getWiimoteId(), r, p, ya, x, y, z);
+	public void setMotionSensingEvent(float r, float p, float ya, float x,
+			float y, float z, short xx, short yy, short zz) {
+		motionSensingEvent = new MotionSensingEvent(getWiimoteId(), r, p, ya,
+				x, y, z, xx, yy, zz);
 	}
-	
-	
 
 	@Override
 	public String toString() {
@@ -147,19 +196,19 @@ public class GenericEvent extends WiiUseApiEvent {
 
 		if (infraredEvent != null) {
 			out += infraredEvent;
-		}else{
+		} else {
 			out += "/******** IR Tracking ********/\n";
 			out += "--- Active : false\n";
 		}
 
 		if (motionSensingEvent != null) {
 			out += motionSensingEvent;
-		}else{
+		} else {
 			out += "/******** Motion sensing ********/\n";
 			out += "--- Motion sensing : false \n";
 		}
 
 		return out;
 	}
-	
+
 }
diff --git a/WiiUseJ/src/wiiusej/wiiuseapievents/IREvent.java b/WiiUseJ/src/wiiusej/wiiuseapievents/IREvent.java
index 568fb4e..9950327 100644
--- a/WiiUseJ/src/wiiusej/wiiuseapievents/IREvent.java
+++ b/WiiUseJ/src/wiiusej/wiiuseapievents/IREvent.java
@@ -16,28 +16,81 @@
  */
 package wiiusej.wiiuseapievents;
 
-import wiiusej.values.Point2DInteger;
+import wiiusej.values.IRSource;
 
 /**
  * Class which represents an IR event.
  * 
  * @author guiguito
  */
-public class IREvent extends WiimoteEvent{
+public class IREvent extends WiimoteEvent {
 
 	/* IR Tracking */
-	private Point2DInteger[] IRPoints;
+	private IRSource[] IRPoints;
 	private short indexPoints = 0;
+	private int x;
+	private int y;
+	private int z;// distance from the sensor bar
+	private int ax;
+	private int ay;
+	private int xVRes;
+	private int yVRes;
+	private int xOffset;
+	private int yOffset;
+	private short sensorBarPostion;
+	private short screenAsPectRatio;
+
+	static private short WIIUSE_IR_ABOVE = 0;
+	static private short WIIUSE_IR_BELOW = 1;
+	static private short WIIUSE_SCREEN_RATIO_4_3 = 0;
+	static private short WIIUSE_SCREEN_RATIO_16_9 = 1;
 
 	private static short NB_POINTS = 4;// number of points IR can track
-	
+
 	/**
-	 * Constructor for an infrared event.
-	 * @param id id of the wiimote concerned.
+	 * Constructor of IREvent with full infos.
+	 * 
+	 * @param id
+	 *            d of the wiimote concerned.
+	 * @param x
+	 *            calculated X coordinate.
+	 * @param y
+	 *            calculated Y coordinate.
+	 * @param z
+	 *            calculated distance.
+	 * @param ax
+	 *            absolute X coordinate.
+	 * @param ay
+	 *            absolute Y coordinate
+	 * @param xVRes
+	 *            IR virtual screen x resolution.
+	 * @param yVRes
+	 *            IR virtual screen y resolution.
+	 * @param xOffset
+	 *            IR X correction offset.
+	 * @param yOffset
+	 *            IR Y correction offset.
+	 * @param sensorBarPostion
+	 *            aspect ratio of the screen.
+	 * @param screenAsPectRatio
+	 *            IR sensor bar position.
 	 */
-	public IREvent(int id) {
+	public IREvent(int id, int x, int y, int z, int ax, int ay, int xVRes,
+			int yVRes, int xOffset, int yOffset, short sensorBarPostion,
+			short screenAsPectRatio) {
 		super(id);
-		IRPoints = new Point2DInteger[NB_POINTS];
+		this.x = x;
+		this.y = y;
+		this.z = z;
+		this.ax = ax;
+		this.ay = ay;
+		this.xVRes = xVRes;
+		this.yVRes = yVRes;
+		this.xOffset = xOffset;
+		this.yOffset = yOffset;
+		this.sensorBarPostion = sensorBarPostion;
+		this.screenAsPectRatio = screenAsPectRatio;
+		IRPoints = new IRSource[NB_POINTS];
 	}
 
 	/**
@@ -45,7 +98,7 @@ public class IREvent extends WiimoteEvent{
 	 * 
 	 * @return the list of 2D points
 	 */
-	public Point2DInteger[] getIRPoints() {
+	public IRSource[] getIRPoints() {
 		return java.util.Arrays.copyOfRange(IRPoints, 0, indexPoints);
 	}
 
@@ -56,19 +109,170 @@ public class IREvent extends WiimoteEvent{
 	 *            x value
 	 * @param y
 	 *            y value
+	 * @param rxx
+	 *            raw X coordinate (0-1023).
+	 * @param ryy
+	 *            raw Y coordinate (0-1023).
+	 * @param si
+	 *            size of the IR dot (0-15).
 	 */
-	public void addIRpoint(int x, int y) {
-		IRPoints[indexPoints] = new Point2DInteger(x, y);
+	public void addIRpoint(int x, int y, short rx, short ry, short size) {
+		IRPoints[indexPoints] = new IRSource(x, y, rx, ry, size);
 		indexPoints++;
 		return;
 	}
 
+	/**
+	 * Return calculated X coordinate.
+	 * 
+	 * @return the x
+	 */
+	public int getX() {
+		return x;
+	}
+
+	/**
+	 * Return calculated Y coordinate.
+	 * 
+	 * @return the y
+	 */
+	public int getY() {
+		return y;
+	}
+
+	/**
+	 * Return calculated distance.
+	 * 
+	 * @return the z
+	 */
+	public int getZ() {
+		return z;
+	}
+
+	/**
+	 * Return absolute X coordinate.
+	 * 
+	 * @return the ax
+	 */
+	public int getAx() {
+		return ax;
+	}
+
+	/**
+	 * Return absolute Y coordinate.
+	 * 
+	 * @return the ay
+	 */
+	public int getAy() {
+		return ay;
+	}
+
+	/**
+	 * Return IR virtual screen x resolution.
+	 * 
+	 * @return the xVRes
+	 */
+	public int getXVRes() {
+		return xVRes;
+	}
+
+	/**
+	 * Return IR virtual screen y resolution.
+	 * 
+	 * @return the yVRes
+	 */
+	public int getYVRes() {
+		return yVRes;
+	}
+
+	/**
+	 * Return IR X correction offset.
+	 * 
+	 * @return the xOffset
+	 */
+	public int getXOffset() {
+		return xOffset;
+	}
+
+	/**
+	 * Return IR Y correction offset.
+	 * 
+	 * @return the yOffset
+	 */
+	public int getYOffset() {
+		return yOffset;
+	}
+
+	/**
+	 * Return true if the sensor bar is above.
+	 * 
+	 * @return true if the sensor bar is above.
+	 */
+	public boolean isSensorBarAbove() {
+		return sensorBarPostion == WIIUSE_IR_ABOVE;
+	}
+
+	/**
+	 * Return true if the sensor bar is below.
+	 * 
+	 * @return true if the sensor bar is below.
+	 */
+	public boolean isSensorBarBelow() {
+		return sensorBarPostion == WIIUSE_IR_BELOW;
+	}
+
+	/**
+	 * Return true if screen aspect ratio set is 4/3.
+	 * 
+	 * @return true if screen aspect ratio set is 4/3.
+	 */
+	public boolean isScreenAspectRatio43() {
+		return screenAsPectRatio == WIIUSE_SCREEN_RATIO_4_3;
+	}
+
+	/**
+	 * Return true if screen aspect ratio set is 16/9.
+	 * 
+	 * @return true if screen aspect ratio set is 16/9.
+	 */
+	public boolean isScreenAspectRatio169() {
+		return screenAsPectRatio == WIIUSE_SCREEN_RATIO_16_9;
+	}
+
+	/**
+	 * Return aspect ratio of the screen.
+	 * 
+	 * @return the screenAsPectRatio
+	 */
+	public short getScreenAsPectRatio() {
+		return screenAsPectRatio;
+	}
+
 	@Override
 	public String toString() {
 		String out = "";
 		/* Display IR Tracking */
 		out += "/******** IR Tracking ********/\n";
 		out += "--- Active : true\n";
+		out += "--- calculated X coordinate : " + x + "\n";
+		out += "--- calculated Y coordinate : " + y + "\n";
+		out += "--- calculated distance : " + z + "\n";
+		out += "--- absolute X coordinate : " + ax + "\n";
+		out += "--- absolute Y coordinate : " + ay + "\n";
+		out += "--- IR virtual screen x resolution : " + xVRes + "\n";
+		out += "--- IR virtual screen y resolution : " + yVRes + "\n";
+		out += "--- IR X correction offset : " + xOffset + "\n";
+		out += "--- IR Y correction offset : " + yOffset + "\n";
+		if (isScreenAspectRatio43()) {
+			out += "--- aspect ratio of the screen : 4/3\n";
+		} else if (isScreenAspectRatio169()) {
+			out += "--- aspect ratio of the screen : 16/9\n";
+		}
+		if (isSensorBarAbove()) {
+			out += "--- IR sensor bar position. : Above\n";
+		} else if (isSensorBarBelow()) {
+			out += "--- IR sensor bar position. : Below\n";
+		}
 		out += "--- Seen points\n";
 		for (int i = 0; i < IRPoints.length; i++) {
 			if (IRPoints[i] != null) {
@@ -77,5 +281,4 @@ public class IREvent extends WiimoteEvent{
 		}
 		return out;
 	}
-
 }
diff --git a/WiiUseJ/src/wiiusej/wiiuseapievents/MotionSensingEvent.java b/WiiUseJ/src/wiiusej/wiiuseapievents/MotionSensingEvent.java
index 305c346..c15127d 100644
--- a/WiiUseJ/src/wiiusej/wiiuseapievents/MotionSensingEvent.java
+++ b/WiiUseJ/src/wiiusej/wiiuseapievents/MotionSensingEvent.java
@@ -18,6 +18,7 @@ package wiiusej.wiiuseapievents;
 
 import wiiusej.values.GForce;
 import wiiusej.values.Orientation;
+import wiiusej.values.RawAcceleration;
 
 /**
  * Class which represents a motion sensing event.
@@ -29,6 +30,7 @@ public class MotionSensingEvent extends WiimoteEvent{
 	/* Motion Sensing */
 	private Orientation orientation;
 	private GForce gforce;
+	private RawAcceleration acceleration;
 
 	/**
 	 * Constructor for a Motion Sensing Event.
@@ -47,15 +49,21 @@ public class MotionSensingEvent extends WiimoteEvent{
 	 *            gravity force on y axis
 	 * @param z
 	 *            gravity force on z axis
+	 * @param xx
+	 *            raw acceleration on x axis
+	 * @param yy
+	 *            raw acceleration on y axis
+	 * @param zz
+	 *            raw acceleration on z axis
 	 */
 	public MotionSensingEvent(int id, float r, float p, float ya, float x, float y,
-			float z) {
+			float z, short xx, short yy, short zz) {
 		super(id);
-		setOrientationAndGforce(r, p, ya, x, y, z);
+		setOrientationAndGforce(r, p, ya, x, y, z, xx, yy, zz);
 	}
 
 	/**
-	 * Set orientation and gravity force.
+	 * Set orientation, gravity force and raw acceleration.
 	 * 
 	 * @param r
 	 *            roll
@@ -69,11 +77,18 @@ public class MotionSensingEvent extends WiimoteEvent{
 	 *            gravity force on y axis
 	 * @param z
 	 *            gravity force on z axis
+     * @param xx
+	 *            raw acceleration on x axis
+	 * @param yy
+	 *            raw acceleration on y axis
+	 * @param zz
+	 *            raw acceleration on z axis
 	 */
 	private void setOrientationAndGforce(float r, float p, float ya, float x,
-			float y, float z) {
+			float y, float z, short xx, short yy, short zz) {
 		this.orientation = new Orientation(r, p, ya);
 		this.gforce = new GForce(x, y, z);
+		this.acceleration = new RawAcceleration(xx, yy, zz);
 	}
 
 	/**
@@ -91,6 +106,15 @@ public class MotionSensingEvent extends WiimoteEvent{
 	public GForce getGforce() {
 		return gforce;
 	}
+	
+	/**
+	 * Get the raw acceleration.
+	 * 
+	 * @return the raw acceleration
+	 */
+	public RawAcceleration getRawAcceleration() {
+		return acceleration;
+	}
 
 	@Override
 	public String toString() {
@@ -100,6 +124,7 @@ public class MotionSensingEvent extends WiimoteEvent{
 		out += "--- Motion sensing : true \n";
 		out += "--- " + orientation + "\n";
 		out += "--- " + gforce + "\n";
+		out += "--- " + acceleration + "\n";
 		return out;
 	}
 }
diff --git a/WiiUseJ/src/wiiusej/wiiuseapievents/StatusEvent.java b/WiiUseJ/src/wiiusej/wiiuseapievents/StatusEvent.java
index e45410c..7367ced 100644
--- a/WiiUseJ/src/wiiusej/wiiuseapievents/StatusEvent.java
+++ b/WiiUseJ/src/wiiusej/wiiuseapievents/StatusEvent.java
@@ -153,6 +153,54 @@ public class StatusEvent extends WiiUseApiEvent {
 	public short getLeds() {
 		return leds;
 	}
+	
+	/**
+	 * Get led1 status.
+	 * @return true if the led is set.
+	 */
+	public boolean isLed1Set(){
+		if ((leds & WIIMOTE_LED_1) > 0){
+			return true;
+		}else{
+			return false;
+		}
+	}
+	
+	/**
+	 * Get led2 status.
+	 * @return true if the led is set.
+	 */
+	public boolean isLed2Set(){
+		if ((leds & WIIMOTE_LED_2) > 0){
+			return true;
+		}else{
+			return false;
+		}
+	}
+	
+	/**
+	 * Get led3 status.
+	 * @return true if the led is set.
+	 */
+	public boolean isLed3Set(){
+		if ((leds & WIIMOTE_LED_3) > 0){
+			return true;
+		}else{
+			return false;
+		}
+	}
+	
+	/**
+	 * Get led4 status.
+	 * @return true if the led is set.
+	 */
+	public boolean isLed4Set(){
+		if ((leds & WIIMOTE_LED_4) > 0){
+			return true;
+		}else{
+			return false;
+		}
+	}
 
 	/**
 	 * Tell if the speaker is enable for this wiimote
diff --git a/WiiUseJ/src/wiiusej/wiiuseapievents/WiiUseApiEvent.java b/WiiUseJ/src/wiiusej/wiiuseapievents/WiiUseApiEvent.java
index 4c5b032..880c632 100644
--- a/WiiUseJ/src/wiiusej/wiiuseapievents/WiiUseApiEvent.java
+++ b/WiiUseJ/src/wiiusej/wiiuseapievents/WiiUseApiEvent.java
@@ -25,7 +25,13 @@ public abstract class WiiUseApiEvent extends WiimoteEvent{
 	
 	public static int GENERIC_EVENT = 1;
 	public static int STATUS_EVENT = 2;
-	public static int DISCONNECTION_EVENT = 3;	
+	public static int DISCONNECTION_EVENT = 3;
+	public static int WIIUSE_NUNCHUK_INSERTED = 4;	
+	public static int WIIUSE_NUNCHUK_REMOVED = 5;
+	public static int WIIUSE_CLASSIC_CTRL_INSERTED = 6;
+	public static int WIIUSE_CLASSIC_CTRL_REMOVED = 7;
+	public static int WIIUSE_GUITAR_HERO_3_CTRL_INSERTED = 8;
+	public static int WIIUSE_GUITAR_HERO_3_CTRL_REMOVED = 9;
 	
 	/* Event Type */
 	private int eventType;
diff --git a/WiiUseJ/src/wiiusej/wiiuseapirequest/IntValueRequest.java b/WiiUseJ/src/wiiusej/wiiuseapirequest/IntValueRequest.java
index b2a9a14..801093d 100644
--- a/WiiUseJ/src/wiiusej/wiiuseapirequest/IntValueRequest.java
+++ b/WiiUseJ/src/wiiusej/wiiuseapirequest/IntValueRequest.java
@@ -26,7 +26,8 @@ public class IntValueRequest extends WiiUseApiRequest {
 	private int intValue;
 
 	/**
-	 * Constructor setting the id of the wiimote concerned.
+	 * Constructor setting the id of the wiimote 
+	 * concerned and the type of the request.
 	 * 
 	 * @param id
 	 *            the id of the wiimote concerned.
@@ -36,14 +37,16 @@ public class IntValueRequest extends WiiUseApiRequest {
 	}
 
 	/**
-	 * Constructor setting the id of the wiimote concerned.
+	 * Constructor setting the id of the wiimote 
+	 * concerned, the type of the request 
+	 * and the int value.
 	 * 
 	 * @param id
 	 *            the id of the wiimote concerned.
 	 * @param type
 	 *            type of the request
 	 * @param th
-	 *            threshold in degrees
+	 *            the int value.
 	 */
 	public IntValueRequest(int id, int type, int th) {
 		super(id, type);
diff --git a/WiiUseJ/src/wiiusej/wiiuseapirequest/WiiUseApiRequest.java b/WiiUseJ/src/wiiusej/wiiuseapirequest/WiiUseApiRequest.java
index 679213f..1f4525b 100644
--- a/WiiUseJ/src/wiiusej/wiiuseapirequest/WiiUseApiRequest.java
+++ b/WiiUseJ/src/wiiusej/wiiuseapirequest/WiiUseApiRequest.java
@@ -40,6 +40,11 @@ public class WiiUseApiRequest {
 	public static int WIIUSE_ACCEL_THRESHOLHD_REQUEST = 10;
 	public static int WIIUSE_ALPHA_SMOOTHING_REQUEST = 11;
 	public static int WIIUSE_RESYNC = 12;
+	public static int WIIUSE_ASPECT_RATIO_4_3 = 13;
+	public static int WIIUSE_ASPECT_RATIO_16_9 = 14;
+	public static int WIIUSE_SENSOR_BAR_ABOVE = 15;
+	public static int WIIUSE_SENSOR_BAR_BELOW = 16;	
+	public static int WIIUSE_SET_VIRTUAL_RESOLUTION = 17;
 
 	private int wiimoteId = 0;
 	private int requestType = 0;