Merge pull request #123 from stefanhaustein/master

Add a demo for the Waveshare 12890 128x64 oled hat

Author: stefanhaustein

README.md

@@ -56,6 +56,7 @@ The following table the currently supported devices within this project:
 | A/D           | SPI        | (1)(3)  | [MCP3008 A/D 10bit converter](src/main/java/com/pi4j/devices/mcp3008/README.md)    
 | A/D           | I2C        | (1)     | [MCP4725  12 bit DAC](src/main/java/com/pi4j/devices/mcp4725/README.md)      
 | HAT           |            |         | [Raspberry SenseHat](src/main/java/com/pi4j/examples/hat/raspberry/sensehat/)
+| HAT           |            |         | [Waveshare 13890 Mini OLED Display Hat](src/main/java/com/pi4j/examples/hat/waveshare/waveshare13890/)
 | HAT           |            |         | [Waveshare 13891 Mini Display Hat](src/main/java/com/pi4j/examples/hat/waveshare/waveshare13891/)
 | HAT           |            |         | [Waveshare 14972 Mini Display Hat](src/main/java/com/pi4j/examples/hat/waveshare/waveshare14972/)
 | HAT           |            |         | [Waveshare GamePi13 Hat](src/main/java/com/pi4j/examples/hat/waveshare/gamepi13/)

src/main/java/com/pi4j/examples/games/bricks/Bricks.java

@@ -78,7 +78,8 @@ private void actionKey(boolean on) {
     }
 
     private void initializeBricks() {
-        display.fillRect(0, 0, display.getWidth(), display.getHeight(), 0);
+        display.fillRect(0, 0, display.getWidth(), display.getHeight(), 0xffffffff);
+        display.fillRect(x0, y0, scale * FIELD_SIZE, scale * FIELD_SIZE, 0xff000000);
         for (int i = 0; i < 4; i++) {
             for (int j = 0; j < 3; j++) {
                 setBrick(i, j, true);
@@ -203,6 +204,6 @@ private void setBrick(int x, int y, boolean alive) {
             y0 + 8 * (y + 1) * scale + 1,
             14 * scale,
             6 * scale,
-            alive ? (y == 0 ? 0xff0000 : y == 1 ? 0xff00 : 0xff) : 0);
+            alive ? (y == 0 ? 0xffff8888 : y == 1 ? 0xffff8888 : 0xff88ff88) : 0);
     }
 }

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

@@ -79,7 +79,8 @@ private void addSegment(int x, int y) {
 
     private void initialize() {
         arena = new Entity[AREA_SIZE][AREA_SIZE];
-        display.fillRect(0, 0, display.getWidth(), display.getHeight(), 0);
+        display.fillRect(0, 0, display.getWidth(), display.getHeight(), 0xffffffff);
+        display.fillRect(x0, y0, scale * AREA_SIZE, scale * AREA_SIZE, 0xff000000);
         body.clear();
         length = 1;
 

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

@@ -0,0 +1,30 @@
+package com.pi4j.examples.hat.waveshare.waveshare13890;
+
+import com.pi4j.Pi4J;
+import com.pi4j.context.Context;
+import com.pi4j.drivers.hat.waveshare.Waveshare13890;
+import com.pi4j.examples.hat.DisplayHatDemo;
+
+/**
+ * A simple demo running a "Snake" game. Exit by holding the center button for one second.
+ */
+public class Demo {
+
+    static void main(String[] args) {
+        Context pi4j = Pi4J.newAutoContext();
+        Waveshare13890 hat = new Waveshare13890(pi4j);
+
+        new DisplayHatDemo(
+            hat.getDisplay(),
+            null,
+            hat.getController(),
+            null,
+            null,
+            null).run();
+
+        hat.getDisplay().close();
+        hat.getController().close();
+        pi4j.shutdown();
+    }
+
+}

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

@@ -0,0 +1,3 @@
+# Waveshare 13890 Display Hat Demo
+
+A small demo allowing the user to play two mini games.