Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.8.0.1 #62

Merged
merged 1 commit into from
Jan 24, 2024
Merged

Release 1.8.0.1 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Source/Additional Samples/Clima_HackKit_Demo/Clima_HackKit_Demo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<EmbeddedResource Include="img_wifi_connecting.jpg" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.Foundation.Web.Maple.Server" Version="1.8.0" />
<PackageReference Include="Meadow.F7" Version="1.8.0" />
<PackageReference Include="Meadow.Foundation" Version="1.8.0" />
<PackageReference Include="Meadow.Foundation.Displays.TextDisplayMenu" Version="1.8.0" />
<PackageReference Include="Meadow.Foundation.Displays.TftSpi" Version="1.8.0" />
<PackageReference Include="Meadow.Foundation.Web.Maple.Server" Version="1.8.0.1" />
<PackageReference Include="Meadow.F7" Version="1.8.0.1" />
<PackageReference Include="Meadow.Foundation" Version="1.8.0.1" />
<PackageReference Include="Meadow.Foundation.Displays.TextDisplayMenu" Version="1.8.0.1" />
<PackageReference Include="Meadow.Foundation.Displays.TftSpi" Version="1.8.0.1" />
<PackageReference Include="SimpleJpegDecoder" Version="0.4.0" />
<PackageReference Include="sqlite-net-static" Version="1.8.116" />
<PackageReference Include="System.Text.Json" Version="*" />
Expand Down
2 changes: 1 addition & 1 deletion Source/Additional Samples/Clima_SQLite_Demo/Clima_SQLite_Demo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<LangVersion>9.0</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meadow.Foundation.Web.Maple.Server" Version="1.8.0" />
<PackageReference Include="Meadow.Foundation.Web.Maple.Server" Version="1.8.0.1" />
<ProjectReference Include="..\..\Meadow.Clima\Meadow.Clima.csproj" />
<PackageReference Include="System.Text.Json" Version="*" />
<PackageReference Include="sqlite-net-static" Version="*" />
Expand Down
3 changes: 1 addition & 2 deletions Source/Clima_Demo/MeadowApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Meadow;
using Meadow.Devices;
using Meadow.Foundation;
using Meadow.Peripherals.Sensors.Location.Gnss;
using Meadow.Units;
using System;
Expand Down Expand Up @@ -56,7 +55,7 @@ public override Task Initialize()

if (clima.BatteryVoltageInput is { } batteryVoltage)
{
batteryVoltage.Updated += BatteryVoltageUpdated;
batteryVoltage.Updated += BatteryVoltageUpdated;
}

if (clima.Gnss is { } gnss)
Expand Down
5 changes: 3 additions & 2 deletions Source/Meadow.Clima/Clima.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
using Meadow.Logging;
using System;

#nullable enable

