From d7e2b2250597864692d90e1e24fadf0fa6e83cc4 Mon Sep 17 00:00:00 2001 From: doingnz Date: Sun, 10 Dec 2023 07:29:54 +1300 Subject: [PATCH 1/4] change reference voltage to account for ideal resistor divider networks at analogue inputs. --- Source/Meadow.Clima/ClimaHardwareV3.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/Meadow.Clima/ClimaHardwareV3.cs b/Source/Meadow.Clima/ClimaHardwareV3.cs index a5303c1..58c6d1e 100644 --- a/Source/Meadow.Clima/ClimaHardwareV3.cs +++ b/Source/Meadow.Clima/ClimaHardwareV3.cs @@ -6,6 +6,7 @@ using Meadow.Foundation.Sensors.Weather; using Meadow.Hardware; using Meadow.Logging; +using Meadow.Units; using System; #nullable enable @@ -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) @@ -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) From 0ae93f010d57254da93f9b3418c5dc96430a7242 Mon Sep 17 00:00:00 2001 From: doingnz Date: Mon, 11 Dec 2023 09:48:29 +1300 Subject: [PATCH 2/4] fix path to Maple Server in .sln file --- Source/Meadow.Clima.sln | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Meadow.Clima.sln b/Source/Meadow.Clima.sln index 1d0496f..3067e24 100644 --- a/Source/Meadow.Clima.sln +++ b/Source/Meadow.Clima.sln @@ -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.MapleServer", "..\..\Maple\Source\Web.Maple.MapleServer\Web.Maple.MapleServer.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 From 897f6c5aa65897b9b19ef3a183c2d2f5ca4b2012 Mon Sep 17 00:00:00 2001 From: doingnz Date: Mon, 11 Dec 2023 10:09:41 +1300 Subject: [PATCH 3/4] fix path to Maple Server --- Source/Meadow.Clima.sln | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Meadow.Clima.sln b/Source/Meadow.Clima.sln index 3067e24..2812725 100644 --- a/Source/Meadow.Clima.sln +++ b/Source/Meadow.Clima.sln @@ -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\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 From fe1649bbbf8ee577f322a974c04b8625cd7f7677 Mon Sep 17 00:00:00 2001 From: doingnz Date: Mon, 11 Dec 2023 10:32:09 +1300 Subject: [PATCH 4/4] fix project paths to Maple server --- .../Clima_HackKit_Demo/Clima_HackKit_Demo.csproj | 2 +- .../Clima_SQLite_Demo/Clima_SQLite_Demo.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Additional Samples/Clima_HackKit_Demo/Clima_HackKit_Demo.csproj b/Source/Additional Samples/Clima_HackKit_Demo/Clima_HackKit_Demo.csproj index 3d5fed2..7be66f2 100644 --- a/Source/Additional Samples/Clima_HackKit_Demo/Clima_HackKit_Demo.csproj +++ b/Source/Additional Samples/Clima_HackKit_Demo/Clima_HackKit_Demo.csproj @@ -15,7 +15,7 @@ - + diff --git a/Source/Additional Samples/Clima_SQLite_Demo/Clima_SQLite_Demo.csproj b/Source/Additional Samples/Clima_SQLite_Demo/Clima_SQLite_Demo.csproj index 29e563d..69ac843 100644 --- a/Source/Additional Samples/Clima_SQLite_Demo/Clima_SQLite_Demo.csproj +++ b/Source/Additional Samples/Clima_SQLite_Demo/Clima_SQLite_Demo.csproj @@ -10,7 +10,7 @@ 9.0 - +