Merge remote-tracking branch 'origin/develop' into feature/#406

Pi4J · Nov 16, 2024 · 4785c28 · 4785c28
2 parents 7dc929a + 3961664
commit 4785c28
Show file tree

Hide file tree

Showing 25 changed files with 83 additions and 31 deletions.
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
+<module name="Checker">
+    <module name="TreeWalker">
+        <module name="UnusedImports"/>
+        <module name="RedundantImport"/>
+        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+    </module>
+</module>
diff --git a/libraries/pi4j-library-pigpio/src/main/java/com/pi4j/library/pigpio/PiGpio_Servo.java b/libraries/pi4j-library-pigpio/src/main/java/com/pi4j/library/pigpio/PiGpio_Servo.java
@@ -27,8 +27,6 @@
  * #L%
  */
 
-import java.io.IOException;
-
 /**
  * <p>PiGpio_Servo interface.</p>
  *

diff --git a/...ries/pi4j-library-pigpio/src/main/java/com/pi4j/library/pigpio/impl/PiGpioNativeImpl.java b/...ries/pi4j-library-pigpio/src/main/java/com/pi4j/library/pigpio/impl/PiGpioNativeImpl.java
@@ -33,8 +33,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.util.Arrays;
 import java.util.Objects;
+import java.util.Scanner;
 
 import static com.pi4j.library.pigpio.PiGpioConst.PI_IF_DISABLE_FIFO;
 import static com.pi4j.library.pigpio.PiGpioConst.PI_IF_DISABLE_SOCK;
@@ -49,6 +51,8 @@
 public class PiGpioNativeImpl extends PiGpioBase implements PiGpio {
     protected Logger logger = LoggerFactory.getLogger(this.getClass());
 
+    private int SPI_BUFFSIZ = 4096;
+
     private static final PiGpioNativeImpl instance;
     static {
         instance = new PiGpioNativeImpl();
@@ -105,6 +109,16 @@ public int gpioInitialise() {
             result = PIGPIO.gpioInitialise();
             validateResult(result);
 
+            try {
+                Scanner scanner = new Scanner(new File("/sys/module/spidev/parameters/bufsiz"));
+                if (scanner.hasNextInt()) {
+                    SPI_BUFFSIZ = scanner.nextInt();
+                }
+                logger.trace("[INITIALIZE] -> SPI_BUFFSIZ={}", SPI_BUFFSIZ);
+            } catch (Exception e) {
+                logger.error(e.getMessage(), e);
+            }
+
             // initialization successful
             this.initialized = true;
             logger.debug("[INITIALIZE] -- INITIALIZED SUCCESSFULLY");
@@ -240,7 +254,7 @@ public void gpioSetMode(int pin, PiGpioMode mode) {
         validateReady();
         validatePin(pin);
         int result = PIGPIO.gpioSetMode(pin, mode.value());
-        logger.trace("[GPIO::MODE-SET] <- PIN: {}; MODE={}({}); SUCCESS={}", mode.name(), mode.value(), (result>=0));
+        logger.trace("[GPIO::MODE-SET] <- PIN: {}; MODE={}({}); SUCCESS={}", pin, mode.name(), mode.value(), (result>=0));
         validateResult(result); // Returns 0 if OK, otherwise PI_BAD_GPIO or PI_BAD_PUD.
     }
 
@@ -1454,8 +1468,16 @@ public int spiWrite(int handle, byte[] data, int offset, int length) {
         Objects.checkFromIndexSize(offset, length, data.length);
         validateHandle(handle);
         // write data array to SPI bus/channel
-        int result = PIGPIO.spiWrite(handle, data, offset, length);
-        logger.trace("[SPI::WRITE] <- HANDLE={}; SUCCESS={}", handle, (result>=0));
+        int result = 0;
+        byte[] someData = Arrays.copyOfRange(data, offset, length);
+        int start = 0;
+        while (start < someData.length) {
+            int end = Math.min(someData.length, start + SPI_BUFFSIZ);
+            byte[] chunk = Arrays.copyOfRange(someData, start, end);
+            result += PIGPIO.spiWrite(handle, chunk, 0, chunk.length );
+            logger.trace("[SPI::WRITE] <- HANDLE={}; SUCCESS={}", handle, (result>=0));
+            start += SPI_BUFFSIZ;
+        }
         validateResult(result, false);
         return result;
     }

diff --git a/pi4j-core/src/main/java/com/pi4j/io/gpio/digital/impl/DigitalConfigBuilderBase.java b/pi4j-core/src/main/java/com/pi4j/io/gpio/digital/impl/DigitalConfigBuilderBase.java
@@ -28,7 +28,6 @@
 import com.pi4j.context.Context;
 import com.pi4j.io.gpio.digital.DigitalConfig;
 import com.pi4j.io.gpio.digital.DigitalConfigBuilder;
-import com.pi4j.io.gpio.digital.DigitalOutputConfigBuilder;
 import com.pi4j.io.gpio.digital.DigitalState;
 import com.pi4j.io.impl.IOAddressConfigBuilderBase;
 

diff --git a/pi4j-core/src/main/java/com/pi4j/io/i2c/I2C.java b/pi4j-core/src/main/java/com/pi4j/io/i2c/I2C.java
@@ -131,11 +131,33 @@ default int writeRead(byte[] writeBuffer, byte[] readBuffer) {
      */
     default int writeRead(byte[] writeBuffer, int writeSize, int writeOffset, byte[] readBuffer, int readSize,
         int readOffset) {
+
+        // Check bounds for writeBuffer
+        if (writeOffset < 0) {
+            throw new IndexOutOfBoundsException("Write offset cannot be negative!");
+        }
+        if (writeOffset + writeSize > writeBuffer.length) {
+            throw new IndexOutOfBoundsException(
+                String.format("Write operation out of bounds. Write buffer length is %d. Yet write offset + size is=%d",
+                    writeBuffer.length, writeOffset + writeSize));
+        }
+
+        // Check bounds for readBuffer
+        if (readOffset < 0) {
+            throw new IndexOutOfBoundsException("Read offset cannot be negative!");
+        }
+        if (readOffset + readSize > readBuffer.length) {
+            throw new IndexOutOfBoundsException(
+                String.format("Read operation out of bounds. Read buffer length is %d. Yet read offset + size is=%d",
+                    readBuffer.length, readOffset + readSize));
+        }
+
         return execute(() -> {
             int written = write(writeBuffer, writeOffset, writeSize);
-            if (written != writeOffset)
+            if (written != writeSize) {
                 throw new IllegalStateException(
-                    "Expected to write " + writeOffset + " bytes but only wrote " + written + " bytes");
+                    "Expected to write " + writeSize + " bytes but only wrote " + written + " bytes");
+            }
             return read(readBuffer, readOffset, readSize);
         });
     }

