admin/goodwe-addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SAFETY-87: peak guard uses every battery that can still give
checks / unit (pull_request) Successful in 25m45s
Details
infra-pin / fresh (pull_request) Successful in 1s
Details

Browse Source 
At N>=2 a battery at or under its own peak reserve is held: it gives
nothing for the peak (weight 0 while the site gives) and the guard's need
is placed on the live, non-refusing batteries above theirs. The guard is
floor-limited, and alarms, only when those cannot hold the limit at full
power for ALARM_HOLD_S. The peak alarms no longer read "Not ready" or hold
the Home page at 0 W, because control keeps running. N=1 is byte-identical.

DECISIONS/SAFETY-87-guard-uses-able-batteries.md.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_019DBUfvndgHwaV339Fvd2gr
This commit is contained in:
Claude
2026-10-01 09:29:30 +02:00
parent b8ddfd787f
commit d0db5b8c39
12 changed files with 901 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
goodwe_controller/test_peakguard.py
+56 -38
View File
@@ -109,6 +109,7 @@ import re
import shutil
import sys
import tempfile
import types
import time
from datetime import datetime, timedelta, timezone
from math import inf, isinf
@@ -2537,12 +2538,18 @@ print(f" banner ({len(_pay25['banner'])} chars): {_pay25['banner']}")
# that is going over the ceiling.
# UX-08: the banner is the notification's own title, and the row below keeps
# the SAFETY-25 sentence.
check("the Not ready banner is a short headline - the notification's title - "
"and NOT the row repeated at the top of the page. A headline that is a "
"paragraph is a headline nobody reads",
# SAFETY-87: control goes on while the guard is floor-limited, so the banner
# does not say "Not ready". This fixture also has a row that does stop control
# (no SoC entity), which outranks it; the peak row alone is graded below.
c25.checks = lambda: rows25
_pay25 = c25.status_payload()
del c25.checks
print(f" banner, peak row alone: {_pay25['banner']}")
check("the banner is a short headline - the notification's title, without "
"'Not ready' (control goes on) - and NOT the row repeated at the top of "
"the page. A headline that is a paragraph is a headline nobody reads",
_pay25["level"] == "bad"
and _pay25["banner"] == (f"{messages.NOT_READY} — "
f"{messages.T_PEAK_RESERVE}")
and _pay25["banner"] == messages.T_PEAK_RESERVE
and not _row_scope(_pay25["banner"]))
check("...and shortening the banner did NOT shorten the row: the SAFETY-25 "
"sentence is still what the checks list carries, which is the surface the "
@@ -4139,18 +4146,22 @@ check("⚠️ ...AND THE SAME PAIR SWAPPED GIVES THE SAME SITE FLOOR, so no "
and _g_deepa.soc_floor != _g_shallow.soc_floor
and [pk.bms_floor for pk in _g_ctl_deepa.packs]
== [B_PACK_FLOOR_DEEP_SIM, B_PACK_FLOOR_SIM])
check("...and it is not just a number in a report - THE SITE'S VERDICT FLIPS. "
"With both packs at 25 % the shallow site is permitted and the guard "
"sizes a positive forced discharge; BOTH deep sites are FLOOR-LIMITED, "
"because 25 % is at or below the 35 % cut-out wherever on the roster it "
"sits. Grading the roster against one position would spend a pack its "
"BMS stops - through `sim/inject.py`, which does not run rule 8 - and "
"this line is what goes red when it does",
# SAFETY-87 changed what the verdict is at N>=2: the pack at or under its own
# floor is HELD (named, gives nothing for the peak) and the others still shave.
check("...and it is not just a number in a report - THE HELD PACK FOLLOWS IT. "
"With both packs at 25 % the shallow site holds nobody back; on BOTH deep "
"sites the pack whose 35 % cut-out is at or above 25 % is held, wherever "
"it sits, gives nothing for the peak (weight 0), and the other pack "
"carries a positive floor (SAFETY-87). Holding a position instead of "
"the pack would spend a pack its BMS stops",
_g_shallow.floor_limited is False and _g_shallow.floor_w > 0.0
and _g_deep.floor_limited is True and _g_deep.floor_w == 0.0
and _g_deep.soc_floor_reason == FLOOR_AT_SOC_FLOOR
and _g_deepa.floor_limited is True and _g_deepa.floor_w == 0.0
and _g_deepa.soc_floor_reason == FLOOR_AT_SOC_FLOOR)
and _g_shallow.held == ()
and _g_deep.floor_limited is False and _g_deep.floor_w > 0.0
and _g_deep.held == ("inverter-b",)
and _g_ctl_deep._peak_reserve() == {"inverter-b"}
and _g_deepa.floor_limited is False and _g_deepa.floor_w > 0.0
and _g_deepa.held == ("inverter-a",)
and _g_ctl_deepa._peak_reserve() == {"inverter-a"})
check("...and the precondition that makes the three runs comparable (habit 1): "
"the two deep runs carry THE SAME PAIR of cut-outs in opposite orders, "
"those two numbers really are different, and all six packs are at the "
@@ -4221,14 +4232,14 @@ check("⚠️ THE POSITIONAL PIN, AND IT NEEDS THREE PACKS TO EXIST. On a roster
for r in _g3_runs)
and [[pk.bms_floor for pk in r[2].packs] for r in _g3_runs]
== [r[1] for r in _g3_runs])
check("...and the VERDICT flips with it, on all three: 25 % is at or below the "
"35 % cut-out wherever it sits, so every one of these sites is "
"FLOOR-LIMITED and sizes no forced discharge at all - where the "
"all-shallow two-pack baseline above was permitted and sized a positive "
"one. A slice that dropped the deep position would spend, through "
"`sim/inject.py`, a pack its BMS stops",
all(r[3].floor_limited is True and r[3].floor_w == 0.0
and r[3].soc_floor_reason == FLOOR_AT_SOC_FLOOR for r in _g3_runs)
check("...and the HELD pack follows it, on all three (SAFETY-87): 25 % is at "
"or below the 35 % cut-out wherever it sits, so that pack and only that "
"pack is held and gives nothing for the peak, while the two others carry "
"a positive floor. A slice that dropped the deep position would spend, "
"through `sim/inject.py`, a pack its BMS stops",
all(r[3].floor_limited is False and r[3].floor_w > 0.0
and r[3].held == (r[2].inverters[r[1].index(_G3_DEEP_SIM)].name,)
and r[2]._peak_reserve() == set(r[3].held) for r in _g3_runs)
and _g_shallow.floor_limited is False and _g_shallow.floor_w > 0.0)
check("...and the precondition that makes the three comparable (habit 1): every "
"pack in all three rosters is at the SAME state of charge, so neither the "
@@ -4386,12 +4397,18 @@ async def _notify32(packs_socs, floors):
inv_b, _ = second_inverter(ctl)
for inv, so, fl in zip(ctl.inverters, packs_socs, floors):
inv.soc, inv.bms_soc_floor = so, fl
ctl.peak_guard = PeakDecision(
# SAFETY-87: the full pack refuses to give (SAFETY-73), so no battery
# can carry the peak and the alarm still fires; it names the held one.
inv.refused = 1 if so > SOC_FLOOR else 0
_idle = [types.SimpleNamespace(phase="idle", owns_setpoint=False,
setpoint_w=None)] * 2
ctl.peak_guard = ctl._peak_on_able(PeakDecision(
engaged=True, floor_w=0.0, ceiling_w=CAP_W, ceiling_from=CEILING_CAP,
projected_w=CAP_W + 500.0, excess_w=500.0, wanted_w=500.0,
floor_limited=True, soc=min(packs_socs),
soc_floor=binding_soc_floor(ctl.packs, SOC_FLOOR),
soc_floor_reason=FLOOR_AT_SOC_FLOOR, reason="PEAK GUARD FLOOR-LIMITED: x")
soc_floor_reason=FLOOR_AT_SOC_FLOOR, reason="PEAK GUARD FLOOR-LIMITED: x"),
_idle)
ctl._peak_floor_limited = False
await ctl.check_peak_floor_limited()
return hs.last_message("goodwe_peak_soc_floor")
@@ -4581,18 +4598,19 @@ check("...and the TWO-pack mirror, which is what production reaches the moment "
[r[3].soc for r in _s2_runs] == [_S_EMPTY_SIM] * 2
and [[inv.soc for inv in r[2].inverters] for r in _s2_runs]
== [[_S_EMPTY_SIM, _S_FULL_SIM], [_S_FULL_SIM, _S_EMPTY_SIM]])
check("⚠️ ...AND THE SITE'S VERDICT FLIPS WITH IT, which is what makes this a "
"defect rather than a reporting difference. With the emptiest pack at "
"11 % - below the 20 % EMS floor - every one of those five sites is "
"FLOOR-LIMITED and sizes NO forced discharge at all, where the baseline "
"with its emptiest pack at 25 % is permitted and sizes a positive one. A "
"reduction that dropped the empty pack's position would grade this site "
"for PERMISSION against a pack 39 points fuller and spend, through "
"`sim/inject.py`, a pack its own BMS stops",
all(r[3].floor_limited is True and r[3].floor_w == 0.0
# SAFETY-87: at N>=2 the emptiest pack is HELD and the others still shave.
check("⚠️ ...AND THE HELD PACK FOLLOWS IT, which is what makes this a defect "
"rather than a reporting difference. With the emptiest pack at 11 % - "
"below the 20 % EMS floor - that pack and only that pack is held on "
"every one of those five sites and gives nothing for the peak, while "
"the fuller ones carry a positive floor (SAFETY-87); the baseline holds "
"nobody back. A reduction that dropped the empty pack's position would "
"spend, through `sim/inject.py`, a pack its own BMS stops",
all(r[3].floor_limited is False and r[3].floor_w > 0.0
and r[3].held == (r[2].inverters[r[1].index(_S_EMPTY_SIM)].name,)
for r in _s3_runs + _s2_runs)
and _s_ok.floor_limited is False and _s_ok.floor_w > 0.0
and _s_ok.soc == SOC_BETWEEN)
and _s_ok.held == () and _s_ok.soc == SOC_BETWEEN)
check("...and the precondition that makes the six runs comparable (habit 1): "
"every pack in every roster carries the SAME cut-out, so "
"`binding_soc_floor()` answers the SAME site floor on all of them and the "
@@ -5727,8 +5745,8 @@ MUT.append(("main.py grading the site against ONE roster position - "
_g_deep.soc_floor == float(B_PACK_FLOOR_DEEP_SIM)
and _g_deepa.soc_floor == float(B_PACK_FLOOR_DEEP_SIM)
and _g_shallow.soc_floor == float(SOC_FLOOR)
and _g_deep.floor_limited and _g_deepa.floor_limited
and not _g_shallow.floor_limited,
and _g_deep.held == ("inverter-b",)
and _g_deepa.held == ("inverter-a",) and _g_shallow.held == (),
"part 12g, REWRITTEN as behaviour: real two-pack cycles, the SAME "
"pair of cut-outs carried in both orders, and both the floor "
"reaching decide() and the site's verdict follow the ROSTER rather "