Fixing basic poller, SysFsPin path issue and renaming modules

doordeck · Nov 20, 2016 · 08c7cd2 · 08c7cd2
1 parent 26e1544
commit 08c7cd2
Show file tree

Hide file tree

Showing 11 changed files with 126 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ A simple library for reading input and writing output to GPIO pins on Linux plat
 
 ## Usage
 SimpleGPIO is split into three components
-- **simplegpio-core** - Core components including a fallback input poller based on a naieve pure Java implementation
+- **simplegpio-core** - Core components including a fallback input poller based on a naive pure Java implementation
 - **simplegpio-module-libbulldog** - An enhanced input poller using JNI and libbulldog; this version offers most stability and performance but least portability - the libbulldog library should be [downloaded](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22bulldog-linux-native-raspberrypi%22) and named 'libbulldog-linux.so'
 - **simplegpio-module-epoll** - A performant and slightly more portable input poller based on calls to epoll using JNA
 

diff --git a/simplegpio-core/src/main/java/com/doordeck/simplegpio/Pin.java b/simplegpio-core/src/main/java/com/doordeck/simplegpio/Pin.java
@@ -40,9 +40,11 @@
  * other feature activation during that time.</p>
  *
  * <p>Mostly, the pin is just used to grab a feature that is available on
- * it:<br/>
- * {@code DigitalOutput output = pin.as(DigitalOutput.class);}<br/>
- * {@code Pwm pwm = pin.as(Pwm.class); }
+ * it:
+ * {@code
+ *      DigitalOutput output = pin.as(DigitalOutput.class);
+ *      Pwm pwm = pin.as(Pwm.class);
+ * }
  * </p>
  */
 public class Pin {

diff --git a/simplegpio-core/src/main/java/com/doordeck/simplegpio/gpio/event/BasicPollResult.java b/simplegpio-core/src/main/java/com/doordeck/simplegpio/gpio/event/BasicPollResult.java
@@ -10,6 +10,6 @@ public BasicPollResult(byte... data) {
 
     @Override
     public byte[] getData() {
-        return new byte[0];
+        return data;
     }
 }
diff --git a/simplegpio-core/src/main/java/com/doordeck/simplegpio/gpio/io/AbstractInputPoller.java b/simplegpio-core/src/main/java/com/doordeck/simplegpio/gpio/io/AbstractInputPoller.java
@@ -1,5 +1,22 @@
 package com.doordeck.simplegpio.gpio.io;
 
+/*
+ * (C) Copyright 2016 Doordeck Limited and others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 import com.doordeck.simplegpio.gpio.event.PollResult;
 import com.doordeck.simplegpio.spi.InputPoller;
 import com.doordeck.simplegpio.util.BulldogUtil;

diff --git a/simplegpio-core/src/main/java/com/doordeck/simplegpio/gpio/io/BasicInputPoller.java b/simplegpio-core/src/main/java/com/doordeck/simplegpio/gpio/io/BasicInputPoller.java
@@ -1,5 +1,22 @@
 package com.doordeck.simplegpio.gpio.io;
 
+/*
+ * (C) Copyright 2016 Doordeck Limited and others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 import com.doordeck.simplegpio.gpio.event.BasicPollResult;
 import com.doordeck.simplegpio.util.BulldogUtil;
 import org.slf4j.Logger;

diff --git a/simplegpio-core/src/main/java/com/doordeck/simplegpio/gpio/io/BasicInputPollerFactory.java b/simplegpio-core/src/main/java/com/doordeck/simplegpio/gpio/io/BasicInputPollerFactory.java
@@ -1,5 +1,22 @@
 package com.doordeck.simplegpio.gpio.io;
 
+/*
+ * (C) Copyright 2016 Doordeck Limited and others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 import com.doordeck.simplegpio.spi.InputPoller;
 import com.doordeck.simplegpio.spi.InputPollerFactory;
 

diff --git a/simplegpio-core/src/main/java/com/doordeck/simplegpio/linux/sysfs/SysFsPin.java b/simplegpio-core/src/main/java/com/doordeck/simplegpio/linux/sysfs/SysFsPin.java
@@ -109,7 +109,7 @@ public Signal getValue() {
     }
 
     public void setValue(Signal signal) {
-        echoToFile(String.valueOf(signal.getNumericValue()), getPinDirectory());
+        echoToFile(String.valueOf(signal.getNumericValue()), getValueFilePath());
     }
 
     private void echoToFile(String value, Path file) {

diff --git a/simplegpio-core/src/main/java/com/doordeck/simplegpio/spi/InputPollerFactoryLocator.java b/simplegpio-core/src/main/java/com/doordeck/simplegpio/spi/InputPollerFactoryLocator.java
@@ -37,9 +37,12 @@ public static InputPollerFactory locate() {
             boolean valid = factory.isValid();
             LOG.debug("Trying to load {}... {}", factory.getClass().getSimpleName(), valid ? "success" : "failed");
             if (valid) {
+                LOG.info("Using {} for GPIO input polling", factory.getClass().getSimpleName());
                 return factory;
             }
         }
+
+        LOG.info("Using {} for GPIO input polling", BasicInputPollerFactory.class.getSimpleName());
         return new BasicInputPollerFactory();
     }
 }
diff --git a/simplegpio-core/src/test/java/com/doordeck/simplegpio/SignalTest.java b/simplegpio-core/src/test/java/com/doordeck/simplegpio/SignalTest.java
@@ -1,4 +1,52 @@
 package com.doordeck.simplegpio;
 
+/*
+ * (C) Copyright 2016 Doordeck Limited and others.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
 public class SignalTest {
+
+    @Test
+    public void testSignal() {
+        assertEquals(Signal.Low, Signal.fromBooleanValue(false));
+        assertEquals(Signal.High, Signal.fromBooleanValue(true));
+
+        assertEquals(Signal.Low, Signal.fromNumericValue(0));
+        assertEquals(Signal.High, Signal.fromNumericValue(-1));
+        assertEquals(Signal.High, Signal.fromNumericValue(1));
+
+        assertEquals(Signal.Low, Signal.fromString("0"));
+        assertEquals(Signal.High, Signal.fromString("1"));
+        assertEquals(Signal.Low, Signal.fromString("-0"));
+
+        assertEquals(Signal.Low, Signal.fromString("LOW"));
+        assertEquals(Signal.High, Signal.fromString("HIGH"));
+        assertEquals(Signal.Low, Signal.fromString("low"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSignalFromNullStringThrowsException() {
+        Signal.fromString(null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSignalFromNonsenseStringThrowsException() {
+        Signal.fromString("highlow");
+    }
 }
diff --git a/simplegpio-module-epoll/pom.xml b/simplegpio-module-epoll/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>simplegpio-jna</artifactId>
+    <artifactId>simplegpio-module-epoll</artifactId>
 
     <properties>
         <jna.version>4.2.1</jna.version>

diff --git a/simplegpio-module-libbulldog/pom.xml b/simplegpio-module-libbulldog/pom.xml
@@ -9,10 +9,10 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>simplegpio-libbulldog</artifactId>
+    <artifactId>simplegpio-module-libbulldog</artifactId>
 
     <properties>
-        <bulldog.version>0.2.0</bulldog.version>
+        <bulldog.version>0.2.1</bulldog.version>
     </properties>
 
     <dependencies>
@@ -34,6 +34,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.silverspoon</groupId>
+            <artifactId>bulldog-linux-native-raspberrypi</artifactId>
+            <version>${bulldog.version}</version>
+            <type>so</type>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.silverspoon</groupId>
+                    <artifactId>bulldog-linux</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
 </project>