Skip to content

Commit

Permalink
Merge pull request #54 from WildernessLabs/v1.11.0
Browse files Browse the repository at this point in the history
Release 1.11.0
  • Loading branch information
ctacke authored May 1, 2024
2 parents 6500c21 + a4d421a commit 2691e3e
Show file tree
Hide file tree
Showing 39 changed files with 75 additions and 72 deletions.
6 changes: 3 additions & 3 deletions Source/C16x9/Driver/C16x9.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<Version>1.9.0</Version>
<Version>1.11.0</Version>
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
Expand All @@ -24,7 +24,7 @@
<None Include="..\..\icon.png" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.Foundation.Graphics.MicroGraphics" Version="1.9.0" />
<PackageReference Include="Meadow.Foundation.ICs.IOExpanders.Is31fl3731" Version="1.9.0" />
<PackageReference Include="Meadow.Foundation.Graphics.MicroGraphics" Version="1.11.0" />
<PackageReference Include="Meadow.Foundation.ICs.IOExpanders.Is31fl3731" Version="1.11.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Source/C16x9/Sample/C16x9_Sample/C16x9_Sample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.9.0" />
<PackageReference Include="Meadow.F7" Version="1.11.0" />
<ProjectReference Include="..\..\Driver\C16x9.csproj" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions Source/C420R/Driver/C420R.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace Meadow.Foundation.mikroBUS.Sensors
/// </summary>
public class C420R : PollingSensorBase<Current>
{
private IAnalogInputPort _adc;
private IAnalogInputPort analogInputPort = default!;

/// <summary>
/// Reference voltage (2.048V)
Expand Down Expand Up @@ -54,13 +54,13 @@ public C420R(ISpiBus spiBus,

private void InitializeMcp(int sampleCount = 1, TimeSpan? sampleInterval = null)
{
_adc = mcp3201.CreateAnalogInputPort(sampleCount, sampleInterval ?? TimeSpan.FromSeconds(5), ReferenceVoltage);
analogInputPort = mcp3201.CreateAnalogInputPort(sampleCount, sampleInterval ?? TimeSpan.FromSeconds(5), ReferenceVoltage);
}

/// <inheritdoc/>
protected override async Task<Current> ReadSensor()
{
var volts = await _adc.Read();
var volts = await analogInputPort.Read();
return new Current(volts.Volts / 100d);
}
}
Expand Down
4 changes: 2 additions & 2 deletions Source/C420R/Driver/C420R.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<Version>1.9.0</Version>
<Version>1.11.0</Version>
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
Expand All @@ -24,6 +24,6 @@
<None Include="..\..\icon.png" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.Foundation.ICs.ADCs.Mcp3xxx" Version="1.9.0" />
<PackageReference Include="Meadow.Foundation.ICs.ADCs.Mcp3xxx" Version="1.11.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Source/C420R/Sample/C420R_Sample/C420R_Sample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.9.0" />
<PackageReference Include="Meadow.F7" Version="1.11.0" />
<ProjectReference Include="..\..\Driver\C420R.csproj" />
</ItemGroup>
</Project>
3 changes: 3 additions & 0 deletions Source/C420T/Driver/C420T.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ public class C420T : IDisposable
private readonly IAnalogOutputPort dac;
private readonly bool portCreated;

/// <summary>
/// Gets a value indicating whether the object has been disposed
/// </summary>
public bool IsDisposed { get; private set; }

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions Source/C420T/Driver/C420T.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<Version>1.9.0</Version>
<Version>1.11.0</Version>
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
Expand All @@ -24,6 +24,6 @@
<None Include="..\..\icon.png" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.Foundation.ICs.DAC.MCP492x" Version="1.9.0" />
<PackageReference Include="Meadow.Foundation.ICs.DAC.MCP492x" Version="1.11.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Source/C420T/Sample/C420T_Sample/C420T_Sample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.9.0" />
<PackageReference Include="Meadow.F7" Version="1.11.0" />
<ProjectReference Include="..\..\Driver\C420T.csproj" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions Source/C8800Retro/Driver/C8800Retro.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public partial class C8800Retro : As1115
/// <param name="i2cBus">The I2C bus</param>
/// <param name="buttonInterruptPin">The interrupt pin</param>
/// <param name="address">The I2C address</param>
public C8800Retro(II2cBus i2cBus, IPin buttonInterruptPin, byte address = 0)
public C8800Retro(II2cBus i2cBus, IPin buttonInterruptPin, byte address = 0)
: base(i2cBus, buttonInterruptPin, address)
{ }

Expand All @@ -29,7 +29,7 @@ public IButton GetButton(ButtonColumn column, ButtonRow row)
{
KeyScanButtonType buttonType = KeyScanButtonType.None;

if(row == ButtonRow.A)
if (row == ButtonRow.A)
{
buttonType = column switch
{
Expand Down Expand Up @@ -74,7 +74,7 @@ public IButton GetButton(ButtonColumn column, ButtonRow row)
};
}

return KeyScanButtons[buttonType];
return KeyScanButtons![buttonType];
}
}
}
4 changes: 2 additions & 2 deletions Source/C8800Retro/Driver/C8800Retro.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<Version>1.9.0</Version>
<Version>1.11.0</Version>
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
Expand All @@ -24,6 +24,6 @@
<None Include="..\..\icon.png" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.Foundation.ICs.IOExpanders.As1115" Version="1.9.0" />
<PackageReference Include="Meadow.Foundation.ICs.IOExpanders.As1115" Version="1.11.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.9.0" />
<PackageReference Include="Meadow.ProjectLab" Version="1.9.0" />
<PackageReference Include="Meadow.F7" Version="1.11.0" />
<PackageReference Include="Meadow.ProjectLab" Version="1.11.0" />
<ProjectReference Include="..\..\Driver\C8800Retro.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.9.0" />
<PackageReference Include="Meadow.F7" Version="1.11.0" />
<ProjectReference Include="..\..\Driver\C8800Retro.csproj" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Source/C8x8/Driver/C8x8.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<Version>1.9.0</Version>
<Version>1.11.0</Version>
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
Expand All @@ -24,6 +24,6 @@
<None Include="..\..\icon.png" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.Foundation.Displays.Max7219" Version="1.9.0" />
<PackageReference Include="Meadow.Foundation.Displays.Max7219" Version="1.11.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.9.0" />
<PackageReference Include="Meadow.ProjectLab" Version="1.9.0" />
<PackageReference Include="Meadow.F7" Version="1.11.0" />
<PackageReference Include="Meadow.ProjectLab" Version="1.11.0" />
<ProjectReference Include="..\..\Driver\C8x8.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Source/C8x8/Sample/C8x8_Sample/C8x8_Sample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.9.0" />
<PackageReference Include="Meadow.F7" Version="1.11.0" />
<ProjectReference Include="..\..\Driver\C8x8.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Source/CACCurrent/Driver/CACCurrent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class CACCurrent : CurrentTransducer
/// </summary>
public Voltage ReferenceVoltage { get; protected set; } = new Voltage(2.048, Voltage.UnitType.Volts);

