Changing all Hardware PWM functions to allow changing values without …

…the need to change the actual mode to PwmOutput. (#9) Update to use libwiringPi.so.2.50 (It is not clear when will the sources for version 2.52 be available)
unosquare · Jul 29, 2019 · 814e9eb · 814e9eb
1 parent e4b7e64
commit 814e9eb
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 19 deletions.
diff --git a/src/Unosquare.WiringPi/GpioPin.cs b/src/Unosquare.WiringPi/GpioPin.cs
@@ -193,13 +193,12 @@ public int PwmRegister
             {
                 lock (_syncLock)
                 {
-                    if (PinMode != GpioPinDriveMode.PwmOutput)
+                    if (!HasCapability(PinCapability.PWM))
                     {
                         _pwmRegister = 0;
 
-                        throw new InvalidOperationException(
-                            $"Unable to write PWM register for pin {BcmPinNumber} because operating mode is {PinMode}."
-                            + $" Writing the PWM register is only allowed if {nameof(PinMode)} is set to {GpioPinDriveMode.PwmOutput}");
+                        throw new NotSupportedException(
+                            $"Pin {BcmPinNumber} '{Name}' does not support mode '{GpioPinDriveMode.PwmOutput}'. Pin capabilities are limited to: {Capabilities}");
                     }
 
                     var val = value.Clamp(0, 1024);
@@ -226,13 +225,12 @@ public PwmMode PwmMode
             {
                 lock (_syncLock)
                 {
-                    if (PinMode != GpioPinDriveMode.PwmOutput)
+                    if (!HasCapability(PinCapability.PWM))
                     {
                         _pwmMode = PwmMode.Balanced;
 
-                        throw new InvalidOperationException(
-                            $"Unable to set PWM mode for pin {BcmPinNumber} because operating mode is {PinMode}."
-                            + $" Setting the PWM mode is only allowed if {nameof(PinMode)} is set to {GpioPinDriveMode.PwmOutput}");
+                        throw new NotSupportedException(
+                            $"Pin {BcmPinNumber} '{Name}' does not support mode '{GpioPinDriveMode.PwmOutput}'. Pin capabilities are limited to: {Capabilities}");
                     }
 
                     WiringPi.PwmSetMode((int)value);
@@ -256,13 +254,12 @@ public uint PwmRange
             {
                 lock (_syncLock)
                 {
-                    if (PinMode != GpioPinDriveMode.PwmOutput)
+                    if (!HasCapability(PinCapability.PWM))
                     {
                         _pwmRange = 1024;
 
-                        throw new InvalidOperationException(
-                            $"Unable to set PWM range for pin {BcmPinNumber} because operating mode is {PinMode}."
-                            + $" Setting the PWM range is only allowed if {nameof(PinMode)} is set to {GpioPinDriveMode.PwmOutput}");
+                        throw new NotSupportedException(
+                            $"Pin {BcmPinNumber} '{Name}' does not support mode '{GpioPinDriveMode.PwmOutput}'. Pin capabilities are limited to: {Capabilities}");
                     }
 
                     WiringPi.PwmSetRange(value);
@@ -286,13 +283,12 @@ public int PwmClockDivisor
             {
                 lock (_syncLock)
                 {
-                    if (PinMode != GpioPinDriveMode.PwmOutput)
+                    if (!HasCapability(PinCapability.PWM))
                     {
                         _pwmClockDivisor = 1;
 
-                        throw new InvalidOperationException(
-                            $"Unable to set PWM range for pin {BcmPinNumber} because operating mode is {PinMode}."
-                            + $" Setting the PWM range is only allowed if {nameof(PinMode)} is set to {GpioPinDriveMode.PwmOutput}");
+                        throw new NotSupportedException(
+                            $"Pin {BcmPinNumber} '{Name}' does not support mode '{GpioPinDriveMode.PwmOutput}'. Pin capabilities are limited to: {Capabilities}");
                     }
 
                     WiringPi.PwmSetClock(value);

diff --git a/src/Unosquare.WiringPi/Native/WiringPi.cs b/src/Unosquare.WiringPi/Native/WiringPi.cs
@@ -9,7 +9,7 @@
     /// </summary>
     public partial class WiringPi
     {
-        internal const string WiringPiLibrary = "libwiringPi.so.2.46";
+        internal const string WiringPiLibrary = "libwiringPi.so.2.50";
 
         #region WiringPi - Core Functions (https://github.com/WiringPi/WiringPi/blob/master/wiringPi/wiringPi.h)
 

diff --git a/src/Unosquare.WiringPi/Resources/gpio b/src/Unosquare.WiringPi/Resources/gpio
diff --git a/src/Unosquare.WiringPi/Resources/gpio.2.44 b/src/Unosquare.WiringPi/Resources/gpio.2.44
diff --git a/src/Unosquare.WiringPi/Resources/libwiringPi.so.2.46 b/src/Unosquare.WiringPi/Resources/libwiringPi.so.2.46
diff --git a/src/Unosquare.WiringPi/Resources/libwiringPi.so.2.50 b/src/Unosquare.WiringPi/Resources/libwiringPi.so.2.50
diff --git a/src/Unosquare.WiringPi/Unosquare.WiringPi.csproj b/src/Unosquare.WiringPi/Unosquare.WiringPi.csproj
@@ -19,8 +19,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Resources\gpio.2.44" />
-    <EmbeddedResource Include="Resources\libwiringPi.so.2.46" />
+    <EmbeddedResource Include="Resources\gpio" />
+    <EmbeddedResource Include="Resources\libwiringPi.so.2.50" />
   </ItemGroup>
 
   <ItemGroup>