From 11e32f157a944f9bb4ba032ee15f7b867df61d76 Mon Sep 17 00:00:00 2001 From: Chris Tacke Date: Thu, 20 Apr 2023 15:12:33 -0500 Subject: [PATCH 1/2] spelling fix --- .../Sensors.Environmental.NextPm/Driver/NextPm.cs | 4 ++-- .../Samples/NextPm_Sample/MeadowApp.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Meadow.Foundation.Peripherals/Sensors.Environmental.NextPm/Driver/NextPm.cs b/Source/Meadow.Foundation.Peripherals/Sensors.Environmental.NextPm/Driver/NextPm.cs index e86d32436e..a961b3e1ab 100644 --- a/Source/Meadow.Foundation.Peripherals/Sensors.Environmental.NextPm/Driver/NextPm.cs +++ b/Source/Meadow.Foundation.Peripherals/Sensors.Environmental.NextPm/Driver/NextPm.cs @@ -167,7 +167,7 @@ public async Task Get1MinuteAverageReading() /// /// Gets the average particulate reading for the past 15 minutes /// - public async Task Get15MinueAverageReading() + public async Task Get15MinuteAverageReading() { await SendCommand(CommandByte.Read900sConcentrations); return new ParticulateReading(_readBuffer, 3); @@ -239,7 +239,7 @@ protected override void RaiseEventsAndNotify(IChangeResult<( try { - conditions.reading15min = await Get15MinueAverageReading(); + conditions.reading15min = await Get15MinuteAverageReading(); } catch (TeraException) { diff --git a/Source/Meadow.Foundation.Peripherals/Sensors.Environmental.NextPm/Samples/NextPm_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Peripherals/Sensors.Environmental.NextPm/Samples/NextPm_Sample/MeadowApp.cs index 7810d590b5..8936ba49e8 100644 --- a/Source/Meadow.Foundation.Peripherals/Sensors.Environmental.NextPm/Samples/NextPm_Sample/MeadowApp.cs +++ b/Source/Meadow.Foundation.Peripherals/Sensors.Environmental.NextPm/Samples/NextPm_Sample/MeadowApp.cs @@ -54,7 +54,7 @@ public override async Task Run() Resolver.Log.Info($" {read1m.EnvironmentalPM_2_5micron.MicroGramsPerMetersCubed:0} ug/L^3 1 micron particles"); Resolver.Log.Info($" {read1m.EnvironmentalPM_10micron.MicroGramsPerMetersCubed:0} ug/L^3 1 micron particles"); - var read15m = await nextPm.Get15MinueAverageReading(); + var read15m = await nextPm.Get15MinuteAverageReading(); Resolver.Log.Info($"Past 15 minutes"); Resolver.Log.Info($" {read15m.CountOf1micronParticles.ParticlesPerLiter:0} 1 micron particles per liter"); Resolver.Log.Info($" {read15m.CountOf2_5micronParticles.ParticlesPerLiter:0} 2.5 micron particles per liter"); From dc1f7925cf3564e4fdcb8e595da5d3103614bfae Mon Sep 17 00:00:00 2001 From: Chris Tacke Date: Thu, 20 Apr 2023 15:17:59 -0500 Subject: [PATCH 2/2] Updated NetxtPM sample to using PollingSensor pattern --- .../Samples/NextPm_Sample/MeadowApp.cs | 40 ++++++------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/Source/Meadow.Foundation.Peripherals/Sensors.Environmental.NextPm/Samples/NextPm_Sample/MeadowApp.cs b/Source/Meadow.Foundation.Peripherals/Sensors.Environmental.NextPm/Samples/NextPm_Sample/MeadowApp.cs index 8936ba49e8..500d4cd702 100644 --- a/Source/Meadow.Foundation.Peripherals/Sensors.Environmental.NextPm/Samples/NextPm_Sample/MeadowApp.cs +++ b/Source/Meadow.Foundation.Peripherals/Sensors.Environmental.NextPm/Samples/NextPm_Sample/MeadowApp.cs @@ -21,10 +21,22 @@ public override Task Initialize() nextPm = new NextPm(port); + nextPm.Readings10sUpdated += NextPm_Readings10sUpdated; return Task.CompletedTask; } + private void NextPm_Readings10sUpdated(object sender, IChangeResult e) + { + Resolver.Log.Info($"Past 10 seconds"); + Resolver.Log.Info($" {e.New.CountOf1micronParticles.ParticlesPerLiter:0} 1 micron particles per liter"); + Resolver.Log.Info($" {e.New.CountOf2_5micronParticles.ParticlesPerLiter:0} 2.5 micron particles per liter"); + Resolver.Log.Info($" {e.New.CountOf10micronParticles.ParticlesPerLiter:0} 10 micron particles per liter"); + Resolver.Log.Info($" {e.New.EnvironmentalPM_1micron.MicroGramsPerMetersCubed:0} ug/L^3 1 micron particles"); + Resolver.Log.Info($" {e.New.EnvironmentalPM_2_5micron.MicroGramsPerMetersCubed:0} ug/L^3 1 micron particles"); + Resolver.Log.Info($" {e.New.EnvironmentalPM_10micron.MicroGramsPerMetersCubed:0} ug/L^3 1 micron particles"); + } + public override async Task Run() { Resolver.Log.Info("Run..."); @@ -32,36 +44,10 @@ public override async Task Run() var firmware = await nextPm.GetFirmwareVersion(); Resolver.Log.Info($"Firmware: 0x{firmware:X4}"); - // if the device was asleep this will fail because data is not yet available var tempAndHumidity = await nextPm.GetTemperatureAndHumidity(); Resolver.Log.Info($"Temp: {tempAndHumidity.temperature:0.0}C Humidity: {tempAndHumidity.humidity}%"); - var read10s = await nextPm.Get10SecondAverageReading(); - Resolver.Log.Info($"Past 10 seconds"); - Resolver.Log.Info($" {read10s.CountOf1micronParticles.ParticlesPerLiter:0} 1 micron particles per liter"); - Resolver.Log.Info($" {read10s.CountOf2_5micronParticles.ParticlesPerLiter:0} 2.5 micron particles per liter"); - Resolver.Log.Info($" {read10s.CountOf10micronParticles.ParticlesPerLiter:0} 10 micron particles per liter"); - Resolver.Log.Info($" {read10s.EnvironmentalPM_1micron.MicroGramsPerMetersCubed:0} ug/L^3 1 micron particles"); - Resolver.Log.Info($" {read10s.EnvironmentalPM_2_5micron.MicroGramsPerMetersCubed:0} ug/L^3 1 micron particles"); - Resolver.Log.Info($" {read10s.EnvironmentalPM_10micron.MicroGramsPerMetersCubed:0} ug/L^3 1 micron particles"); - - var read1m = await nextPm.Get1MinuteAverageReading(); - Resolver.Log.Info($"Past 1 minute"); - Resolver.Log.Info($" {read1m.CountOf1micronParticles.ParticlesPerLiter:0} 1 micron particles per liter"); - Resolver.Log.Info($" {read1m.CountOf2_5micronParticles.ParticlesPerLiter:0} 2.5 micron particles per liter"); - Resolver.Log.Info($" {read1m.CountOf10micronParticles.ParticlesPerLiter:0} 10 micron particles per liter"); - Resolver.Log.Info($" {read1m.EnvironmentalPM_1micron.MicroGramsPerMetersCubed:0} ug/L^3 1 micron particles"); - Resolver.Log.Info($" {read1m.EnvironmentalPM_2_5micron.MicroGramsPerMetersCubed:0} ug/L^3 1 micron particles"); - Resolver.Log.Info($" {read1m.EnvironmentalPM_10micron.MicroGramsPerMetersCubed:0} ug/L^3 1 micron particles"); - - var read15m = await nextPm.Get15MinuteAverageReading(); - Resolver.Log.Info($"Past 15 minutes"); - Resolver.Log.Info($" {read15m.CountOf1micronParticles.ParticlesPerLiter:0} 1 micron particles per liter"); - Resolver.Log.Info($" {read15m.CountOf2_5micronParticles.ParticlesPerLiter:0} 2.5 micron particles per liter"); - Resolver.Log.Info($" {read15m.CountOf10micronParticles.ParticlesPerLiter:0} 10 micron particles per liter"); - Resolver.Log.Info($" {read15m.EnvironmentalPM_1micron.MicroGramsPerMetersCubed:0} ug/L^3 1 micron particles"); - Resolver.Log.Info($" {read15m.EnvironmentalPM_2_5micron.MicroGramsPerMetersCubed:0} ug/L^3 1 micron particles"); - Resolver.Log.Info($" {read15m.EnvironmentalPM_10micron.MicroGramsPerMetersCubed:0} ug/L^3 1 micron particles"); + nextPm.StartUpdating(); }