Merge remote-tracking branch 'origin/develop' into develop

control/LedHandler.java

@@ -49,7 +49,6 @@ public class LedHandler {
 	    if(led<0)
 	    	return;
     	try {
-    		System.out.println("Set the led with " + r);
 	        out.write( "1|" + led + "|" + r + "|" + g + "|" + b + "\n" );
 	        out.flush();
 	    }

control/button/ButtonHandler.java

@@ -39,8 +39,8 @@ public class ButtonHandler implements KeyListener{
 		buttons.add(new Button(5, 4, led));
 		buttons.add(new Button(6, 5, led));
 	
-		if (Window.ON_RASP)
-			addGpioListeners();
+//		if (Window.ON_RASP)
+//			addGpioListeners();
 		
 	}
 	

control/joystick/JoystickHandler.java

@@ -30,8 +30,8 @@ public class JoystickHandler implements KeyListener{
 		listeners = new ArrayList<JoystickListener>();
 		keys = new HashSet<Integer>();
 		j = new Joystick();
-		if(Window.ON_RASP)
-			addGpioListeners();
+//		if(Window.ON_RASP)
+//			addGpioListeners();
 	}
 	
 	private void addGpioListeners(){