wip

evcc-io · Jun 24, 2024 · 806d851 · 806d851
1 parent c3b5cb8
commit 806d851
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/charger/charger.go b/charger/charger.go
@@ -133,6 +133,9 @@ func NewConfigurableFromConfig(other map[string]interface{}) (api.Charger, error
 
 	// decorate measurements
 	powerG, energyG, currentsG, voltagesG, powersG, err := meter.BuildMeasurements(cc.Power, cc.Energy, cc.Currents, cc.Voltages, cc.Powers)
+	if err != nil {
+		return nil, err
+	}
 
 	return decorateCustom(c, maxcurrentmillis, identify, phases1p3p, wakeup, soc, powerG, energyG, currentsG, voltagesG, powersG), nil
 }

diff --git a/meter/mbmd.go b/meter/mbmd.go
@@ -160,11 +160,9 @@ func (m *ModbusMbmd) buildPhaseProviders(readings []string) (func() (float64, fl
 			return nil, fmt.Errorf("invalid measurement [%d]: %s", idx, reading)
 		}
 
-		c := func() (float64, error) {
+		phases[idx] = func() (float64, error) {
 			return m.floatGetter(opCurrent)
 		}
-
-		phases[idx] = c
 	}
 
 	return CollectPhaseProviders(phases), nil