diff --git a/pi4j-test/src/test/java/com/pi4j/test/platform/ManualPlatformsCtorTest.java b/pi4j-test/src/test/java/com/pi4j/test/platform/ManualPlatformsCtorTest.java
@@ -30,7 +30,6 @@
 
 import com.pi4j.Pi4J;
 import com.pi4j.context.Context;
-import com.pi4j.exception.Pi4JException;
 import com.pi4j.test.provider.TestI2CProvider;
 import com.pi4j.test.provider.TestPwmProvider;
 import com.pi4j.test.provider.TestSerialProvider;

diff --git a/.../main/java/com/pi4j/plugin/gpiod/provider/gpio/digital/GpioDDigitalInputProviderImpl.java b/.../main/java/com/pi4j/plugin/gpiod/provider/gpio/digital/GpioDDigitalInputProviderImpl.java
@@ -1,7 +1,6 @@
 package com.pi4j.plugin.gpiod.provider.gpio.digital;
 
 
-import com.pi4j.boardinfo.util.BoardInfoHelper;
 import com.pi4j.context.Context;
 import com.pi4j.exception.InitializeException;
 import com.pi4j.exception.ShutdownException;

diff --git a/...main/java/com/pi4j/plugin/gpiod/provider/gpio/digital/GpioDDigitalOutputProviderImpl.java b/...main/java/com/pi4j/plugin/gpiod/provider/gpio/digital/GpioDDigitalOutputProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.boardinfo.util.BoardInfoHelper;
 import com.pi4j.context.Context;
 import com.pi4j.exception.InitializeException;
 import com.pi4j.exception.ShutdownException;

