fix(pkg/daemon): use measuredValue interface instead of different structs
This commit is contained in:
@ -10,16 +10,16 @@ import (
|
||||
"github.com/go-flucky/flucky/pkg/types"
|
||||
)
|
||||
|
||||
// ReadHumidities returns a list of measured humidities by humidity sensors
|
||||
func ReadHumidities(humiditySensors []HumiditySensor, round float64) ([]*types.Humidity, error) {
|
||||
humidityChannel := make(chan *types.Humidity, len(humiditySensors))
|
||||
errorChannel := make(chan error, len(humiditySensors))
|
||||
// Read measured values from sensors
|
||||
func Read(ctx context.Context, sensors []Sensor) ([]types.MeasuredValue, error) {
|
||||
measuredValueChannel := make(chan types.MeasuredValue, len(sensors))
|
||||
errorChannel := make(chan error, len(sensors))
|
||||
|
||||
wg := new(sync.WaitGroup)
|
||||
wg.Add(len(humiditySensors))
|
||||
wg.Add(len(sensors))
|
||||
|
||||
for _, humiditySensor := range humiditySensors {
|
||||
go humiditySensor.ReadHumidityWriteIntoChannel(round, humidityChannel, errorChannel, wg)
|
||||
for _, sensor := range sensors {
|
||||
go sensor.ReadContinously(ctx, measuredValueChannel, errorChannel)
|
||||
}
|
||||
|
||||
wg.Wait()
|
||||
@ -29,132 +29,29 @@ func ReadHumidities(humiditySensors []HumiditySensor, round float64) ([]*types.H
|
||||
return nil, prittyprint.FormatErrors(errors)
|
||||
}
|
||||
|
||||
humidities := collect.Humidities(humidityChannel)
|
||||
measuredValues := collect.MeasuredValues(measuredValueChannel)
|
||||
|
||||
return humidities, nil
|
||||
return measuredValues, nil
|
||||
}
|
||||
|
||||
// ReadHumiditiesWriteIntoChannel reads the humidity values of humidity sensors and writes them into a channel
|
||||
func ReadHumiditiesWriteIntoChannel(ctx context.Context, humiditySensors []HumiditySensor, round float64, humidityChannel chan<- *types.Humidity, errorChannel chan<- error, wg *sync.WaitGroup) {
|
||||
for _, humiditySensor := range humiditySensors {
|
||||
humiditySensor.ReadHumidityWriteIntoChannel(round, humidityChannel, errorChannel, wg)
|
||||
// ReadChannel reads the measured values from sensors and writes them to a
|
||||
// channel.
|
||||
func ReadChannel(ctx context.Context, sensors []Sensor, measuredValueChannel chan<- types.MeasuredValue, errorChannel chan<- error, wg *sync.WaitGroup) {
|
||||
for _, sensor := range sensors {
|
||||
sensor.ReadChannel(measuredValueChannel, errorChannel, wg)
|
||||
}
|
||||
}
|
||||
|
||||
// ReadHumiditiesContinuously reads the humidity values of humidity sensors continuously and writes them into a channel
|
||||
func ReadHumiditiesContinuously(ctx context.Context, humiditySensors []HumiditySensor, round float64, humidityChannel chan<- *types.Humidity, errorChannel chan<- error) {
|
||||
// ReadContinuously reads the measured values continously from sensors and writes
|
||||
// them to a channel.
|
||||
func ReadContinuously(ctx context.Context, sensors []Sensor, measuredValueChannel chan<- types.MeasuredValue, errorChannel chan<- error) {
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
errorChannel <- fmt.Errorf("Context closed: %v", ctx.Err())
|
||||
return
|
||||
default:
|
||||
ReadHumiditiesWriteIntoChannel(ctx, humiditySensors, round, humidityChannel, errorChannel, nil)
|
||||
ReadChannel(ctx, sensors, measuredValueChannel, errorChannel, nil)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ReadTemperatures returns a list of measured temperatures by temperature sensors
|
||||
func ReadTemperatures(temperatureSensors []TemperatureSensor, degree types.TemperatureUnit, round float64) ([]*types.Temperature, error) {
|
||||
temperatureChannel := make(chan *types.Temperature, len(temperatureSensors))
|
||||
errorChannel := make(chan error, len(temperatureSensors))
|
||||
|
||||
wg := new(sync.WaitGroup)
|
||||
wg.Add(len(temperatureSensors))
|
||||
|
||||
for _, temperatureSensor := range temperatureSensors {
|
||||
go temperatureSensor.ReadTemperatureWriteIntoChannel(degree, round, temperatureChannel, errorChannel, wg)
|
||||
}
|
||||
|
||||
wg.Wait()
|
||||
|
||||
errors := collect.Errors(errorChannel)
|
||||
if len(errors) > 0 {
|
||||
return nil, prittyprint.FormatErrors(errors)
|
||||
}
|
||||
|
||||
temperatures := collect.Temperatures(temperatureChannel)
|
||||
|
||||
return temperatures, nil
|
||||
}
|
||||
|
||||
// ReadTemperaturesWriteIntoChannel reads the temperature values of temperature sensors and writes them into a channel
|
||||
func ReadTemperaturesWriteIntoChannel(ctx context.Context, temperatureSensors []TemperatureSensor, degree types.TemperatureUnit, round float64, temperatureChannel chan<- *types.Temperature, errorChannel chan<- error, wg *sync.WaitGroup) {
|
||||
for _, temperatureSensor := range temperatureSensors {
|
||||
temperatureSensor.ReadTemperatureWriteIntoChannel(degree, round, temperatureChannel, errorChannel, wg)
|
||||
}
|
||||
}
|
||||
|
||||
// ReadTemperaturesContinuously reads the temperature values of temperature sensors continuously and writes them into a chann
|
||||
func ReadTemperaturesContinuously(ctx context.Context, temperatureSensors []TemperatureSensor, degree types.TemperatureUnit, round float64, temperatureChannel chan<- *types.Temperature, errorChannel chan<- error) {
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
errorChannel <- fmt.Errorf("Context closed: %v", ctx.Err())
|
||||
return
|
||||
default:
|
||||
ReadTemperaturesWriteIntoChannel(ctx, temperatureSensors, degree, round, temperatureChannel, errorChannel, nil)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func convertTemperatureMeasurementUnit(value float64, fromDegree types.TemperatureUnit, toDegree types.TemperatureUnit) float64 {
|
||||
|
||||
switch fromDegree {
|
||||
// Celsius
|
||||
case types.TemperatureUnitCelsius:
|
||||
switch toDegree {
|
||||
// Celsius -> Celsius
|
||||
case types.TemperatureUnitCelsius:
|
||||
return value
|
||||
// Celsius -> Fahrenheit
|
||||
case types.TemperatureUnitFahrenheit:
|
||||
return (value * 9 / 5) + 32
|
||||
// Celsius -> Kelvin
|
||||
case types.TemperatureUnitKelvin:
|
||||
return value + 273.15
|
||||
}
|
||||
|
||||
// Fahrenheit
|
||||
case types.TemperatureUnitFahrenheit:
|
||||
switch toDegree {
|
||||
// Fahrenheit -> Celsius
|
||||
case types.TemperatureUnitCelsius:
|
||||
return (value - 32) * 5 / 9
|
||||
// Fahrenheit -> Fahrenheit
|
||||
case types.TemperatureUnitFahrenheit:
|
||||
return value
|
||||
// Fahrenheit -> Kelvin
|
||||
case types.TemperatureUnitKelvin:
|
||||
return (value-32)*5/9 + 273.15
|
||||
}
|
||||
|
||||
case types.TemperatureUnitKelvin:
|
||||
switch toDegree {
|
||||
// Kelvin -> Celsius
|
||||
case types.TemperatureUnitCelsius:
|
||||
return value - 273.15
|
||||
// Kelvin -> Fahrenheit
|
||||
case types.TemperatureUnitFahrenheit:
|
||||
return (value-273.15)*9/5 + 32
|
||||
// Kevin -> Kelvin
|
||||
case types.TemperatureUnitKelvin:
|
||||
return value
|
||||
}
|
||||
}
|
||||
|
||||
return value
|
||||
}
|
||||
|
||||
func SelectTemperatureMeasurementUnit(unit string) (types.TemperatureUnit, error) {
|
||||
switch unit {
|
||||
case "celsius":
|
||||
return types.TemperatureUnitCelsius, nil
|
||||
case "fahrenheit":
|
||||
return types.TemperatureUnitFahrenheit, nil
|
||||
case "kelvin":
|
||||
return types.TemperatureUnitKelvin, nil
|
||||
default:
|
||||
return "", fmt.Errorf("Can not determine temperature measurement unit")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user