readonly Mcp3201 mcp3201;
readonly Mcp3201 mcp3201 = default!;

/// <summary>
/// Creates a new CACCurrent object using the SPI bus for readings
Expand Down
8 changes: 4 additions & 4 deletions Source/CACCurrent/Driver/CACCurrent.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<Version>1.9.0</Version>
<Version>1.11.0</Version>
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
Expand All @@ -13,7 +13,7 @@
<AssemblyName>CACCurrent</AssemblyName>
<Company>Wilderness Labs, Inc</Company>
<PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/</PackageProjectUrl>
<PackageId>Meadow.Foundation.mikroBUS.Sensors.Buttons.CACCurrent</PackageId>
<PackageId>Meadow.Foundation.mikroBUS.Sensors.CACCurrent</PackageId>
<RepositoryUrl>https://github.com/WildernessLabs/Meadow.Foundation</RepositoryUrl>
<PackageTags>Meadow,Meadow.Foundation,MikroBus,Mikroe,MikroElectronika,AC,current</PackageTags>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand All @@ -24,7 +24,7 @@
<None Include="..\..\icon.png" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.Foundation.ICs.ADCs.Mcp3xxx" Version="1.9.0" />
<PackageReference Include="Meadow.Foundation.Sensors.Power.CurrentTransducer" Version="1.9.0" />
<PackageReference Include="Meadow.Foundation.ICs.ADCs.Mcp3xxx" Version="1.11.0" />
<PackageReference Include="Meadow.Foundation.Sensors.Power.CurrentTransducer" Version="1.11.0" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions Source/CACCurrent/Driver/Readme.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Meadow.Foundation.mikroBUS.Sensors.Buttons.CACCurrent
# Meadow.Foundation.mikroBUS.Sensors.CACCurrent

**MikroElectronika SPI AC Current click board**

The **CACCurrent** library is included in the **Meadow.Foundation.mikroBUS.Sensors.Buttons.CACCurrent** nuget package and is designed for the [Wilderness Labs](www.wildernesslabs.co) Meadow .NET IoT platform.
The **CACCurrent** library is included in the **Meadow.Foundation.mikroBUS.Sensors.CACCurrent** nuget package and is designed for the [Wilderness Labs](www.wildernesslabs.co) Meadow .NET IoT platform.

