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

Fix solution reference to maple #55

Merged
merged 4 commits into from
Dec 10, 2023
+12 −5
Merged

Fix solution reference to maple #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7e2b22
change reference voltage to account for ideal resistor divider networ…
doingnz Dec 9, 2023
0ae93f0
fix path to Maple Server in .sln file
doingnz Dec 10, 2023
897f6c5
fix path to Maple Server
doingnz Dec 10, 2023
fe1649b
fix project paths to Maple server
doingnz Dec 10, 2023
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
2 changes: 1 addition & 1 deletion 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,7 +15,7 @@
<EmbeddedResource Include="img_wifi_connecting.jpg" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Maple\Source\Web.Maple.MapleServer\Driver\Web.Maple.MapleServer.csproj" />
<ProjectReference Include="..\..\..\..\Maple\Source\Web.Maple.Server\Web.Maple.Server.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Core\Source\implementations\f7\Meadow.F7\Meadow.F7.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Core\Meadow.Foundation.Core.csproj" />
<ProjectReference Include="..\..\..\..\Meadow.Foundation\Source\Meadow.Foundation.Libraries_and_Frameworks\Displays.TextDisplayMenu\Driver\Displays.TextDisplayMenu.csproj" />
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>
<ProjectReference Include="..\..\..\..\Maple\Source\Web.Maple.MapleServer\Driver\Web.Maple.MapleServer.csproj" />
<ProjectReference Include="..\..\..\..\Maple\Source\Web.Maple.Server\Web.Maple.Server.csproj" />
<ProjectReference Include="..\..\Meadow.Clima\Meadow.Clima.csproj" />
<PackageReference Include="System.Text.Json" Version="*" />
<PackageReference Include="sqlite-net-static" Version="*" />
Expand Down
2 changes: 1 addition & 1 deletion Source/Meadow.Clima.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Displays.TftSpi", "..\..\Me
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Displays.TextDisplayMenu", "..\..\Meadow.Foundation\Source\Meadow.Foundation.Libraries_and_Frameworks\Displays.TextDisplayMenu\Driver\Displays.TextDisplayMenu.csproj", "{2300B0AB-E8B2-4897-B532-5148636483A0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.MapleServer", "..\..\Maple\Source\Web.Maple.MapleServer\Driver\Web.Maple.MapleServer.csproj", "{009F059F-0677-487C-9C9B-9396AF54D67C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Maple.Server", "..\..\Maple\Source\Web.Maple.Server\Web.Maple.Server.csproj", "{009F059F-0677-487C-9C9B-9396AF54D67C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Units", "..\..\Meadow.Units\Source\Meadow.Units\Meadow.Units.csproj", "{CAC3B6F1-6337-493A-9D90-9FB8BAE28417}"
EndProject
Expand Down
11 changes: 9 additions & 2 deletions Source/Meadow.Clima/ClimaHardwareV3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Meadow.Foundation.Sensors.Weather;
using Meadow.Hardware;
using Meadow.Logging;
using Meadow.Units;
using System;

#nullable enable
Expand Down Expand Up @@ -182,7 +183,9 @@ public ClimaHardwareV3(IF7CoreComputeMeadowDevice device, II2cBus i2cBus)
try
{
Logger?.Trace("Instantiating Solar Voltage Input");
SolarVoltageInput = device.Pins.A02.CreateAnalogInputPort(5);
SolarVoltageInput = device.Pins.A02.CreateAnalogInputPort(5,
AnalogInputPort.DefaultSampleInterval,
AnalogInputPort.DefaultReferenceVoltage * (1000 + 680) / 680);
Logger?.Trace("Solar Voltage Input up");
}
catch (Exception ex)
Expand All @@ -193,7 +196,11 @@ public ClimaHardwareV3(IF7CoreComputeMeadowDevice device, II2cBus i2cBus)
try
{
Logger?.Trace("Instantiating Battery Voltage Input");
BatteryVoltageInput = device.Pins.A04.CreateAnalogInputPort(5);
//BatteryVoltageInput = device.Pins.A04.CreateAnalogInputPort(5);
BatteryVoltageInput = device.Pins.A04.CreateAnalogInputPort(5,
AnalogInputPort.DefaultSampleInterval,
AnalogInputPort.DefaultReferenceVoltage * (1000 + 2000) / 2000);

Logger?.Trace("Battery Voltage Input up");
}
catch (Exception ex)
Expand Down