diff --git a/...in-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/i2c/LinuxFsI2CProviderImpl.java b/...in-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/i2c/LinuxFsI2CProviderImpl.java
@@ -28,7 +28,6 @@
  */
 
 
-import com.pi4j.boardinfo.util.BoardInfoHelper;
 import com.pi4j.context.Context;
 import com.pi4j.exception.ShutdownException;
 import com.pi4j.io.i2c.I2C;

diff --git a/.../src/main/java/com/pi4j/plugin/mock/provider/gpio/analog/MockAnalogInputProviderImpl.java b/.../src/main/java/com/pi4j/plugin/mock/provider/gpio/analog/MockAnalogInputProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
 import com.pi4j.io.gpio.analog.AnalogInput;
 import com.pi4j.io.gpio.analog.AnalogInputConfig;
 import com.pi4j.io.gpio.analog.AnalogInputProviderBase;

diff --git a/...src/main/java/com/pi4j/plugin/mock/provider/gpio/analog/MockAnalogOutputProviderImpl.java b/...src/main/java/com/pi4j/plugin/mock/provider/gpio/analog/MockAnalogOutputProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
 import com.pi4j.io.gpio.analog.AnalogOutput;
 import com.pi4j.io.gpio.analog.AnalogOutputConfig;
 import com.pi4j.io.gpio.analog.AnalogOutputProviderBase;

diff --git a/...rc/main/java/com/pi4j/plugin/mock/provider/gpio/digital/MockDigitalInputProviderImpl.java b/...rc/main/java/com/pi4j/plugin/mock/provider/gpio/digital/MockDigitalInputProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
 import com.pi4j.io.gpio.digital.DigitalInput;
 import com.pi4j.io.gpio.digital.DigitalInputConfig;
 import com.pi4j.io.gpio.digital.DigitalInputProviderBase;

diff --git a/...c/main/java/com/pi4j/plugin/mock/provider/gpio/digital/MockDigitalOutputProviderImpl.java b/...c/main/java/com/pi4j/plugin/mock/provider/gpio/digital/MockDigitalOutputProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
 import com.pi4j.io.gpio.digital.DigitalOutput;
 import com.pi4j.io.gpio.digital.DigitalOutputConfig;
 import com.pi4j.io.gpio.digital.DigitalOutputProviderBase;

diff --git a/...pi4j-plugin-mock/src/main/java/com/pi4j/plugin/mock/provider/i2c/MockI2CProviderImpl.java b/...pi4j-plugin-mock/src/main/java/com/pi4j/plugin/mock/provider/i2c/MockI2CProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
 import com.pi4j.io.i2c.I2C;
 import com.pi4j.io.i2c.I2CConfig;
 import com.pi4j.io.i2c.I2CProviderBase;

diff --git a/...pi4j-plugin-mock/src/main/java/com/pi4j/plugin/mock/provider/pwm/MockPwmProviderImpl.java b/...pi4j-plugin-mock/src/main/java/com/pi4j/plugin/mock/provider/pwm/MockPwmProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
 import com.pi4j.io.pwm.Pwm;
 import com.pi4j.io.pwm.PwmConfig;
 import com.pi4j.io.pwm.PwmProviderBase;

diff --git a/...lugin-mock/src/main/java/com/pi4j/plugin/mock/provider/serial/MockSerialProviderImpl.java b/...lugin-mock/src/main/java/com/pi4j/plugin/mock/provider/serial/MockSerialProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
 import com.pi4j.io.serial.Serial;
 import com.pi4j.io.serial.SerialConfig;
 import com.pi4j.io.serial.SerialProviderBase;

diff --git a/...pi4j-plugin-mock/src/main/java/com/pi4j/plugin/mock/provider/spi/MockSpiProviderImpl.java b/...pi4j-plugin-mock/src/main/java/com/pi4j/plugin/mock/provider/spi/MockSpiProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
 import com.pi4j.io.spi.Spi;
 import com.pi4j.io.spi.SpiConfig;
 import com.pi4j.io.spi.SpiProviderBase;

diff --git a/...pi4j-plugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/serial/PiGpioSerial.java b/...pi4j-plugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/serial/PiGpioSerial.java
@@ -37,8 +37,6 @@
 import com.pi4j.library.pigpio.PiGpio;
 import com.pi4j.library.pigpio.PiGpioMode;
 
