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

Circuit: simplify validation (#20364)

Browse source
This commit is contained in:
mfuchs1984 2025-04-04 08:34:35 +02:00 • committed by GitHub
parent c43a92ffd0
commit 61ae848296
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

35
core/circuit/circuit.go
View file

@ -322,21 +322,18 @@ func (c *Circuit) GetMaxPhaseCurrent() float64 {
// ValidatePower validates power request
func (c *Circuit) ValidatePower(old, new float64, charging bool) float64 {
if maxPower := c.GetMaxPower(); maxPower != 0 {
delta := max(0, new-old)
potential := maxPower - c.power
var capped float64
if charging {
if delta > potential {
capped := max(0, min(new, min(old+potential, maxPower*1.1))) //allow 10% more than maxPower since some devices may not utilize offered power completely
c.log.DEBUG.Printf("validate power: %.5gW + (%.5gW -> %.5gW) > %.5gW capped at %.5gW", c.power, old, new, maxPower, capped)
new = capped
} else {
c.log.TRACE.Printf("validate power: %.5gW + (%.5gW -> %.5gW) <= %.5gW ok", c.power, old, new, maxPower)
new = min(new, maxPower*1.1)
}
capped = min(maxPower, min(max(0, potential+old), new))
} else {
new = max(0, min(new, potential))
capped = max(0, min(new, potential))
}
if new > capped {
c.log.DEBUG.Printf("validate power: %.5gW + (%.5gW -> %.5gW) > %.5gW capped at %.5gW", c.power, old, new, maxPower, capped)
}
new = capped
}
if c.parent == nil {
@ -346,25 +343,21 @@ func (c *Circuit) ValidatePower(old, new float64, charging bool) float64 {
return c.parent.ValidatePower(old, new, charging)
}
// ValidateCurrent validates current request
// ValidateCurrent validates current request
func (c *Circuit) ValidateCurrent(old, new float64, charging bool) float64 {
if maxCurrent := c.GetMaxCurrent(); maxCurrent != 0 {
delta := max(0, new-old)
potential := maxCurrent - c.current
var capped float64
if charging {
if delta > potential {
capped := max(0, min(new, min(old+potential, maxCurrent*1.1))) //allow up to 10% more than maxCurrent since some devices may not utilize offered current completely
c.log.DEBUG.Printf("validate current: %.3gA + (%.3gA -> %.3gA) > %.3gA capped at %.3gA", c.current, old, new, maxCurrent, capped)
new = capped
} else {
c.log.TRACE.Printf("validate current: %.3gA + (%.3gA -> %.3gA) <= %.3gA ok", c.current, old, new, maxCurrent)
new = min(new, maxCurrent*1.1)
}
capped = min(maxCurrent, min(max(0, potential+old), new))
} else {
new = max(0, min(new, potential))
capped = max(0, min(new, potential))
}
if new > capped {
c.log.DEBUG.Printf("validate current: %.3gA + (%.3gA -> %.3gA) > %.3gA capped at %.3gA", c.current, old, new, maxCurrent, capped)
}
new = capped
}
if c.parent == nil {

13
core/circuit/circuit_test.go
View file

@ -47,12 +47,13 @@ func circuitTests() []circuitTest {
{1, 0, 0, 2, 1, 1}, // -
// parent overloaded
{2, 0, 0, 0, 0, 0}, // =
{2, 0, 0, 0, 1, 0}, // +
{2, 0, 0, 1, 1, 0}, // =
{2, 0, 0, 2, 2, 1}, // =
{2, 0, 0, 2, 3, 1}, // +
{2, 0, 0, 2, 1, 1}, // -
{2, 0, 0, 0, 0, 0}, // =
{2, 0, 0, 0, 1, 0}, // +
{2, 0, 0, 1, 1, 0}, // =
{2, 0, 0, 2, 2, 1}, // =
{2, 0, 0, 2, 3, 1}, // +
{2, 0, 0, 2, 1, 1}, // -
{1.1, 0, 0, 1, 0, 0}, // -
}
}