Skip to content

Commit

Permalink
Merge pull request #620 from WildernessLabs/feature/next-pm
Browse files Browse the repository at this point in the history 
spelling fix
  • Loading branch information
@adrianstevens
adrianstevens authored Apr 20, 2023
2 parents 7c006a7 + dc1f792 commit 05e673a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 29 deletions.
4 changes: 2 additions & 2 deletions Source/Meadow.Foundation.Peripherals/Sensors.Environmental.NextPm/Driver/NextPm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public async Task<ParticulateReading> Get1MinuteAverageReading()
/// <summary>
/// Gets the average particulate reading for the past 15 minutes
/// </summary>
public async Task<ParticulateReading> Get15MinueAverageReading()
public async Task<ParticulateReading> Get15MinuteAverageReading()
{
await SendCommand(CommandByte.Read900sConcentrations);
return new ParticulateReading(_readBuffer, 3);
Expand Down Expand Up @@ -239,7 +239,7 @@ protected override void RaiseEventsAndNotify(IChangeResult<(
try
{
conditions.reading15min = await Get15MinueAverageReading();
conditions.reading15min = await Get15MinuteAverageReading();
}
catch (TeraException)
{
Expand Down
40 changes: 13 additions & 27 deletions ...ow.Foundation.Peripherals/Sensors.Environmental.NextPm/Samples/NextPm_Sample/MeadowApp.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,47 +21,33 @@ public override Task Initialize()

nextPm = new NextPm(port);

nextPm.Readings10sUpdated += NextPm_Readings10sUpdated;

return Task.CompletedTask;
}

private void NextPm_Readings10sUpdated(object sender, IChangeResult<ParticulateReading> 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...");

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.Get15MinueAverageReading();
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();
}


Expand Down

0 comments on commit 05e673a

Please sign in to comment.