Merge pull request #119 from stefanhaustein/master

Add an example for the Waveshare GamePi13 hat

Author: stefanhaustein

src/main/java/com/pi4j/devices/cp2102n/CP2102N.java

@@ -73,7 +73,7 @@ Serial createSerialDevice() {
             .flowControl(FlowControl.NONE)
             .id(id)
             .name(name)
-            .device("/dev/ttyAMA0")
+            .port("/dev/ttyAMA0")
             .provider("linuxfsserial")
             .build());
 

src/main/java/com/pi4j/examples/games/snake/Snake.java

@@ -11,7 +11,7 @@
 /**
  * A simple "Snake" game implementation for a 8x8 playing field.
  * <p>
- * Hold the center key for one second to exit.
+ * Press the select key or hold the center key for one second to exit.
  * <p>
  * This class doesn't include a main() method; please find an examples for wiring this up in the waveshare 14972
  * dispay hat demo.
@@ -42,6 +42,7 @@ public class Snake {
     private Entity[][] arena;
     private List<Segment> body = new ArrayList<>();
     private long longPressStart = Long.MAX_VALUE;
+    private boolean exit = false;
 
     public Snake(GraphicsDisplay display, GameController controller) {
         this.display = display;
@@ -52,6 +53,7 @@ public Snake(GraphicsDisplay display, GameController controller) {
         assignKey(GameController.Key.LEFT, value -> processDirectionalKey(value, -1, 0));
         assignKey(GameController.Key.RIGHT, value -> processDirectionalKey(value, 1, 0));
         assignKey(GameController.Key.CENTER, value -> processCenterKey(value));
+        assignKey(GameController.Key.SELECT, _ -> { exit = true; });
 
         int displayWidth = display.getWidth();
         int displayHeight = display.getHeight();
@@ -122,10 +124,13 @@ private void renderColor(int x, int y, int color) {
 
     public void run() {
         initialize();
-        while (System.currentTimeMillis() - longPressStart < 1000) {
+        while (!exit) {
             deferredDelay.setDelayMillis(stepTimeMillis);
             step();
             deferredDelay.materializeDelay();
+            if (System.currentTimeMillis() - longPressStart > 1000) {
+                exit = true;
+            }
         }
         display.fillRect(0, 0, display.getWidth(), display.getHeight(), 0xff000000);
         for (Map.Entry<ListenableOnOffRead<?>, Consumer<Boolean>> entry : keys.entrySet()) {

src/main/java/com/pi4j/examples/hat/waveshare/gamepi13/Demo.java

@@ -0,0 +1,27 @@
+package com.pi4j.examples.hat.waveshare.gamepi13;
+
+import com.pi4j.Pi4J;
+import com.pi4j.context.Context;
+import com.pi4j.drivers.display.graphics.GraphicsDisplay;
+import com.pi4j.drivers.hat.waveshare.GamePi13;
+import com.pi4j.drivers.input.GameController;
+
+/**
+ * A simple demo running a "Snake" game. Exit by pressing the select key.
+ */
+public class Demo {
+
+    static void main(String[] args) {
+        Context pi4j = Pi4J.newAutoContext();
+        GamePi13 hat = new GamePi13(pi4j);
+        GraphicsDisplay display = hat.getDisplay();
+        GameController controller = hat.getController();
+
+        new com.pi4j.examples.games.snake.Snake(display, controller).run();
+
+        display.close();
+        controller.close();
+        pi4j.shutdown();
+    }
+
+}

src/main/java/com/pi4j/examples/hat/waveshare/gamepi13/README.md

@@ -0,0 +1,5 @@
+# Waveshare GamePi13 Demo
+
+Runs a small snake game on the display.
+
+Exit by pressing the select key.