From a327f394b0615f32d7d81ca6d5e641f2cde8be6a Mon Sep 17 00:00:00 2001 From: Frank Delporte Date: Tue, 18 Jun 2024 08:51:31 +0200 Subject: [PATCH 1/2] Add runsOnRaspberryPi --- .../java/com/pi4j/library/gpiod/internal/GpioDContext.java | 3 +-- .../java/com/pi4j/library/gpiod/util/NativeLibraryLoader.java | 3 +-- .../main/java/com/pi4j/boardinfo/util/BoardInfoHelper.java | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-) 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 index 4a0f3f07..0e5788f7 100644 --- 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,6 +1,5 @@ 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; @@ -36,7 +35,7 @@ public GpioDContext() { } public synchronized void initialize() { - if (BoardInfoHelper.current().getBoardModel() == BoardModel.UNKNOWN) { + if (!BoardInfoHelper.runsOnRaspberryPi()) { logger.warn("Can't initialize GpioD context, board model is unknown"); return; } diff --git a/libraries/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/util/NativeLibraryLoader.java b/libraries/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/util/NativeLibraryLoader.java index 1b473f63..11118f77 100644 --- a/libraries/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/util/NativeLibraryLoader.java +++ b/libraries/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/util/NativeLibraryLoader.java @@ -26,7 +26,6 @@ * #L% */ -import com.pi4j.boardinfo.definition.BoardModel; import com.pi4j.boardinfo.util.BoardInfoHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -256,7 +255,7 @@ public static void loadLibraryFromClasspath(String path) throws IOException { } // Finally, load the library - if (BoardInfoHelper.current().getBoardModel() == BoardModel.UNKNOWN) { + if (!BoardInfoHelper.runsOnRaspberryPi()) { logger.warn("Can't load the library, board model is unknown"); } else { System.load(target.toAbsolutePath().toString()); diff --git a/pi4j-core/src/main/java/com/pi4j/boardinfo/util/BoardInfoHelper.java b/pi4j-core/src/main/java/com/pi4j/boardinfo/util/BoardInfoHelper.java index bc291f42..24a5620b 100644 --- a/pi4j-core/src/main/java/com/pi4j/boardinfo/util/BoardInfoHelper.java +++ b/pi4j-core/src/main/java/com/pi4j/boardinfo/util/BoardInfoHelper.java @@ -64,6 +64,10 @@ public static boolean usesRP1() { return instance.boardInfo.getBoardModel() == BoardModel.MODEL_5_B; } + public static boolean runsOnRaspberryPi() { + return instance.boardInfo.getBoardModel() != BoardModel.UNKNOWN; + } + public static boolean is32bit() { return !is64bit(); } From d532f68b06db1a484eec4dda9981f7ad6a16aca3 Mon Sep 17 00:00:00 2001 From: Frank Delporte Date: Tue, 25 Jun 2024 09:48:17 +0200 Subject: [PATCH 2/2] Rename method to runningOnRaspberryPi --- .../main/java/com/pi4j/library/gpiod/internal/GpioDContext.java | 2 +- .../java/com/pi4j/library/gpiod/util/NativeLibraryLoader.java | 2 +- .../src/main/java/com/pi4j/boardinfo/util/BoardInfoHelper.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 index 0e5788f7..52522998 100644 --- 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 @@ -35,7 +35,7 @@ public GpioDContext() { } public synchronized void initialize() { - if (!BoardInfoHelper.runsOnRaspberryPi()) { + if (!BoardInfoHelper.runningOnRaspberryPi()) { logger.warn("Can't initialize GpioD context, board model is unknown"); return; } diff --git a/libraries/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/util/NativeLibraryLoader.java b/libraries/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/util/NativeLibraryLoader.java index 11118f77..86e90d0c 100644 --- a/libraries/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/util/NativeLibraryLoader.java +++ b/libraries/pi4j-library-gpiod/src/main/java/com/pi4j/library/gpiod/util/NativeLibraryLoader.java @@ -255,7 +255,7 @@ public static void loadLibraryFromClasspath(String path) throws IOException { } // Finally, load the library - if (!BoardInfoHelper.runsOnRaspberryPi()) { + if (!BoardInfoHelper.runningOnRaspberryPi()) { logger.warn("Can't load the library, board model is unknown"); } else { System.load(target.toAbsolutePath().toString()); diff --git a/pi4j-core/src/main/java/com/pi4j/boardinfo/util/BoardInfoHelper.java b/pi4j-core/src/main/java/com/pi4j/boardinfo/util/BoardInfoHelper.java index 24a5620b..0aa1065a 100644 --- a/pi4j-core/src/main/java/com/pi4j/boardinfo/util/BoardInfoHelper.java +++ b/pi4j-core/src/main/java/com/pi4j/boardinfo/util/BoardInfoHelper.java @@ -64,7 +64,7 @@ public static boolean usesRP1() { return instance.boardInfo.getBoardModel() == BoardModel.MODEL_5_B; } - public static boolean runsOnRaspberryPi() { + public static boolean runningOnRaspberryPi() { return instance.boardInfo.getBoardModel() != BoardModel.UNKNOWN; }