Updated nugets

raspberry-sharp · Feb 25, 2015 · 2a6a7d4 · 2a6a7d4
1 parent 4acf29b
commit 2a6a7d4
Show file tree

Hide file tree

Showing 31 changed files with 203 additions and 140 deletions.
diff --git 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
@@ -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
+    }
+}
diff --git a/Raspberry.IO.Components/Displays/Ssd1306/ScrollSpeed.cs 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
+    }
+}
diff --git a/Raspberry.IO.Components/Raspberry.IO.Components.csproj b/Raspberry.IO.Components/Raspberry.IO.Components.csproj
@@ -33,17 +33,20 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Common.Logging">
-      <HintPath>..\packages\Common.Logging.2.2.0\lib\net40\Common.Logging.dll</HintPath>
+    <Reference Include="Common.Logging, Version=3.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Common.Logging.3.0.0\lib\net40\Common.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Common.Logging.Core">
-      <HintPath>..\packages\Common.Logging.Core.2.2.0\lib\net40\Common.Logging.Core.dll</HintPath>
+    <Reference Include="Common.Logging.Core, Version=2.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Common.Logging.Core.3.0.0\lib\net40\Common.Logging.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Raspberry.System">
-      <HintPath>..\packages\Raspberry.System.1.3.0\lib\net40\Raspberry.System.dll</HintPath>
+    <Reference Include="Raspberry.System, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Raspberry.System.1.4.0\lib\net40\Raspberry.System.dll</HintPath>
     </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssemblyInfo.cs">
@@ -81,6 +84,8 @@
     <Compile Include="Displays\Hd44780\Hd44780LcdConnection.cs" />
     <Compile Include="Displays\Hd44780\Hd44780LcdConnectionSettings.cs" />
     <Compile Include="Displays\Hd44780\Hd44780Pins.cs" />
+    <Compile Include="Displays\Ssd1306\ScrollDirection.cs" />
+    <Compile Include="Displays\Ssd1306\ScrollSpeed.cs" />
     <Compile Include="Expanders\Mcp23017\Mcp23017InputBinaryPin.cs" />
     <Compile Include="Expanders\Mcp23017\Mcp23017OutputBinaryPin.cs" />
     <Compile Include="Expanders\Mcp23017\Mcp23017PinExtensionMethods.cs" />
@@ -154,12 +159,6 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <ItemGroup>
-    <Folder Include="Leds\" />
-    <Folder Include="Leds\GroveRgb\" />
-    <Folder Include="Displays\Ssd1306\" />
-    <Folder Include="Displays\Ssd1306\Fonts\" />
-    <Folder Include="Leds\GroveBar\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup />
 </Project>
diff --git a/Raspberry.IO.Components/packages.config b/Raspberry.IO.Components/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Common.Logging" version="2.2.0" targetFramework="net40" />
-  <package id="Common.Logging.Core" version="2.2.0" targetFramework="net40" />
-  <package id="Raspberry.System" version="1.3.0" targetFramework="net40" />
+  <package id="Common.Logging" version="3.0.0" targetFramework="net40" />
+  <package id="Common.Logging.Core" version="3.0.0" targetFramework="net40" />
+  <package id="Raspberry.System" version="1.4.0" targetFramework="net40" />
 </packages>
diff --git a/Raspberry.IO.GeneralPurpose/ConnectorPin.cs b/Raspberry.IO.GeneralPurpose/ConnectorPin.cs
@@ -137,7 +137,7 @@ public enum ConnectorPin
 
         /// <summary>
         /// Connector P1, pin 32.
-        /// </summary>enum
+        /// </summary>
         P1Pin32,
 
         /// <summary>

diff --git a/Raspberry.IO.GeneralPurpose/GpioConnectionDriverCapabilities.cs b/Raspberry.IO.GeneralPurpose/GpioConnectionDriverCapabilities.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace Raspberry.IO.GeneralPurpose
+{
+    /// <summary>
+    /// Represents capabilities of a driver.
+    /// </summary>
+    [Flags]
+    public enum GpioConnectionDriverCapabilities
+    {
+        /// <summary>
+        /// No advanced capability.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// The driver can set pin resistor
+        /// </summary>
+        CanSetPinResistor = 1,
+
+        /// <summary>
+        /// The driver can set pin detected edges
+        /// </summary>
+        CanSetPinDetectedEdges = 2
+    }
+}
diff --git 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
-    }
-
     /// <summary>
     /// Provides an interface for connection drivers.
     /// </summary>

diff --git a/Raspberry.IO.GeneralPurpose/Raspberry.IO.GeneralPurpose.csproj b/Raspberry.IO.GeneralPurpose/Raspberry.IO.GeneralPurpose.csproj
@@ -35,12 +35,13 @@
     <DocumentationFile>bin\Release\Raspberry.IO.GeneralPurpose.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Raspberry.System, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Raspberry.System.1.4.0\lib\net40\Raspberry.System.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="Raspberry.System">
