Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Config UI: separate consumers from additional meters (#30243)

Browse source
This commit is contained in:
Michael Geers 2026-06-19 14:31:09 +02:00 • committed by GitHub
parent 614ff4ac06
commit 8769ae489d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
31 changed files with 494 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/dump.go
View file

@ -121,6 +121,12 @@ func runDump(cmd *cobra.Command, args []string) {
}
}
for id, name := range site.Meters.ConsumerMetersRef {
if name != "" {
d.DumpWithHeader(fmt.Sprintf("consumer %d: %s", id+1, name), handle(name, config.Meters()))
}
}
for _, v := range site.Vehicles().Instances() {
d.DumpWithHeader(fmt.Sprintf("vehicle: %s", v.GetTitle()), v)
}

1
cmd/migrate.go
View file

@ -76,6 +76,7 @@ func runMigrate(cmd *cobra.Command, args []string) {
settings.Delete(keys.PvMeters)
settings.Delete(keys.AuxMeters)
settings.Delete(keys.ExtMeters)
settings.Delete(keys.ConsumerMeters)
settings.Delete(keys.BatteryMeters)
// clear config table
result := db.Instance.Delete(&config.Config{}, "true")

3
cmd/refs.go
View file

@ -64,13 +64,14 @@ func collectSiteRefs(conf globalconfig.All) error {
references.meter = append(references.meter, refs.Meters.BatteryMetersRef...)
references.meter = append(references.meter, refs.Meters.ExtMetersRef...)
references.meter = append(references.meter, refs.Meters.AuxMetersRef...)
references.meter = append(references.meter, refs.Meters.ConsumerMetersRef...)
// append devices from settings
if v, err := settings.String(keys.GridMeter); err == nil && v != "" {
references.meter = append(references.meter, v)
}
for _, key := range []string{keys.PvMeters, keys.BatteryMeters, keys.ExtMeters, keys.AuxMeters} {
for _, key := range []string{keys.PvMeters, keys.BatteryMeters, keys.ExtMeters, keys.AuxMeters, keys.ConsumerMeters} {
if v, err := settings.String(key); err == nil && v != "" {
references.meter = append(references.meter, strings.Split(v, ",")...)
}