Merge branch 'develop' into Pi5_SPI_ioctl

Update my branch to the commits already in develop

libraries/pi4j-library-gpiod/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.pi4j</groupId>
         <artifactId>pi4j-library</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
         <relativePath>../pi4j-library/pom.xml</relativePath>
     </parent>
 

libraries/pi4j-library-linuxfs/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>pi4j-library</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
         <relativePath>../pi4j-library/pom.xml</relativePath>
     </parent>
 

libraries/pi4j-library-pigpio/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>pi4j-library</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
         <relativePath>../pi4j-library/pom.xml</relativePath>
     </parent>
 

libraries/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;
     }

libraries/pi4j-library/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pi4j-parent</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pi4j-core/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.pi4j</groupId>
         <artifactId>pi4j-parent</artifactId>
-        <version>2.6.1-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

pi4j-core/src/main/java/com/pi4j/Pi4J.java

@@ -63,31 +63,13 @@ public static ContextBuilder newContextBuilder() {
      * state and lifecycle.   This 'Context' instance will automatically
      * load all detected 'Platforms' and 'Providers' that are detected
      * in the application's class-path.</p>
-     *
-     * <p>This method does not allow mock plugins to be used. If this is required, e.g. for testing then use {@link #newAutoContextAllowMocks()}</p>
-     *
      * @return Context
      */
     public static Context newAutoContext() {
         logger.info("New auto context");
         return newContextBuilder().autoDetect().build();
     }
 
-    /**
-     * <p>Returns a new 'Context' instance which represents the Pi4J runtime
-     * state and lifecycle.   This 'Context' instance will automatically
-     * load all detected 'Platforms' and 'Providers' that are detected
-     * in the application's class-path.</p>
-     *
-     * <p>In contrast to {@link #newAutoContext()} this method will allow mocks to be added to the runtime.</p>
-     *
-     * @return Context
-     */
-    public static Context newAutoContextAllowMocks() {
-        logger.info("New auto context");
-        return newContextBuilder().autoDetect().autoDetectMockPlugins().build();
-    }
-
     /**
      * Returns a new empty 'Context' instance which represents the Pi4J
      * runtime state and lifecycle.  This empty 'Context' will not contain