wip

Author: andig

core/site_optimizer.go

@@ -18,6 +18,7 @@ import (
 	"github.com/evcc-io/evcc/core/loadpoint"
 	"github.com/evcc-io/evcc/core/metrics"
 	"github.com/evcc-io/evcc/core/types"
+	"github.com/evcc-io/evcc/hems/hems"
 	"github.com/evcc-io/evcc/tariff"
 	"github.com/evcc-io/evcc/util/config"
 	"github.com/evcc-io/evcc/util/request"
@@ -332,9 +333,9 @@ func (site *Site) optimizerUpdate(battery []types.Measurement) error {
 
 	// soft grid feed-in cap from active HEMS curtailment (e.g. German 70% rule):
 	// export is capped at this power, excess PV is curtailed instead of exported
-	if site.hems != nil {
-		if p := site.hems.MaxProductionPower(); p != nil && *p > 0 {
-			req.Grid.PMaxExp = float32(*p)
+	if curtailed := hems.Curtailed(site.hems); curtailed != nil && *curtailed {
+		if pMaxExp := site.hems.MaxProductionPower(); pMaxExp != nil {
+			req.Grid.PMaxExp = float32(*pMaxExp)
 		}
 	}