Merge branch 'develop' into release/2.6

Pi4J · Jun 17, 2024 · a257c29 · a257c29
2 parents 5e8cbc4 + 4878aee
commit a257c29
Show file tree

Hide file tree

Showing 19 changed files with 124 additions and 177 deletions.
diff --git a/libraries/pi4j-library-gpiod/pom.xml b/libraries/pi4j-library-gpiod/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.pi4j</groupId>
         <artifactId>pi4j-library</artifactId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.1-SNAPSHOT</version>
         <relativePath>../pi4j-library/pom.xml</relativePath>
     </parent>
 

diff --git a/libraries/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/internal/GpioDContext.java b/libraries/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/internal/GpioDContext.java
@@ -1,10 +1,15 @@
 package com.pi4j.library.gpiod.internal;
 
+import com.pi4j.boardinfo.definition.BoardModel;
+import com.pi4j.boardinfo.util.BoardInfoHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.Closeable;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 public class GpioDContext implements Closeable {
 
@@ -31,6 +36,11 @@ public GpioDContext() {
     }
 
     public synchronized void initialize() {
+        if (BoardInfoHelper.current().getBoardModel() == BoardModel.UNKNOWN) {
+            logger.warn("Can't initialize GpioD context, board model is unknown");
+            return;
+        }
+
         // already initialized
         if (this.gpioChip != null)
             return;

diff --git a/...ies/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/util/NativeLibraryLoader.java b/...ies/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/util/NativeLibraryLoader.java
@@ -26,6 +26,8 @@
  * #L%
  */
 
+import com.pi4j.boardinfo.definition.BoardModel;
+import com.pi4j.boardinfo.util.BoardInfoHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -252,7 +254,12 @@ public static void loadLibraryFromClasspath(String path) throws IOException {
             }
             Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
         }
+
         // Finally, load the library
-        System.load(target.toAbsolutePath().toString());
+        if (BoardInfoHelper.current().getBoardModel() == BoardModel.UNKNOWN) {
+            logger.warn("Can't load the library, board model is unknown");
+        } else {
+            System.load(target.toAbsolutePath().toString());
+        }
     }
 }
diff --git a/libraries/pi4j-library-linuxfs/pom.xml b/libraries/pi4j-library-linuxfs/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>pi4j-library</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.1-SNAPSHOT</version>
         <relativePath>../pi4j-library/pom.xml</relativePath>
     </parent>
 

diff --git a/libraries/pi4j-library-pigpio/pom.xml b/libraries/pi4j-library-pigpio/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>pi4j-library</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.1-SNAPSHOT</version>
         <relativePath>../pi4j-library/pom.xml</relativePath>
     </parent>
 

diff --git a/libraries/pi4j-library/pom.xml b/libraries/pi4j-library/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pi4j-parent</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pi4j-core/pom.xml b/pi4j-core/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.pi4j</groupId>
         <artifactId>pi4j-parent</artifactId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pi4j-distribution/pom.xml b/pi4j-distribution/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>pi4j-parent</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pi4j-test/pom.xml b/pi4j-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pi4j-parent</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pi4j-test/src/main/java/com/pi4j/test/About.java b/pi4j-test/src/main/java/com/pi4j/test/About.java
@@ -105,12 +105,16 @@ public void enumeratePlatforms(Context context) {
      * @param context a {@link com.pi4j.context.Context} object.
      * @throws Pi4JException if any.
      */
-    public void describeDeafultPlatform(Context context) throws Pi4JException {
+    public void describeDefaultPlatform(Context context) throws Pi4JException {
         logger.info("=====================================================");
         logger.info("DEFAULT (RUNTIME) PLATFORM ");
         logger.info("=====================================================");
-        logger.info("  " + context.platform().name() + " [" + context.platform().id() + "]");
-        context.platform().describe().print(System.out);
+        if (context.platform() == null) {
+            logger.warn("  NOT DEFINED");
+        } else {
+            logger.info("  {}} [{}}]", context.platform().name(), context.platform().id());
+            context.platform().describe().print(System.out);
+        }
     }
 
 //    public void enumeratePlatformProviders() throws Pi4JException {

diff --git a/pi4j-test/src/main/java/com/pi4j/test/Main.java b/pi4j-test/src/main/java/com/pi4j/test/Main.java
@@ -67,7 +67,7 @@ public static void main(String[] args) {
         About about = new About();
         about.enumerateProviders(pi4j);
         about.enumeratePlatforms(pi4j);
-        about.describeDeafultPlatform(pi4j);
+        about.describeDefaultPlatform(pi4j);
         for(var ioType : IOType.values()){
             about.enumerateProviders(pi4j, ioType);
         }

diff --git a/plugins/pi4j-plugin-gpiod/pom.xml b/plugins/pi4j-plugin-gpiod/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pi4j</groupId>
         <artifactId>pi4j-plugin</artifactId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.1-SNAPSHOT</version>
         <relativePath>../pi4j-plugin/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/plugins/pi4j-plugin-linuxfs/pom.xml b/plugins/pi4j-plugin-linuxfs/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pi4j</groupId>
         <artifactId>pi4j-plugin</artifactId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.1-SNAPSHOT</version>
         <relativePath>../pi4j-plugin/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/plugins/pi4j-plugin-mock/pom.xml b/plugins/pi4j-plugin-mock/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pi4j-plugin</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.6.0-SNAPSHOT</version>
+        <version>2.6.1-SNAPSHOT</version>
         <relativePath>../pi4j-plugin/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>