From 36cbc2b012e5bf5ed0b441951838dd4919afda6b Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Thu, 21 May 2015 21:21:23 +0200 Subject: [PATCH] Added option for PC/RASP --- src/control/button/Button.java | 8 ++++++-- src/control/button/ButtonHandler.java | 5 +++++ src/main/Window.java | 15 ++++++++++++--- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/control/button/Button.java b/src/control/button/Button.java index 29e6116..bac6b79 100644 --- a/src/control/button/Button.java +++ b/src/control/button/Button.java @@ -2,6 +2,7 @@ package control.button; import java.awt.Color; +import main.Window; import control.LedHandler; public class Button { @@ -22,8 +23,11 @@ public class Button { private void setLed() { - led.setLed(ledID, color.getGreen(), color.getRed(), color.getBlue()); - led.show(); + if(Window.ON_RASP) + { + led.setLed(ledID, color.getGreen(), color.getRed(), color.getBlue()); + led.show(); + } } public void setColor(Color newColor) diff --git a/src/control/button/ButtonHandler.java b/src/control/button/ButtonHandler.java index 317b3bc..7a8a4fc 100644 --- a/src/control/button/ButtonHandler.java +++ b/src/control/button/ButtonHandler.java @@ -5,6 +5,7 @@ import java.awt.event.KeyListener; import java.util.ArrayList; import java.util.List; +import main.Window; import control.LedHandler; public class ButtonHandler implements KeyListener{ @@ -71,6 +72,10 @@ public class ButtonHandler implements KeyListener{ case KeyEvent.VK_6: buttonPress(buttons.get(6)); break; + case KeyEvent.VK_ESCAPE: + if(!Window.ON_RASP) + System.exit(0); + break; } } diff --git a/src/main/Window.java b/src/main/Window.java index af6b42e..4e48621 100644 --- a/src/main/Window.java +++ b/src/main/Window.java @@ -13,6 +13,9 @@ import control.button.ButtonHandler; import control.joystick.JoystickHandler; public class Window extends JFrame { + + public static boolean ON_RASP = false; + public Window() { //Create window @@ -32,9 +35,15 @@ public class Window extends JFrame { setUndecorated(true); //Create Events - LedHandler led = new LedHandler(); + LedHandler led = null; + + if(Window.ON_RASP) //TODO REMOVE + { + led = new LedHandler(); + } + ButtonHandler bth = new ButtonHandler(led); - JoystickHandler jsh = new JoystickHandler(led); + JoystickHandler jsh = new JoystickHandler(); //Create Instances GameView view = new GameView(led); @@ -46,7 +55,7 @@ public class Window extends JFrame { addKeyListener(bth); addKeyListener(jsh); bth.addButtonListener(control); - jsh.addJoyStickListener(control); + jsh.addJoystickListener(control); //Display pack();