namespace Meadow.Devices
{
/// <summary>
/// Represents the Clima hardware
/// </summary>
public class Clima
{
private Clima() { }
Expand Down
15 changes: 8 additions & 7 deletions Source/Meadow.Clima/ClimaHardwareV2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
using Meadow.Logging;
using System;

#nullable enable

namespace Meadow.Devices
{
/// <summary>
/// Represents the Clima v2.x hardware
/// </summary>
public class ClimaHardwareV2 : IClimaHardware
{
/// <summary>
Expand Down Expand Up @@ -109,7 +110,7 @@ public ClimaHardwareV2(IF7FeatherMeadowDevice device, II2cBus i2cBus)
try
{
Resolver.Log?.Trace("Initializing GNSS");
Gnss = new NeoM8(device, device.PlatformOS.GetSerialPortName("COM4"), null, null);
Gnss = new NeoM8(device, device.PlatformOS.GetSerialPortName("COM4")!, null, null);
Resolver.Log?.Trace("GNSS initialized");
}
catch (Exception e)
Expand All @@ -125,7 +126,7 @@ public ClimaHardwareV2(IF7FeatherMeadowDevice device, II2cBus i2cBus)
}
catch (Exception ex)
{
Resolver.Log.Error($"Unable to create the Wind Vane: {ex.Message}");
Resolver.Log?.Error($"Unable to create the Wind Vane: {ex.Message}");
}

try
Expand All @@ -136,7 +137,7 @@ public ClimaHardwareV2(IF7FeatherMeadowDevice device, II2cBus i2cBus)
}
catch (Exception ex)
{
Resolver.Log.Error($"Unable to create the Switching Rain Gauge: {ex.Message}");
Resolver.Log?.Error($"Unable to create the Switching Rain Gauge: {ex.Message}");
}

try
Expand All @@ -147,7 +148,7 @@ public ClimaHardwareV2(IF7FeatherMeadowDevice device, II2cBus i2cBus)
}
catch (Exception ex)
{
Resolver.Log.Error($"Unable to create the Switching Anemometer: {ex.Message}");
Resolver.Log?.Error($"Unable to create the Switching Anemometer: {ex.Message}");
}

try
Expand All @@ -158,7 +159,7 @@ public ClimaHardwareV2(IF7FeatherMeadowDevice device, II2cBus i2cBus)
}
catch (Exception ex)
{
Resolver.Log.Error($"Unable to create the Solar Voltage Input: {ex.Message}");
Resolver.Log?.Error($"Unable to create the Solar Voltage Input: {ex.Message}");
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions Source/Meadow.Clima/ClimaHardwareV3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
using Meadow.Foundation.Sensors.Weather;
using Meadow.Hardware;
using Meadow.Logging;
using Meadow.Units;
using System;

#nullable enable

namespace Meadow.Devices
{
/// <summary>
/// Represents the Clima v3.x hardware
/// </summary>
public class ClimaHardwareV3 : IClimaHardware
{
/// <summary>
Expand Down Expand Up @@ -153,7 +153,7 @@ public ClimaHardwareV3(IF7CoreComputeMeadowDevice device, II2cBus i2cBus)
try
{
Resolver.Log.Debug("Initializing GNSS");
Gnss = new NeoM8(device, device.PlatformOS.GetSerialPortName("COM4"), device.Pins.D05, device.Pins.A03);
Gnss = new NeoM8(device, device.PlatformOS.GetSerialPortName("COM4")!, device.Pins.D05, device.Pins.A03);
Resolver.Log.Debug("GNSS initialized");
}
catch (Exception e)
Expand Down
10 changes: 7 additions & 3 deletions Source/Meadow.Clima/IClimaHardware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
using Meadow.Foundation.Sensors.Weather;
using Meadow.Hardware;

#nullable enable

namespace Meadow.Devices
{
/// <summary>
/// Contract for the Clima hardware definitions
/// </summary>
public interface IClimaHardware
{
/// <summary>
Expand Down Expand Up @@ -57,10 +58,13 @@ public interface IClimaHardware
public IAnalogInputPort? BatteryVoltageInput { get; }

/// <summary>
/// Gets the RGB PWM LED
/// The RGB PWM LED on the Clima board
/// </summary>
public RgbPwmLed? ColorLed { get; }

/// <summary>
/// The hardware revision string for the Clima board
/// </summary>
public string RevisionString { get; }
}
}
16 changes: 8 additions & 8 deletions Source/Meadow.Clima/Meadow.Clima.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
<None Include="icon.png" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="1.8.0" />
<PackageReference Include="Meadow.Foundation.ICs.IOExpanders.Mcp23xxx" Version="1.8.0" />
<PackageReference Include="Meadow.Foundation.Sensors.Atmospheric.Bme68x" Version="1.8.0" />
<PackageReference Include="Meadow.Foundation.Sensors.Environmental.Scd4x" Version="1.8.0" />
<PackageReference Include="Meadow.Foundation.Sensors.Gnss.NeoM8" Version="1.8.0" />
<PackageReference Include="Meadow.Foundation.Sensors.Weather.SwitchingAnemometer" Version="1.8.0" />
<PackageReference Include="Meadow.Foundation.Sensors.Weather.SwitchingRainGauge" Version="1.8.0" />
<PackageReference Include="Meadow.Foundation.Sensors.Weather.WindVane" Version="1.8.0" />
<PackageReference Include="Meadow.F7" Version="1.8.0.1" />
<PackageReference Include="Meadow.Foundation.ICs.IOExpanders.Mcp23xxx" Version="1.8.0.1" />
<PackageReference Include="Meadow.Foundation.Sensors.Atmospheric.Bme68x" Version="1.8.0.1" />
<PackageReference Include="Meadow.Foundation.Sensors.Environmental.Scd4x" Version="1.8.0.1" />
<PackageReference Include="Meadow.Foundation.Sensors.Gnss.NeoM8" Version="1.8.0.1" />
<PackageReference Include="Meadow.Foundation.Sensors.Weather.SwitchingAnemometer" Version="1.8.0.1" />
<PackageReference Include="Meadow.Foundation.Sensors.Weather.SwitchingRainGauge" Version="1.8.0.1" />
<PackageReference Include="Meadow.Foundation.Sensors.Weather.WindVane" Version="1.8.0.1" />
</ItemGroup>
</Project>
Loading