Merge pull request #4931 from gohai/io-changes

benfry · web-flow · commit 6919beff8eb1 · 2017-04-20T14:38:51.000-04:00
Hardware I/O updates
diff --git a/java/libraries/io/examples/I2CScreen/I2CScreen.pde b/java/libraries/io/examples/I2CScreen/I2CScreen.pde
@@ -8,11 +8,15 @@ void setup() {
 
   // the display can be set to one of these two addresses: 0x3c (default) or 0x3d
   // (they might be listed as 0x7a and 0x7b on the circuit board)
-  oled = new SSD1306(I2C.list()[0], 0x3c);
+
+  // you might need to use a different interface on other SBCs
+  oled = new SSD1306("i2c-1", 0x3c);
 }
 
 void draw() {
-	line(0, 0, 127, 63);
-	line(0, 63, 127, 0);
-	oled.sendImage(get());
+  background(0);
+  stroke(255);
+  line(0, 0, 127, 63);
+  line(0, 63, 127, 0);
+  oled.sendImage(get());
 }
diff --git a/java/libraries/io/examples/I2CScreen/SSD1306.pde b/java/libraries/io/examples/I2CScreen/SSD1306.pde
@@ -61,7 +61,7 @@ class SSD1306 extends I2C {
     img.loadPixels();
     for (int y=startY; y < height && y-startY < 64; y++) {
       for (int x=startX; x < width && x-startX < 128; x++) {
-        if (brightness(img.pixels[y*img.width+x]) < 128) {
+        if (128 <= brightness(img.pixels[y*img.width+x])) {
           // this isn't the normal (scanline) mapping, but 8 pixels below each other at a time
           // white pixels have their bit turned on
           frame[x + (y/8)*128] |= (1 << (y % 8));
diff --git a/java/libraries/io/examples/SPIAnalogDigitalOOP/MCP3001.pde b/java/libraries/io/examples/SPIAnalogDigitalOOP/MCP3001.pde
@@ -7,13 +7,13 @@ class MCP3001 extends SPI {
 
   MCP3001(String dev) {
     super(dev);
-    super.settings(500000, SPI.MSBFIRST, SPI.MODE0);
+    settings(500000, SPI.MSBFIRST, SPI.MODE0);
   }
 
   float getAnalog() {
     // dummy write, actual values don't matter
     byte[] out = { 0, 0 };
-    byte[] in = super.transfer(out);
+    byte[] in = transfer(out);
     // some input bit shifting according to the datasheet p. 16
     int val = ((in[0] & 0x1f) << 5) | ((in[1] & 0xf8) >> 3);
     // val is between 0 and 1023
diff --git a/java/libraries/io/examples/SPIAnalogDigitalOOP8/MCP3008.pde b/java/libraries/io/examples/SPIAnalogDigitalOOP8/MCP3008.pde
@@ -8,7 +8,7 @@ class MCP3008 extends SPI {
 
   MCP3008(String dev) {
     super(dev);
-    super.settings(500000, SPI.MSBFIRST, SPI.MODE0);
+    settings(500000, SPI.MSBFIRST, SPI.MODE0);
   }
 
   float getAnalog(int channel) {
@@ -19,7 +19,7 @@ class MCP3008 extends SPI {
     byte[] out = { 0, 0, 0 };
     // encode the channel number in the first byte
     out[0] = (byte)(0x18 | channel);
-    byte[] in = super.transfer(out);
+    byte[] in = transfer(out);
     int val = ((in[1] & 0x03) << 8) | (in[2] & 0xff);
     // val is between 0 and 1023
     return val/1023.0;
diff --git a/java/libraries/io/src/native/Makefile b/java/libraries/io/src/native/Makefile
@@ -3,7 +3,7 @@ OBJS := impl.o
 CC := gcc
 
 # prefix with -m32 to compile for linux32
-CFLAGS := -std=gnu99 -fPIC -g
+CFLAGS := -std=gnu99 -fPIC -g -ffast-math
 CFLAGS += -I$(shell dirname $(shell realpath $(shell which javac)))/../include
 CFLAGS += -I$(shell dirname $(shell realpath $(shell which javac)))/../include/linux
 LDFLAGS := -shared
diff --git a/java/libraries/io/src/processing/io/GPIO.java b/java/libraries/io/src/processing/io/GPIO.java
@@ -447,13 +447,32 @@ public static void releasePin(int pin) {
    *  Waits for the value of an input pin to change
    *  @param pin GPIO pin
    *  @param mode what to wait for: GPIO.CHANGE, GPIO.FALLING or GPIO.RISING
-   *  @param timeout don't wait more than timeout milliseconds (-1 waits indefinitely)
-   *  @return true if the interrupt occured, false if the timeout occured
    *  @webref
    */
-  public static boolean waitForInterrupt(int pin, int mode, int timeout) {
+  public static void waitFor(int pin, int mode) {
+    waitForInterrupt(pin, mode, -1);
+  }
+
+
+  /**
+   *  Waits for the value of an input pin to change
+   *
+   *  This function will throw a RuntimeException in case of a timeout.
+   *  @param pin GPIO pin
+   *  @param mode what to wait for: GPIO.CHANGE, GPIO.FALLING or GPIO.RISING
+   *  @param timeout don't wait more than timeout milliseconds
+   *  @webref
+   */
+  public static void waitFor(int pin, int mode, int timeout) {
     enableInterrupt(pin, mode);
-    return waitForInterrupt(pin, timeout);
+    if (waitForInterrupt(pin, timeout) == false) {
+      throw new RuntimeException("Timeout occurred");
+    }
+  }
+
+
+  public static boolean waitForInterrupt(int pin, int mode, int timeout) {
+    throw new RuntimeException("The waitForInterrupt function has been renamed to waitFor. Please update your sketch accordingly.");
   }
 
 
diff --git a/java/libraries/io/src/processing/io/PWM.java b/java/libraries/io/src/processing/io/PWM.java
@@ -117,7 +117,7 @@ public void close() {
     // XXX: implicit clear()?
     // XXX: also check GPIO
 
-    String fn = "/sys/class/pwm/" + chip + "/export";
+    String fn = "/sys/class/pwm/" + chip + "/unexport";
     int ret = NativeInterface.writeFile(fn, Integer.toString(channel));
     if (ret < 0) {
       if (ret == -2) {    // ENOENT
diff --git a/java/libraries/io/src/processing/io/RPI.java b/java/libraries/io/src/processing/io/RPI.java
