FFM API code base

.github/workflows/ci-develop-snapshot.yml

@@ -10,47 +10,47 @@ jobs:
     name: Build & Deploy Snapshot
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Get latest Docker image
-      run: docker pull pi4j/pi4j-builder:2.0
-    - name: Build entire Pi4J Project in Docker
-      env:
-        MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-        MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}    
-      run: docker run --env MAVEN_USERNAME=$MAVEN_USERNAME --env MAVEN_PASSWORD=$MAVEN_PASSWORD --user "$(id -u):$(id -g)" --rm --volume $(pwd):/build pi4j/pi4j-builder:2.0 clean deploy -Pnative,cross-compile --batch-mode
-    - name: Make staging directory
-      run: mkdir staging
-    - name: Copy distribution files to staging
-      run: |
-        cp -r pi4j-distribution/target/*.deb staging
-        cp -r pi4j-distribution/target/*.zip staging    
-    - name: Upload distribution files to staging
-      uses: actions/upload-artifact@v4
-      with:
-        name: pi4j-dist
-        path: staging
+      - uses: actions/checkout@v4
+      - name: Get latest Docker image
+        run: docker pull pi4j/pi4j-builder:2.0
+      - name: Build entire Pi4J Project in Docker
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+        run: docker run --env MAVEN_USERNAME=$MAVEN_USERNAME --env MAVEN_PASSWORD=$MAVEN_PASSWORD --user "$(id -u):$(id -g)" --rm --volume $(pwd):/build pi4j/pi4j-builder:2.0 clean deploy -Pnative,cross-compile --batch-mode
+      - name: Make staging directory
+        run: mkdir staging
+      - name: Copy distribution files to staging
+        run: |
+          cp -r pi4j-distribution/target/*.deb staging
+          cp -r pi4j-distribution/target/*.zip staging
+      - name: Upload distribution files to staging
+        uses: actions/upload-artifact@v4
+        with:
+          name: pi4j-dist
+          path: staging
   DeployPackages:
-      name: Deploy to APT/Download Repo
-      needs: [Build]
-      runs-on: ubuntu-latest
-      environment: 
-        name: Staging
-        url: 'https://github.com/Pi4J/download'
-      steps:
-        - name: Download staged artifacts from build 
-          uses: actions/download-artifact@v4
-          with:
-            name: pi4j-dist
-        - name: Display downloaded build artifacts
-          shell: bash
-          run: tree
-        - name: Publish build packages to APT download repository
-          uses: dmnemec/copy_file_to_another_repo_action@v1.0.4
-          env:
-            API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
-          with:
-            source_file: 'pi4j-*.*'
-            destination_repo: 'pi4j/download'
-            destination_branch: 'main'
-            user_email: 'team@pi4j.com'
-            user_name: 'Pi4J Build'
+    name: Deploy to APT/Download Repo
+    needs: [ Build ]
+    runs-on: ubuntu-latest
+    environment:
+      name: Staging
+      url: 'https://github.com/Pi4J/download'
+    steps:
+      - name: Download staged artifacts from build
+        uses: actions/download-artifact@v4
+        with:
+          name: pi4j-dist
+      - name: Display downloaded build artifacts
+        shell: bash
+        run: tree
+      - name: Publish build packages to APT download repository
+        uses: dmnemec/copy_file_to_another_repo_action@v1.0.4
+        env:
+          API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
+        with:
+          source_file: 'pi4j-*.*'
+          destination_repo: 'pi4j/download'
+          destination_branch: 'main'
+          user_email: 'team@pi4j.com'
+          user_name: 'Pi4J Build'

.github/workflows/ci-pull-request.yml

@@ -10,22 +10,31 @@ jobs:
     name: Build Snapshot
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Get latest Docker image
-      run: docker pull pi4j/pi4j-builder:2.0
-    - name: Build entire Pi4J Project in Docker
-      env:
-        MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-        MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}    
-      run: docker run --env MAVEN_USERNAME=$MAVEN_USERNAME --env MAVEN_PASSWORD=$MAVEN_PASSWORD --user "$(id -u):$(id -g)" --rm --volume $(pwd):/build pi4j/pi4j-builder:2.0 clean install -Pnative,cross-compile --batch-mode
-    - name: Make staging directory
-      run: mkdir staging
-    - name: Copy distribution files to staging
-      run: |
-        cp -r pi4j-distribution/target/*.deb staging
-        cp -r pi4j-distribution/target/*.zip staging    
-    - name: Upload distribution files to staging
-      uses: actions/upload-artifact@v4
-      with:
-        name: pi4j-dist
-        path: staging
+      - uses: actions/checkout@v4
+      - name: Get latest Docker image
+        run: docker pull pi4j/pi4j-builder:2.0
+      - name: Build entire Pi4J Project in Docker
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+        run: |
+          # Create target directory with proper permissions before running Docker
+          docker run \
+            --env MAVEN_USERNAME=$MAVEN_USERNAME \
+            --env MAVEN_PASSWORD=$MAVEN_PASSWORD \
+            --user "$(id -u):$(id -g)" \
+            --rm \
+            --volume $(pwd):/build \
+            pi4j/pi4j-builder:2.0 \
+            clean install -Pnative,cross-compile --batch-mode
+      - name: Make staging directory
+        run: mkdir staging
+      - name: Copy distribution files to staging
+        run: |
+          cp -r pi4j-distribution/target/*.deb staging
+          cp -r pi4j-distribution/target/*.zip staging
+      - name: Upload distribution files to staging
+        uses: actions/upload-artifact@v4
+        with:
+          name: pi4j-dist
+          path: staging

.github/workflows/ci-release-tags.yml

@@ -11,47 +11,47 @@ jobs:
     name: Build & Deploy Tag
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Get latest Docker image
-      run: docker pull pi4j/pi4j-builder:2.0
-    - name: Build entire Pi4J Project in Docker
-      env:
-        MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-        MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}    
-      run: docker run --env MAVEN_USERNAME=$MAVEN_USERNAME --env MAVEN_PASSWORD=$MAVEN_PASSWORD --user "$(id -u):$(id -g)" --rm --volume $(pwd):/build pi4j/pi4j-builder:2.0 clean install -Pnative,cross-compile --batch-mode
-    - name: Make staging directory
-      run: mkdir staging
-    - name: Copy distribution files to staging
-      run: |
-        cp -r pi4j-distribution/target/*.deb staging
-        cp -r pi4j-distribution/target/*.zip staging    
-    - name: Upload distribution files to staging
-      uses: actions/upload-artifact@v4
-      with:
-        name: pi4j-dist
-        path: staging
+      - uses: actions/checkout@v4
+      - name: Get latest Docker image
+        run: docker pull pi4j/pi4j-builder:2.0
+      - name: Build entire Pi4J Project in Docker
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+        run: docker run --env MAVEN_USERNAME=$MAVEN_USERNAME --env MAVEN_PASSWORD=$MAVEN_PASSWORD --user "$(id -u):$(id -g)" --rm --volume $(pwd):/build pi4j/pi4j-builder:2.0 clean install -Pnative,cross-compile --batch-mode
+      - name: Make staging directory
+        run: mkdir staging
+      - name: Copy distribution files to staging
+        run: |
+          cp -r pi4j-distribution/target/*.deb staging
+          cp -r pi4j-distribution/target/*.zip staging
+      - name: Upload distribution files to staging
+        uses: actions/upload-artifact@v4
+        with:
+          name: pi4j-dist
+          path: staging
   DeployPackages:
-      name: Deploy to APT/Download Repo
-      needs: [Build]
-      runs-on: ubuntu-latest
-      environment: 
-        name: Release
-        url: 'https://github.com/Pi4J/download'
-      steps:
-        - name: Download staged artifacts from build 
-          uses: actions/download-artifact@v4
-          with:
-            name: pi4j-dist
-        - name: Display downloaded build artifacts
-          shell: bash
-          run: tree
-        - name: Publish build packages to APT download repository
-          uses: dmnemec/copy_file_to_another_repo_action@v1.0.4
-          env:
-            API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
-          with:
-            source_file: 'pi4j-*.*'
-            destination_repo: 'pi4j/download'
-            destination_branch: 'main'
-            user_email: 'team@pi4j.com'
-            user_name: 'Pi4J Build'
+    name: Deploy to APT/Download Repo
+    needs: [ Build ]
+    runs-on: ubuntu-latest
+    environment:
+      name: Release
+      url: 'https://github.com/Pi4J/download'
+    steps:
+      - name: Download staged artifacts from build
+        uses: actions/download-artifact@v4
+        with:
+          name: pi4j-dist
+      - name: Display downloaded build artifacts
+        shell: bash
+        run: tree
+      - name: Publish build packages to APT download repository
+        uses: dmnemec/copy_file_to_another_repo_action@v1.0.4
+        env:
+          API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
+        with:
+          source_file: 'pi4j-*.*'
+          destination_repo: 'pi4j/download'
+          destination_branch: 'main'
+          user_email: 'team@pi4j.com'
+          user_name: 'Pi4J Build'

libraries/pi4j-library-gpiod/pom.xml

@@ -3,10 +3,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
+    <!-- MAVEN PARENT POM -->
     <parent>
         <groupId>com.pi4j</groupId>
         <artifactId>pi4j-library</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pi4j-library/pom.xml</relativePath>
     </parent>
 

libraries/pi4j-library-linuxfs/pom.xml

@@ -6,9 +6,9 @@
 
     <!-- MAVEN PARENT POM -->
     <parent>
-        <artifactId>pi4j-library</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>3.1.0-SNAPSHOT</version>
+        <artifactId>pi4j-library</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pi4j-library/pom.xml</relativePath>
     </parent>
 

libraries/pi4j-library-pigpio/pom.xml

@@ -6,9 +6,9 @@
 
     <!-- MAVEN PARENT POM -->
     <parent>
-        <artifactId>pi4j-library</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>3.1.0-SNAPSHOT</version>
+        <artifactId>pi4j-library</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pi4j-library/pom.xml</relativePath>
     </parent>
 

libraries/pi4j-library/pom.xml

@@ -2,13 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- MAVEN PARENT POM -->
     <parent>
         <artifactId>pi4j-parent</artifactId>
         <groupId>com.pi4j</groupId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <!-- MAVEN ARTIFACT INFORMATION -->
     <artifactId>pi4j-library</artifactId>

pi4j-core/pom.xml

@@ -2,19 +2,20 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <!-- MAVEN ARTIFACT INFORMATION -->
-    <artifactId>pi4j-core</artifactId>
-    <name>Pi4J :: LIBRARY :: Java Library (CORE)</name>
-    <description>Pi4J Java API &amp; Runtime Library</description>
-    <packaging>jar</packaging>
-
+    <!-- MAVEN PARENT POM -->
     <parent>
         <groupId>com.pi4j</groupId>
         <artifactId>pi4j-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <!-- MAVEN ARTIFACT INFORMATION -->
+    <artifactId>pi4j-core</artifactId>
+    <name>Pi4J :: LIBRARY :: Java Library (CORE)</name>
+    <description>Pi4J Java API &amp; Runtime Library</description>
+    <packaging>jar</packaging>
+
     <!-- BUILD INSTRUCTIONS -->
     <build>
         <resources>

pi4j-core/src/main/java/com/pi4j/context/impl/DefaultContextBuilder.java

@@ -253,7 +253,6 @@ public ContextBuilder properties(File file, String prefixFilter) throws IOExcept
     @Override
     public ContextBuilder setGpioChipName(String chipName) {
         this.gpioChipName = chipName;
-        this.properties.put("gpio.chip.name", chipName);
         return this;
     }
 
@@ -305,6 +304,7 @@ public boolean autoDetectProviders() {
 
             @Override
             public Map<String, String> properties() {
+                builder.properties.put("gpio.chip.name", gpioChipName != null ? gpioChipName : "unknown");
                 return Collections.unmodifiableMap(builder.properties);
             }
         };

pi4j-core/src/main/java/com/pi4j/io/gpio/Gpio.java

@@ -31,26 +31,31 @@
 /**
  * <p>Gpio interface.</p>
  *
- * @author Robert Savage (<a href="http://www.savagehomeautomation.com">http://www.savagehomeautomation.com</a>)
- * @version $Id: $Id
  * @param <CONFIG_TYPE>
  * @param <IO_TYPE>
  * @param <PROVIDER_TYPE>
+ * @author Robert Savage (<a href="http://www.savagehomeautomation.com">http://www.savagehomeautomation.com</a>)
+ * @version $Id: $Id
  */
