From c41f2043e2f7a02c39dcd82906596d5b55513eb9 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Mon, 9 Dec 2019 17:27:40 +0100 Subject: [PATCH] add Swan.Tiny and CodingStyles --- Unosquare.WiringPi/BootstrapWiringPi.cs | 37 +++++++++---------- Unosquare.WiringPi/GpioPin.cs | 8 ++-- .../Resources/EmbeddedResources.cs | 17 ++++----- Unosquare.WiringPi/SpiChannel.cs | 2 +- Unosquare.WiringPi/SystemInfo.cs | 4 +- .../Unosquare.WiringPi.Tiny.csproj | 27 ++++++++++++++ Unosquare.WiringPi/Unosquare.WiringPi.csproj | 1 + 7 files changed, 60 insertions(+), 36 deletions(-) create mode 100644 Unosquare.WiringPi/Unosquare.WiringPi.Tiny.csproj diff --git a/Unosquare.WiringPi/BootstrapWiringPi.cs b/Unosquare.WiringPi/BootstrapWiringPi.cs index 3ac6d24..0ecd7b9 100644 --- a/Unosquare.WiringPi/BootstrapWiringPi.cs +++ b/Unosquare.WiringPi/BootstrapWiringPi.cs @@ -9,24 +9,21 @@ namespace Unosquare.WiringPi { /// Represents the Bootstrap class to extract resources. /// /// - public class BootstrapWiringPi : IBootstrap - { - private static readonly Object SyncLock = new Object(); - - /// - public void Bootstrap() - { - lock (SyncLock) - { - Resources.EmbeddedResources.ExtractAll(); - - DependencyContainer.Current.Register(new GpioController()); - DependencyContainer.Current.Register(new SpiBus()); - DependencyContainer.Current.Register(new I2CBus()); - DependencyContainer.Current.Register(new SystemInfo()); - DependencyContainer.Current.Register(new Timing()); - DependencyContainer.Current.Register(new Threading()); - } - } - } + public class BootstrapWiringPi : IBootstrap { + private static readonly Object SyncLock = new Object(); + + /// + public void Bootstrap() { + lock(SyncLock) { + Resources.EmbeddedResources.ExtractAll(); + + _ = DependencyContainer.Current.Register(new GpioController()); + _ = DependencyContainer.Current.Register(new SpiBus()); + _ = DependencyContainer.Current.Register(new I2CBus()); + _ = DependencyContainer.Current.Register(new SystemInfo()); + _ = DependencyContainer.Current.Register(new Timing()); + _ = DependencyContainer.Current.Register(new Threading()); + } + } + } } diff --git a/Unosquare.WiringPi/GpioPin.cs b/Unosquare.WiringPi/GpioPin.cs index 8fec72f..586d0dd 100644 --- a/Unosquare.WiringPi/GpioPin.cs +++ b/Unosquare.WiringPi/GpioPin.cs @@ -396,7 +396,7 @@ namespace Unosquare.WiringPi { /// /// The value. /// The awaitable task. - public Task WriteAsync(GpioPinValue value) => Task.Run(() => { this.Write(value); }); + public Task WriteAsync(GpioPinValue value) => Task.Run(() => this.Write(value)); /// /// Writes the specified bit value. @@ -413,7 +413,7 @@ namespace Unosquare.WiringPi { /// /// The awaitable task. /// - public Task WriteAsync(Boolean value) => Task.Run(() => { this.Write(value); }); + public Task WriteAsync(Boolean value) => Task.Run(() => this.Write(value)); /// /// Writes the specified value. 0 for low, any other value for high @@ -428,7 +428,7 @@ namespace Unosquare.WiringPi { /// /// The value. /// The awaitable task. - public Task WriteAsync(Int32 value) => Task.Run(() => { this.Write(value); }); + public Task WriteAsync(Int32 value) => Task.Run(() => this.Write(value)); /// /// Writes the specified value as an analog level. @@ -452,7 +452,7 @@ namespace Unosquare.WiringPi { /// /// The value. /// The awaitable task. - public Task WriteLevelAsync(Int32 value) => Task.Run(() => { this.WriteLevel(value); }); + public Task WriteLevelAsync(Int32 value) => Task.Run(() => this.WriteLevel(value)); #endregion diff --git a/Unosquare.WiringPi/Resources/EmbeddedResources.cs b/Unosquare.WiringPi/Resources/EmbeddedResources.cs index 0749aef..2f27fb6 100644 --- a/Unosquare.WiringPi/Resources/EmbeddedResources.cs +++ b/Unosquare.WiringPi/Resources/EmbeddedResources.cs @@ -39,16 +39,15 @@ namespace Unosquare.WiringPi.Resources { return; } - using(Stream stream = typeof(EmbeddedResources).Assembly.GetManifestResourceStream(resourceName)) { - using(FileStream outputStream = File.OpenWrite(targetPath)) { - stream?.CopyTo(outputStream); - } + using Stream stream = typeof(EmbeddedResources).Assembly.GetManifestResourceStream(resourceName); + using(FileStream outputStream = File.OpenWrite(targetPath)) { + stream?.CopyTo(outputStream); + } - try { - _ = SysCall.Chmod(targetPath, (UInt32)executablePermissions); - } catch { - /* Ignore */ - } + try { + _ = SysCall.Chmod(targetPath, (UInt32)executablePermissions); + } catch { + /* Ignore */ } } } diff --git a/Unosquare.WiringPi/SpiChannel.cs b/Unosquare.WiringPi/SpiChannel.cs index 4c9c507..2af8a22 100644 --- a/Unosquare.WiringPi/SpiChannel.cs +++ b/Unosquare.WiringPi/SpiChannel.cs @@ -107,7 +107,7 @@ namespace Unosquare.WiringPi { /// /// The buffer. /// The awaitable task. - public Task WriteAsync(Byte[] buffer) => Task.Run(() => { this.Write(buffer); }); + public Task WriteAsync(Byte[] buffer) => Task.Run(() => this.Write(buffer)); /// /// Retrieves the spi bus. If the bus channel is not registered it sets it up automatically. diff --git a/Unosquare.WiringPi/SystemInfo.cs b/Unosquare.WiringPi/SystemInfo.cs index dc4314e..f6267a3 100644 --- a/Unosquare.WiringPi/SystemInfo.cs +++ b/Unosquare.WiringPi/SystemInfo.cs @@ -19,8 +19,8 @@ namespace Unosquare.WiringPi { public Version LibraryVersion { get { String[] libParts = Native.WiringPi.WiringPiLibrary.Split('.'); - Int32 major = Int32.Parse(libParts[libParts.Length - 2]); - Int32 minor = Int32.Parse(libParts[libParts.Length - 1]); + Int32 major = Int32.Parse(libParts[^2]); + Int32 minor = Int32.Parse(libParts[^1]); return new Version(major, minor); } } diff --git a/Unosquare.WiringPi/Unosquare.WiringPi.Tiny.csproj b/Unosquare.WiringPi/Unosquare.WiringPi.Tiny.csproj new file mode 100644 index 0000000..555a28b --- /dev/null +++ b/Unosquare.WiringPi/Unosquare.WiringPi.Tiny.csproj @@ -0,0 +1,27 @@ + + + + This library uses WiringPi to enables developers to use the various Raspberry Pi's hardware modules including the Camera to capture images and video, the GPIO pins, and both, the SPI and I2C buses. + Unosquare (c) 2016-2019 + netcoreapp3.0 + Unosquare.WiringPi + Unosquare.WiringPi + 0.4.2 + Unosquare + https://github.com/unosquare/wiringpi-dotnet/raw/master/logos/raspberryio-logo-32.png + https://github.com/unosquare/wiringpi-dotnet + https://raw.githubusercontent.com/unosquare/wiringpi-dotnet/master/LICENSE + Raspberry Pi GPIO Camera SPI I2C Embedded IoT Mono C# .NET wiringPi + 8.0 + + + + + + + + + + + + diff --git a/Unosquare.WiringPi/Unosquare.WiringPi.csproj b/Unosquare.WiringPi/Unosquare.WiringPi.csproj index a324ec7..d58a041 100644 --- a/Unosquare.WiringPi/Unosquare.WiringPi.csproj +++ b/Unosquare.WiringPi/Unosquare.WiringPi.csproj @@ -21,6 +21,7 @@ +