-import java.io.IOException;
-
 /**
  * <p>PiGpioSerial class.</p>
  *

diff --git a/...n/java/com/pi4j/plugin/raspberrypi/provider/gpio/digital/RpiDigitalInputProviderImpl.java b/...n/java/com/pi4j/plugin/raspberrypi/provider/gpio/digital/RpiDigitalInputProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
 import com.pi4j.io.gpio.digital.DigitalInput;
 import com.pi4j.io.gpio.digital.DigitalInputConfig;
 import com.pi4j.io.gpio.digital.DigitalInputProviderBase;

diff --git a/.../java/com/pi4j/plugin/raspberrypi/provider/gpio/digital/RpiDigitalOutputProviderImpl.java b/.../java/com/pi4j/plugin/raspberrypi/provider/gpio/digital/RpiDigitalOutputProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
 import com.pi4j.io.gpio.digital.DigitalOutput;
 import com.pi4j.io.gpio.digital.DigitalOutputConfig;
 import com.pi4j.io.gpio.digital.DigitalOutputProviderBase;

diff --git a/...aspberrypi/src/main/java/com/pi4j/plugin/raspberrypi/provider/i2c/RpiI2CProviderImpl.java b/...aspberrypi/src/main/java/com/pi4j/plugin/raspberrypi/provider/i2c/RpiI2CProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
 import com.pi4j.io.i2c.I2C;
 import com.pi4j.io.i2c.I2CConfig;
 import com.pi4j.io.i2c.I2CProviderBase;

diff --git a/...aspberrypi/src/main/java/com/pi4j/plugin/raspberrypi/provider/pwm/RpiPwmProviderImpl.java b/...aspberrypi/src/main/java/com/pi4j/plugin/raspberrypi/provider/pwm/RpiPwmProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
 import com.pi4j.io.pwm.Pwm;
 import com.pi4j.io.pwm.PwmConfig;
 import com.pi4j.io.pwm.PwmProviderBase;

diff --git a/...rypi/src/main/java/com/pi4j/plugin/raspberrypi/provider/serial/RpiSerialProviderImpl.java b/...rypi/src/main/java/com/pi4j/plugin/raspberrypi/provider/serial/RpiSerialProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
 import com.pi4j.io.serial.Serial;
 import com.pi4j.io.serial.SerialConfig;
 import com.pi4j.io.serial.SerialProviderBase;

diff --git a/...aspberrypi/src/main/java/com/pi4j/plugin/raspberrypi/provider/spi/RpiSpiProviderImpl.java b/...aspberrypi/src/main/java/com/pi4j/plugin/raspberrypi/provider/spi/RpiSpiProviderImpl.java
@@ -27,7 +27,6 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
 import com.pi4j.io.spi.Spi;
 import com.pi4j.io.spi.SpiConfig;
 import com.pi4j.io.spi.SpiProviderBase;

diff --git a/pom.xml b/pom.xml
@@ -274,10 +274,10 @@
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
         <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
         <maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version>
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
         <maven-gpg-plugin.version>3.2.1</maven-gpg-plugin.version>
-        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+        <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
         <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
         <maven-release-plugin.version>3.0.0-M4</maven-release-plugin.version>
         <maven-resource-plugin.version>3.2.0</maven-resource-plugin.version>
@@ -668,7 +668,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0-M2</version>
+                    <version>3.5.0</version>
                 </plugin>
 
                 <!-- Deploy to Maven plugin -->
@@ -759,6 +759,25 @@
                         </configuration>
                     </execution>
                 </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.5.0</version>
+                <executions>
+                    <execution>
+                        <id>checkstyle-check</id>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <phase>validate</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <failsOnError>true</failsOnError>
+                    <configLocation>config/checkstyle/checkstyle.xml</configLocation>
+                    <excludes>**/module-info.java</excludes>
+                </configuration>
             </plugin>
 		</plugins>
 	</build>
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,8 +27,6 @@ @@
      * #L%
      */
-    import java.io.IOException;
     /**
      * <p>PiGpio_Servo interface.</p>
      *
@@ Expand Down @@