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

48
server/http_config_site_handler.go
View file

@ -11,19 +11,21 @@ import (
func siteHandler(site site.API) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
res := struct {
Title string `json:"title"`
Grid string `json:"grid"`
PV []string `json:"pv"`
Battery []string `json:"battery"`
Aux []string `json:"aux"`
Ext []string `json:"ext"`
Title string `json:"title"`
Grid string `json:"grid"`
PV []string `json:"pv"`
Battery []string `json:"battery"`
Aux []string `json:"aux"`
Ext []string `json:"ext"`
Consumers []string `json:"consumers"`
}{
Title: site.GetTitle(),
Grid: site.GetGridMeterRef(),
PV: site.GetPVMeterRefs(),
Battery: site.GetBatteryMeterRefs(),
Aux: site.GetAuxMeterRefs(),
Ext: site.GetExtMeterRefs(),
Title: site.GetTitle(),
Grid: site.GetGridMeterRef(),
PV: site.GetPVMeterRefs(),
Battery: site.GetBatteryMeterRefs(),
Aux: site.GetAuxMeterRefs(),
Ext: site.GetExtMeterRefs(),
Consumers: site.GetConsumerMeterRefs(),
}
jsonWrite(w, res)
@ -44,12 +46,13 @@ func validateRefs(w http.ResponseWriter, refs []string) bool {
func updateSiteHandler(site site.API) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var payload struct {
Title *string
Grid *string
PV *[]string
Battery *[]string
Aux *[]string
Ext *[]string
Title *string
Grid *string
PV *[]string
Battery *[]string
Aux *[]string
Ext *[]string
Consumers *[]string
}
if err := jsonDecoder(r.Body).Decode(&payload); err != nil {
@ -106,6 +109,15 @@ func updateSiteHandler(site site.API) http.HandlerFunc {
setConfigDirty()
}
if payload.Consumers != nil {
if !validateRefs(w, *payload.Consumers) {
return
}
site.SetConsumerMeterRefs(*payload.Consumers)
setConfigDirty()
}
status := map[bool]int{false: http.StatusOK, true: http.StatusAccepted}
w.WriteHeader(status[ConfigDirty()])
}