Avans/Arcade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network buttons

Browse Source
This commit is contained in:
jancoow
2015-06-11 19:11:38 +02:00
parent 22853812f3
commit 44f4444ad0
4 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
control/button/Button.java
+8 -6
View File
@@ -3,21 +3,23 @@ package control.button;
import java.awt.Color;
import main.Window;
import control.LedHandler;
import control.NetworkHandler;
public class Button {
Color color;
int ledID;
int buttonID;
LedHandler led;
NetworkHandler ntw;
public int pressed;
public Button(int buttonID, int ledID, LedHandler led)
public Button(int buttonID, int ledID, NetworkHandler ntw)
{
color = new Color(255,255,255);
this.ledID = ledID;
this.buttonID = buttonID;
this.led = led;
this.ntw = ntw;
pressed = 1;
setLed();
}
@@ -25,8 +27,8 @@ public class Button {
{
if(Window.ON_RASP)
{
led.setLed(ledID, color.getGreen(), color.getRed(), color.getBlue());
led.show();
ntw.setLed(ledID, color.getGreen(), color.getRed(), color.getBlue());
ntw.show();
}
}
control/button/ButtonHandler.java
+20 -16
View File
@@ -16,28 +16,20 @@ import com.pi4j.io.gpio.RaspiPin;
import com.pi4j.io.gpio.event.GpioPinDigitalStateChangeEvent;
import com.pi4j.io.gpio.event.GpioPinListenerDigital;
import control.LedHandler;
import control.NetworkHandler;
public class ButtonHandler implements KeyListener{
List<ButtonListener> listeners;
static List<Button> buttons;
LedHandler led;
NetworkHandler ntw;
public ButtonHandler(LedHandler led)
public ButtonHandler()
{
this.led = led;
this.ntw = null;
listeners = new ArrayList<ButtonListener>();
buttons = new ArrayList<Button>();
buttons.add(new Button(0, -1, led));
buttons.add(new Button(1, 2, led));
buttons.add(new Button(2, 1, led));
buttons.add(new Button(3, 0, led));
buttons.add(new Button(4, 3, led));
buttons.add(new Button(5, 4, led));
buttons.add(new Button(6, 5, led));
// if (Window.ON_RASP)
// addGpioListeners();
@@ -81,8 +73,8 @@ public class ButtonHandler implements KeyListener{
if(Window.ON_RASP)
{
Color c = b.getColor().brighter().brighter();
led.setLed(b.getLedID(), c.getGreen(), c.getRed(), c.getBlue());
led.show();
ntw.setLed(b.getLedID(), c.getGreen(), c.getRed(), c.getBlue());
ntw.show();
}
ButtonEvent e = new ButtonEvent(b, System.currentTimeMillis());
for (ButtonListener bt : listeners)
@@ -92,8 +84,8 @@ public class ButtonHandler implements KeyListener{
public void buttonRelease(Button b) {
if(Window.ON_RASP)
{
led.setLed(b.getLedID(), b.getColor().getGreen(), b.getColor().getRed(), b.getColor().getBlue());
led.show();
ntw.setLed(b.getLedID(), b.getColor().getGreen(), b.getColor().getRed(), b.getColor().getBlue());
ntw.show();
}
ButtonEvent e = new ButtonEvent(b, System.currentTimeMillis());
for (ButtonListener bt : listeners)
@@ -177,4 +169,16 @@ public class ButtonHandler implements KeyListener{
}
return null;
}
public void setNetwork(NetworkHandler ntw) {
this.ntw = ntw;
buttons.add(new Button(0, -1, ntw));
buttons.add(new Button(1, 2, ntw));
buttons.add(new Button(2, 1, ntw));
buttons.add(new Button(3, 0, ntw));
buttons.add(new Button(4, 3, ntw));
buttons.add(new Button(5, 4, ntw));
buttons.add(new Button(6, 5, ntw));
}
}