Release 0.22.0: version and CHANGELOG

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Bdqr7PiaHcBnzPituu2yTC

goodwe_controller/CHANGELOG.md

@@ -1,5 +1,128 @@
 # Changelog
 
+## 0.22.0
+
+**A minor bump: a battery's monthly charge now gets the cheap night, the plan knows about the 7-day wait, a slow meter is followed more gently, and one peak-guard stop no longer costs a night charge its whole period. No option changes.**
+No option was added, removed or renamed, and no default changed (86 options). **Existing installs need no option change:** options that start 0.21.0 also start 0.22.0, and the Supervisor form is the same. It is a minor bump because control acts differently in the cases below; every saved setting still starts.
+
+**A battery's monthly charge gets the cheap night.** While one battery is in the charge part of its monthly cycle, the other battery no longer grid-charges ahead of it, and the charge aims at this month's highest peak, as the peak guard does, not at the lower limit. In a rig test with the live setup (two batteries, one in its monthly charge), the cycling battery charged at about 1.5 kW in every cheap quarter (13.3 kWh in a night) and the other battery bought nothing; before, it charged at about 225 W or not at all. The peak limit was kept. At the start of a month, before a peak above the limit has been seen, this charge is much slower ([[SAFETY-111]]).
+
+**The plan knows about the 7-day wait.** After a failed monthly cycle, Home no longer shows a cycle every night. It says the cycle waits, and shows the day the wait ends. The cycle tries again at its start hour after that day ([[MAINT-26]]). In a rig test no cycle was drawn during the wait, and none started.
+
+**One peak-guard stop no longer costs the night charge its period.** With battery modes on, a night grid charge that the peak guard stops early in a 15-minute period used to stay stopped until the period ended. It may now start again after a minute, once per period, and not in the last minute. A real overload is cut as fast as before. In a rig test of the 01:00 case the night's charge was 0.45 to 0.46 kWh, against 0.42 to 0.44 kWh before. The status says "grid charge paused, it tries again in a minute" while it waits.
+
+**A slow meter is followed more gently.** With a meter whose readings come 4 s or more apart, such as a 5 s meter, control now takes smaller steps after a big change until the meter shows it. With Home Assistant readings 10 s late, less power goes to the grid when loads switch on and off: 44 % less in a simulation and 29 % less in a rig test. Meters of 1 or 2 s are left alone by design (the same commands in 63 simulation runs). Readings 15 s late gain less (19 % in a simulation) and are in the known issues.
+
+**No change in behaviour:** the comments in the main program file are shorter, and the file is split into smaller files by job. A rig test saw the same start-up, stops and commands.
+
+Contents of this release, in merge order since 0.21.0 (`5e00cbb`):
+
+| | |
+|---|---|
+| `56fc41f` | The comments in the main program file are shorter and clearer. There is no change in behaviour ([[MAINT-20]], #224) |
+| `8508ac3` | The main program file is split into smaller files by job. There is no change in behaviour; a rig test saw the same start-up, stops and commands ([[MAINT-21]], #243) |
+| `a8ecf17` | With a 5 s meter and Home Assistant readings 10 to 15 s late, control follows the meter more gently after a change, so less power goes to the grid when loads switch on and off. Meters of 1 or 2 s are left alone ([[SAFETY-136]], #244) |
+| `02eac3b` | A night grid charge that the peak guard stops early in a 15-minute period may start again after a minute, once per period, instead of staying stopped until the period ends. A real overload is cut as fast as before. Battery modes only ([[SAFETY-135]], #245) |
+| `1b5f7c9` | While a battery's monthly cycle charges, the other battery no longer grid-charges ahead of it, and the charge aims at this month's highest peak, so it gets the cheap night. After a failed cycle, the plan no longer shows a cycle every night and says the cycle waits ([[MAINT-24]], [[MAINT-25]], #246) |
+| `f3f9483`, `4c0122a` | History only: MAINT-28 was merged (#247) and then taken out again (#249). The two cancel out and the code is the same as at `1b5f7c9`. MAINT-28 is not in this release ([[MAINT-28]]) |
+
+### Known issues
+
+### Known issues
+
+- A false "Battery is not keeping up" can still show when the peak guard pauses a maintenance charge ([[SAFETY-92]]).
+- A battery capped at a low limit with a perfectly flat reading can still trip the stale check ([[SAFETY-74]]).
+- A battery whose reading at rest is beyond about ±175 W is still not caught when it refuses ([[SAFETY-97]]).
+- The peak guard can still back off near the end of a 15-minute period when a meter reading is late, by less than 30 s. This is about the guard's discharge only; a grid charge is cut back since 0.19.2 ([[SAFETY-99]]).
+- Two inverters: the maintenance charge can switch on and off while the house is above the peak aim ([[SAFETY-88]]).
+- Two inverters: the "circulating" figure counts a battery's reading at rest ([[SAFETY-98]]).
+- Two inverters: a drain that starts during a big step in house use can send the other battery to full power, and about 1 kW goes to the grid for about 10 s ([[SAFETY-104]]).
+- Two inverters: when a battery comes back during a maintenance charge, the grid can step by several kW at once ([[SAFETY-101]]).
+- Two inverters: when a battery drops out during a solar surplus, the others can swing by up to 1.5 kW in a simulation ([[SAFETY-105]]).
+- Two inverters: after a drain ends, a change in house use can go unanswered for about 9 s, because some readings are old ([[SAFETY-106]]).
+- Two inverters: when one battery's level is missing, both batteries are held at 0 W, and for about 15 s the last command stays on ([[SAFETY-108]]).
+- Two inverters: if one battery's level stays missing for 12 h, the other battery's cycle can be marked failed, with a 7-day wait and a notice, though it is healthy. This comes from reading the code; it has not been seen on a site ([[MAINT-17]]).
+- When the 15-minute demand forecast sensor counts the battery's own charge, the maintenance charge runs at about half the power the peak limit leaves, so it takes about twice as long. Seen on a site: about 1.2 kW instead of 2.5 kW, and the peak limit was kept Since 0.22.0 the other battery's grid charge waits while this charge runs. At the start of a month, before a peak above the limit has been seen, this charge can give about 2 kWh a night (a rig test) and need about 4 nights, longer than its 36 h limit, and the other battery loses those cheap nights ([[SAFETY-111]]).
+- One inverter: after a link drop, the battery's own safety stop to 0 W can be taken as a refusal, and the site stays at 0 W for up to 15 min ([[SAFETY-102]]).
+- After a Home Assistant restart, control still waits until Home Assistant has finished starting, which can take several minutes, though the readings are already there ([[SAFETY-115]]).
+- While Home Assistant is not answering, the page can list inverters as refusing commands and sensors as missing, and send you to Developer Tools, though they are fine ([[UX-37]]).
+- If Home Assistant hangs or stops, the page keeps saying "Waiting for Home Assistant" and never turns into an alarm ([[SAFETY-113]]).
+- Right after Home Assistant has started, the page can say for about 4 s that an inverter cannot be controlled, and the first command can come late ([[SAFETY-114]]).
+- After a Home Assistant restart, the controller status sensor can still say "running" while the add-on cannot control. It was seen once, and the cause is not known ([[SAFETY-116]]).
+- Battery modes on: after a planned top-up from the grid, the Batteries screen can say "Enough sun is forecast" ([[UX-32]]).
+- Battery modes on: the forecast line "we count on" can show more sun than the plan counts, because the plan takes house use off first ([[UX-33]]).
+- Battery modes on: before a planned top-up, the Today list shows a smaller "gives" amount than the plan will use; it grows as the charge happens ([[UX-34]]).
+- Two inverters, battery modes on: while the other battery is in its maintenance charge, a battery's card can say it charges from the grid while it stays at 0 W ([[OPT-18]]).
+- Two inverters, battery modes on: while a battery refuses to charge in a cheap run, the action log on the page gets about 8 lines an hour for its retries, and the page hint says "waiting for a better price" ([[UX-38]]).
+- A battery in a safety stop, or one the add-on cannot reach, can still be started for a cycle, and its drain then waits about 12 h and ends in a failed-cycle notice. This comes from reading the code; it has not been seen on a site ([[MAINT-19]]).
+- On the Settings page, the rows of the solar forecast lists are labelled "Phase 1", "Phase 2" instead of "Sensor 1", "Sensor 2" ([[UX-27]]).
+- In the solar forecast list, a blank or repeated row makes "source 2 of 2" count differently from the rows on the Settings page ([[UX-28]]).
+- The solar forecast message says "has no reading" also when the sensor shows a number that is too old or in the wrong unit ([[UX-29]]).
+- If you use only the forecast lists, two Settings notes sit on the single-sensor field, and one of them tells you to set that field ([[UX-30]]).
+- After a restart during a price outage, the "No prices" message can say "yet" when prices did come in earlier ([[UX-39]]).
+- On the new settings page, you cannot see whether a price service token is set. Check the Configuration tab ([[UX-41]]).
+- On the classic settings page, the first click on Save after editing a field can do nothing. Click again ([[UX-42]]).
+- A steady overload on a 1 s meter can warn, and send the Home Assistant notification, 2 or 3 times at the start of each 15-minute period instead of once. The peak limit is still kept ([[SAFETY-122]]).
+- A fixed tariff is priced once per hour, so a price window that starts or ends at :15, :30 or :45 gets the wrong price for part of that hour. Windows that start and end on the hour are right ([[TARIFF-23]]).
+- Step 6 of the setup wizard stays empty because of an error in the page, in English and in Dutch ([[UX-51]]).
+- On Dutch pages, refusal texts, the last-event line under the Home buttons, the installer details and the trading status sentences are still English, and a few Dutch texts read badly, such as "1 metingen geweigerd" ([[UX-52]]).
+- Some price texts say "hour" where the add-on acts on a 15-minute period, such as "cheapest hour" ([[UX-47]]).
+- After the add-on restarts, the Home price chart shows no price for the earlier part of today, and the setup check can say "12 of 24 hours", though the prices are known ([[UX-48]]).
+- With battery modes on and only batteries on "Leftover solar", the Home price chart can mark a cheap period where no battery charges ([[UX-49]]).
+- On a phone, the bars of the Home price chart are too thin to tap one 15-minute period. The arrow keys work ([[UX-50]]).
+- In the last second of a 15-minute period, being a few watts over the aim can make the peak guard ask a battery for full power for one second. When a charge ends on a period edge, the last-second give can fade out over about 10 s, and a rig test exported up to 7.4 kW for about 8 s ([[SAFETY-124]]).
+- During the night grid charge, a 15-minute period can end 6 to 14 W over the peak aim, because the battery charges harder than asked. This was seen in simulation; a rig test saw 2 to 8 W ([[OPT-35]]).
+- The test rig could not bring back the false peak alarm that [[SAFETY-126]] fixes, so that fix is shown in simulation only. Watch the notifications for a few nights ([[TEST-35]]).
+- The night cheap run is sized for the batteries' full charging power, not for what the peak limit leaves. Under a tight limit the run can end before the batteries reach their level, and Home can show a level they do not reach (79.9 % against a shown 95 % in a rig test) ([[OPT-25]]).
+- By day, a Leftover solar plan that has only a daily forecast figure counts the sun from now, not from when the figure was read. It counts about 22 % too much for a figure one hour old; the night plan is not affected ([[OPT-30]]).
+- The night charge can buy too much in a house that uses more at night than by day, such as one with a car charger or heat pump, and on a sunny day, because spare sun in one expensive hour does not count for the later ones ([[OPT-31]]).
+- A cheap run that has already started can overlap a new give run after a re-plan, so a battery can charge from the grid at the dearest price for part of an hour. This was seen in a test case, not on a site. Also in 0.19.2 ([[OPT-32]]).
+- If the solar forecast sensors stop updating before 17:00, as in winter or further north, there is no forecast from three hours after their last update until 20:00 ([[OPT-33]]).
+- With a forecast that gives only a daily total, the sun is spread an hour off on the two clock-change days after the change. The day's total is right ([[OPT-24]]).
+- The add-on learns the house's use only once a solar forecast is set, so a site that adds a forecast later waits one more day for its first plan ([[OPT-26]]).
+- Home says "No trading on price yet: no prices have arrived" when every battery is on Solar first, though the prices are shown ([[UX-55]]).
+- The Home plan header can say "Charges in the cheapest hour, gives power in the dearest" when Home draws no charge, and it says "hour" for 15-minute prices ([[UX-56]]).
+- While the peak guard holds back charging, Home hides the rest of the cheap run and gives no reason. The charge starts again when the guard lets go ([[UX-57]]).
+- With battery modes on and selling on, Home can draw a "Sells up to" block when the add-on judges the trade not worth it, and then it will not sell ([[UX-58]]).
+- Home, the plan and the Forecast tab stop drawing a battery's give at the trading floor, though control goes on giving down to the battery's cut-out ([[UX-59]]).
+- During a price outage, the Batteries screen says "Prices differ too little" and Home says "The price gap is too small" ([[UX-60]]).
+- With battery modes on and no meter, or a meter that is a Home Assistant entity, a grid charge is not possible and nothing says so ([[UX-61]]).
+- On the Batteries screen, a charge the add-on refused in a cheap run reads as "Saves its power for ...", for up to 15 minutes ([[UX-62]]).
+- A Leftover solar battery with no capacity set never charges from the grid when a solar forecast is set, and nothing warns about it ([[UX-63]]).
+- The "How the modes work" box on the Batteries screen does not describe Cheap hours only ([[UX-64]]).
+- With battery modes on, Settings still shows "Trade on the price spread", which the modes ignore. A site with modes on and no price source starts, and the Batteries screen says "No prices, so it follows the house" without pointing to Settings ([[UX-65]]).
+- With battery modes off and several equal prices in a row, Home and the Forecast tab draw one price quarter, while the add-on trades every quarter of the run ([[UX-67]]).
+- Late in the day, the Forecast tab's "now" line and last bars sit over the axis labels at the right edge ([[UX-68]]).
+- The Forecast tab's level curve charges at each battery's full rating. Under a peak limit the levels it draws are too high and a charge block can end early (54.6 % shown against 39.7 % in a rig test) ([[UX-70]]).
+- The peak forecast check says maintenance charging is not kept under the peak limit when no peak forecast is set, but since 0.19.2 it is ([[UX-73]]).
+- The peak guard row can show the same figure twice, such as "at this rate 3 500 W, over 3 500 W". Also in 0.19.2 ([[UX-74]]).
+- If the inverter's setpoint entity appears in Home Assistant after the add-on has started, the page keeps saying "Inverter control: not found in Home Assistant" and the batteries say "An alarm stopped control" until a restart, though control runs ([[UX-75]]).
+- In the last minute of a 15-minute period, with Home Assistant readings 30 s late, the period can end about 80 W over the peak aim and over the limit: 3 530 W against a 3 450 W aim and a 3 500 W limit in a rig test with a 2 kW load added 45 s before the end. The peak guard sees the load too late to hold it back ([[SAFETY-133]]).
+- With Home Assistant readings 10 s late, the grid charge in a cheap run can swing by several kW. In a test the add-on asked for an 8.7 kW charge (9.6 kW on 0.20.0) ([[SAFETY-132]]).
+- A plan rebuilt while the battery levels are missing for a moment can drop a cheap run that has not started yet, so the battery does not charge that day. Seen in a replay of real prices, where it cost about EUR 0.40 of extra grid use; the Leftover solar change in 0.20.1 no longer triggers it in those replays, but the cause stays ([[OPT-37]]).
+- On a 5 s meter, Home Assistant readings 10 s late are still not caught, and readings 15 s late only after about 4 minutes. Control now follows the meter more gently, so less goes to the grid: in a simulation with a changing load, 340 Wh became 189 Wh at 10 s late and 363 Wh became 296 Wh at 15 s late. In a rig test, 15 s late exported 13 to 19 % more than before ([[SAFETY-136]], [[SAFETY-134]]).
+- With readings 10 to 15 s late, the hold can end in the middle of the delay and the swing can come back. Seen in rig tests with a 2 s and a 5 s meter ([[SAFETY-134]]).
+- With readings 10 s late on a 1 s meter, the grid can still move between -422 and +340 W while the batteries are held. With a very long delay (30 to 90 s) the request can swing by about 900 W every few seconds. Seen in review tests ([[SAFETY-130]]).
+- A battery that answers very slowly (10 s or more) can be taken for late Home Assistant readings and held, and the page then blames Home Assistant. A GoodWe battery settles in about 6 s and this has not been seen on one ([[SAFETY-131]]).
+- The page row for late readings reads awkwardly in English ("Home Assistant readings show requests about N seconds late, so control holds the batteries"), and the Dutch text misses a word ([[UX-78]]).
+- When the add-on stops, a write that takes more than 2 s can still land after the 0 W, and the 30 s safety timer on the ESPHome board then sets 0 W. After the Stop button, a cycle that had already decided can send its share (560 to 670 W) just after the 0 W; the next cycle sends 0 W again ([[SAFETY-138]]).
+- In the last hour of a cheap run, Home can draw a battery's grid charge up to an hour past the time control stops charging it. It only draws too much, never too little ([[UX-79]]).
+- A tomorrow solar forecast sensor that reports just after midnight with yesterday's value can be used as the new day's forecast for up to 12 hours. This has not been seen on a site ([[OPT-39]]).
+- During a cheap-hours charge, at some 15-minute boundaries the add-on sends 0 W for one tick ("no trade (headroom)") and then goes on. Seen in a rig test, in 5 of 8 cases; once, with a frozen battery reading, it left a battery at 0 W until 23:45 ([[OPT-40]]).
+- During a real peak, a battery in its maintenance charge may switch between charging and giving; more wear, no higher peak. In one rig test it switched 468 times in 45 minutes ([[MAINT-28]]).
+- While one battery's monthly cycle charges, the other battery's card on Home says "Saves its power for higher prices", and the plan still shows its grid charge in the cheap hours, though it will not charge ([[UX-80]]).
+- After a failed monthly cycle, the plan line says the wait ends on a day such as 18 November, but the cycle tries again at its start hour the next day, 19 November at 19:00 ([[MAINT-26]]).
+- At the start of a cheap window the peak guard can step once although the period is under the aim, and the step can land on a battery in its monthly charge. In a rig test it gave 1.7 to 2.3 kW for 6 s ([[SAFETY-140]]).
+- A grid charge at full power in the last seconds of a 15-minute period can run into the next period, where the peak guard cuts it back ([[SAFETY-139]]).
+
+### If you are crossing from a version older than 0.10.0
+
+`## 0.10.0` below can refuse an old config: `slew_w` above its limit, and the
+withdrawn `price_provider` ids `engie_dynamic`, `totalenergies_dynamic` and
+`eneco_eddy`. Read it before you update. Run `tools/predeploy_check.py` with the
+bare options (`jq '.data.options'`) first.
+
+
 ## 0.21.0
 
 **A minor bump: control now holds the batteries when Home Assistant readings come late, Home draws the whole night's grid charge, and the shutdown 0 W is sent last. No option changes.**

goodwe_controller/DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md

@@ -1,36 +0,0 @@
-# MAINT-28 - during a real peak the maintenance charge stays paused
-
-**Status: for review.** Tests: `test_maint28.py`. No option added; the peak aim, the month peak and the MAINT-13 numbers are unchanged. MAINT-24 follow-up (rig test finding F-1, `reports/MAINT-24-test-report.md`).
-
-## What happened (rig x10, house 6.5 kW, month aim 5.95 kW, A in maintenance CHARGE)
-`peakguard.shaping_suspended()` pauses the charge while the forecast is over the aim or the guard is engaged. MAINT-24 moved the aim from 3450 W to the month aim (SAFETY-80), so the pause no longer lasts the whole peak: the guard gives, its projection drops under 5950 W and it idles ("heading for 5 6xx W, under this month's peak"), the pause ends, the floor charges A 150-460 W, the grid goes to 6.3-6.9 kW, the guard trips again. A flipped charge/give 468 times in 45 min (base 02eac3b 11). The quarters stayed at the aim; the cost was a battery working against itself and a grid that swung 5.4-6.9 kW.
-
-## The change
-`peakguard.shaping_held(suspended, held, forecast, aim, house)`: `suspended` is the old `shaping_suspended()`, and once it was true the pause stays until the house (`grid + battery power`, the load without our own charge) is `MAINT_RESUME_UNDER_W` = 300 W under the aim. A guard that is engaged or a forecast over the aim still pauses at once. House unread: the forecast stands in; neither read: no pause (SAFETY-63). `ctl_cycle.py` keeps the flag in `_maint_peak_hold`. The hold is for N=2 and up, and only where MAINT-24 moved the aim (a banked month peak above `peak_cap_w`, so the aim is above cap minus margin). Elsewhere the old rule stays, byte for byte: SAFETY-87's N=1 digests (`n1_charge_low`) and SAFETY-119's N=2 charge at 5050 W over a 5000 W cap with no banked peak are pinned, and 1b5f7c9 behaves as 02eac3b there (a chase that was not a MAINT-24 regression).
-
-Why the house and not the forecast: while A gives, the forecast sits just under the aim by design, so no forecast margin is both safe and reachable. The house is the meter reading plus the batteries' power (`grid + site_batt_w`): the net demand the meter would see with no battery at work. Solar is already in it, and that is right: the aim is a limit on what the meter takes, so a sunny hour that lowers the net demand is real room, and a cloud that raises it brings the hold back at once. It is not the gross load, and it would be wrong to add PV back (that would hold the pause on room the meter really has). It stays put when A switches, except for the age of the battery reading (up to 10 s on the rig); the 300 W line is far larger than that lag moves it.
-
-Why 300 W: the house wanders +-50 W; once the charge resumes it settles at (aim - house) / 2, so 300 W gives at least 150 W, three times the noise, and charging less than that is not worth a restart.
-
-The flag lives only while the charge-only branch is taken: every cycle that reaches the maintenance loop starts it at False, so a maintenance that ended, a mode change or a missing aim cannot carry a stale True into the next charge (test_maint28.py part 1b). `cycle()` has two returns before that loop, and the flag is kept through them on purpose: "inputs missing" and "readings late" (SAFETY-128) are holds of under `stale_after` seconds that write nothing and decide nothing, so the next full cycle sees the same charge and the same peak. A missed poll must not end a peak pause; a reset there would restart the charge on it (`_maint_shape_suspended` is kept through them the same way).
-
-It only ever keeps the maintenance charge off. No cut-back is delayed or weakened: the guard's claim is filed as before. While the pause is held the loop works as at 02eac3b, so A also gives for the house (quarters then sit under the aim, A's energy goes to the load: 1.67 kWh in the 45 min below, 0.45 kWh on 1b5f7c9). Measured alternative, A capped at 0 W while held and the guard idle (review scratch, same 45 min run): A gives 0.44 kWh in the load instead of 1.66, quarters 5919/5915 W, but A switches give/idle 32 times in 40 min. The uncapped give costs ~1.2 kWh round trip per 45-min peak (a few cents) and ~50 min more maintenance charge, far inside the 36 h timeout, so the steady give is kept.
-
-## Numbers (sim, real `cycle()`, A rated 2500 W)
-House 3000 -> 6500 W for 45 min -> 3000 W, +-50 W every 5 s, banked month peak 6000 W (aim 5950 W), forecast = quarter average so far plus the rest at the present grid (`scratch/MAINT-28/dev/m28_repro.py`; `test_maint28.py` runs the same shape for 15 min to keep the suite short).
-
-| 45 min load | base 02eac3b | 1b5f7c9 | MAINT-28 |
-|---|---|---|---|
-| A charge/give reversals | 0 | 52 | 1 (the first trip) |
-| A charging seconds in the load (of 2700) | 0 | 367 | 301 (before the first trip) |
-| quarter averages (W) | 5959 5950 5950 5438 5502 | 5356 5923 5924 5041 4479 | 5356 4012 4000 4226 4476 |
-| A out / in (kWh) | 0.65 / 0 | 0.45 / 0.51 | 1.67 / 0.56 |
-| charge back after the load | - | 3 s | 3 s |
-
-Rig (MAINT-24 test report, F-1): 468 reversals in 45 min on 1b5f7c9, 11 on 02eac3b. Live shape (house 3000 W): no pause, A 1475 W, as MAINT-24.
-
-## Tests and mutants
-`test_maint28.py`: part 1 the real peak, 1b the stale hold, 2 `shaping_held()` edges, 3 the unchanged cases (digests equal 1b5f7c9). On 1b5f7c9 itself (hold stubbed out) part 1 and 1b fail. Mutants, each red: M1 hold state not kept (`held` always False: the 1b5f7c9 behaviour); M2 resume line `-` to `+`; M3 house not passed; M4 the per-cycle reset removed; M5 the N=1 gate removed (digest `n1_peak`: N=1, banked peak, house 6500 W); M6 the aim gate removed (digest `n2_nobank`).
-
-## Not changed
-MAINT-24's rate and its tests, N=1, the drain, modes off (digests of 1b5f7c9). The pause for a late or missing forecast.

goodwe_controller/app/ctl_cycle.py

@@ -537,10 +537,6 @@ class CycleMixin:
 
         # maintenance  ⚠️ ONE PASS PER PACK, AND `arbitrate()` IS WHY THE LIST
         # STAYS SHORT. (DECISIONS/MAIN-orchestration-archive.md)
-        # MAINT-28: the hold lives only while the charge-only branch is taken;
-        # kept through the two short holds above on purpose
-        # (DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md).
-        _peak_held, self._maint_peak_hold = self._maint_peak_hold, False
         for inv, result in zip(self.inverters, maint_results):
             if result.owns_setpoint:
                 # PER-INVERTER: §12's recalibration is a PACK procedure, filed
@@ -568,17 +564,8 @@ class CycleMixin:
                 maint_aim = peakguard.quarter_target_w(
                     float(self.o.get("peak_cap_w", 3500)),
                     self.peak_margin_w, _reading)
-                # MAINT-28: hold the pause in a real peak.
-                # DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md
-                house = (None if self.grid is None or self.site_batt_w is None
-                         else float(self.grid) + float(self.site_batt_w))
-                _susp = peakguard.shaping_suspended(
-                    self.peak_guard, self.peak_fc, maint_aim)
-                self._maint_peak_hold = peakguard.shaping_held(
-                    _susp, _peak_held and len(self.inverters) > 1
-                    and maint_aim > self.peak_aim_w(),
-                    self.peak_fc, maint_aim, house)
-                if self._maint_peak_hold:
+                if peakguard.shaping_suspended(
+                        self.peak_guard, self.peak_fc, maint_aim):
                     # Edge-logged: level-logging here would write one line per
                     # cycle for as long as the event lasts and flush the 40-line
                     # action log of the very context that explains it.

goodwe_controller/app/main.py

@@ -505,7 +505,6 @@ class Controller(InputsMixin, WritesMixin, TradeMixin, CycleMixin, AlarmsMixin,
         self._land_batt_prev = None
         self._peak_needed = False
         self._maint_shape_suspended = False
-        self._maint_peak_hold = False          # MAINT-28
         # OPT-11: battery modes, off by default (SAFETY-10 section 1). Each
         # battery's mode and on/off switch live in the store, not in options,
         # so a change applies at once (`pack_use`, `pack_mode`).

goodwe_controller/app/peakguard.py

@@ -28,10 +28,6 @@ FLOOR_AT_SOC_FLOOR = "the battery level is at or below the peak reserve"
 
 SOURCE = "peak"
 
-# MAINT-28. Watts the house must sit under the aim before a paused maintenance
-# charge resumes. DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md.
-MAINT_RESUME_UNDER_W = 300.0
-
 # Mirror of config.yaml's peak options, pinned to the file by
 # test_peakguard.py. Not a read: `decide()` takes them as arguments.
 PEAK_OPTION_DEFAULTS = {
@@ -450,20 +446,6 @@ def shaping_suspended(decision, peak_forecast_w, cap_w) -> bool:
     return decision is not None and decision.engaged
 
 
-def shaping_held(suspended, held, peak_forecast_w, aim_w, house_w) -> bool:
-    """MAINT-28. `suspended` (`shaping_suspended()`'s answer), kept on while
-    `held` until the house is `MAINT_RESUME_UNDER_W` under `aim_w`
-    (`peak_forecast_w` stands in for an unread house; neither read: not held,
-    as SAFETY-63). Only ever pauses the maintenance charge, never a cut-back.
-    DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md."""
-    if suspended:
-        return True
-    if not held:
-        return False
-    level = house_w if house_w is not None else peak_forecast_w
-    return level is not None and level > float(aim_w) - MAINT_RESUME_UNDER_W
-
-
 def cap_floor(decision, cap_w):
     """SAFETY-128: the floor no higher than `cap_w` (the command standing while
     the readings have not answered it), or `decision` unchanged when None.

goodwe_controller/config.yaml

@@ -1,5 +1,5 @@
 name: GoodWe RS485 Controller
-version: "0.21.0"
+version: "0.22.0"
 slug: goodwe_controller
 description: >-
   Drives a GoodWe ES/BP battery inverter over its RS485 EMS port by sending it a

goodwe_controller/test_maint28.py

@@ -1,288 +0,0 @@
-"""Runnable check for MAINT-28.  `python3 test_maint28.py`
-
-MAINT-24 follow-up. With A in maintenance CHARGE and a real peak (house over
-the month aim), MAINT-24's pause ended every time the guard idled: the
-forecast dipped under the aim, the floor charged A, the guard tripped again,
-and A flipped charge/give every few seconds (rig x10: 468 flips in 45 min,
-base 02eac3b 11). Now the pause is held (`peakguard.shaping_held()`) until the
-house is MAINT_RESUME_UNDER_W under the aim.
-
-All on the real Controller through `cycle()` (tools/opt20_scen.py): cheap
-window, cap 3500 / margin 50, a month peak of 6000 W banked (aim 5950 W), a
-peak forecast like the live sensor (quarter average so far, the rest at the
-present grid), house +-50 W every 5 s.
-
-1. A real peak (house 3000 W, then 6500 W for 15 min, then 3000 W): once the
-   guard has stepped in, A does not charge and does not flip; every quarter is
-   at or under the aim; A's charge is back within 10 cycles after the load.
-2. peakguard.shaping_held(): the pure rule, with its edges.
-3. Unchanged: the MAINT-24 live shape (A 1475 W, no pause), N=1, the SAFETY-78
-   drain and battery modes off (digests of release/1.0 1b5f7c9, as
-   test_maint24.py).
-Mutations: DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md.
-Read MUTATION.md before you report a survivor.
-"""
-
-import logging
-import os
-import random
-import sys
-
-HERE = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, HERE)
-sys.path.insert(0, os.path.join(HERE, "tools"))
-logging.disable(logging.WARNING)
-
-import opt11p3_replay as rp                                    # noqa: E402
-import opt20_scen as sc                                        # noqa: E402
-from app import ctl_cycle, peakguard, tariff                   # noqa: E402
-from app.maintenance import DRAIN, IDLE, MaintResult                 # noqa: E402
-
-fails = []
-
-
-def check(name, cond):
-    print(f"  {'ok  ' if cond else 'FAIL'} {name}")
-    if not cond:
-        fails.append(name)
-
-
-CH = sc.MAINT_CHARGE
-MONTH_PEAK = 6000.0
-AIM = MONTH_PEAK - 50.0
-DRAIN_R = MaintResult(DRAIN, True, 2000.0, False, [])
-T0 = sc.at(2.0)                              # a quarter boundary
-PRE, LOAD, POST = 120.0, 900.0, 120.0        # s (CI time: short runs)
-
-
-def stepped_house(base_w, hi_w):
-    """[(t_utc, W)]: base_w, then hi_w from PRE for LOAD s, +-50 W per 5 s."""
-    rnd = random.Random(28)
-    out = [(sc.UTC0.timestamp() - 10, base_w)]
-    for t in range(0, int(PRE + LOAD + POST), 5):
-        w = hi_w if PRE <= t < PRE + LOAD else base_w
-        out.append((T0.timestamp() + t, w + rnd.uniform(-50.0, 50.0)))
-    return out
-
-
-def scen(*, a=None, tick=None, soc=(49.0, 30.0), house=None, house_w=3000.0,
-         peak=MONTH_PEAK, fc="grid", n=2, variant="p3_ch_sell", dur=600.0):
-    """`a`: A's forced maintenance result. `fc`: "grid" (follows the grid),
-    "quarter" (quarter average so far, the rest at the present grid, like the
-    live sensor) or None (no forecast entity). Returns (rows, stats, c)."""
-    rows = []
-    q = dict(q=None, s=0.0, last=None, start=None)
-
-    def patch(c):
-        if tick is not None:
-            c.maints[0].tick = (
-                lambda now, soc_, blocked_by=None, gate_open=True: tick(now))
-        elif a is not None:
-            c.maints[0].tick = (
-                lambda now, soc_, blocked_by=None, gate_open=True: a)
-        if peak is not None:
-            orig_peak = c.peak.peak
-
-            def peak_(now):
-                r = orig_peak(now)
-                return tariff.PeakReading(tariff.OBSERVED,
-                                          getattr(r, "month", ""), peak)
-            c.peak.peak = peak_
-        orig = c.cycle
-        susp = []
-        c._m28_susp = susp
-
-        async def cyc():
-            c.cheap = True
-            if fc and c.grid is not None:
-                g = float(c.grid)
-                if fc == "grid":
-                    c.peak_fc = g
-                else:
-                    # the replay's clock; not main_files.live (it parses
-                    # every app file per access: ~0.1 s a cycle).
-                    now = ctl_cycle.datetime.now()
-                    qi = int(now.timestamp() // 900)
-                    if q["q"] != qi:
-                        q.update(q=qi, s=0.0, last=now, start=now)
-                    el = (now - q["start"]).total_seconds()
-                    q["s"] += g * (now - q["last"]).total_seconds()
-                    q["last"] = now
-                    c.peak_fc = (q["s"] + g * (900.0 - el)) / 900.0
-            await orig()
-            susp.append(bool(c._maint_shape_suspended))
-        c.cycle = cyc
-
-    def cb(c, h, now, pr):
-        sh = dict(c.allocation.shares) if c.allocation is not None \
-            and c.allocation.shares else {}
-        rows.append(dict(
-            now=now, grid=h.grid(), shares=sh,
-            action=getattr(c.arb, "action", None),
-            reason=getattr(c.arb, "reason", None) or "",
-            roles=dict(c.mode_tick.roles) if c.mode_tick else {},
-            why=c.mode_tick.why if c.mode_tick else None,
-            p={u: p.p for u, p in h.plants.items()},
-            t=(now - T0).total_seconds(), a=h.plants["a"].p,
-            susp=c._m28_susp[-1], hold=bool(getattr(c, "_maint_peak_hold", False))))
-
-    src = house if house is not None else [(sc.UTC0.timestamp() - 10, house_w)]
-    stats, c = rp.run(variant, src, sc.WPTS, T0, dur, check=cb, lag=sc.LAG,
-                      n=n, soc0={"a": soc[0], "b": soc[1]},
-                      choice=sc.CH_CH, refuse=(), patch=patch,
-                      extra={"cycle_cost_threshold_eur": 0.10})
-    return rows, stats, c
-
-
-def flips(rs):
-    """Reversals of A between charging and giving (beyond 50 W)."""
-    n, s = 0, 0
-    for r in rs:
-        v = 1 if r["a"] > 50 else -1 if r["a"] < -50 else 0
-        if v and s and v != s:
-            n += 1
-        if v:
-            s = v
-    return n
-
-
-# ============================================================================ #
-print("1. a real peak: house 3000 W, 6500 W for 15 min, 3000 W")
-rows, st, c = scen(a=CH, house=stepped_house(3000.0, 6500.0), fc="quarter",
-                   dur=PRE + LOAD + POST)
-end = PRE + LOAD
-trip = next((r["t"] for r in rows if r["t"] >= PRE and r["a"] > 50), None)
-load = [r for r in rows if trip is not None and trip <= r["t"] < end]
-after = [r for r in rows if r["t"] >= end]
-back = next((i for i, r in enumerate(after) if r["a"] < -50), None)   # cycles
-print(f"    first give at {trip}, flips in the load {flips(load)}, charge s in"
-      f" the load {sum(1 for r in load if r['a'] < -50)}, charge back "
-      f"{back} cycles after it, quarters "
-      f"{[round(a[0] / a[1]) for a in st['quarters'].values()]}")
-check("the guard stepped in once the projection went over the aim",
-      trip is not None)
-check("from the first give to the load's end A does not flip",
-      flips(load) == 0)
-check("...and does not charge at all", not any(r["a"] < -50 for r in load))
-check("...the pause is on in every one of those cycles",
-      all(r["susp"] for r in load))
-check("every quarter at or under the month aim",
-      max(a[0] / a[1] for a in st["quarters"].values()) <= AIM + 1.0)
-check("after the load A's charge is back within 10 cycles (1 s each)",
-      back is not None and back <= 10)
-tail = [r["a"] for r in after[10:]]
-check("...and stays on: at least 150 W (half the resume margin), no give",
-      tail and sum(tail) / len(tail) <= -150.0 and max(tail) <= 50.0)
-
-# ============================================================================ #
-print("\n1b. the hold does not outlive the charge: a stale True must not "
-      "pause the next charge")
-# The idle window opens on a quarter boundary, so the new charge meets a
-# fresh quarter whose projection (house 5700 W) is under the aim.
-HI_START, HI_END, IDLE_END, B_END = 300.0, 900.0, 1000.0, 1300.0
-
-
-def _house_b():
-    rnd = random.Random(29)
-    out = [(sc.UTC0.timestamp() - 10, 3000.0)]
-    for t in range(0, int(B_END) + 100, 5):
-        w = 3000.0 if t < HI_START else 6500.0 if t < HI_END else 5700.0
-        out.append((T0.timestamp() + t, w + rnd.uniform(-50.0, 50.0)))
-    return out
-
-
-def _tick_b(now):
-    t = (now - T0).total_seconds()
-    return MaintResult(IDLE, False, None, False, []) \
-        if HI_END <= t < IDLE_END else CH
-
-
-rb, sb, cb_ = scen(tick=_tick_b, house=_house_b(), fc="quarter", dur=B_END)
-held_before = [r for r in rb if HI_START <= r["t"] < HI_END and r["hold"]]
-idle_rows = [r for r in rb if HI_END <= r["t"] < IDLE_END]
-later = [r["a"] for r in rb if IDLE_END + 10.0 <= r["t"] < B_END]
-print(f"    hold on {len(held_before)} cycles before; in the idle window "
-      f"{sum(r['hold'] for r in idle_rows)} of {len(idle_rows)}; A after "
-      f"{sum(later) / len(later):+.0f} W (house 5700 W: 125 W)")
-check("the hold was on in the peak", len(held_before) > 100)
-check("it is off in every cycle the charge-only branch is not taken",
-      not any(r["hold"] for r in idle_rows))
-check("a new maintenance charge at house 5700 W (over the resume line) "
-      "starts at once: (5950 - 5700) / 2 = 125 W, not paused",
-      sum(later) / len(later) <= -60.0)
-
-# ============================================================================ #
-print("\n2. peakguard.shaping_held()")
-
-
-def held(was, decision, fc, aim, house):
-    return peakguard.shaping_held(
-        peakguard.shaping_suspended(decision, fc, aim), was, fc, aim, house)
-
-
-U = peakguard.MAINT_RESUME_UNDER_W
-eng = peakguard.PeakDecision(engaged=True, floor_w=100.0, ceiling_w=6000.0,
-                             ceiling_from="x", target_w=AIM)
-idle = peakguard.PeakDecision(engaged=False, floor_w=None, ceiling_w=6000.0,
-                              ceiling_from="x", target_w=AIM)
-check("the old conjunction still pauses: forecast over the aim; guard engaged",
-      held(False, idle, AIM + 1, AIM, 3000.0)
-      and held(False, eng, None, AIM, 3000.0))
-check("not held and not suspended: not paused", not held(False, idle, AIM - 1,
-                                                         AIM, 6500.0))
-check("held: stays paused while the house is over the aim minus the margin",
-      held(True, idle, AIM - 1, AIM, 6500.0)
-      and held(True, idle, AIM - 1, AIM, AIM - U + 1))
-check("held: resumes when the house is the margin under the aim",
-      not held(True, idle, AIM - 1, AIM, AIM - U)
-      and not held(True, idle, AIM - 1, AIM, 3000.0))
-check("held, house unread: the forecast stands in; neither read: resumes "
-      "(SAFETY-63)",
-      held(True, idle, AIM - 1, AIM, None)
-      and not held(True, idle, AIM - U, AIM, None)
-      and not held(True, idle, None, AIM, None))
-check("a guard that is engaged pauses whatever the house reads",
-      held(True, eng, AIM - 1, AIM, 3000.0))
-
-# ============================================================================ #
-print("\n3. unchanged: the live shape, N=1, the drain, modes off")
-rl, sl, cl = scen(a=CH)
-body = rl[len(rl) // 6:]
-mean_a = sum(r["a"] for r in body) / len(body)
-print(f"    A {mean_a:+.0f} W, paused {sum(cl._m28_susp)} cycles")
-check("MAINT-24 live shape: A charges 1475 W and the pause never comes",
-      -1500.0 <= mean_a <= -1440.0 and not any(cl._m28_susp))
-d1 = sc.digest(scen(a=CH, n=1, fc=None, peak=None)[0])
-dd = sc.digest(scen(a=DRAIN_R, soc=(60.0, 30.0), peak=None, fc=None)[0])
-dm = sc.digest(scen(a=CH, variant="modes_off", peak=None, fc=None)[0])
-d2n = sc.digest(scen(a=CH, house_w=5000.0, peak=None, fc="grid")[0])
-d1p = sc.digest(scen(a=CH, n=1, fc=None, house_w=6500.0)[0])
-AT_BASE = {
-    "n2_nobank": "f9053833891794ead8b3f44db4030ded8c4b43681e25e8a19882105d3593f20d",
-    "n1_peak": "3e451c536bea8270469fffe578c5a7199431e0e7ba4902413406b0afe2bb0fd1",
-    "n1": "02ecc3011c559df050ae5321ceb6b24cf79342ae35f1a289fbd1a749c86f1d10",
-    "drain": "bfcf9a643dfffff21d0a8417426d2088377a8f64afbc544732b1635a77775d8a",
-    "off": "6f4ec14578d8ed59fc7721485d037f3c1fb086abae7c52f28c9e9155cf2107b0",
-}
-got = {"n2_nobank": d2n, "n1_peak": d1p, "n1": d1, "drain": dd, "off": dm}
-for k in AT_BASE:
-    print(f"    {k} {'same' if got[k] == AT_BASE[k] else 'DIFFERS'} "
-          f"{got[k]}")
-check("N=1 with A in maintenance charge and no forecast entity: equal to "
-      "release/1.0 1b5f7c9", got["n1"] == AT_BASE["n1"])
-check("N=1 in a real peak above a banked month peak (house 6500 W, the guard steps in): equal "
-      "to 1b5f7c9, the hold is for N=2 and up", got["n1_peak"] == AT_BASE["n1_peak"])
-check("N=2 in a real peak with no banked peak (house 5000 W over the aim "
-      "3450 W): equal to 1b5f7c9, the hold is for a month aim above the cap",
-      got["n2_nobank"] == AT_BASE["n2_nobank"])
-check("the SAFETY-78 drain beside a charger: equal to 1b5f7c9",
-      got["drain"] == AT_BASE["drain"])
-check("battery modes off: equal to 1b5f7c9", got["off"] == AT_BASE["off"])
-
-print()
-if fails:
-    print(f"{len(fails)} FAILED:")
-    for f in fails:
-        print(f"  - {f}")
-    sys.exit(1)
-print("all checks passed")

goodwe_controller/test_safety84.py

@@ -481,10 +481,6 @@ print("\n8. the N=1 and N=2 digests")
 # quarter's room, as at N=2, so the guard no longer steps in and discharges.
 # The banked quarters go 3461.9 -> 3450.0 W (aim 3450) and 3938.9 -> 3950.0
 # W (aim 3950). n1_charge_dear (no cheap window) is unchanged.
-# MAINT-28 re-pinned n2_charge_banked: in the 5000 W load (over the 3950 W
-# aim) the maintenance charge no longer restarts at -125 W after each guard
-# stop (t=1550 s, 64 of 480 rows); the pause is held until the load is gone
-# (DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md). The other five are equal.
 PINNED = {
     "n1_charge":
         "00f0a16b3ac1bd2830e9e0aaac8923fd9d1736c2bc6c543669bdd35b2fb542e9",
@@ -497,7 +493,7 @@ PINNED = {
     "n2_charge_dear":
         "aa2bbc677a8e2274b25ba1170de1b1635e08a3bd93105e2a38a9bb1575b5b6db",
     "n2_charge_banked":
-        "5d523562219245c135a4e9aa856826bc2939a3157c6ae0320cafc2cd1a8a6cf1",
+        "a6973faea916e4c88ca1770047f94478346eeb1efa4889b154fad0747f91267f",
 }
 _now = s84.digests()
 for k in PINNED: