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

Improve charging with Sunny Home Manager (#468)
Some checks failed
Build / Build (push) Failing after 2m34s
Details

Browse source
This commit is contained in:
premultiply 2020-11-24 21:54:17 +01:00 • committed by GitHub
parent ebb99fd1a9
commit 403e953ae7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/loadpoint.go
View file

@ -793,7 +793,7 @@ func (lp *LoadPoint) Update(sitePower float64) {
}
// Sunny Home Manager
if mode == api.ModePV && lp.remoteControlled(RemoteSoftDisable) {
if lp.remoteControlled(RemoteSoftDisable) {
remoteDisabled = RemoteSoftDisable
targetCurrent = 0
required = true

11
hems/semp/semp.go
View file

@ -216,6 +216,7 @@ func (s *SEMP) deviceRootHandler(w http.ResponseWriter, r *http.Request) {
msg := Device2EMMsg()
msg.DeviceInfo = append(msg.DeviceInfo, s.allDeviceInfo()...)
msg.DeviceStatus = append(msg.DeviceStatus, s.allDeviceStatus()...)
msg.PlanningRequest = append(msg.PlanningRequest, s.allPlanningRequest()...)
s.writeXML(w, msg)
}
@ -344,7 +345,7 @@ func (s *SEMP) deviceStatus(id int, lp core.LoadPointAPI) DeviceStatus {
isPV := false
if modeP, err := s.cache.GetChecked(id, "mode"); err == nil {
if mode, ok := modeP.Val.(api.ChargeMode); ok && mode == api.ModePV {
if mode, ok := modeP.Val.(api.ChargeMode); ok && (mode == api.ModeMinPV || mode == api.ModePV) {
isPV = true
}
}
@ -394,7 +395,7 @@ func (s *SEMP) planningRequest(id int, lp core.LoadPointAPI) (res PlanningReques
}
latestEnd := int(chargeEstimate / time.Second)
if mode == api.ModePV || latestEnd <= 0 {
if mode == api.ModeMinPV || mode == api.ModePV || latestEnd <= 0 {
latestEnd = 24 * 3600
}
@ -404,7 +405,7 @@ func (s *SEMP) planningRequest(id int, lp core.LoadPointAPI) (res PlanningReques
}
// add 1kWh in case we're charging but battery claims full
if maxEnergy == 0 {
if charging && maxEnergy == 0 {
maxEnergy = 1e3 // 1kWh
}
@ -413,7 +414,7 @@ func (s *SEMP) planningRequest(id int, lp core.LoadPointAPI) (res PlanningReques
minEnergy = 0
}
if charging {
if maxEnergy > 0 {
res = PlanningRequest{
Timeframe: []Timeframe{{
DeviceID: s.deviceID(id),
@ -462,7 +463,7 @@ func (s *SEMP) deviceControlHandler(w http.ResponseWriter, r *http.Request) {
continue
}
if mode := lp.GetMode(); mode != api.ModePV {
if mode := lp.GetMode(); mode != api.ModeMinPV && mode != api.ModePV {
w.WriteHeader(http.StatusBadRequest)
return
}