Skip to content

Commit

Permalink
Update to latest PagerDuty release version
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aldaviva
Aldaviva committed Sep 26, 2024
1 parent 87b5c01 commit 13bcdb7
Show file tree
Hide file tree
Showing 6 changed files with 223 additions and 224 deletions.
4 changes: 2 additions & 2 deletions DryerDuty/DryerDuty.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RollForward>latestMajor</RollForward>
<LangVersion>latest</LangVersion>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<ServerGarbageCollection>true</ServerGarbageCollection>
<NoWarn>CS8524</NoWarn>
Expand All @@ -19,13 +20,12 @@
</PropertyGroup>

<ItemGroup>
<None Remove="ExceptionAdjustments.txt" />
<AdditionalFiles Include="ExceptionAdjustments.txt" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Iot.Device.Bindings" Version="3.2.0" />
<PackageReference Include="PagerDuty" Version="1.1.0" />
<PackageReference Include="PagerDuty" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
</ItemGroup>

Expand Down
270 changes: 135 additions & 135 deletions DryerDuty/DryerMonitor.cs
View file
Original file line number Diff line number Diff line change
@@ -1,136 +1,136 @@
using Iot.Device.Adc;
using Pager.Duty.Requests;
using System.Device.Spi;
using System.Timers;
using Timer = System.Timers.Timer;

namespace DryerDuty;

