dnutiu/NucuCar
dnutiu/NucuCar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor NucuCar.Sensors configuration handling

Browse source
This commit is contained in:
Denis-Cosmin Nutiu 2019-11-24 18:40:42 +02:00
parent 52ac34761c
commit 4db467f221
8 changed files with 61 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
NucuCar.Sensors/EnvironmentSensor/Bme680Config.cs Normal file
View file

@ -0,0 +1,18 @@
using Microsoft.Extensions.Configuration;
namespace NucuCar.Sensors.EnvironmentSensor
{
public class Bme680Config
{
public bool SensorEnabled { get; }
public bool TelemetryEnabled { get; }
public int MeasurementInterval { get; }
public Bme680Config(IConfiguration configuration)
{
SensorEnabled = configuration.GetValue<bool>("EnvironmentSensor:Enabled");
TelemetryEnabled = configuration.GetValue<bool>("EnvironmentSensor:TelemetryEnabled");
MeasurementInterval = configuration.GetValue<int>("EnvironmentSensor:MeasurementInterval");
}
}
}

5
NucuCar.Sensors/EnvironmentSensor/Bme680Sensor.cs
View file

@ -4,7 +4,6 @@ using System.Device.I2c;
using System.Threading.Tasks;
using Iot.Device.Bmxx80;
using Iot.Device.Bmxx80.PowerMode;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using NucuCar.Domain.Telemetry;
using NucuCarSensorsProto;
@ -24,11 +23,11 @@ namespace NucuCar.Sensors.EnvironmentSensor
private EnvironmentSensorMeasurement _lastMeasurement;
private SensorStateEnum _sensorStateEnum;
public Bme680Sensor(ILogger<Bme680Sensor> logger, IConfiguration configuration)
public Bme680Sensor(ILogger<Bme680Sensor> logger, Bme680Config configuration)
{
_sensorStateEnum = SensorStateEnum.Uninitialized;
_logger = logger;
if (configuration.GetValue<bool>("EnvironmentSensor:Enabled"))
if (configuration.SensorEnabled)
{
InitializeSensor();
}

11
NucuCar.Sensors/EnvironmentSensor/Bme680Worker.cs
View file

@ -1,6 +1,5 @@
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using NucuCar.Domain.Telemetry;
@ -16,18 +15,18 @@ namespace NucuCar.Sensors.EnvironmentSensor
public class Bme680Worker : BackgroundService
{
private readonly bool _telemetryEnabled;
private readonly int _measurementDelay;
private readonly int _measurementInterval;
private readonly ILogger<Bme680Worker> _logger;
private readonly TelemetryPublisher _telemetryPublisher;
private readonly Bme680Sensor _bme680Sensor;
public Bme680Worker(ILogger<Bme680Worker> logger, IConfiguration config,
public Bme680Worker(ILogger<Bme680Worker> logger, Bme680Config config,
SensorTelemetry sensorTelemetry, Bme680Sensor bme680Sensor)
{
_logger = logger;
_telemetryEnabled = config.GetValue<bool>("EnvironmentSensor:Telemetry");
_measurementDelay = config.GetValue<int>("EnvironmentSensor:MeasurementInterval");
_telemetryEnabled = config.TelemetryEnabled;
_measurementInterval = config.MeasurementInterval;
_telemetryPublisher = sensorTelemetry.Publisher;
_bme680Sensor = bme680Sensor;
}
@ -54,7 +53,7 @@ namespace NucuCar.Sensors.EnvironmentSensor
_bme680Sensor.InitializeSensor();
}
await Task.Delay(_measurementDelay, stoppingToken);
await Task.Delay(_measurementInterval, stoppingToken);
}
_telemetryPublisher?.UnRegisterTelemeter(_bme680Sensor);

22
NucuCar.Sensors/Program.cs
View file

@ -2,6 +2,8 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using NucuCar.Sensors.EnvironmentSensor;
using NucuCar.Sensors.Telemetry;
namespace NucuCar.Sensors
{
@ -16,23 +18,17 @@ namespace NucuCar.Sensors
Host.CreateDefaultBuilder(args)
.ConfigureServices((hostContext, services) =>
{
var config = hostContext.Configuration;
// Transient
services.AddTransient<TelemetryConfig>();
services.AddTransient<Bme680Config>();
// Singletons
services.AddSingleton<Telemetry.SensorTelemetry>();
services.AddSingleton<EnvironmentSensor.Bme680Sensor>();
services.AddSingleton<SensorTelemetry>();
services.AddSingleton<Bme680Sensor>();
// Workers
if (config.GetValue<bool>("Telemetry:Enabled"))
{
services.AddHostedService<Telemetry.TelemetryWorker>();
}
if (config.GetValue<bool>("EnvironmentSensor:Enabled"))
{
services.AddHostedService<EnvironmentSensor.Bme680Worker>();
}
services.AddHostedService<TelemetryWorker>();
services.AddHostedService<Bme680Worker>();
})
.ConfigureWebHostDefaults(webBuilder =>
{

7
NucuCar.Sensors/Telemetry/SensorTelemetry.cs
View file

@ -1,4 +1,3 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using NucuCar.Domain.Telemetry;
@ -8,13 +7,13 @@ namespace NucuCar.Sensors.Telemetry
{
public TelemetryPublisher Publisher { get; }
public SensorTelemetry(ILogger<SensorTelemetry> logger, IConfiguration configuration)
public SensorTelemetry(ILogger<SensorTelemetry> logger, TelemetryConfig configuration)
{
if (configuration.GetValue<bool>("Telemetry:Enabled"))
if (configuration.ServiceEnabled)
{
Publisher = new TelemetryPublisherAzure(new TelemetryPublisherBuilderOptions()
{
ConnectionString = configuration.GetValue<string>("Telemetry:ConnectionString"),
ConnectionString = configuration.ConnectionString,
TelemetrySource = "NucuCar.Sensors",
Logger = logger
});

19
NucuCar.Sensors/Telemetry/TelemetryConfig.cs Normal file
View file

@ -0,0 +1,19 @@
using Microsoft.Extensions.Configuration;
namespace NucuCar.Sensors.Telemetry
{
public class TelemetryConfig
{
public bool ServiceEnabled { get; }
public int PublishInterval { get; }
public string ConnectionString { get; }
public TelemetryConfig(IConfiguration configuration)
{
ServiceEnabled = configuration.GetValue<bool>("Telemetry:Enabled");
PublishInterval = configuration.GetValue<int>("Telemetry:PublishInterval");
ConnectionString = configuration.GetValue<string>("Telemetry:ConnectionString");
}
}
}

5
NucuCar.Sensors/Telemetry/TelemetryWorker.cs
View file

@ -1,6 +1,5 @@
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using NucuCar.Domain.Telemetry;
@ -16,11 +15,11 @@ namespace NucuCar.Sensors.Telemetry
private readonly ILogger _logger;
private readonly TelemetryPublisher _telemetryPublisher;
public TelemetryWorker(ILogger<TelemetryWorker> logger, IConfiguration configuration,
public TelemetryWorker(ILogger<TelemetryWorker> logger, TelemetryConfig config,
SensorTelemetry sensorTelemetry)
{
_logger = logger;
_interval = configuration.GetValue<int>("Telemetry:Interval");
_interval = config.PublishInterval;
_telemetryPublisher = sensorTelemetry.Publisher;
if (_telemetryPublisher == null)
{

4
NucuCar.Sensors/appsettings.json
View file

@ -1,12 +1,12 @@
{
"Telemetry": {
"Enabled": true,
"Interval": 3000,
"PublishInterval": 3000,
"ConnectionString": "YOUR_CONNECTION_STRING"
},
"EnvironmentSensor": {
"Enabled": true,
"Telemetry": true,
"TelemetryEnabled": true,
"MeasurementInterval": 1000
},
"Logging": {