Merge pull request #349 from taartspi/PWM_provider_cleanup

Pwm provider cleanup
Pi4J · Apr 18, 2024 · 2c6399d · 2c6399d
2 parents 2da171d + e482673
commit 2c6399d
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 61 deletions.
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
@@ -36,14 +36,8 @@ public DigitalInput create(DigitalInputConfig config) {
 
     @Override
     public int getPriority() {
-        // the gpioD driver should be higher priority when on Rp1 chip
-        int rval = 0;
-         if(BoardInfoHelper.usesRP1()) {
-            rval = 150;
-        }else{
-            rval = 150;
-        }
-        return(rval);
+        // the gpioD driver should be higher priority always
+        return(150);
     }
 
     /**

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
@@ -68,14 +68,8 @@ public DigitalOutput create(DigitalOutputConfig config) {
 
     @Override
     public int getPriority() {
-        // the gpioD driver should be higher priority when on RP1 chip
-        int rval = 0;
-       if(BoardInfoHelper.usesRP1()) {
-            rval = 150;
-        }else{
-            rval = 150;
-        }
-        return(rval);
+        // the gpioD driver should be higher priority always
+        return(150);
     }
 
     @Override

diff --git a/...n/java/com/pi4j/plugin/linuxfs/provider/gpio/digital/LinuxFsDigitalInputProviderImpl.java b/...n/java/com/pi4j/plugin/linuxfs/provider/gpio/digital/LinuxFsDigitalInputProviderImpl.java
@@ -55,12 +55,10 @@ public LinuxFsDigitalInputProviderImpl(String gpioFileSystemPath) {
 
     @Override
     public int getPriority() {
-        // the linux FS Digital driver should be higher priority than Pigpio on RP1 chip
-        int rval = 0;
+        // the linux FS Digital driver should be higher priority on RP1 chip
+        int rval = 50;
         if(BoardInfoHelper.usesRP1()) {
             rval = 100;
-        }else{
-            rval = 50;
         }
         return(rval);
     }

diff --git a/.../java/com/pi4j/plugin/linuxfs/provider/gpio/digital/LinuxFsDigitalOutputProviderImpl.java b/.../java/com/pi4j/plugin/linuxfs/provider/gpio/digital/LinuxFsDigitalOutputProviderImpl.java
@@ -56,12 +56,10 @@ public LinuxFsDigitalOutputProviderImpl(String gpioFileSystemPath) {
 
     @Override
     public int getPriority() {
-        // the linux FS Digital driver should be higher priority than Pigpio on RP1 chip.
-        int rval = 0;
+        // the linux FS Digital driver should be higher priority on RP1 chip.
+        int rval = 50;
         if(BoardInfoHelper.usesRP1()) {
             rval = 100;
-        }else{
-            rval = 50;
         }
         return(rval);
     }

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
@@ -48,14 +48,8 @@ public LinuxFsI2CProviderImpl() {
 
     @Override
     public int getPriority() {
-       // 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);
+       // the linux FS driver should always be higher priority
+       return(150);
     }
 
     @Override

diff --git a/...in-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/pwm/LinuxFsPwmProviderImpl.java b/...in-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/pwm/LinuxFsPwmProviderImpl.java
@@ -60,12 +60,10 @@ public LinuxFsPwmProviderImpl(String pwmFileSystemPath, int pwmChip) {
 
     @Override
     public int getPriority() {
-        // the linux FS PWM driver should be higher priority than Pigpio on RP1 chip
-        int rval = 0;
+        // the linux FS PWM driver should be higher priority on RP1 chip
+        int rval = 50;
         if(BoardInfoHelper.usesRP1()) {
             rval = 100;
-        }else{
-            rval = 50;
         }
         return(rval);
     }

diff --git a/...ain/java/com/pi4j/plugin/pigpio/provider/gpio/digital/PiGpioDigitalInputProviderImpl.java b/...ain/java/com/pi4j/plugin/pigpio/provider/gpio/digital/PiGpioDigitalInputProviderImpl.java
@@ -58,10 +58,8 @@ public PiGpioDigitalInputProviderImpl(PiGpio piGpio) {
     @Override
     public int getPriority() {
         // the Pigpio driver should be higher priority when NOT on RP1 chip
-        int rval = 0;
-        if(!BoardInfoHelper.usesRP1()) {
-            rval = 100;
-        }else{
+        int rval = 100;
+        if(BoardInfoHelper.usesRP1()) {
             rval = 50;
         }
         return(rval);

diff --git a/...in/java/com/pi4j/plugin/pigpio/provider/gpio/digital/PiGpioDigitalOutputProviderImpl.java b/...in/java/com/pi4j/plugin/pigpio/provider/gpio/digital/PiGpioDigitalOutputProviderImpl.java
@@ -58,10 +58,8 @@ public PiGpioDigitalOutputProviderImpl(PiGpio piGpio) {
     @Override
     public int getPriority() {
         // the Pigpio driver should be higher priority when NOT on RP1 chip.
-        int rval = 0;
-        if(!BoardInfoHelper.usesRP1()) {
-            rval = 100;
-        }else{
+        int rval = 100;
+        if(BoardInfoHelper.usesRP1()) {
             rval = 50;
         }
         return(rval);

diff --git a/...lugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/i2c/PiGpioI2CProviderImpl.java b/...lugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/i2c/PiGpioI2CProviderImpl.java
@@ -58,10 +58,8 @@ public PiGpioI2CProviderImpl(PiGpio piGpio) {
     @Override
     public int getPriority() {
         // the Pigpio driver should be higher priority when NOT on RP1 chip
-        int rval = 0;
-        if(!BoardInfoHelper.usesRP1()) {
-            rval = 100;
-        }else{
+        int rval = 100;
+        if(BoardInfoHelper.usesRP1()) {
             rval = 50;
         }
         return(rval);

diff --git a/...lugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/pwm/PiGpioPwmProviderImpl.java b/...lugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/pwm/PiGpioPwmProviderImpl.java
@@ -59,10 +59,8 @@ public PiGpioPwmProviderImpl(PiGpio piGpio) {
     @Override
     public int getPriority() {
         // the Pigpio driver should be higher priority when NOT on RP1 chip.
-        int rval = 0;
-        if(!BoardInfoHelper.usesRP1()) {
-            rval = 100;
-        }else{
+        int rval = 100;
+        if(BoardInfoHelper.usesRP1()) {
             rval = 50;
         }
         return(rval);

diff --git a/...pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/serial/PiGpioSerialProviderImpl.java b/...pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/serial/PiGpioSerialProviderImpl.java
@@ -57,10 +57,8 @@ public PiGpioSerialProviderImpl(PiGpio piGpio) {
     @Override
     public int getPriority() {
         // the Pigpio driver should be higher priority when NOT on Rp1 chip.
-        int rval = 0;
-        if(!BoardInfoHelper.usesRP1()) {
-            rval = 100;
-        }else{
+        int rval = 100;
+        if(BoardInfoHelper.usesRP1()) {
             rval = 50;
         }
         return(rval);

diff --git a/...lugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/spi/PiGpioSpiProviderImpl.java b/...lugin-pigpio/src/main/java/com/pi4j/plugin/pigpio/provider/spi/PiGpioSpiProviderImpl.java
@@ -57,14 +57,11 @@ public PiGpioSpiProviderImpl(PiGpio piGpio) {
     @Override
     public int getPriority() {
         // the Pigpio driver should be higher priority when NOT on RP1 chip.
-        int rval = 0;
-       if(!BoardInfoHelper.usesRP1()) {
-            rval = 100;
-        }else{
+        int rval = 100;
+       if(BoardInfoHelper.usesRP1()) {
             rval = 50;
         }
         return(rval);
-
     }
 
     /**