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

HEMS: published detailed config including max power (#25869)

Browse source
This commit is contained in:
andig 2025-12-11 09:48:39 +01:00 • committed by GitHub
parent f365e2099a
commit c25bf05086
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
50 changed files with 364 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

35
cmd/setup.go
View file

@ -26,6 +26,7 @@ import (
"github.com/evcc-io/evcc/core/session"
coresettings "github.com/evcc-io/evcc/core/settings"
"github.com/evcc-io/evcc/hems"
hemsapi "github.com/evcc-io/evcc/hems/hems"
"github.com/evcc-io/evcc/hems/shm"
"github.com/evcc-io/evcc/meter"
"github.com/evcc-io/evcc/plugin/golang"
@ -79,6 +80,11 @@ var conf = globalconfig.All{
},
}
var fromYaml struct {
sponsor bool
hems bool
}
var nameRE = regexp.MustCompile(`^[a-zA-Z0-9_.:-]+$`)
func nameValid(name string) error {
@ -492,11 +498,10 @@ func configureSponsorship(token string) (err error) {
if token, err = settings.String(keys.SponsorToken); err != nil {
return err
}
sponsor.SetFromYaml(false) // from database
} else if token != "" {
fromYaml.sponsor = true
}
// TODO migrate settings
return sponsor.ConfigureSponsorship(token)
}
@ -711,32 +716,36 @@ func configureGo(conf []globalconfig.Go) error {
}
// setup HEMS
func configureHEMS(conf *globalconfig.Hems, site *core.Site) error {
// migrate settings
if settings.Exists(keys.Hems) {
*conf = globalconfig.Hems{}
if err := settings.Yaml(keys.Hems, new(map[string]any), &conf); err != nil {
return err
func configureHEMS(conf *globalconfig.Hems, site *core.Site) (hemsapi.API, error) {
// use yaml if configured
if conf.Type == "" {
if settings.Exists(keys.Hems) {
*conf = globalconfig.Hems{}
if err := settings.Yaml(keys.Hems, new(map[string]any), &conf); err != nil {
return nil, err
}
}
} else {
fromYaml.hems = true
}
if conf.Type == "" {
return nil
return nil, nil
}
props, err := customDevice(conf.Other)
if err != nil {
return fmt.Errorf("cannot decode custom hems '%s': %w", conf.Type, err)
return nil, fmt.Errorf("cannot decode custom hems '%s': %w", conf.Type, err)
}
hems, err := hems.NewFromConfig(context.TODO(), conf.Type, props, site)
if err != nil {
return fmt.Errorf("failed configuring hems: %w", err)
return nil, fmt.Errorf("failed configuring hems: %w", err)
}
go hems.Run()
return nil
return hems, nil
}
// networkSettings reads/migrates network settings