forked from amkovkov/GranuSightSoftware2
feat: минорые изменения после тестирования
This commit is contained in:
@@ -26,9 +26,9 @@ public class Program
|
||||
var configuration = serviceProvider.GetService<IConfiguration>();
|
||||
if (configuration is null)
|
||||
throw new Exception("Cannot get configuration");
|
||||
var serviceConfiguration = configuration.GetValue<LightsService.LightsServiceConfiguration>("Lights");
|
||||
var serviceConfiguration = configuration.GetSection("Hardware:Lights").Get<LightsService.LightsServiceConfiguration>();
|
||||
if (serviceConfiguration is null)
|
||||
throw new InvalidConfigurationException("Cannot get configuration (Lights)");
|
||||
throw new InvalidConfigurationException("Cannot get configuration (Hardware:Lights)");
|
||||
var logger = serviceProvider.GetService<ILogger<LightsService>>();
|
||||
if (logger is null)
|
||||
throw new Exception("Cannot get logger");
|
||||
@@ -41,9 +41,9 @@ public class Program
|
||||
var configuration = serviceProvider.GetService<IConfiguration>();
|
||||
if (configuration is null)
|
||||
throw new Exception("Cannot get configuration");
|
||||
var serviceConfiguration = configuration.GetValue<TemperatureHumidityService.TemperatureHumidityServiceConfiguration>("TemperatureHumidity");
|
||||
var serviceConfiguration = configuration.GetSection("Hardware:TemperatureHumidity").Get<TemperatureHumidityService.TemperatureHumidityServiceConfiguration>();
|
||||
if (serviceConfiguration is null)
|
||||
throw new InvalidConfigurationException("Cannot get configuration (TemperatureHumidity)");
|
||||
throw new InvalidConfigurationException("Cannot get configuration (Hardware:TemperatureHumidity)");
|
||||
var logger = serviceProvider.GetService<ILogger<TemperatureHumidityService>>();
|
||||
if (logger is null)
|
||||
throw new Exception("Cannot get logger");
|
||||
|
||||
+2
-6
@@ -7,23 +7,19 @@ namespace GSS2.Test;
|
||||
public class Worker(
|
||||
ILogger<Worker> logger,
|
||||
AmineContentCalibrationContext calibrationContext,
|
||||
LightsService lightsService,
|
||||
TemperatureHumidityService temperatureHumidity
|
||||
LightsService lightsService
|
||||
) : BackgroundService
|
||||
{
|
||||
private readonly ILogger<Worker> _logger = logger;
|
||||
private readonly AmineContentCalibrationContext _calibrationContext = calibrationContext;
|
||||
private readonly LightsService _lightsService = lightsService;
|
||||
private readonly TemperatureHumidityService _temperatureHumidity = temperatureHumidity;
|
||||
|
||||
protected override async Task ExecuteAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
_ = _lightsService.Run(cancellationToken);
|
||||
await _lightsService.SnowfallAsync(0.3, 1, Color.Aqua, cancellationToken);
|
||||
_ = _lightsService.SnowfallAsync(0.3, 1, Color.Aqua, cancellationToken);
|
||||
while (!cancellationToken.IsCancellationRequested)
|
||||
{
|
||||
var (temperature, humidity) = await _temperatureHumidity.MeasureAsync();
|
||||
_logger.LogInformation("Temperature: {}, RelativeHumidity: {}", temperature, humidity);
|
||||
await Task.Delay(5000);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,11 +23,11 @@
|
||||
"MaxUv365PwmDuty": 1.0
|
||||
},
|
||||
"TemperatureHumidity": {
|
||||
"Bus": 0,
|
||||
"Address": 68
|
||||
"Bus": 6,
|
||||
"Address": 69
|
||||
},
|
||||
"Lights": {
|
||||
"ServerAddress": "localhost:50051"
|
||||
"ServerAddress": "http://127.0.0.1:50051"
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user