diff --git a/cmd/demo.yaml b/cmd/demo.yaml index 4ca21cb98..3f1cba078 100644 --- a/cmd/demo.yaml +++ b/cmd/demo.yaml @@ -209,16 +209,14 @@ loadpoints: phases: 1 soc: target: 90 - meters: - charge: meter_charger_1 + meter: meter_charger_1 vehicle: vehicle_1 - title: Garage charger: charger_2 soc: target: 75 mode: "off" - meters: - charge: meter_charger_2 + meter: meter_charger_2 vehicle: vehicle_2 # - title: Garage rechts # charger: charger_3 diff --git a/core/loadpoint.go b/core/loadpoint.go index a0e5af6d3..edecc863b 100644 --- a/core/loadpoint.go +++ b/core/loadpoint.go @@ -96,15 +96,12 @@ type LoadPoint struct { sync.Mutex // guard status Mode api.ChargeMode `mapstructure:"mode"` // Charge mode, guarded by mutex - Title string `mapstructure:"title"` // UI title - Phases int `mapstructure:"phases"` // Charger enabled phases - ChargerRef string `mapstructure:"charger"` // Charger reference - VehicleRef string `mapstructure:"vehicle"` // Vehicle reference - VehiclesRef []string `mapstructure:"vehicles"` // Vehicles reference - MeterRef string `mapstructure:"meter"` // Charge meter reference - Meters struct { - ChargeMeterRef string `mapstructure:"charge"` // deprecated - } + Title string `mapstructure:"title"` // UI title + Phases int `mapstructure:"phases"` // Charger enabled phases + ChargerRef string `mapstructure:"charger"` // Charger reference + VehicleRef string `mapstructure:"vehicle"` // Vehicle reference + VehiclesRef []string `mapstructure:"vehicles"` // Vehicles reference + MeterRef string `mapstructure:"meter"` // Charge meter reference SoC SoCConfig Enable, Disable ThresholdConfig ResetOnDisconnect bool `mapstructure:"resetOnDisconnect"` @@ -195,16 +192,6 @@ func NewLoadPointFromConfig(log *util.Logger, cp configProvider, other map[strin lp.chargeMeter = cp.Meter(lp.MeterRef) } - // deprecated - if lp.Meters.ChargeMeterRef != "" { - lp.log.WARN.Println("meters: charge: is deprecated. Use meter: instead") - if lp.chargeMeter == nil { - lp.chargeMeter = cp.Meter(lp.Meters.ChargeMeterRef) - } else { - lp.log.ERROR.Println("must not have meter: and meters: charge: both") - } - } - // multiple vehicles for _, ref := range lp.VehiclesRef { vehicle := cp.Vehicle(ref)