This commit is contained in:
2015-05-22 12:29:36 +02:00
parent 678201d118
commit c5c9b58b16
5 changed files with 11 additions and 11 deletions
-2
View File
@@ -43,6 +43,4 @@ public class Button {
{ {
return buttonID; return buttonID;
} }
} }
+6 -6
View File
@@ -23,12 +23,12 @@ public class ButtonHandler implements KeyListener{
buttons = new ArrayList<Button>(); buttons = new ArrayList<Button>();
buttons.add(new Button(0, -1, led)); buttons.add(new Button(0, -1, led));
buttons.add(new Button(1, 5, led)); buttons.add(new Button(1, 2, led));
buttons.add(new Button(2, 4, led)); buttons.add(new Button(2, 1, led));
buttons.add(new Button(3, 3, led)); buttons.add(new Button(3, 0, led));
buttons.add(new Button(4, 2, led)); buttons.add(new Button(4, 3, led));
buttons.add(new Button(5, 1, led)); buttons.add(new Button(5, 4, led));
buttons.add(new Button(6, 0, led)); buttons.add(new Button(6, 5, led));
for(Button b : buttons) for(Button b : buttons)
{ {
+2 -1
View File
@@ -76,10 +76,11 @@ public class JoystickHandler implements KeyListener{
@Override @Override
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
System.out.println("Test " + e.getKeyCode());
if(e.getKeyCode() == KeyEvent.VK_UP || e.getKeyCode() == KeyEvent.VK_DOWN || e.getKeyCode() == KeyEvent.VK_LEFT || e.getKeyCode() == KeyEvent.VK_RIGHT) if(e.getKeyCode() == KeyEvent.VK_UP || e.getKeyCode() == KeyEvent.VK_DOWN || e.getKeyCode() == KeyEvent.VK_LEFT || e.getKeyCode() == KeyEvent.VK_RIGHT)
{ {
Set<Integer> keysCopy = new HashSet<Integer>(keys); Set<Integer> keysCopy = new HashSet<Integer>(keys);
System.out.println("YES!");
keys.add(e.getKeyCode()); keys.add(e.getKeyCode());
updateJoystickPosition(); updateJoystickPosition();
+1 -1
View File
@@ -9,7 +9,7 @@ public class Main {
} }
else else
{ {
new Window(Boolean.getBoolean(args[0].toLowerCase())); new Window(true);
} }
} }
+2 -1
View File
@@ -23,6 +23,7 @@ public class Window extends JFrame {
setSize(1280, 1024); setSize(1280, 1024);
this.ON_RASP = ON_RASP; this.ON_RASP = ON_RASP;
System.out.println(ON_RASP);
//Set window close listener //Set window close listener
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
@@ -39,7 +40,7 @@ public class Window extends JFrame {
//Create Events //Create Events
LedHandler led = null; LedHandler led = null;
if(Window.ON_RASP) //TODO REMOVE if(ON_RASP) //TODO REMOVE
{ {
led = new LedHandler(); led = new LedHandler();
} }