This driver is part of the [Meadow.Foundation](https://developer.wildernesslabs.co/Meadow/Meadow.Foundation/) peripherals library, an open-source repository of drivers and libraries that streamline and simplify adding hardware to your C# .NET Meadow IoT applications.

Expand All @@ -14,7 +14,7 @@ To view all Wilderness Labs open-source projects, including samples, visit [gith

You can install the library from within Visual studio using the the NuGet Package Manager or from the command line using the .NET CLI:

`dotnet add package Meadow.Foundation.mikroBUS.Sensors.Buttons.CACCurrent`
`dotnet add package Meadow.Foundation.mikroBUS.Sensors.CACCurrent`
## Usage

```csharp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.9.0" />
<PackageReference Include="Meadow.F7" Version="1.11.0" />
<ProjectReference Include="..\..\Driver\CACCurrent.csproj" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Source/CButton/Driver/CButton.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<Version>1.9.0</Version>
<Version>1.11.0</Version>
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
Expand All @@ -24,6 +24,6 @@
<None Include="..\..\icon.png" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.Foundation" Version="1.9.0" />
<PackageReference Include="Meadow.Foundation" Version="1.11.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Source/CButton/Sample/CButton_Sample/CButton_Sample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.9.0" />
<PackageReference Include="Meadow.F7" Version="1.11.0" />
<ProjectReference Include="..\..\Driver\CButton.csproj" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Source/CGNSS10/Driver/CGNSS10.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ public class CGNSS10 : NeoM8
/// <summary>
/// Creates a new CGNSS10 object
/// </summary>
public CGNSS10(ISpiBus spiBus, IDigitalOutputPort chipSelectPort, IDigitalOutputPort resetPort = null)
public CGNSS10(ISpiBus spiBus, IDigitalOutputPort chipSelectPort, IDigitalOutputPort? resetPort = null)
: base(spiBus, chipSelectPort, resetPort)
{ }

/// <summary>
/// Creates a new CGNSS10 object
/// </summary>
public CGNSS10(ISpiBus spiBus, IPin chipSelectPin, IPin resetPin = null)
public CGNSS10(ISpiBus spiBus, IPin chipSelectPin, IPin? resetPin = null)
: base(spiBus, chipSelectPin, resetPin)
{ }
}
Expand Down
4 changes: 2 additions & 2 deletions Source/CGNSS10/Driver/CGNSS10.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<Version>1.9.0</Version>
<Version>1.11.0</Version>
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
Expand All @@ -24,6 +24,6 @@
<None Include="..\..\icon.png" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.Foundation.Sensors.Gnss.NeoM8" Version="1.9.0" />
<PackageReference Include="Meadow.Foundation.Sensors.Gnss.NeoM8" Version="1.11.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.9.0" />
<PackageReference Include="Meadow.ProjectLab" Version="1.9.0" />
<PackageReference Include="Meadow.F7" Version="1.11.0" />
<PackageReference Include="Meadow.ProjectLab" Version="1.11.0" />
<ProjectReference Include="..\..\Driver\CGNSS10.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Source/CGNSS10/Sample/CGNSS10_Sample/CGNSS10_Sample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.9.0" />
<PackageReference Include="Meadow.F7" Version="1.11.0" />
<ProjectReference Include="..\..\Driver\CGNSS10.csproj" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Source/CGNSS5/Driver/CGNSS5.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ public class CGNSS5 : NeoM8
/// <summary>
/// Creates a new CGNSS5 object using serial
/// </summary>
public CGNSS5(IMeadowDevice device, SerialPortName serialPortName, IPin resetPin, IPin ppsPin = null)
public CGNSS5(IMeadowDevice device, SerialPortName serialPortName, IPin? resetPin, IPin? ppsPin = null)
: base(device, serialPortName, resetPin, ppsPin)
{ }

/// <summary>
/// Creates a new CGNSS5 object using I2C
/// </summary>
public CGNSS5(II2cBus i2cBus, IPin resetPin, IPin ppsPin = null)
public CGNSS5(II2cBus i2cBus, IPin? resetPin, IPin? ppsPin = null)
: base(i2cBus, (byte)Addresses.Default, resetPin: resetPin, ppsPin: ppsPin)
{ }
}
Expand Down
4 changes: 2 additions & 2 deletions Source/CGNSS5/Driver/CGNSS5.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<Version>1.9.0</Version>
<Version>1.11.0</Version>
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
Expand All @@ -24,6 +24,6 @@
<None Include="..\..\icon.png" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.Foundation.Sensors.Gnss.NeoM8" Version="1.9.0" />
<PackageReference Include="Meadow.Foundation.Sensors.Gnss.NeoM8" Version="1.11.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<AssemblyName>App</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.9.0" />
<PackageReference Include="Meadow.ProjectLab" Version="1.9.0" />
<PackageReference Include="Meadow.F7" Version="1.11.0" />
<PackageReference Include="Meadow.ProjectLab" Version="1.11.0" />
<ProjectReference Include="..\..\Driver\CGNSS5.csproj" />
</ItemGroup>
</Project>
Loading

0 comments on commit 2691e3e

Please sign in to comment.