-public interface Gpio<IO_TYPE extends IO<IO_TYPE,CONFIG_TYPE, PROVIDER_TYPE>,
-        CONFIG_TYPE extends GpioConfig,
-        PROVIDER_TYPE extends Provider>
-          extends IO<IO_TYPE, CONFIG_TYPE, PROVIDER_TYPE> {
+public interface Gpio<IO_TYPE extends IO<IO_TYPE, CONFIG_TYPE, PROVIDER_TYPE>,
+    CONFIG_TYPE extends GpioConfig,
+    PROVIDER_TYPE extends Provider>
+    extends IO<IO_TYPE, CONFIG_TYPE, PROVIDER_TYPE> {
     /**
      * <p>address.</p>
      *
-     * @return a {@link java.lang.Number} object.
+     * @return a {@link Integer} object.
      */
-    default Integer address() { return config().address(); }
+    default Integer address() {
+        return config().address();
+    }
+
     /**
      * <p>getAddress.</p>
      *
-     * @return a {@link java.lang.Number} object.
+     * @return a {@link Integer} object.
      */
-    default Integer getAddress() { return address(); };
+    default Integer getAddress() {
+        return address();
+    }
 }

pi4j-core/src/main/java/com/pi4j/io/gpio/GpioConfig.java

@@ -38,4 +38,9 @@
  */
 public interface GpioConfig<CONFIG_TYPE extends Config>
         extends AddressConfig<CONFIG_TYPE>, IOConfig<CONFIG_TYPE> {
+
+    String BUS_NUMBER = "bus-number";
+
+    Integer busNumber();
+
 }

pi4j-core/src/main/java/com/pi4j/io/gpio/GpioConfigBuilder.java

@@ -38,4 +38,6 @@
 public interface GpioConfigBuilder<BUILDER_TYPE extends GpioConfigBuilder, CONFIG_TYPE extends GpioConfig>
         extends IOAddressConfigBuilder<BUILDER_TYPE, CONFIG_TYPE> {
     // MARKER INTERFACE
+
+    GpioConfigBuilder<BUILDER_TYPE, CONFIG_TYPE> busNumber(int busNumber);
 }