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

fix(cmd/humidity): enabled humidity read command - use measured value interface instead humidity struct

Browse Source
This commit is contained in:
Markus Pesch 2019-06-27 18:49:04 +02:00
parent 4680841684
commit 6469c0dd6c
Signed by: volker.raschek
GPG Key ID: 852BCC170D81A982
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/cmd.go
View File

@ -6,6 +6,7 @@ import (
"time" "time"
"github.com/go-flucky/flucky/cmd/daemon" "github.com/go-flucky/flucky/cmd/daemon"
"github.com/go-flucky/flucky/cmd/humidity"
"github.com/go-flucky/flucky/cmd/rgbled" "github.com/go-flucky/flucky/cmd/rgbled"
"github.com/go-flucky/flucky/cmd/sensor" "github.com/go-flucky/flucky/cmd/sensor"
"github.com/go-flucky/flucky/cmd/temperature" "github.com/go-flucky/flucky/cmd/temperature"
@ -56,7 +57,7 @@ func Execute(version string) {
rootCmd.PersistentFlags().StringVar(&configFile, "config", "/etc/flucky/config.json", "Config file") rootCmd.PersistentFlags().StringVar(&configFile, "config", "/etc/flucky/config.json", "Config file")
daemon.InitCmd(rootCmd, configFile) daemon.InitCmd(rootCmd, configFile)
//humidity.InitCmd(rootCmd, configFile) humidity.InitCmd(rootCmd, configFile)
rgbled.InitCmd(rootCmd, configFile) rgbled.InitCmd(rootCmd, configFile)
sensor.InitCmd(rootCmd, configFile) sensor.InitCmd(rootCmd, configFile)
temperature.InitCmd(rootCmd, configFile) temperature.InitCmd(rootCmd, configFile)

17
cmd/humidity/read.go
View File

@ -1,9 +1,12 @@
package humidity package humidity
import ( import (
"context"
"log" "log"
"os" "os"
"github.com/go-flucky/flucky/pkg/types/typeswitch"
"github.com/go-flucky/flucky/pkg/cli" "github.com/go-flucky/flucky/pkg/cli"
"github.com/go-flucky/flucky/pkg/config" "github.com/go-flucky/flucky/pkg/config"
"github.com/go-flucky/flucky/pkg/sensor" "github.com/go-flucky/flucky/pkg/sensor"
@ -24,20 +27,24 @@ var readHumidityCmd = &cobra.Command{
} }
// fetch all temperature sensors or sensors by args // fetch all temperature sensors or sensors by args
humiditySensors := make([]sensor.HumiditySensor, 0) sensors := make([]sensor.Sensor, 0)
if len(args) == 0 { if len(args) == 0 {
humiditySensors = cnf.GetHumiditySensors(config.ENABLED) sensors = cnf.GetHumiditySensors(config.ENABLED)
} else { } else {
humiditySensors = cnf.GetHumiditySensorsByName(args) sensors = cnf.GetHumiditySensorsByName(args)
} }
humidities, err := sensor.ReadHumidities(humiditySensors, round) ctx := context.Background()
measuredValues, err := sensor.Read(ctx, sensors)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} }
measuredValues = typeswitch.HumidityValues(measuredValues)
// print humidities on stdout // print humidities on stdout
cli.PrintHumidities(humidities, cnf, os.Stdout) cli.PrintMeasuredValues(measuredValues, cnf, os.Stdout)
// if logs { // if logs {
// humiditiyLogfile := logfile.New(cnf.Device.HumidityLogfile) // humiditiyLogfile := logfile.New(cnf.Device.HumidityLogfile)