public class DryerMonitor: IHostedService, IDisposable {

internal const int SAMPLES_PER_WINDOW = 2 * 60; // 120Hz is the Nyquist limit for 60Hz AC sine wave
private const int MOTOR_CHANNEL = 0;
private const int LIGHT_CHANNEL = 1;
private const int MAX_ADC_READING = 1023; // 10-bit unsigned int
private const double REFERENCE_VOLTS = 3.3;
private const double MAX_CURRENT_TRANSFORMER_OUTPUT_VOLTS = 1;

private readonly ILogger<DryerMonitor> logger;
private readonly PagerDutyManager pagerDutyManager;
private readonly Configuration config;
private readonly Mcp3xxx adc;
private readonly TimeSpan samplingWindow = TimeSpan.FromSeconds(1);
private readonly Timer samplingTimer;
private readonly Timer aggregatingTimer;
private readonly int[][] samplesByChannel = new int[2][];
private readonly int[] maxCurrentTransformerAmps = { 60, 5 };

internal LaundryMachineState? state;
internal string? pagerDutyLaundryDoneDedupKey;
private int sampleWriteIndex;

public DryerMonitor(ILogger<DryerMonitor> logger, PagerDutyManager pagerDutyManager, Configuration config): this(logger, pagerDutyManager, config,
new Mcp3008(SpiDevice.Create(new SpiConnectionSettings(0, 0) { ClockFrequency = 1_000_000 }))) { }

internal DryerMonitor(ILogger<DryerMonitor> logger, PagerDutyManager pagerDutyManager, Configuration config, Mcp3xxx adc) {
this.logger = logger;
this.pagerDutyManager = pagerDutyManager;
this.config = config;
this.adc = adc;

for (int i = 0; i < samplesByChannel.Length; i++) {
samplesByChannel[i] = new int[SAMPLES_PER_WINDOW];
}

aggregatingTimer = new Timer(samplingWindow) { AutoReset = true };
samplingTimer = new Timer(samplingWindow.Divide(SAMPLES_PER_WINDOW)) { AutoReset = true };

samplingTimer.Elapsed += onSample;
aggregatingTimer.Elapsed += async (_, _) => await aggregateSamplesInWindow();
}

public async Task StartAsync(CancellationToken cancellationToken) {
samplingTimer.Start();

try {
// Give the sample buffer time to fill before starting to aggregate its contents
await Task.Delay(samplingWindow, cancellationToken);
} catch (TaskCanceledException) {
return;
}

aggregatingTimer.Start();
}

public Task StopAsync(CancellationToken cancellationToken) {
aggregatingTimer.Stop();
samplingTimer.Stop();
return Task.CompletedTask;
}

internal void onSample(object? sender = null, ElapsedEventArgs? e = null) {
for (int channel = 0; channel < samplesByChannel.Length; channel++) {
samplesByChannel[channel][sampleWriteIndex] = adc.Read(channel); // sample is in the range [0, 1024)
}

sampleWriteIndex = (sampleWriteIndex + 1) % SAMPLES_PER_WINDOW;
}

private double getRmsAmps(int channel) =>
samplesByChannel[channel].Aggregate(0.0,
(sum, sample) => sum + Math.Pow(
(((sample - MAX_ADC_READING / 2.0) / (REFERENCE_VOLTS / 2) + MAX_ADC_READING / 2.0) / MAX_ADC_READING * REFERENCE_VOLTS - REFERENCE_VOLTS / 2) /
MAX_CURRENT_TRANSFORMER_OUTPUT_VOLTS * maxCurrentTransformerAmps[channel], 2),
sumOfSquares => Math.Sqrt(sumOfSquares / SAMPLES_PER_WINDOW));

internal async Task aggregateSamplesInWindow() {
double motorAmps = getRmsAmps(MOTOR_CHANNEL) * config.motorGain;
double lightAmps = getRmsAmps(LIGHT_CHANNEL) * config.lightGain;

LaundryMachineState newState = state switch {
LaundryMachineState.IDLE or null when motorAmps >= config.motorMinimumActiveAmps => LaundryMachineState.ACTIVE,
LaundryMachineState.ACTIVE when motorAmps < config.motorMinimumActiveAmps => LaundryMachineState.COMPLETE,
LaundryMachineState.COMPLETE when lightAmps >= config.lightMinimumActiveAmps => LaundryMachineState.IDLE,
_ => state ?? LaundryMachineState.IDLE
};

bool stateChanged = state != null && state != newState;
state = newState;

logger.Log(stateChanged ? LogLevel.Debug : LogLevel.Trace, "Dryer is {state}, using {motorAmps:N3} amps for the motor and {lightAmps:N3} amps for the light", newState, motorAmps, lightAmps);

if (stateChanged) {
await onStateChange(newState);
}
}

private async Task onStateChange(LaundryMachineState newState) {
switch (newState) {
case LaundryMachineState.ACTIVE:
logger.LogInformation("Started a load of laundry");
await pagerDutyManager.createChange();
pagerDutyLaundryDoneDedupKey = null;
break;

case LaundryMachineState.COMPLETE:
logger.LogInformation("Laundry is finished");
pagerDutyLaundryDoneDedupKey = await pagerDutyManager.createIncident(Severity.Info, "The dryer has finished a load of laundry.", "dryer-00");
break;

case LaundryMachineState.IDLE when pagerDutyLaundryDoneDedupKey is not null:
logger.LogInformation("Laundry is being emptied");
await pagerDutyManager.resolveIncident(pagerDutyLaundryDoneDedupKey);
pagerDutyLaundryDoneDedupKey = null;
break;
}
}

public void Dispose() {
aggregatingTimer.Dispose();
samplingTimer.Dispose();
adc.Dispose();
// The Mcp3Base superclass of adc disposes of the SpiDevice instance.
GC.SuppressFinalize(this);
}

using Iot.Device.Adc;
using Pager.Duty.Requests;
using System.Device.Spi;
using System.Timers;
using Timer = System.Timers.Timer;

namespace DryerDuty;

public class DryerMonitor: IHostedService, IDisposable {

internal const int SAMPLES_PER_WINDOW = 2 * 60; // 120Hz is the Nyquist limit for 60Hz AC sine wave
private const int MOTOR_CHANNEL = 0;
private const int LIGHT_CHANNEL = 1;
private const int MAX_ADC_READING = 1023; // 10-bit unsigned int
private const double REFERENCE_VOLTS = 3.3;
private const double MAX_CURRENT_TRANSFORMER_OUTPUT_VOLTS = 1;

private readonly ILogger<DryerMonitor> logger;
private readonly PagerDutyManager pagerDutyManager;
private readonly Configuration config;
private readonly Mcp3xxx adc;
private readonly TimeSpan samplingWindow = TimeSpan.FromSeconds(1);
private readonly Timer samplingTimer;
private readonly Timer aggregatingTimer;
private readonly int[][] samplesByChannel = new int[2][];
private readonly int[] maxCurrentTransformerAmps = [60, 5];

internal LaundryMachineState? state;
internal string? pagerDutyLaundryDoneDedupKey;
private int sampleWriteIndex;

public DryerMonitor(ILogger<DryerMonitor> logger, PagerDutyManager pagerDutyManager, Configuration config): this(logger, pagerDutyManager, config,
new Mcp3008(SpiDevice.Create(new SpiConnectionSettings(0, 0) { ClockFrequency = 1_000_000 }))) { }

internal DryerMonitor(ILogger<DryerMonitor> logger, PagerDutyManager pagerDutyManager, Configuration config, Mcp3xxx adc) {
this.logger = logger;
this.pagerDutyManager = pagerDutyManager;
this.config = config;
this.adc = adc;

for (int i = 0; i < samplesByChannel.Length; i++) {
samplesByChannel[i] = new int[SAMPLES_PER_WINDOW];
}

aggregatingTimer = new Timer(samplingWindow) { AutoReset = true };
samplingTimer = new Timer(samplingWindow.Divide(SAMPLES_PER_WINDOW)) { AutoReset = true };

samplingTimer.Elapsed += onSample;
aggregatingTimer.Elapsed += async (_, _) => await aggregateSamplesInWindow();
}

public async Task StartAsync(CancellationToken cancellationToken) {
samplingTimer.Start();

try {
// Give the sample buffer time to fill before starting to aggregate its contents
await Task.Delay(samplingWindow, cancellationToken);
} catch (TaskCanceledException) {
return;
}

aggregatingTimer.Start();
}

public Task StopAsync(CancellationToken cancellationToken) {
aggregatingTimer.Stop();
samplingTimer.Stop();
return Task.CompletedTask;
}

internal void onSample(object? sender = null, ElapsedEventArgs? e = null) {
for (int channel = 0; channel < samplesByChannel.Length; channel++) {
samplesByChannel[channel][sampleWriteIndex] = adc.Read(channel); // sample is in the range [0, 1024)
}

sampleWriteIndex = (sampleWriteIndex + 1) % SAMPLES_PER_WINDOW;
}

private double getRmsAmps(int channel) =>
samplesByChannel[channel].Aggregate(0.0,
(sum, sample) => sum + Math.Pow(
(((sample - MAX_ADC_READING / 2.0) / (REFERENCE_VOLTS / 2) + MAX_ADC_READING / 2.0) / MAX_ADC_READING * REFERENCE_VOLTS - REFERENCE_VOLTS / 2) /
MAX_CURRENT_TRANSFORMER_OUTPUT_VOLTS * maxCurrentTransformerAmps[channel], 2),
sumOfSquares => Math.Sqrt(sumOfSquares / SAMPLES_PER_WINDOW));

internal async Task aggregateSamplesInWindow() {
double motorAmps = getRmsAmps(MOTOR_CHANNEL) * config.motorGain;
double lightAmps = getRmsAmps(LIGHT_CHANNEL) * config.lightGain;

LaundryMachineState newState = state switch {
LaundryMachineState.IDLE or null when motorAmps >= config.motorMinimumActiveAmps => LaundryMachineState.ACTIVE,
LaundryMachineState.ACTIVE when motorAmps < config.motorMinimumActiveAmps => LaundryMachineState.COMPLETE,
LaundryMachineState.COMPLETE when lightAmps >= config.lightMinimumActiveAmps => LaundryMachineState.IDLE,
_ => state ?? LaundryMachineState.IDLE
};

bool stateChanged = state != null && state != newState;
state = newState;

logger.Log(stateChanged ? LogLevel.Debug : LogLevel.Trace, "Dryer is {state}, using {motorAmps:N3} amps for the motor and {lightAmps:N3} amps for the light", newState, motorAmps, lightAmps);

if (stateChanged) {
await onStateChange(newState);
}
}

private async Task onStateChange(LaundryMachineState newState) {
switch (newState) {
case LaundryMachineState.ACTIVE:
logger.LogInformation("Started a load of laundry");
await pagerDutyManager.createChange();
pagerDutyLaundryDoneDedupKey = null;
break;

case LaundryMachineState.COMPLETE:
logger.LogInformation("Laundry is finished");
pagerDutyLaundryDoneDedupKey = await pagerDutyManager.createIncident(Severity.Info, "The dryer has finished a load of laundry.", "dryer-00");
break;

case LaundryMachineState.IDLE when pagerDutyLaundryDoneDedupKey is not null:
logger.LogInformation("Laundry is being emptied");
await pagerDutyManager.resolveIncident(pagerDutyLaundryDoneDedupKey);
pagerDutyLaundryDoneDedupKey = null;
break;
}
}

public void Dispose() {
aggregatingTimer.Dispose();
samplingTimer.Dispose();
adc.Dispose();
// The Mcp3Base superclass of adc disposes of the SpiDevice instance.
GC.SuppressFinalize(this);
}

}
Loading

0 comments on commit 13bcdb7

Please sign in to comment.