From a676fe5cda89dc859fe2ba8e7c7e0f6821ea95e7 Mon Sep 17 00:00:00 2001 From: andig Date: Mon, 8 Jan 2024 22:51:59 +0100 Subject: [PATCH] cli/meter: exit after setting battery mode --- cmd/meter.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/cmd/meter.go b/cmd/meter.go index 2abd4a7cb..babb2a12a 100644 --- a/cmd/meter.go +++ b/cmd/meter.go @@ -48,9 +48,11 @@ func runMeter(cmd *cobra.Command, args []string) { meters := config.Meters().Devices() + var flagUsed bool if mode != api.BatteryUnknown { - for _, dev := range meters { - v := dev.Instance() + flagUsed = true + + for _, v := range config.Instances(meters) { if b, ok := v.(api.BatteryController); ok { if err := b.SetBatteryMode(mode); err != nil { log.FATAL.Fatalln("set battery mode:", err) @@ -64,11 +66,13 @@ func runMeter(cmd *cobra.Command, args []string) { } } - d := dumper{len: len(meters)} - for _, dev := range meters { - v := dev.Instance() + if !flagUsed { + d := dumper{len: len(meters)} + for _, dev := range meters { + v := dev.Instance() - d.DumpWithHeader(dev.Config().Name, v) + d.DumpWithHeader(dev.Config().Name, v) + } } // wait for shutdown