flucky/PKGBUILD
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(types): humidity and temperature with from and till date

Browse Source
This commit is contained in:
Markus Pesch
2019-06-13 22:22:12 +02:00
parent 5220eac16b
commit a8aa7a14c5
6 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/sensor/dht11.go
View File

@ -42,10 +42,11 @@ func (s *DHT11) ReadHumidity() (*types.Humidity, error) {
}
humidity := &types.Humidity{
HumidityID: uuid.NewV4().String(),
HumidityValue: humidityValue,
HumidityDate: time.Now(),
SensorID: s.SensorID,
HumidityID: uuid.NewV4().String(),
HumidityValue: humidityValue,
HumidityFromDate: time.Now(),
HumidityTillDate: time.Now(),
SensorID: s.SensorID,
}
return humidity, nil
@ -74,10 +75,11 @@ func (s *DHT11) ReadTemperature() (*types.Temperature, error) {
}
temperature := &types.Temperature{
TemperatureID: uuid.NewV4().String(),
TemperatureValue: temperatureValue,
TemperatureDate: time.Now(),
SensorID: s.SensorID,
TemperatureID: uuid.NewV4().String(),
TemperatureValue: temperatureValue,
TemperatureFromDate: time.Now(),
TemperatureTillDate: time.Now(),
SensorID: s.SensorID,
}
return temperature, nil

18
pkg/sensor/dht22.go
View File

@ -42,10 +42,11 @@ func (s *DHT22) ReadHumidity() (*types.Humidity, error) {
}
humidity := &types.Humidity{
HumidityID: uuid.NewV4().String(),
HumidityValue: humidityValue,
HumidityDate: time.Now(),
SensorID: s.SensorID,
HumidityID: uuid.NewV4().String(),
HumidityValue: humidityValue,
HumidityFromDate: time.Now(),
HumidityTillDate: time.Now(),
SensorID: s.SensorID,
}
return humidity, nil
@ -74,10 +75,11 @@ func (s *DHT22) ReadTemperature() (*types.Temperature, error) {
}
temperature := &types.Temperature{
TemperatureID: uuid.NewV4().String(),
TemperatureValue: temperatureValue,
TemperatureDate: time.Now(),
SensorID: s.SensorID,
TemperatureID: uuid.NewV4().String(),
TemperatureValue: temperatureValue,
TemperatureFromDate: time.Now(),
TemperatureTillDate: time.Now(),
SensorID: s.SensorID,
}
return temperature, nil

9
pkg/sensor/ds18b20.go
View File

@ -33,10 +33,11 @@ func (s *DS18B20) ReadTemperature() (*types.Temperature, error) {
}
temperature := &types.Temperature{
TemperatureID: uuid.NewV4().String(),
TemperatureValue: t,
TemperatureDate: time.Now(),
SensorID: s.SensorID,
TemperatureID: uuid.NewV4().String(),
TemperatureValue: t,
TemperatureFromDate: time.Now(),
TemperatureTillDate: time.Now(),
SensorID: s.SensorID,
}
return temperature, nil