based on machine (pi5) set pwmchip to 2, Also set provider priority …

plugins/pi4j-plugin-gpiod/src/main/java/com/pi4j/plugin/gpiod/provider/gpio/digital/GpioDDigitalInputProviderImpl.java

@@ -1,5 +1,7 @@
 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;
@@ -34,8 +36,14 @@ public DigitalInput create(DigitalInputConfig config) {
 
     @Override
     public int getPriority() {
-        // GpioD should be used if available
-        return 150;
+        // the gpioD driver should be higher priority when on Rp1 chip
+        int rval = 0;
+         if(BoardInfoHelper.usesRP1()) {
+            rval = 150;
+        }else{
+            rval = 150;
+        }
+        return(rval);
     }
 
     /**

plugins/pi4j-plugin-gpiod/src/main/java/com/pi4j/plugin/gpiod/provider/gpio/digital/GpioDDigitalOutputProviderImpl.java

@@ -27,6 +27,7 @@
  * #L%
  */
 
+import com.pi4j.boardinfo.util.BoardInfoHelper;
 import com.pi4j.context.Context;
 import com.pi4j.exception.InitializeException;
 import com.pi4j.exception.ShutdownException;
@@ -67,8 +68,14 @@ public DigitalOutput create(DigitalOutputConfig config) {
 
     @Override
     public int getPriority() {
-        // GpioD should be used if available
-        return 150;
+        // the gpioD driver should be higher priority when on RP1 chip
+        int rval = 0;
+       if(BoardInfoHelper.usesRP1()) {
+            rval = 150;
+        }else{
+            rval = 150;
+        }
+        return(rval);
     }
 
     @Override

plugins/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/LinuxFsPlugin.java

@@ -27,6 +27,8 @@
  * #L%
  */
 
+
+import com.pi4j.boardinfo.util.BoardInfoHelper;
 import com.pi4j.extension.Plugin;
 import com.pi4j.extension.PluginService;
 import com.pi4j.plugin.linuxfs.internal.LinuxGpio;
@@ -108,7 +110,6 @@ public class LinuxFsPlugin implements Plugin {
 
     public static String DEFAULT_GPIO_FILESYSTEM_PATH = LinuxGpio.DEFAULT_SYSTEM_PATH;
     public static String DEFAULT_PWM_FILESYSTEM_PATH = LinuxPwm.DEFAULT_SYSTEM_PATH;
-    public static int DEFAULT_PWM_CHIP = LinuxPwm.DEFAULT_PWM_CHIP;
 
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -121,7 +122,13 @@ public void initialize(PluginService service) {
         // get Linux file system path for GPIO & PWM
         String gpioFileSystemPath = DEFAULT_GPIO_FILESYSTEM_PATH;
         String pwmFileSystemPath = DEFAULT_PWM_FILESYSTEM_PATH;
-        int pwmChip = DEFAULT_PWM_CHIP;
+
+        int pwmChip;
+        if(BoardInfoHelper.usesRP1()) {
+            pwmChip = LinuxPwm.DEFAULT_RP1_PWM_CHIP;
+        }else{
+            pwmChip = LinuxPwm.DEFAULT_LEGACY_PWM_CHIP;
+        }
 
         // [GPIO] get overriding custom 'linux.gpio.system.path' setting from Pi4J context
         if(service.context().properties().has("linux.gpio.system.path")){

plugins/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/internal/LinuxPwm.java

@@ -43,9 +43,18 @@ public class LinuxPwm {
     /** Constant <code>DEFAULT_SYSTEM_PATH="/sys/class/pwm"</code> */
     public static String DEFAULT_SYSTEM_PATH = "/sys/class/pwm";
 
-    /** Constant <code>DEFAULT_PWM_CHIP=0</code> */
-    /** In Pi5 the chip is number 2 */
-    public static int DEFAULT_PWM_CHIP = 2;
+    /** Constant <code>DEFAULT_LEGACY_PWM_CHIP=0</code> */
+    /** In Pi Models Previous to RP1 the chip is number 0 */
+    public static int DEFAULT_LEGACY_PWM_CHIP = 0;
+
+    /** Constant <code>DEFAULT_RP1_PWM_CHIP=2</code> */
+    /** In RP1 the chip is number 2 */
+    public static int DEFAULT_RP1_PWM_CHIP = 2;
+
+    /** Constant <code>DEFAULT_PWM_CHIP=2</code> */
+    /** In RP1 the chip is number 2 */
+    public static int DEFAULT_PWM_CHIP = DEFAULT_RP1_PWM_CHIP;
+
 
     protected final String systemPath;
     protected final int chip;
@@ -77,7 +86,8 @@ public LinuxPwm(String systemPath, int chip, int address){
      * @param systemPath a {@link String} object.
      * @param address a int.
      */
-    public LinuxPwm(String systemPath, int address){
+
+    public LinuxPwm(String systemPath, int address) {
         this(DEFAULT_SYSTEM_PATH, DEFAULT_PWM_CHIP, address);
     }
 
@@ -90,6 +100,8 @@ public LinuxPwm(int address){
         this(DEFAULT_SYSTEM_PATH, address);
     }
 
+
+
     /**
      * <p>channels.</p>
      * The number of PWM channels this chip supports (read-only).

plugins/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/gpio/digital/LinuxFsDigitalInputProviderImpl.java

@@ -27,7 +27,8 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
+
+import com.pi4j.boardinfo.util.BoardInfoHelper;
 import com.pi4j.io.gpio.digital.DigitalInput;
 import com.pi4j.io.gpio.digital.DigitalInputConfig;
 import com.pi4j.io.gpio.digital.DigitalInputProviderBase;
@@ -54,8 +55,14 @@ public LinuxFsDigitalInputProviderImpl(String gpioFileSystemPath) {
 
     @Override
     public int getPriority() {
-        // the linux FS DI driver should not be used over the pigpio
-        return 50;
+        // the linux FS Digital driver should be higher priority than Pigpio on RP1 chip
+        int rval = 0;
+        if(BoardInfoHelper.usesRP1()) {
+            rval = 100;
+        }else{
+            rval = 50;
+        }
+        return(rval);
     }
 
     /**

plugins/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/gpio/digital/LinuxFsDigitalOutputProviderImpl.java

@@ -27,7 +27,8 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
+
+import com.pi4j.boardinfo.util.BoardInfoHelper;
 import com.pi4j.io.gpio.digital.DigitalOutput;
 import com.pi4j.io.gpio.digital.DigitalOutputConfig;
 import com.pi4j.io.gpio.digital.DigitalOutputProviderBase;
@@ -55,8 +56,14 @@ public LinuxFsDigitalOutputProviderImpl(String gpioFileSystemPath) {
 
     @Override
     public int getPriority() {
-        // the linux FS DO driver should not be used over the pigpio
-        return 50;
+        // the linux FS Digital driver should be higher priority than Pigpio on RP1 chip.
+        int rval = 0;
+        if(BoardInfoHelper.usesRP1()) {
+            rval = 100;
+        }else{
+            rval = 50;
+        }
+        return(rval);
     }
 
     /**

plugins/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/i2c/LinuxFsI2CProviderImpl.java

@@ -27,7 +27,8 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
+
+import com.pi4j.boardinfo.util.BoardInfoHelper;
 import com.pi4j.io.i2c.I2C;
 import com.pi4j.io.i2c.I2CConfig;
 import com.pi4j.io.i2c.I2CProviderBase;
@@ -47,8 +48,14 @@ public LinuxFsI2CProviderImpl() {
 
     @Override
     public int getPriority() {
-        // the linux FS I2C driver should be used over the pigpio
-        return 150;
+       // the linux FS driver should be higher priority when on RP1 chip
+       int rval = 0;
+       if(BoardInfoHelper.usesRP1()) {
+            rval = 150;
+        }else{
+            rval = 150;
+        }
+        return(rval);
     }
 
     @Override

plugins/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/pwm/LinuxFsPwmProviderImpl.java

@@ -27,14 +27,14 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
+
+import com.pi4j.boardinfo.util.BoardInfoHelper;
 import com.pi4j.io.exception.IOException;
 import com.pi4j.io.pwm.Pwm;
 import com.pi4j.io.pwm.PwmConfig;
 import com.pi4j.io.pwm.PwmProviderBase;
 import com.pi4j.io.pwm.PwmType;
 import com.pi4j.plugin.linuxfs.internal.LinuxPwm;
-
 import static java.text.MessageFormat.format;
 
 /**
@@ -60,8 +60,14 @@ public LinuxFsPwmProviderImpl(String pwmFileSystemPath, int pwmChip) {
 
     @Override
     public int getPriority() {
-        // the linux FS PWM driver should not be used over the pigpio
-        return 50;
+        // the linux FS PWM driver should be higher priority than Pigpio on RP1 chip
+        int rval = 0;
+        if(BoardInfoHelper.usesRP1()) {
+            rval = 100;
+        }else{
+            rval = 50;
+        }
+        return(rval);
     }
 
     /**
@@ -71,7 +77,11 @@ public LinuxFsPwmProviderImpl(String pwmFileSystemPath) {
         this.id = ID;
         this.name = NAME;
         this.pwmFileSystemPath = pwmFileSystemPath;
-        this.pwmChip = LinuxPwm.DEFAULT_PWM_CHIP;
+        if(BoardInfoHelper.usesRP1()) {
+            this.pwmChip = LinuxPwm.DEFAULT_RP1_PWM_CHIP;
+        }else{
+            this.pwmChip = LinuxPwm.DEFAULT_LEGACY_PWM_CHIP;
+        }
     }
 
     /**

plugins/pi4j-plugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/gpio/digital/PiGpioDigitalInputProviderImpl.java

@@ -27,7 +27,8 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
+
+import com.pi4j.boardinfo.util.BoardInfoHelper;
 import com.pi4j.io.gpio.digital.DigitalInput;
 import com.pi4j.io.gpio.digital.DigitalInputConfig;
 import com.pi4j.io.gpio.digital.DigitalInputProviderBase;
@@ -56,8 +57,14 @@ public PiGpioDigitalInputProviderImpl(PiGpio piGpio) {
 
     @Override
     public int getPriority() {
-        // the pigpio DI driver should be used over the default
-        return 100;
+        // the Pigpio driver should be higher priority when NOT on RP1 chip
+        int rval = 0;
+        if(!BoardInfoHelper.usesRP1()) {
+            rval = 100;
+        }else{
+            rval = 50;
+        }
+        return(rval);
     }
 
     /**

plugins/pi4j-plugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/gpio/digital/PiGpioDigitalOutputProviderImpl.java

@@ -27,7 +27,8 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
+
+import com.pi4j.boardinfo.util.BoardInfoHelper;
 import com.pi4j.io.gpio.digital.DigitalOutput;
 import com.pi4j.io.gpio.digital.DigitalOutputConfig;
 import com.pi4j.io.gpio.digital.DigitalOutputProviderBase;
@@ -56,8 +57,14 @@ public PiGpioDigitalOutputProviderImpl(PiGpio piGpio) {
 
     @Override
     public int getPriority() {
-        // the pigpio DO driver should be used over the default
-        return 100;
+        // the Pigpio driver should be higher priority when NOT on RP1 chip.
+        int rval = 0;
+        if(!BoardInfoHelper.usesRP1()) {
+            rval = 100;
+        }else{
+            rval = 50;
+        }
+        return(rval);
     }
 
     /**

plugins/pi4j-plugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/i2c/PiGpioI2CProviderImpl.java

@@ -27,7 +27,8 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
+
+import com.pi4j.boardinfo.util.BoardInfoHelper;
 import com.pi4j.io.i2c.I2C;
 import com.pi4j.io.i2c.I2CConfig;
 import com.pi4j.io.i2c.I2CProviderBase;
@@ -56,8 +57,14 @@ public PiGpioI2CProviderImpl(PiGpio piGpio) {
 
     @Override
     public int getPriority() {
-        // the pigpio I2C driver should be used over the default
-        return 100;
+        // the Pigpio driver should be higher priority when NOT on RP1 chip
+        int rval = 0;
+        if(!BoardInfoHelper.usesRP1()) {
+            rval = 100;
+        }else{
+            rval = 50;
+        }
+        return(rval);
     }
 
     /**

plugins/pi4j-plugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/pwm/PiGpioPwmProviderImpl.java

@@ -27,7 +27,8 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
+
+import com.pi4j.boardinfo.util.BoardInfoHelper;
 import com.pi4j.io.pwm.Pwm;
 import com.pi4j.io.pwm.PwmConfig;
 import com.pi4j.io.pwm.PwmProviderBase;
@@ -57,8 +58,14 @@ public PiGpioPwmProviderImpl(PiGpio piGpio) {
 
     @Override
     public int getPriority() {
-        // the pigpio PWM driver should be used over the default
-        return 100;
+        // the Pigpio driver should be higher priority when NOT on RP1 chip.
+        int rval = 0;
+        if(!BoardInfoHelper.usesRP1()) {
+            rval = 100;
+        }else{
+            rval = 50;
+        }
+        return(rval);
     }
 
     /**

plugins/pi4j-plugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/serial/PiGpioSerialProviderImpl.java

@@ -27,7 +27,7 @@
  * #L%
  */
 
-import com.pi4j.io.exception.IOAlreadyExistsException;
+import com.pi4j.boardinfo.util.BoardInfoHelper;
 import com.pi4j.io.serial.Serial;
 import com.pi4j.io.serial.SerialConfig;
 import com.pi4j.io.serial.SerialProviderBase;
@@ -56,8 +56,14 @@ public PiGpioSerialProviderImpl(PiGpio piGpio) {
 
     @Override
     public int getPriority() {
-        // the pigpio Serial driver should be used over the default
-        return 100;
+        // the Pigpio driver should be higher priority when NOT on Rp1 chip.
+        int rval = 0;
+        if(!BoardInfoHelper.usesRP1()) {
+            rval = 100;
+        }else{
+            rval = 50;
+        }
+        return(rval);
     }
 
     /**