ckaczor/HomeMonitor
1
0
Fork 0
mirror of https://github.com/ckaczor/HomeMonitor.git synced 2026-01-25 01:25:37 -05:00
Code Issues 9 Packages Projects Releases Wiki Activity

Power service updates

Browse Source 
- Upgrade to .NET 8
- Remove ApplicationInsights
- Add OpenTelemetry
This commit is contained in:
Chris Kaczor
2024-01-22 18:54:18 -05:00
parent 911e7fbdb9
commit 2a58b26eb3
16 changed files with 361 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Power/Service/Models/PowerChannel.cs
View File

@@ -1,30 +1,29 @@
using JetBrains.Annotations;
using System.Text.Json.Serialization;
namespace ChrisKaczor.HomeMonitor.Power.Service.Models
namespace ChrisKaczor.HomeMonitor.Power.Service.Models;
[PublicAPI]
public class PowerChannel
{
[PublicAPI]
public class PowerChannel
{
[JsonPropertyName("type")]
public string Type { get; set; }
[JsonPropertyName("type")]
public string Type { get; set; }
[JsonPropertyName("ch")]
public long ChannelNumber { get; set; }
[JsonPropertyName("ch")]
public long ChannelNumber { get; set; }
[JsonPropertyName("eImp_Ws")]
public long ImportedEnergy { get; set; }
[JsonPropertyName("eImp_Ws")]
public long ImportedEnergy { get; set; }
[JsonPropertyName("eExp_Ws")]
public long ExportedEnergy { get; set; }
[JsonPropertyName("eExp_Ws")]
public long ExportedEnergy { get; set; }
[JsonPropertyName("p_W")]
public long RealPower { get; set; }
[JsonPropertyName("p_W")]
public long RealPower { get; set; }
[JsonPropertyName("q_VAR")]
public long ReactivePower { get; set; }
[JsonPropertyName("q_VAR")]
public long ReactivePower { get; set; }
[JsonPropertyName("v_V")]
public double Voltage { get; set; }
}
}
[JsonPropertyName("v_V")]
public double Voltage { get; set; }
}

27
Power/Service/Models/PowerSample.cs
View File

@@ -3,21 +3,20 @@ using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace ChrisKaczor.HomeMonitor.Power.Service.Models
namespace ChrisKaczor.HomeMonitor.Power.Service.Models;
[PublicAPI]
public class PowerSample
{
[PublicAPI]
public class PowerSample
{
[JsonPropertyName("sensorId")]
public string SensorId { get; set; }
[JsonPropertyName("sensorId")]
public string SensorId { get; set; }
[JsonPropertyName("timestamp")]
public DateTimeOffset Timestamp { get; set; }
[JsonPropertyName("timestamp")]
public DateTimeOffset Timestamp { get; set; }
[JsonPropertyName("channels")]
public PowerChannel[] Channels { get; set; }
[JsonPropertyName("channels")]
public PowerChannel[] Channels { get; set; }
[JsonPropertyName("cts")]
public Dictionary<string, double>[] CurrentTransformers { get; set; }
}
}
[JsonPropertyName("cts")]
public Dictionary<string, double>[] CurrentTransformers { get; set; }
}

17
Power/Service/Models/PowerStatus.cs
View File

@@ -1,13 +1,12 @@
using JetBrains.Annotations;
using System;
namespace ChrisKaczor.HomeMonitor.Power.Service.Models
namespace ChrisKaczor.HomeMonitor.Power.Service.Models;
[PublicAPI]
public class PowerStatus
{
[PublicAPI]
public class PowerStatus
{
public DateTimeOffset Timestamp { get; set; } = DateTimeOffset.UtcNow;
public long Generation { get; set; }
public long Consumption { get; set; }
}
}
public DateTimeOffset Timestamp { get; set; } = DateTimeOffset.UtcNow;
public long Generation { get; set; }
public long Consumption { get; set; }
}

17
Power/Service/Models/PowerStatusGrouped.cs
View File

@@ -1,13 +1,12 @@
using JetBrains.Annotations;
using System;
namespace ChrisKaczor.HomeMonitor.Power.Service.Models
namespace ChrisKaczor.HomeMonitor.Power.Service.Models;
[PublicAPI]
public class PowerStatusGrouped
{
[PublicAPI]
public class PowerStatusGrouped
{
public DateTimeOffset Bucket { get; set; }
public long AverageGeneration { get; set; }
public long AverageConsumption { get; set; }
}
}
public DateTimeOffset Bucket { get; set; }
public long AverageGeneration { get; set; }
public long AverageConsumption { get; set; }
}