-      <HintPath>..\packages\Raspberry.System.1.3.0\lib\net40\Raspberry.System.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssemblyInfo.cs">
@@ -57,6 +58,7 @@
     <Compile Include="FileGpioConnectionDriver.cs" />
     <Compile Include="GpioBinaryPinExtensionMethods.cs" />
     <Compile Include="GpioConnectionDriver.cs" />
+    <Compile Include="GpioConnectionDriverCapabilities.cs" />
     <Compile Include="GpioConnectionDriverExtensionMethods.cs" />
     <Compile Include="GpioConnectionSettings.cs" />
     <Compile Include="GpioInputBinaryPin.cs" />

diff --git a/Raspberry.IO.GeneralPurpose/packages.config b/Raspberry.IO.GeneralPurpose/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Raspberry.System" version="1.3.0" targetFramework="net40" />
+  <package id="Raspberry.System" version="1.4.0" targetFramework="net40" />
 </packages>
diff --git a/Raspberry.IO.InterIntegratedCircuit/Raspberry.IO.InterIntegratedCircuit.csproj b/Raspberry.IO.InterIntegratedCircuit/Raspberry.IO.InterIntegratedCircuit.csproj
@@ -35,11 +35,12 @@
     <DocumentationFile>bin\Release\Raspberry.IO.InterIntegratedCircuit.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Raspberry.System, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Raspberry.System.1.4.0\lib\net40\Raspberry.System.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="Raspberry.System">
-      <HintPath>..\packages\Raspberry.System.1.3.0\lib\net40\Raspberry.System.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssemblyInfo.cs">

diff --git a/Raspberry.IO.InterIntegratedCircuit/packages.config b/Raspberry.IO.InterIntegratedCircuit/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Raspberry.System" version="1.3.0" targetFramework="net40" />
+  <package id="Raspberry.System" version="1.4.0" targetFramework="net40" />
 </packages>
diff --git 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<T> {
+
             #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
@@ -35,11 +35,12 @@
     <DocumentationFile>bin\Release\Raspberry.IO.SerialPeripheralInterface.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Raspberry.System, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Raspberry.System.1.4.0\lib\net40\Raspberry.System.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="Raspberry.System">
-      <HintPath>..\packages\Raspberry.System.1.3.0\lib\net40\Raspberry.System.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedAssemblyInfo.cs">

diff --git a/Raspberry.IO.SerialPeripheralInterface/packages.config b/Raspberry.IO.SerialPeripheralInterface/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Raspberry.System" version="1.3.0" targetFramework="net40" />
+  <package id="Raspberry.System" version="1.4.0" targetFramework="net40" />
 </packages>
diff --git 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
@@ -58,11 +58,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Raspberry.System, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Raspberry.System.1.4.0\lib\net40\Raspberry.System.dll</HintPath>
+    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="Raspberry.System">
-      <HintPath>..\..\packages\Raspberry.System.1.3.0\lib\net40\Raspberry.System.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\SharedAssemblyInfo.cs">

diff --git a/Tests/Test.Gpio.HCSR04/packages.config b/Tests/Test.Gpio.HCSR04/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Raspberry.System" version="1.3.0" targetFramework="net40" />
+  <package id="Raspberry.System" version="1.4.0" targetFramework="net40" />
 </packages>
diff --git a/Tests/Test.Gpio.Pca9685/Test.Gpio.Pca9685.csproj b/Tests/Test.Gpio.Pca9685/Test.Gpio.Pca9685.csproj
@@ -37,10 +37,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Common.Logging">
-      <HintPath>..\..\packages\Common.Logging.2.2.0\lib\net40\Common.Logging.dll</HintPath>
+      <HintPath>..\..\packages\Common.Logging.3.0.0\lib\net40\Common.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Common.Logging.Core">
-      <HintPath>..\..\packages\Common.Logging.Core.2.2.0\lib\net40\Common.Logging.Core.dll</HintPath>
+    <Reference Include="Common.Logging.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Common.Logging.Core.3.0.0\lib\net40\Common.Logging.Core.dll</HintPath>
     </Reference>
     <Reference Include="NDesk.Options">
       <HintPath>..\..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll</HintPath>
@@ -85,4 +86,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/Tests/Test.Gpio.Pca9685/app.config b/Tests/Test.Gpio.Pca9685/app.config
@@ -22,7 +22,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Tests/Test.Gpio.Pca9685/packages.config b/Tests/Test.Gpio.Pca9685/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Common.Logging" version="2.2.0" targetFramework="net40" />
-  <package id="Common.Logging.Core" version="2.2.0" targetFramework="net40" />
+  <package id="Common.Logging" version="3.0.0" targetFramework="net40" />
+  <package id="Common.Logging.Core" version="3.0.0" targetFramework="net40" />
   <package id="NDesk.Options" version="0.2.1" targetFramework="net40" />
 </packages>
diff --git a/Tests/Test.Spi.TLC59711/App.config b/Tests/Test.Spi.TLC59711/App.config
@@ -1,6 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
-    </startup>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+  </startup>
+
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>