diff --git a/Raspberry.IO.Components/Displays/Ssd1306/Command.cs b/Raspberry.IO.Components/Displays/Ssd1306/Command.cs index 59ef677..b344d3d 100644 --- a/Raspberry.IO.Components/Displays/Ssd1306/Command.cs +++ b/Raspberry.IO.Components/Displays/Ssd1306/Command.cs @@ -1,5 +1,3 @@ -using System; - namespace Raspberry.IO.Components.Displays.Ssd1306 { public class Command @@ -38,28 +36,5 @@ public class Command public const byte ExternalVcc = 0x1; public const byte SwitchCapVcc = 0x2; } - - [Flags] - public enum ScrollSpeed : byte - { - F2 = 0x7, - F3 = 0x4, - F4 = 0x5, - F5 = 0x0, - F25 = 0x6, - F64 = 0x1, - F128 = 0x2, - F256 = 0x3 - } - - [Flags] - public enum ScrollDirection : byte - { - HorizontalRight = 0x01, - HorizontalLeft = 0x02, - VerticalAndHorizontalRight = 0x04, - VerticalAndHorizontalLeft = 0x05 - } - } diff --git a/Raspberry.IO.Components/Displays/Ssd1306/ScrollDirection.cs b/Raspberry.IO.Components/Displays/Ssd1306/ScrollDirection.cs new file mode 100644 index 0000000..020db0e --- /dev/null +++ b/Raspberry.IO.Components/Displays/Ssd1306/ScrollDirection.cs @@ -0,0 +1,13 @@ +using System; + +namespace Raspberry.IO.Components.Displays.Ssd1306 +{ + [Flags] + public enum ScrollDirection : byte + { + HorizontalRight = 0x01, + HorizontalLeft = 0x02, + VerticalAndHorizontalRight = 0x04, + VerticalAndHorizontalLeft = 0x05 + } +} \ No newline at end of file diff --git a/Raspberry.IO.Components/Displays/Ssd1306/ScrollSpeed.cs b/Raspberry.IO.Components/Displays/Ssd1306/ScrollSpeed.cs new file mode 100644 index 0000000..62310f8 --- /dev/null +++ b/Raspberry.IO.Components/Displays/Ssd1306/ScrollSpeed.cs @@ -0,0 +1,17 @@ +using System; + +namespace Raspberry.IO.Components.Displays.Ssd1306 +{ + [Flags] + public enum ScrollSpeed : byte + { + F2 = 0x7, + F3 = 0x4, + F4 = 0x5, + F5 = 0x0, + F25 = 0x6, + F64 = 0x1, + F128 = 0x2, + F256 = 0x3 + } +} \ No newline at end of file diff --git a/Raspberry.IO.Components/Raspberry.IO.Components.csproj b/Raspberry.IO.Components/Raspberry.IO.Components.csproj index c0a0ba0..eed52df 100644 --- a/Raspberry.IO.Components/Raspberry.IO.Components.csproj +++ b/Raspberry.IO.Components/Raspberry.IO.Components.csproj @@ -33,17 +33,20 @@ 4 - - - - ..\packages\Common.Logging.2.2.0\lib\net40\Common.Logging.dll + + False + ..\packages\Common.Logging.3.0.0\lib\net40\Common.Logging.dll - - ..\packages\Common.Logging.Core.2.2.0\lib\net40\Common.Logging.Core.dll + + False + ..\packages\Common.Logging.Core.3.0.0\lib\net40\Common.Logging.Core.dll - - ..\packages\Raspberry.System.1.3.0\lib\net40\Raspberry.System.dll + + False + ..\packages\Raspberry.System.1.4.0\lib\net40\Raspberry.System.dll + + @@ -81,6 +84,8 @@ + + @@ -154,12 +159,6 @@ --> - - - - - - - + \ No newline at end of file diff --git a/Raspberry.IO.Components/packages.config b/Raspberry.IO.Components/packages.config index 7553870..b127615 100644 --- a/Raspberry.IO.Components/packages.config +++ b/Raspberry.IO.Components/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/Raspberry.IO.GeneralPurpose/ConnectorPin.cs b/Raspberry.IO.GeneralPurpose/ConnectorPin.cs index 22a53b8..01f3fc4 100644 --- a/Raspberry.IO.GeneralPurpose/ConnectorPin.cs +++ b/Raspberry.IO.GeneralPurpose/ConnectorPin.cs @@ -137,7 +137,7 @@ public enum ConnectorPin /// /// Connector P1, pin 32. - /// enum + /// P1Pin32, /// diff --git a/Raspberry.IO.GeneralPurpose/GpioConnectionDriverCapabilities.cs b/Raspberry.IO.GeneralPurpose/GpioConnectionDriverCapabilities.cs new file mode 100644 index 0000000..6bf80b9 --- /dev/null +++ b/Raspberry.IO.GeneralPurpose/GpioConnectionDriverCapabilities.cs @@ -0,0 +1,26 @@ +using System; + +namespace Raspberry.IO.GeneralPurpose +{ + /// + /// Represents capabilities of a driver. + /// + [Flags] + public enum GpioConnectionDriverCapabilities + { + /// + /// No advanced capability. + /// + None = 0, + + /// + /// The driver can set pin resistor + /// + CanSetPinResistor = 1, + + /// + /// The driver can set pin detected edges + /// + CanSetPinDetectedEdges = 2 + } +} \ No newline at end of file diff --git a/Raspberry.IO.GeneralPurpose/IGpioConnectionDriver.cs b/Raspberry.IO.GeneralPurpose/IGpioConnectionDriver.cs index 91b6d4f..edc5f07 100644 --- a/Raspberry.IO.GeneralPurpose/IGpioConnectionDriver.cs +++ b/Raspberry.IO.GeneralPurpose/IGpioConnectionDriver.cs @@ -1,15 +1,5 @@ -using System; - namespace Raspberry.IO.GeneralPurpose { - [Flags] - public enum GpioConnectionDriverCapabilities - { - None = 0, - CanSetPinResistor = 1, - CanSetPinDetectedEdges = 2 - } - /// /// Provides an interface for connection drivers. /// diff --git a/Raspberry.IO.GeneralPurpose/Raspberry.IO.GeneralPurpose.csproj b/Raspberry.IO.GeneralPurpose/Raspberry.IO.GeneralPurpose.csproj index 14ed1bb..00b44fb 100644 --- a/Raspberry.IO.GeneralPurpose/Raspberry.IO.GeneralPurpose.csproj +++ b/Raspberry.IO.GeneralPurpose/Raspberry.IO.GeneralPurpose.csproj @@ -35,12 +35,13 @@ bin\Release\Raspberry.IO.GeneralPurpose.XML + + False + ..\packages\Raspberry.System.1.4.0\lib\net40\Raspberry.System.dll + - - ..\packages\Raspberry.System.1.3.0\lib\net40\Raspberry.System.dll - @@ -57,6 +58,7 @@ + diff --git a/Raspberry.IO.GeneralPurpose/packages.config b/Raspberry.IO.GeneralPurpose/packages.config index 052cd50..78864cb 100644 --- a/Raspberry.IO.GeneralPurpose/packages.config +++ b/Raspberry.IO.GeneralPurpose/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Raspberry.IO.InterIntegratedCircuit/Raspberry.IO.InterIntegratedCircuit.csproj b/Raspberry.IO.InterIntegratedCircuit/Raspberry.IO.InterIntegratedCircuit.csproj index 2ec8596..9bd89c9 100644 --- a/Raspberry.IO.InterIntegratedCircuit/Raspberry.IO.InterIntegratedCircuit.csproj +++ b/Raspberry.IO.InterIntegratedCircuit/Raspberry.IO.InterIntegratedCircuit.csproj @@ -35,11 +35,12 @@ bin\Release\Raspberry.IO.InterIntegratedCircuit.XML + + False + ..\packages\Raspberry.System.1.4.0\lib\net40\Raspberry.System.dll + - - ..\packages\Raspberry.System.1.3.0\lib\net40\Raspberry.System.dll - diff --git a/Raspberry.IO.InterIntegratedCircuit/packages.config b/Raspberry.IO.InterIntegratedCircuit/packages.config index 052cd50..78864cb 100644 --- a/Raspberry.IO.InterIntegratedCircuit/packages.config +++ b/Raspberry.IO.InterIntegratedCircuit/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Raspberry.IO.Interop/ControlDevice.cs b/Raspberry.IO.Interop/ControlDevice.cs index 4f947e7..0bfe3bb 100644 --- a/Raspberry.IO.Interop/ControlDevice.cs +++ b/Raspberry.IO.Interop/ControlDevice.cs @@ -9,13 +9,17 @@ namespace Raspberry.IO.Interop public class ControlDevice : IControlDevice { #region Classes + private static class GenericIoControl { + #region Libc imports + [DllImport("libc", EntryPoint = "ioctl", SetLastError = true)] public static extern int ioctl(int descriptor, UInt32 request, ref T data); [DllImport("libc", EntryPoint = "ioctl", SetLastError = true)] public static extern int ioctl(int descriptor, UInt32 request, T data); + #endregion } #endregion diff --git a/Raspberry.IO.SerialPeripheralInterface/Raspberry.IO.SerialPeripheralInterface.csproj b/Raspberry.IO.SerialPeripheralInterface/Raspberry.IO.SerialPeripheralInterface.csproj index a64e73e..43f9f0c 100644 --- a/Raspberry.IO.SerialPeripheralInterface/Raspberry.IO.SerialPeripheralInterface.csproj +++ b/Raspberry.IO.SerialPeripheralInterface/Raspberry.IO.SerialPeripheralInterface.csproj @@ -35,11 +35,12 @@ bin\Release\Raspberry.IO.SerialPeripheralInterface.XML + + False + ..\packages\Raspberry.System.1.4.0\lib\net40\Raspberry.System.dll + - - ..\packages\Raspberry.System.1.3.0\lib\net40\Raspberry.System.dll - diff --git a/Raspberry.IO.SerialPeripheralInterface/packages.config b/Raspberry.IO.SerialPeripheralInterface/packages.config index 052cd50..78864cb 100644 --- a/Raspberry.IO.SerialPeripheralInterface/packages.config +++ b/Raspberry.IO.SerialPeripheralInterface/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs index dba3ed9..6221bbb 100644 --- a/SharedAssemblyInfo.cs +++ b/SharedAssemblyInfo.cs @@ -4,9 +4,9 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyCompany("Raspberry-Sharp")] +[assembly: AssemblyCompany("Raspberry#")] [assembly: AssemblyProduct("Raspberry.IO")] -[assembly: AssemblyCopyright("www.raspberry-sharp.org, 2012-2013")] +[assembly: AssemblyCopyright("www.raspberry-sharp.org, 2012-2015")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -25,5 +25,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.1.0")] -[assembly: AssemblyFileVersion("2.0.1.0")] +[assembly: AssemblyVersion("2.1.0.0")] +[assembly: AssemblyFileVersion("2.1.0.0")] diff --git a/Tests/Test.Gpio.HCSR04/Test.Gpio.HCSR04.csproj b/Tests/Test.Gpio.HCSR04/Test.Gpio.HCSR04.csproj index 0b50a03..852b0db 100644 --- a/Tests/Test.Gpio.HCSR04/Test.Gpio.HCSR04.csproj +++ b/Tests/Test.Gpio.HCSR04/Test.Gpio.HCSR04.csproj @@ -58,11 +58,12 @@ 4 + + False + ..\..\packages\Raspberry.System.1.4.0\lib\net40\Raspberry.System.dll + - - ..\..\packages\Raspberry.System.1.3.0\lib\net40\Raspberry.System.dll - diff --git a/Tests/Test.Gpio.HCSR04/packages.config b/Tests/Test.Gpio.HCSR04/packages.config index 052cd50..78864cb 100644 --- a/Tests/Test.Gpio.HCSR04/packages.config +++ b/Tests/Test.Gpio.HCSR04/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Tests/Test.Gpio.Pca9685/Test.Gpio.Pca9685.csproj b/Tests/Test.Gpio.Pca9685/Test.Gpio.Pca9685.csproj index e722fc3..5e11036 100644 --- a/Tests/Test.Gpio.Pca9685/Test.Gpio.Pca9685.csproj +++ b/Tests/Test.Gpio.Pca9685/Test.Gpio.Pca9685.csproj @@ -37,10 +37,11 @@ - ..\..\packages\Common.Logging.2.2.0\lib\net40\Common.Logging.dll + ..\..\packages\Common.Logging.3.0.0\lib\net40\Common.Logging.dll - - ..\..\packages\Common.Logging.Core.2.2.0\lib\net40\Common.Logging.Core.dll + + False + ..\..\packages\Common.Logging.Core.3.0.0\lib\net40\Common.Logging.Core.dll ..\..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll @@ -85,4 +86,4 @@ --> - + \ No newline at end of file diff --git a/Tests/Test.Gpio.Pca9685/app.config b/Tests/Test.Gpio.Pca9685/app.config index 2401161..09d5127 100644 --- a/Tests/Test.Gpio.Pca9685/app.config +++ b/Tests/Test.Gpio.Pca9685/app.config @@ -22,7 +22,11 @@ - + + + + + diff --git a/Tests/Test.Gpio.Pca9685/packages.config b/Tests/Test.Gpio.Pca9685/packages.config index a2f5d8c..5148318 100644 --- a/Tests/Test.Gpio.Pca9685/packages.config +++ b/Tests/Test.Gpio.Pca9685/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/Tests/Test.Spi.TLC59711/App.config b/Tests/Test.Spi.TLC59711/App.config index 74ade9d..88f04af 100644 --- a/Tests/Test.Spi.TLC59711/App.config +++ b/Tests/Test.Spi.TLC59711/App.config @@ -1,6 +1,15 @@ - + - - - + + + + + + + + + + + + diff --git a/UnitTests/Tests.Raspberry.IO.Components/Tests.Raspberry.IO.Components.csproj b/UnitTests/Tests.Raspberry.IO.Components/Tests.Raspberry.IO.Components.csproj index f84ffe8..2aaebdb 100644 --- a/UnitTests/Tests.Raspberry.IO.Components/Tests.Raspberry.IO.Components.csproj +++ b/UnitTests/Tests.Raspberry.IO.Components/Tests.Raspberry.IO.Components.csproj @@ -36,13 +36,16 @@ - ..\..\packages\FakeItEasy.1.20.0\lib\net40\FakeItEasy.dll + ..\..\packages\FakeItEasy.1.25.2\lib\net40\FakeItEasy.dll - ..\..\packages\FluentAssertions.2.2.0.0\lib\net40\FluentAssertions.dll + ..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.dll + + + ..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.Core.dll - ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll + ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll @@ -90,4 +93,4 @@ --> - + \ No newline at end of file diff --git a/UnitTests/Tests.Raspberry.IO.Components/packages.config b/UnitTests/Tests.Raspberry.IO.Components/packages.config index 277a3fb..1191330 100644 --- a/UnitTests/Tests.Raspberry.IO.Components/packages.config +++ b/UnitTests/Tests.Raspberry.IO.Components/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/UnitTests/Tests.Raspberry.IO.Interop/Tests.Raspberry.IO.Interop.csproj b/UnitTests/Tests.Raspberry.IO.Interop/Tests.Raspberry.IO.Interop.csproj index 6f4689f..eaaa384 100644 --- a/UnitTests/Tests.Raspberry.IO.Interop/Tests.Raspberry.IO.Interop.csproj +++ b/UnitTests/Tests.Raspberry.IO.Interop/Tests.Raspberry.IO.Interop.csproj @@ -36,13 +36,20 @@ - ..\..\packages\FakeItEasy.1.20.0\lib\net40\FakeItEasy.dll + ..\..\packages\FakeItEasy.1.25.2\lib\net40\FakeItEasy.dll + True - ..\..\packages\FluentAssertions.2.2.0.0\lib\net40\FluentAssertions.dll + ..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.dll + True + + + ..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.Core.dll + True - ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll + ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll + True @@ -82,4 +89,4 @@ --> - + \ No newline at end of file diff --git a/UnitTests/Tests.Raspberry.IO.Interop/packages.config b/UnitTests/Tests.Raspberry.IO.Interop/packages.config index 277a3fb..1191330 100644 --- a/UnitTests/Tests.Raspberry.IO.Interop/packages.config +++ b/UnitTests/Tests.Raspberry.IO.Interop/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/UnitTests/Tests.Raspberry.IO.SerialPeripheralInterface/Tests.Raspberry.IO.SerialPeripheralInterface.csproj b/UnitTests/Tests.Raspberry.IO.SerialPeripheralInterface/Tests.Raspberry.IO.SerialPeripheralInterface.csproj index 38c40dc..020e944 100644 --- a/UnitTests/Tests.Raspberry.IO.SerialPeripheralInterface/Tests.Raspberry.IO.SerialPeripheralInterface.csproj +++ b/UnitTests/Tests.Raspberry.IO.SerialPeripheralInterface/Tests.Raspberry.IO.SerialPeripheralInterface.csproj @@ -37,8 +37,20 @@ false + + False + ..\..\packages\FakeItEasy.1.25.2\lib\net40\FakeItEasy.dll + - ..\..\packages\FluentAssertions.2.2.0.0\lib\net40\FluentAssertions.dll + ..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.dll + + + ..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.Core.dll + True + + + False + ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll @@ -47,12 +59,6 @@ - - ..\..\packages\FakeItEasy.1.20.0\lib\net40\FakeItEasy.dll - - - ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll - @@ -86,4 +92,4 @@ --> - + \ No newline at end of file diff --git a/UnitTests/Tests.Raspberry.IO.SerialPeripheralInterface/packages.config b/UnitTests/Tests.Raspberry.IO.SerialPeripheralInterface/packages.config index 277a3fb..1191330 100644 --- a/UnitTests/Tests.Raspberry.IO.SerialPeripheralInterface/packages.config +++ b/UnitTests/Tests.Raspberry.IO.SerialPeripheralInterface/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/UnitTests/Tests.Raspberry.IO/Tests.Raspberry.IO.csproj b/UnitTests/Tests.Raspberry.IO/Tests.Raspberry.IO.csproj index f2bd35d..ddc9754 100644 --- a/UnitTests/Tests.Raspberry.IO/Tests.Raspberry.IO.csproj +++ b/UnitTests/Tests.Raspberry.IO/Tests.Raspberry.IO.csproj @@ -36,13 +36,17 @@ - ..\..\packages\FakeItEasy.1.20.0\lib\net40\FakeItEasy.dll + ..\..\packages\FakeItEasy.1.25.2\lib\net40\FakeItEasy.dll - ..\..\packages\FluentAssertions.2.2.0.0\lib\net40\FluentAssertions.dll + ..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.dll - - ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll + + ..\..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.Core.dll + + + False + ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll @@ -69,4 +73,4 @@ --> - + \ No newline at end of file diff --git a/UnitTests/Tests.Raspberry.IO/packages.config b/UnitTests/Tests.Raspberry.IO/packages.config index 277a3fb..1191330 100644 --- a/UnitTests/Tests.Raspberry.IO/packages.config +++ b/UnitTests/Tests.Raspberry.IO/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/packages/repositories.config b/packages/repositories.config index afaac42..a7cbf91 100644 --- a/packages/repositories.config +++ b/packages/repositories.config @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file