Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
12c97b56f4 | ||
|
|
9fdce023e9 | ||
|
|
7788543e09 | ||
|
|
6d7046fc45 | ||
|
|
07f703d1bc | ||
|
|
2cfbc4aec8 | ||
|
|
f66048b287 | ||
|
|
69a1ccce1f | ||
|
|
9a355144fc | ||
|
|
628bde8013 |
@@ -2,8 +2,127 @@
|
||||
|
||||
### Not in a release yet
|
||||
|
||||
- The *Car* card can now charge: choose **Manual** and set the current (6 A up to the charger limit) and 1 or 3 phases, on Home or from Home Assistant. The car is never slowed for the peak limit, the add-on says so instead of raising false peak alarms, and the batteries help cover it unless you switch that off. Off still writes nothing ([[EV-04]]).
|
||||
- Car charger fixes: when the car alone takes the batteries to the peak reserve, the add-on no longer raises "Battery stopped limiting the peak" (the grey "Car over the peak limit" note says it instead); that note and the Car card's reason stay steady instead of flickering; and switching to Off right after the add-on's own change no longer shows "Something else changes the charger".
|
||||
- When the add-on changes the car's phases while the batteries are at the peak reserve, there is no longer a false "Battery stopped limiting the peak" for a moment ([[EV-15]]).
|
||||
|
||||
## 0.24.0
|
||||
|
||||
**A minor bump: the add-on can now charge the car (Manual mode), and a car that alone takes the batteries to the peak reserve no longer raises a false peak alarm. Two new options were added, both with defaults, and none needs setting.**
|
||||
Two options were added (`ev_batt_cover` and `ev_mode_start`), none was removed or renamed, and no default changed (92 options, 90 before). **Existing installs need no option change:** the new options have defaults, and `ev_charger` is still off, so an install that does not use the car charger runs as 0.23.0 did. It is a minor bump because it adds a feature and new options; every saved setting still starts.
|
||||
|
||||
**The add-on can now charge the car.** This is the first version that writes to the car charger. On the *Car* card, choose **Manual** and set the current (6 A up to the charger limit) and 1 or 3 phases, on Home, or from Home Assistant when MQTT is on. **Off writes nothing.** The car is never slowed for the peak limit; the batteries help cover it unless you switch *Batteries help with the peak* off. **If your own automation in Home Assistant writes the same charger, switch it off before you choose Manual:** two writers fight over one setting. See "Car charger" in DOCS ([[EV-04]]).
|
||||
|
||||
**Car charger fixes.** When the car alone takes the batteries to the peak reserve, the add-on no longer says "Battery stopped limiting the peak"; a grey "Car over the peak limit" note says it instead, and the note stays steady instead of flickering. A change the add-on makes itself is no longer shown as "Something else changes the charger". A real overload of the house still raises the normal alarm ([[EV-10]], [[EV-11]], [[EV-12]]).
|
||||
|
||||
Contents of this release, in merge order since 0.23.0 (`b656091`):
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| `75ebe22` | The add-on can charge the car: choose Manual on the *Car* card and set the current (6 A up to the charger limit) and 1 or 3 phases. Off writes nothing, the car is never slowed for the peak limit, and the batteries help cover it unless you switch that off. This is the first version that writes to the charger, so switch off any other automation that writes it ([[EV-04]], #257) |
|
||||
| `b86c015` | When the car alone takes the batteries to the peak reserve, there is no false "Battery stopped limiting the peak". The "Car over the peak limit" note stays steady, and the add-on's own change is not shown as "Something else changes the charger" ([[EV-10]], [[EV-11]], [[EV-12]], #258) |
|
||||
| `628bde8` | The false "Battery stopped limiting the peak" is now gone also when the batteries cover the car down to the reserve: the check counts the house alone. A real overload of the house still raises the alarm ([[EV-10]], #259, called EV-10b) |
|
||||
|
||||
|
||||
### 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; the peak limit was kept). At the start of a month, before a peak above the limit, that is about 2 kWh a night in a rig test: the cycle can reach its 36 h limit after about 4 nights and fail, and since 0.22.0 the other battery gets no grid charge on those 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 heat pump or a car charger that is not set up in the add-on, 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]]).
|
||||
- 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 shows the day the wait ends, such as 18 November, not when the cycle tries again, such as 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]]).
|
||||
- In a long real peak, the peak guard can end a 15-minute period up to 10 W over its aim, as 0.22.0 does (up to 31 W there). In a rig test the month's highest peak did not rise ([[SAFETY-141]]).
|
||||
- The peak reserve notification can be created again and again, 24 to 47 times in 2 hours in a rig test, while the guard holds a battery at its reserve. 0.22.0 does the same ([[MAINT-29]]).
|
||||
- When you switch the car charger off, its three sensors stay in Home Assistant with their last values. From reading the code, the PV power sensor does the same when it is switched off ([[TEL-19]]).
|
||||
- In Settings, the choice for no car charger says "None", while its help says "Off" ([[UX-81]]).
|
||||
- DOCS names the car's energy sensor `goodwe_car_today_kwh`, but Home Assistant creates it as `sensor.goodwe_car_energy_today` ([[TEL-20]]).
|
||||
- When the charger refuses a current, the Car card can show two amber rows: "Charger did not take it" and "Charger reading may be stuck" ([[EV-13]]).
|
||||
- In shadow mode, and after a phase change was given up, the Car card's *Why* line says what you set, not what the charger does ([[EV-14]]).
|
||||
- When the add-on changes the car's phases while the batteries are at the peak reserve, "Battery stopped limiting the peak" can show for a moment, with one notification ([[EV-15]]).
|
||||
- With *Batteries help with the peak* on, the Car card's *Why* line can switch between two wordings while the car is over the peak limit ([[EV-16]]).
|
||||
|
||||
### 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.23.0
|
||||
|
||||
|
||||
@@ -97,10 +97,10 @@ up to 1.8 kW; the 40 Wh floor fixes that.)
|
||||
that latch twice, with and without the car, from the same readings. Both reset
|
||||
at a new quarter and when the guard stops wanting power, and they run every
|
||||
cycle, so the cover option does not touch them. This holds with the projection
|
||||
still under the aim (rig: 5888 W against 6000 W). A car of 0 W makes the two the
|
||||
same, so it explains nothing; a stale, stuck or uncorroborated figure is `None`,
|
||||
sets the latch without the car, and the normal alarms stand. There is no minimum
|
||||
car power: the comparison itself is what separates car from house.
|
||||
still under the aim (rig: 5888 W against 6000 W). A car of 0 W explains
|
||||
nothing; a stale, stuck or uncorroborated figure is `None` and the normal
|
||||
alarms stand while it is (EV-18 below). There is no minimum car power: the
|
||||
comparison itself is what separates car from house.
|
||||
- **The period without the car is not clipped at 0 W** (EV-10b). The rig showed
|
||||
EV-10 failing: house 3 kW, car 11 kW, batteries 8.1 kW, aim 6 kW. The batteries
|
||||
give more than the house uses, so the house alone is an export; `car_exclude`
|
||||
@@ -120,6 +120,35 @@ up to 1.8 kW; the 40 Wh floor fixes that.)
|
||||
the gaps seen on the rig, 150 to 250 s at 50 s sampling, and shorter than a
|
||||
quarter) and a gap does not restart the 10 s
|
||||
on-count. `car_explains`, which the alarms read, has no hold.
|
||||
- **Our own phase change is not a reason to alarm** (EV-15). Rig, twice: at the
|
||||
reserve, with the car covering, the add-on's 3 -> 1 switch set the car to 0 A.
|
||||
A car that is not charging has no corroboration (`CarTracker._corr_note` clears
|
||||
the window, `corroborated` is False), so `car_alarm_w()` was None, the car
|
||||
explained nothing and `_car_need_excl` latched for the quarter: one
|
||||
PEAK_GUARD_FLOOR_LIMITED and one `goodwe_peak_soc_floor`. Now, only for grading
|
||||
(`car_cycle`), `ctl_car._car_own_pause` lets the car's fresh, not stuck figure
|
||||
(`CarTracker.car_w_paused`, 0 W while paused) stand in without corroboration:
|
||||
from the moment our 0 A write is SENT (`zero_sent_at`: the cycle runs beside
|
||||
the writer and the car stops before the write returns), until the current is
|
||||
set again, at most
|
||||
`OWN_PAUSE_MAX_S` (85 s, the sequence's own waits), then at most one
|
||||
corroboration window (60 s). It ends at once on Off, Stop, shadow, unplug,
|
||||
another writer, or a refused select or write (`seq["failed"]`). The energy it
|
||||
drew in the pause is kept apart (`ws_p`), so `car_exclude`, the guard's
|
||||
input, the claim, floor and writes are unchanged. A house overload still fails
|
||||
the test without the car, so it alarms as on Off.
|
||||
- **The batteries as they give now, and no latch from an unknown** (EV-18, EV-15
|
||||
rig F-A). At the reserve the loop still gives some battery power; "without the
|
||||
car, batteries at 0 W" counted it as house, `_car_need_excl` latched at the
|
||||
quarter's start and the floor alarm stood for the quarter with the excess
|
||||
smaller than the car. Owner 2026-11-19: without the car the batteries keep
|
||||
giving what they give now (the lower of two readings, every cycle); a miss so
|
||||
(`_car_need_house`) seen with a trusted car figure stays latched to the
|
||||
quarter's end. The car explains where the period with it misses on the same
|
||||
batteries (`_car_over_now`), or by the EV-10 test above. A `None` car figure
|
||||
or battery reading explains nothing in that cycle and latches nothing. After
|
||||
a restart or a gap the car's share of what is done is unknown (`_carq`
|
||||
`whole`), so only the rest of the period is graded without the car.
|
||||
- **Our own write is ours until its mute ends** (EV-12). The mute of the tracker's
|
||||
own detector opens before the write and runs 15 s from when it returns, because
|
||||
the read-back reaches the cycle while the write still waits for it.
|
||||
|
||||
@@ -125,6 +125,8 @@ class ManualWriter:
|
||||
self.phase_fails = 0 # phase selects the charger did not take
|
||||
self.phases_gave_up = False
|
||||
self.undone = 0 # sequences undone before the select
|
||||
self.phase_done_at = None # EV-15: our phase change ended well then
|
||||
self.zero_sent_at = None # EV-15: our 0 A write is out, not yet back
|
||||
|
||||
# ------------------------------------------------------------------ user
|
||||
def user_changed(self) -> None:
|
||||
@@ -292,7 +294,14 @@ class ManualWriter:
|
||||
async def _begin(self, drv, r, cur, n, now, tracker) -> None:
|
||||
"""Step 1 of the safe sequence: 0 A. A charger that does not take it
|
||||
stops the sequence before the phases are touched."""
|
||||
ok = await self._write(drv, 0.0, cur, now, tracker)
|
||||
self.phase_done_at = None
|
||||
# EV-15: the car stops while the write waits for its read-back, and the
|
||||
# cycle runs beside it: the window opens when the write is SENT.
|
||||
self.zero_sent_at = now
|
||||
try:
|
||||
ok = await self._write(drv, 0.0, cur, now, tracker)
|
||||
finally:
|
||||
self.zero_sent_at = None
|
||||
if not ok:
|
||||
self._failed(now)
|
||||
return
|
||||
@@ -336,6 +345,7 @@ class ManualWriter:
|
||||
self.log.append(("phases", q["n"], now, ok))
|
||||
q["stage"], q["t1"] = "settle", self.last_done # from its return
|
||||
if not ok:
|
||||
q["failed"] = True # EV-15: no grace for the alarm
|
||||
# The charger did not take it: the car gets its current back
|
||||
# on the old phases after the same SETTLE_S as a taken select
|
||||
# (HA may have taken it and only the read-back be late), and
|
||||
@@ -356,7 +366,10 @@ class ManualWriter:
|
||||
# still wanted, and one that is in place is adopted.
|
||||
self.seq, self.rev_applied, self.reapply = None, None, False
|
||||
self.fails, self.blocked = 0, False
|
||||
if not q.get("failed"):
|
||||
self.phase_done_at = self.last_done # EV-15
|
||||
return
|
||||
q["failed"] = True # EV-15: a refused write ends it
|
||||
q["tries"] += 1
|
||||
if q["tries"] >= MAX_TRIES:
|
||||
# Left at 0 A is the safe side; the next reading re-applies.
|
||||
|
||||
@@ -800,8 +800,20 @@ class CarTracker:
|
||||
EV-03 rules), not stuck after a write, corroborated by the energy meter
|
||||
(`corroborated`), and never above what the read-back allows the car to
|
||||
draw: an old or frozen figure must not hide a house overload."""
|
||||
return self._capped_w(now, True)
|
||||
|
||||
def car_w_paused(self, now: float):
|
||||
"""EV-15: the same figure as `car_w_trusted` without the energy-meter
|
||||
corroboration, which a car held at 0 A by the add-on's own phase change
|
||||
cannot give (the meter's window restarts when it stops charging). Fresh,
|
||||
not stuck, and capped by the read-back. Only for grading the alarm
|
||||
during that sequence (`ctl_car._car_own_pause`)."""
|
||||
return self._capped_w(now, False)
|
||||
|
||||
def _capped_w(self, now: float, corroborate: bool):
|
||||
w = self.car_w(now)
|
||||
if w is None or self.stuck(now) or not self.corroborated(now):
|
||||
if w is None or self.stuck(now) \
|
||||
or (corroborate and not self.corroborated(now)):
|
||||
return None
|
||||
r = self.reading
|
||||
a = r.allowed_a if r.allowed_a is not None else r.setpoint_a
|
||||
|
||||
@@ -24,6 +24,13 @@ OVER_HOLD_S = peakguard.ALARM_HOLD_S
|
||||
# the cause: longer than the gaps seen on the rig (150 to 250 s at 50 s
|
||||
# sampling) and shorter than a quarter, or until the session really ends.
|
||||
OVER_OFF_HOLD_S = 180.0
|
||||
# EV-15: the longest our own phase change can take (0 A wait, settle, three
|
||||
# tries of a write at 5 s apart and up to 10 s each, the select's own wait);
|
||||
# the grace for the alarm never outlasts it, and after the current is set
|
||||
# again it lasts at most one corroboration window.
|
||||
OWN_PAUSE_MAX_S = (carmode.ZERO_WAIT_S + carmode.SETTLE_S
|
||||
+ carmode.MAX_TRIES * 15.0 + 10.0)
|
||||
OWN_PAUSE_TAIL_S = chargers.CORR_WINDOW_S
|
||||
|
||||
|
||||
class CarMixin:
|
||||
@@ -53,11 +60,12 @@ class CarMixin:
|
||||
self._car_over_gone = None
|
||||
self._car_batt_prev = None
|
||||
self._car_need_real = self._car_need_excl = False # EV-10 latches
|
||||
self._car_need_house = self._car_over_now = False # EV-18 latches
|
||||
self._car_latch_block = None
|
||||
self._car_over_notified = None # the session a notice was raised for
|
||||
self._car_session = 0
|
||||
self._car_prev_state = None
|
||||
self._carq = {"key": None, "ws": 0.0, "mono": None}
|
||||
self._carq = {"key": None, "ws": 0.0, "ws_p": 0.0, "mono": None}
|
||||
self._peak_proj_real = None
|
||||
saved = data.get(CAR_PEAK_KEY)
|
||||
self.car_peak_q = dict(saved) if isinstance(saved, dict) else {}
|
||||
@@ -206,17 +214,63 @@ class CarMixin:
|
||||
return None
|
||||
return self.car.car_w_trusted(self.car_now())
|
||||
|
||||
def _car_quarter(self, proj, w, mono) -> None:
|
||||
def _car_own_pause(self, mono) -> bool:
|
||||
"""EV-15: is the car held at 0 A by the add-on's OWN phase change? From
|
||||
the moment its 0 A write is SENT (the cycle runs beside the write)
|
||||
until the current is set again, then at most one corroboration window.
|
||||
No when it was aborted (Off, Stop, shadow, unplug, another writer), a
|
||||
write was refused, or it ran past its own maximum."""
|
||||
wr = getattr(self, "car_writer", None)
|
||||
if wr is None or (wr.seq is None and wr.phase_done_at is None
|
||||
and wr.zero_sent_at is None) or wr.hold:
|
||||
return False
|
||||
r = self.car.reading
|
||||
if not (self.car_manual() and self.car_writing()
|
||||
and r is not None and r.available and r.state != "A"):
|
||||
return False
|
||||
q = wr.seq
|
||||
if q is None and wr.zero_sent_at is not None: # sent, not yet back
|
||||
return 0.0 <= mono - wr.zero_sent_at <= OWN_PAUSE_MAX_S
|
||||
if q is not None:
|
||||
return not q.get("failed") and 0.0 <= mono - q["t0"] \
|
||||
<= OWN_PAUSE_MAX_S
|
||||
return 0.0 <= mono - wr.phase_done_at <= OWN_PAUSE_TAIL_S
|
||||
|
||||
def _car_idle(self, mono) -> bool:
|
||||
"""EV-18: is the car known to draw nothing? A fresh reading that says
|
||||
it is not charging (mode3 A or B) at under `CAR_PEAK_MIN_W`. Not an
|
||||
unknown figure: the house's own need is graded in such a cycle."""
|
||||
r = getattr(self.car, "reading", None)
|
||||
if r is None or not r.available or r.charging is not False:
|
||||
return False
|
||||
p = self.car.car_w(mono)
|
||||
return p is not None and p < CAR_PEAK_MIN_W
|
||||
|
||||
def _car_quarter(self, proj, w, mono, wg=None) -> None:
|
||||
"""The car's energy in the open quarter, for the average the guard's
|
||||
house leaves out and for the peak line."""
|
||||
house leaves out and for the peak line. `wg` (EV-15) is the figure for
|
||||
grading during our own pause; its energy is kept apart (`ws_p`) so the
|
||||
guard's input is unchanged."""
|
||||
q = self._carq
|
||||
key = None if proj is None else proj.block_start
|
||||
last = q["mono"]
|
||||
if key != q["key"]:
|
||||
# EV-18: `whole` when the count covers the block: it follows on
|
||||
# from the block before, or starts in its first seconds (not
|
||||
# after a restart or a gap).
|
||||
whole = key is not None and (
|
||||
float(proj.elapsed_s) <= 5.0 or (
|
||||
last is not None and q["key"] is not None
|
||||
and (key - q["key"]).total_seconds() == QUARTER_S))
|
||||
self._car_bank(q)
|
||||
q["key"], q["ws"] = key, 0.0
|
||||
if key is not None and w is not None and last is not None:
|
||||
q["ws"] += float(w) * min(max(mono - last, 0.0), 5.0)
|
||||
q["key"], q["ws"], q["ws_p"] = key, 0.0, 0.0
|
||||
q["whole"] = whole
|
||||
if key is not None and last is not None:
|
||||
dt = min(max(mono - last, 0.0), 5.0)
|
||||
if w is not None:
|
||||
q["ws"] += float(w) * dt
|
||||
elif wg is not None:
|
||||
q["ws_p"] = q.get("ws_p", 0.0) + float(wg) * dt
|
||||
q["mono"] = mono
|
||||
|
||||
def _car_bank(self, q) -> None:
|
||||
@@ -233,14 +287,17 @@ class CarMixin:
|
||||
del self.car_peak_q[k]
|
||||
self.store.set(CAR_PEAK_KEY, dict(self.car_peak_q))
|
||||
|
||||
def car_avg_w(self, proj, w) -> float:
|
||||
def car_avg_w(self, proj, w, graded=False) -> float:
|
||||
"""The car's average over the whole open quarter: what it drew so far
|
||||
and `w` for the rest."""
|
||||
and `w` for the rest. `graded` (EV-15) adds what it drew during our
|
||||
own pause."""
|
||||
if proj is None or w is None:
|
||||
return 0.0
|
||||
left = max(0.0, QUARTER_S - float(proj.elapsed_s))
|
||||
so_far = self._carq["ws"] if self._carq["key"] == proj.block_start \
|
||||
else 0.0
|
||||
if graded and self._carq["key"] == proj.block_start:
|
||||
so_far += self._carq.get("ws_p", 0.0)
|
||||
return (so_far + float(w) * left) / QUARTER_S
|
||||
|
||||
def car_exclude(self, proj, w):
|
||||
@@ -264,7 +321,7 @@ class CarMixin:
|
||||
the car asked for. Unchanged without a fresh car reading."""
|
||||
if proj is None or w is None or proj.block_start is None:
|
||||
return proj
|
||||
avg = self.car_avg_w(proj, w)
|
||||
avg = self.car_avg_w(proj, w, graded=True)
|
||||
left = max(0.0, QUARTER_S - float(proj.elapsed_s))
|
||||
held = float(proj.held_w)
|
||||
done_ws = QUARTER_S * float(proj.projected_w) - max(held, 0.0) * left
|
||||
@@ -280,13 +337,27 @@ class CarMixin:
|
||||
`real_proj` is the projection WITH the car, whatever the guard saw."""
|
||||
mono = self.car_now()
|
||||
w = self.car_alarm_w()
|
||||
self._car_quarter(real_proj, w, mono)
|
||||
# EV-15: the figure for grading only. Our own phase change holds the
|
||||
# car at 0 A and the energy meter cannot corroborate it then, so for
|
||||
# that bounded time its fresh, not stuck figure stands in.
|
||||
wg = w
|
||||
own = (w is None or float(w) <= 0.0) and self._car_own_pause(mono)
|
||||
if w is None and own:
|
||||
wg = self.car.car_w_paused(mono)
|
||||
self._car_quarter(real_proj, w, mono, wg)
|
||||
self._car_session_tick(mono)
|
||||
explains = over = False
|
||||
if real_proj is not None and target_w is not None \
|
||||
and real_proj.block_start is not None:
|
||||
# EV-10: every cycle, so the latches do not depend on the option.
|
||||
graded = self._car_explains_alarm(real_proj, guard, target_w, w)
|
||||
# EV-18: a car known to draw nothing counts as 0 W for the latches
|
||||
# (the house's own need); it and a 0 W figure explain nothing,
|
||||
# but in our own pause (EV-15).
|
||||
idle = wg is None and self._car_idle(mono)
|
||||
graded = self._car_explains_alarm(real_proj, guard, target_w,
|
||||
0.0 if idle else wg)
|
||||
if idle or (w is not None and float(w) <= 0.0 and not own):
|
||||
graded = False
|
||||
if self.car_cover:
|
||||
explains = over = graded
|
||||
elif w is not None:
|
||||
@@ -316,35 +387,41 @@ class CarMixin:
|
||||
batteries left are graded by `load_too_high` on where the period lands
|
||||
(SAFETY-81 / 87); a floor that leaves nothing is graded by SAFETY-126's
|
||||
`misses_aim` (the batteries at 0 W from now on), latched for the
|
||||
quarter. That latch is kept here twice, on the period as it is
|
||||
(`_car_need_real`) and without the car (`_car_need_excl`), from the
|
||||
same `misses_aim` and the same batteries reading. Both reset at a new
|
||||
quarter and when the guard no longer wants power, whatever the cover
|
||||
option says (this runs every cycle). A car that is 0 W, or untrusted
|
||||
(`w` None sets the second latch), makes the two equal and explains
|
||||
nothing."""
|
||||
batt, prev = self.site_batt_w, self._car_batt_prev
|
||||
self._car_batt_prev = batt
|
||||
quarter (`_car_need_real`, and `_car_need_excl` without the car).
|
||||
EV-18 (owner 2026-11-19): without the car, the batteries keep giving
|
||||
what they give now (the lower of two readings), re-checked every cycle;
|
||||
a miss seen so (`_car_need_house`) never lets the car explain for the
|
||||
rest of the quarter. The car also explains where the period with it,
|
||||
on the same batteries, misses (`_car_over_now`). Only a trusted figure
|
||||
latches: an untrusted car (`w` None) or an unknown battery reading
|
||||
explains nothing in that cycle only. All reset at a new quarter and
|
||||
when the guard no longer wants power, whatever the cover option says
|
||||
(this runs every cycle). DECISIONS/EV-04-manual-mode.md (EV-18)."""
|
||||
now, prev = self.site_batt_w, self._car_batt_prev
|
||||
self._car_batt_prev = now
|
||||
wants = bool(guard is not None and guard.engaged
|
||||
and guard.blind is None
|
||||
and (guard.wanted_w or 0.0) > 0.0)
|
||||
if real_proj.block_start != self._car_latch_block:
|
||||
if real_proj.block_start != self._car_latch_block or not wants:
|
||||
self._car_latch_block = real_proj.block_start
|
||||
self._car_need_real = self._car_need_excl = False
|
||||
if not wants:
|
||||
self._car_need_real = self._car_need_excl = False
|
||||
self._car_need_house = self._car_over_now = False
|
||||
batt = now
|
||||
if batt is not None and prev is not None:
|
||||
batt = min(float(batt), float(prev))
|
||||
excl = self.car_exclude_alarm(real_proj, w)
|
||||
if wants:
|
||||
if batt is None:
|
||||
self._car_need_real = self._car_need_excl = True
|
||||
else:
|
||||
self._car_need_real = self._car_need_real or \
|
||||
peakguard.misses_aim(real_proj, batt_w=batt,
|
||||
target_w=target_w)
|
||||
self._car_need_excl = self._car_need_excl or w is None or \
|
||||
if wants and batt is not None:
|
||||
self._car_need_real = self._car_need_real or \
|
||||
peakguard.misses_aim(real_proj, batt_w=batt,
|
||||
target_w=target_w)
|
||||
self._car_over_now = self._car_over_now or \
|
||||
self._car_lands_over(real_proj, now, batt, target_w)
|
||||
if w is not None:
|
||||
whole = self._carq.get("whole", True)
|
||||
self._car_need_excl = self._car_need_excl or \
|
||||
peakguard.misses_aim(excl, batt_w=batt, target_w=target_w)
|
||||
self._car_need_house = self._car_need_house or \
|
||||
self._car_lands_over(excl, now, batt, target_w, whole)
|
||||
if w is None or batt is None or not wants \
|
||||
or not (guard.saturated or guard.floor_limited):
|
||||
return False
|
||||
@@ -354,7 +431,8 @@ class CarMixin:
|
||||
rating = guard.able_w
|
||||
else:
|
||||
return bool(not guard.within_aim and self._car_need_real
|
||||
and not self._car_need_excl)
|
||||
and not self._car_need_house
|
||||
and (self._car_over_now or not self._car_need_excl))
|
||||
|
||||
def high(p):
|
||||
return peakguard.load_too_high(
|
||||
@@ -362,6 +440,20 @@ class CarMixin:
|
||||
achievable_w=rating)
|
||||
return bool(high(real_proj) and not high(excl))
|
||||
|
||||
@staticmethod
|
||||
def _car_lands_over(p, now, gives, target_w, whole=True) -> bool:
|
||||
"""EV-18: does the period end more than `ALARM_MISS_W` over the aim
|
||||
with the batteries giving `gives` W from now on (`now`: what they gave
|
||||
in the meter's figure)? Not `whole`: the car's share of what is done
|
||||
is not known (a restart, a gap), so only the rest is graded."""
|
||||
if whole:
|
||||
return peakguard.load_too_high(p, batt_w=now, ceiling_w=target_w,
|
||||
achievable_w=gives)
|
||||
if QUARTER_S - float(p.elapsed_s) <= 0.0:
|
||||
return False
|
||||
rest = float(p.held_w) + float(now) - float(gives)
|
||||
return rest - float(target_w) > peakguard.ALARM_MISS_W
|
||||
|
||||
def _car_session_tick(self, mono) -> None:
|
||||
"""A charging session is a plug-in: the state goes from no car to a
|
||||
car. The notice is raised once per session."""
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
name: GoodWe RS485 Controller
|
||||
version: "0.23.0"
|
||||
version: "0.24.0"
|
||||
slug: goodwe_controller
|
||||
description: >-
|
||||
Drives a GoodWe ES/BP battery inverter over its RS485 EMS port by sending it a
|
||||
|
||||
@@ -0,0 +1,344 @@
|
||||
"""EV-15: the add-on's own phase change at the peak reserve raises no alarm.
|
||||
`python3 -B test_ev15.py`
|
||||
|
||||
The rig (EV-10 and EV-10b, F-2): cover on, the batteries at the reserve, the car
|
||||
charging and explaining the excess. The add-on's own 3 -> 1 phase switch sets
|
||||
the car to 0 A; with the car not charging its figure is no longer corroborated
|
||||
(`CarTracker.corroborated`), so `car_alarm_w()` is None, nothing is explained,
|
||||
and PEAK_GUARD_FLOOR_LIMITED plus `goodwe_peak_soc_floor` fire. The rule: for
|
||||
the add-on's own sequence only (`ctl_car._car_own_pause`, bounded) the car's
|
||||
fresh, not stuck figure stands in for grading.
|
||||
|
||||
1. The rig shapes end to end through the car cycle: 3 -> 1 and 1 -> 3.
|
||||
2. A house overload that starts during the sequence still alarms, as on Off.
|
||||
3. Aborted (Off, Stop, unplug), refused, an outside writer: no grace.
|
||||
4. The bounds, and the figure that stands in (stale, stuck: nothing).
|
||||
Mutating a module this file grades? Read MUTATION.md first (purge __pycache__).
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import logging
|
||||
import os
|
||||
import sys
|
||||
|
||||
HERE = os.path.dirname(os.path.abspath(__file__))
|
||||
sys.path.insert(0, os.path.join(HERE, "tools"))
|
||||
|
||||
from app import ctl_car, carmode, chargers as CH # noqa: E402
|
||||
import ev04_peak as P # noqa: E402
|
||||
import safety81_sim as s81 # noqa: E402
|
||||
|
||||
logging.disable(logging.CRITICAL)
|
||||
fails = []
|
||||
|
||||
|
||||
def check(name, cond):
|
||||
print(f" {'ok ' if cond else 'FAIL'} {name}")
|
||||
if not cond:
|
||||
fails.append(name)
|
||||
|
||||
|
||||
def at(t, fn):
|
||||
return {"t": t, "fn": fn}
|
||||
|
||||
|
||||
def beside(plant, c):
|
||||
"""The writer runs BESIDE the cycle, as in production (`car_kick`): its 1 s
|
||||
poll for the read-back lands after the cycle's own read, and the cycle does
|
||||
not wait for the writer (`ev04_peak.drive` does)."""
|
||||
gate = asyncio.Event()
|
||||
|
||||
async def sleep(_s):
|
||||
gate.clear()
|
||||
await gate.wait()
|
||||
|
||||
async def settle():
|
||||
gate.set()
|
||||
for _ in range(5):
|
||||
await asyncio.sleep(0)
|
||||
c.charger._sleep = sleep
|
||||
c.car_settle = settle
|
||||
|
||||
|
||||
def run(house, cap, t_res, t_sw, new, *, extra=None, mode="manual",
|
||||
sim_fn=None, dur=895, plug=True, side=False):
|
||||
"""Reserve at `t_res`, our phase change to `new` at `t_sw`. Returns the
|
||||
run, a per-second trace (second, own-pause, explains, red rows) and the
|
||||
alarms."""
|
||||
tr = []
|
||||
|
||||
def note(plant, c):
|
||||
red = [x["id"] for x in c.checks()
|
||||
if x["ok"] is False and not x["warn"]] \
|
||||
if t_sw - 5 <= plant.t <= t_sw + 90 else []
|
||||
g = c.peak_guard
|
||||
lim = bool(g is not None and (g.floor_limited or g.saturated))
|
||||
tr.append((plant.t, getattr(c, "_car_own_pause", lambda _t: False)(c.car_now()), c.car_explains,
|
||||
red, plant.ch.power_w, plant.ch.state, lim))
|
||||
|
||||
def reserve(plant, c):
|
||||
plant.soc = 19.0
|
||||
plant.load = lambda t: house + plant.ch.power_w
|
||||
|
||||
def switch(plant, c):
|
||||
asyncio.get_event_loop().create_task(
|
||||
c.handle_action("car_phases", value=new))
|
||||
|
||||
ev = {t: note for t in range(0, dur)}
|
||||
ev[t_res] = lambda p, c: (reserve(p, c), note(p, c))
|
||||
ev[t_sw] = lambda p, c: (switch(p, c), note(p, c))
|
||||
if side:
|
||||
ev[t_sw - 2] = lambda p, c: (beside(p, c), note(p, c))
|
||||
for t, fn in (extra or {}).items():
|
||||
prev = ev.get(t, note)
|
||||
ev[t] = (lambda p, c, prev=prev, fn=fn: (fn(p, c), prev(p, c)))
|
||||
sim = None
|
||||
if sim_fn is not None or side:
|
||||
from chargersim import SimCharger
|
||||
sim = SimCharger(setpoint_a=16)
|
||||
sim_fn = sim_fn or (lambda s: None)
|
||||
sim_fn(sim)
|
||||
r = P.drive(s81.constant(house), dur=dur, rating=12000.0, soc=60.0,
|
||||
cap=cap, phases=(3 if new == 1 else 1), user_a=16, setpoint=16,
|
||||
mode=mode, events=ev, sim=sim, plug=plug)
|
||||
return r, tr, P.ids(r, *P.ALARMS)
|
||||
|
||||
|
||||
def reds(tr):
|
||||
return [x for x in tr if x[3]]
|
||||
|
||||
|
||||
# =========================================================================== #
|
||||
print("1. THE RIG SHAPES THROUGH THE CAR CYCLE")
|
||||
# =========================================================================== #
|
||||
SHAPES = (
|
||||
("EV-10 shape: house 3 kW, car 11 kW, aim 6 kW, 3 -> 1",
|
||||
3000.0, 6050.0, 300, 600, 1),
|
||||
("EV-10b shape: a 9411 W limit, 3 -> 1", 2000.0, 9461.0, 300, 600, 1),
|
||||
("1 -> 3 (the car 3.7 kW, then 11 kW), aim 5 kW", 2500.0, 5050.0,
|
||||
100, 600, 3),
|
||||
)
|
||||
for name, house, cap, t_res, t_sw, new in SHAPES:
|
||||
r, tr, al = run(house, cap, t_res, t_sw, new)
|
||||
c, sim = r["c"], r["sim"]
|
||||
sw = [x for x in sim.writes() if x[1] == "phases"]
|
||||
check(f"{name}: the car at the reserve covers, and the add-on's own "
|
||||
f"sequence ran (0 A, select, the current back)",
|
||||
len(sw) == 1 and [x[2] for x in sim.writes("current")][-2:]
|
||||
== [0.0, 16.0] and sim.phases_allowed == new)
|
||||
pause = [x for x in tr if x[1]]
|
||||
check(f"{name}: the own-pause grace was on during it, and ended",
|
||||
len(pause) >= 10 and not any(x[1] for x in tr[-1:])
|
||||
and (pause[-1][0] - pause[0][0])
|
||||
<= getattr(ctl_car, "OWN_PAUSE_MAX_S", 0)
|
||||
+ getattr(ctl_car, "OWN_PAUSE_TAIL_S", 0))
|
||||
check(f"{name}: no PEAK_GUARD_FLOOR_LIMITED / saturated, no "
|
||||
f"goodwe_peak_soc_floor notification", al == [])
|
||||
check(f"{name}: no red row in any sample around the switch",
|
||||
reds(tr) == [])
|
||||
limited = [x for x in tr if x[1] and x[6]]
|
||||
check(f"{name}: in every cycle of the sequence in which the guard is "
|
||||
f"limited (the cycle of the rig's alarm among them) the car "
|
||||
f"explains it", len(limited) >= 1 and all(x[2] for x in limited)
|
||||
and any(x[2] for x in tr if x[0] == t_sw + 1))
|
||||
check(f"{name}: and in every limited cycle after it, to the quarter's end",
|
||||
all(x[2] for x in tr if x[0] >= t_sw and x[6]))
|
||||
|
||||
# =========================================================================== #
|
||||
print("\n2. A HOUSE OVERLOAD DURING THE SEQUENCE STILL ALARMS")
|
||||
# =========================================================================== #
|
||||
def overload(plant, c):
|
||||
plant.load = lambda t: 25000.0 + plant.ch.power_w
|
||||
|
||||
|
||||
r, tr, al = run(3000.0, 6050.0, 300, 600, 1, extra={606: overload})
|
||||
ro, tro, alo = run(3000.0, 6050.0, 300, 600, 1, extra={606: overload},
|
||||
mode="off", plug=False)
|
||||
rn, trn, aln = run(3000.0, 6050.0, 300, 900, 1, extra={606: overload})
|
||||
check("PRECONDITION: on Off (no car) the same load alarms, and in Manual "
|
||||
"with no phase change", alo != [] and aln != [])
|
||||
check("a 25 kW house overload that starts 6 s into the sequence (the car "
|
||||
"paused): the alarm fires", al != [])
|
||||
print(f" alarm seconds: in the sequence {[t for t, _ in al]}, Off without "
|
||||
f"the car {[t for t, _ in alo]}, Manual with no phase change "
|
||||
f"{[t for t, _ in aln]}")
|
||||
check("...at the same second as on Off and as in Manual with no phase change",
|
||||
bool(al) and bool(alo) and bool(aln)
|
||||
and al[0][0] == alo[0][0] == aln[0][0])
|
||||
check("...and the car does not explain it (during the sequence too)",
|
||||
not any(x[2] for x in tr if 640 <= x[0] <= 660))
|
||||
|
||||
# =========================================================================== #
|
||||
print("\n3. ABORTED, REFUSED, OUTSIDE: NO GRACE AFTER IT")
|
||||
# =========================================================================== #
|
||||
def hit(res, t0, secs):
|
||||
return [x for x in res if t0 <= x[0] <= t0 + secs and x[1]]
|
||||
|
||||
|
||||
def off_now(plant, c):
|
||||
asyncio.get_event_loop().create_task(c.handle_action("car_mode",
|
||||
value="off"))
|
||||
|
||||
|
||||
def stop_now(plant, c):
|
||||
c.auto = False
|
||||
|
||||
|
||||
def unplug(plant, c):
|
||||
plant.ch.unplug()
|
||||
|
||||
|
||||
slow = lambda s: setattr(s, "stop_delay_s", 8.0) # noqa: E731
|
||||
for what, fn in (("Off", off_now), ("Stop", stop_now), ("unplug", unplug)):
|
||||
r, tr, al = run(3000.0, 6050.0, 300, 600, 1, extra={602: fn},
|
||||
sim_fn=slow)
|
||||
check(f"{what} 2 s into the sequence: the grace is off from the next "
|
||||
f"cycle on", not hit(tr, 604, 200)
|
||||
and any(x[1] for x in tr if 600 <= x[0] <= 602))
|
||||
|
||||
def refuse_phases(sim):
|
||||
sim.request_phases = lambda n: False
|
||||
|
||||
|
||||
r, tr, al = run(3000.0, 6050.0, 300, 600, 1, sim_fn=refuse_phases)
|
||||
check("the select is refused: the grace ends at once (no cycle of it after "
|
||||
"the refusal), the current comes back",
|
||||
len([x for x in r["sim"].writes("current")]) >= 2
|
||||
and not hit(tr, 606, 200))
|
||||
|
||||
def outside_zero(plant, c):
|
||||
plant.ch.set_current(0.0)
|
||||
|
||||
|
||||
r2, tr2, al2 = run(3000.0, 6050.0, 300, 900, 1, extra={602: outside_zero})
|
||||
check("an outside writer's 0 A: no grace, and the normal grading (no car "
|
||||
"power: nothing explained) raises the alarm as before",
|
||||
not any(x[1] for x in tr2) and not any(x[2] for x in tr2
|
||||
if 610 <= x[0] <= 700)
|
||||
and al2 != [])
|
||||
|
||||
# =========================================================================== #
|
||||
print("\n4. THE BOUNDS AND THE FIGURE THAT STANDS IN")
|
||||
# =========================================================================== #
|
||||
class _C(ctl_car.CarMixin):
|
||||
"""The mixin with just what `_car_own_pause` reads."""
|
||||
def __init__(self):
|
||||
self.o = {}
|
||||
self.car_init({}, type("S", (), {"data": {}, "set": lambda s, k, v: 0})())
|
||||
self.car_mode = carmode.MANUAL
|
||||
self.auto, self.shadow = True, False
|
||||
self.inverters, self.site_sign_wd = [], type("W", (), {"tripped": False})()
|
||||
self.circ_wd = type("W", (), {"tripped": False})()
|
||||
self.charger = type("H", (), {"configured": lambda s: True})()
|
||||
self.car = CH.CarTracker()
|
||||
self.car.reading = CH.ChargerReading(available=True, state="B")
|
||||
|
||||
|
||||
c = _C()
|
||||
c.car_writer.seq = {"stage": "settle", "t0": 100.0, "n": 1, "tries": 0,
|
||||
"prev": 16.0}
|
||||
M = ctl_car.OWN_PAUSE_MAX_S
|
||||
check("bound: the sequence's own maximum is its waits (0 A wait, settle, "
|
||||
"three tries at 15 s, the select) and no more",
|
||||
M == carmode.ZERO_WAIT_S + carmode.SETTLE_S + carmode.MAX_TRIES * 15.0
|
||||
+ 10.0 and ctl_car.OWN_PAUSE_TAIL_S == CH.CORR_WINDOW_S)
|
||||
check("bound: on at the 0 A write and up to the maximum",
|
||||
c._car_own_pause(100.0) and c._car_own_pause(100.0 + M))
|
||||
check("bound: off one second past it", not c._car_own_pause(101.0 + M))
|
||||
c.car_writer.seq = None
|
||||
c.car_writer.phase_done_at = 200.0
|
||||
T = ctl_car.OWN_PAUSE_TAIL_S
|
||||
check("bound: after the current is set again it lasts one corroboration "
|
||||
"window", c._car_own_pause(200.0 + T) and not c._car_own_pause(201.0 + T))
|
||||
c.car_writer.phase_done_at = None
|
||||
check("no sequence and none just done: no grace", not c._car_own_pause(100.0))
|
||||
c.car_writer.seq = {"stage": "settle", "t0": 100.0, "failed": True}
|
||||
check("a refused write marks the sequence: no grace", not c._car_own_pause(110.0))
|
||||
c.car_writer.seq = {"stage": "settle", "t0": 100.0}
|
||||
c.car_mode = carmode.OFF
|
||||
check("Off: no grace", not c._car_own_pause(110.0))
|
||||
c.car_mode, c.shadow = carmode.MANUAL, True
|
||||
check("shadow mode: no grace", not c._car_own_pause(110.0))
|
||||
c.shadow, c.auto = False, False
|
||||
check("control stopped: no grace", not c._car_own_pause(110.0))
|
||||
c.auto = True
|
||||
c.car_writer.hold = True
|
||||
check("another writer (hold): no grace", not c._car_own_pause(110.0))
|
||||
c.car_writer.hold = False
|
||||
c.car_writer.seq, c.car_writer.zero_sent_at = None, 100.0
|
||||
check("0 A sent, not yet back: grace from the send, to the maximum, no more",
|
||||
c._car_own_pause(100.0) and c._car_own_pause(100.0 + M)
|
||||
and not c._car_own_pause(101.0 + M))
|
||||
c.car_writer.zero_sent_at = None
|
||||
c.car_writer.phase_done_at = 200.0
|
||||
c.car_writer.hold = True
|
||||
check("another writer in the 60 s after the current is set: no grace",
|
||||
not c._car_own_pause(210.0))
|
||||
c.car_writer.hold, c.car_writer.phase_done_at = False, None
|
||||
c.car_writer.seq = {"stage": "settle", "t0": 100.0}
|
||||
c.car.reading = CH.ChargerReading(available=True, state="A")
|
||||
check("unplugged: no grace", not c._car_own_pause(110.0))
|
||||
c.car.reading = CH.ChargerReading(available=True, state="B")
|
||||
check("PRECONDITION: the same state is on", c._car_own_pause(110.0))
|
||||
|
||||
tk = CH.CarTracker()
|
||||
tk.reading = CH.ChargerReading(available=True, state="B", power_w=500.0,
|
||||
allowed_a=16.0, phases_allowed=1)
|
||||
tk.last_ok = 0.0
|
||||
check("the stand-in figure is the fresh reading, capped by the read-back",
|
||||
tk.car_w_paused(5.0) == 500.0 and tk.car_w_trusted(5.0) is None)
|
||||
check("a stale reading stands in for nothing", tk.car_w_paused(100.0) is None)
|
||||
tk.stuck_now = True
|
||||
check("a stuck reading stands in for nothing", tk.car_w_paused(5.0) is None)
|
||||
|
||||
# =========================================================================== #
|
||||
print("\n5. THE WRITER RUNS BESIDE THE CYCLE (review F-1)")
|
||||
# =========================================================================== #
|
||||
# The car stops (state B) in the same Home Assistant update as the 0 A
|
||||
# read-back; the write has not returned yet, so no sequence exists. The window
|
||||
# opens when the write is SENT (`ManualWriter.zero_sent_at`).
|
||||
def lagged(lag, delay):
|
||||
def f(s):
|
||||
s.lag_s, s.stop_delay_s = lag, delay
|
||||
return f
|
||||
|
||||
|
||||
for lag, delay in ((2, 0), (0, 0), (2, 3), (5, 2)):
|
||||
r, tr, al = run(3000.0, 6050.0, 300, 600, 1, side=True,
|
||||
sim_fn=lagged(lag, delay))
|
||||
nm = f"beside the cycle, lag {lag} s, stop delay {delay} s"
|
||||
limited = [x for x in tr if x[0] >= 600 and x[6]]
|
||||
check(f"{nm}: our sequence ran (select once, then 16 A again)",
|
||||
len([x for x in r["sim"].writes("phases")]) == 1
|
||||
and r["sim"].phases_allowed == 1
|
||||
and [x[2] for x in r["sim"].writes("current")][-2:] == [0.0, 16.0])
|
||||
check(f"{nm}: no PEAK_GUARD_FLOOR_LIMITED, no goodwe_peak_soc_floor",
|
||||
al == [])
|
||||
check(f"{nm}: no red row, and the car explains every limited cycle",
|
||||
reds(tr) == [] and all(x[2] for x in limited))
|
||||
|
||||
|
||||
def not_taken(plant, c):
|
||||
plant.ch.refuse = "ignore" # HA accepts, the charger does nothing
|
||||
|
||||
|
||||
r, tr, al = run(3000.0, 6050.0, 300, 600, 1, side=True,
|
||||
sim_fn=lagged(0, 0), extra={600: not_taken})
|
||||
check("the 0 A write is not taken (read-back never follows): the window was "
|
||||
"open while it waited", any(x[1] for x in tr if 600 <= x[0] <= 606))
|
||||
own = [x[0] for x in tr if x[1]]
|
||||
runs = 1 + len([1 for a, b in zip(own, own[1:]) if b - a > 1])
|
||||
check("...and no grace after the refusal (the retry, RETRY_S later, opens it "
|
||||
"again only while that write waits: at most 3 runs of 11 s), no "
|
||||
"sequence made", not hit(tr, 613, 40) and r["c"].car_writer.seq is None
|
||||
and 1 <= runs <= 3 and len(own) <= 3 * 11)
|
||||
check("...the car went on charging and nothing was written but the 0 A",
|
||||
r["sim"].power_w > 5000.0 and not r["sim"].writes("phases"))
|
||||
|
||||
print()
|
||||
if fails:
|
||||
print(f"FAIL: {len(fails)} check(s)")
|
||||
for f in fails:
|
||||
print(" -", f)
|
||||
sys.exit(1)
|
||||
print("ok: EV-15")
|
||||
@@ -0,0 +1,681 @@
|
||||
"""EV-18: no floor alarm at a quarter's start while the car explains the excess
|
||||
(EV-15 rig F-A). `python3 -B test_ev18.py`
|
||||
|
||||
The rig: both batteries at the peak reserve, the car charging, and
|
||||
PEAK_GUARD_FLOOR_LIMITED + `goodwe_peak_soc_floor` at a quarter's start, red
|
||||
for most of the quarter, while the grid excess was smaller than the car. Two
|
||||
causes, both latched for the quarter by `_car_need_excl`:
|
||||
C1 one cycle with no trusted car figure set the latch (T1);
|
||||
C2 "without the car" assumed the batteries give 0 W from now on, so what
|
||||
the loop still gives below the reserve counted as house (T2).
|
||||
The rule now (owner 2026-11-19, Q1-Q3): without the car the batteries keep
|
||||
giving what they give now (the lower of the last two readings, re-checked
|
||||
every cycle); a house need seen with a trusted car figure stays latched to the
|
||||
quarter's end; an unknown car figure keeps the alarm only while it is unknown.
|
||||
|
||||
T-ids are the test plan's (reports/EV-18-test-plan.md). "base" is 9fdce02.
|
||||
Mutating a module this file grades? Read MUTATION.md first (purge __pycache__).
|
||||
"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
from datetime import datetime, timedelta, timezone
|
||||
|
||||
HERE = os.path.dirname(os.path.abspath(__file__))
|
||||
sys.path.insert(0, os.path.join(HERE, "tools"))
|
||||
|
||||
from app import chargers as CH, ctl_car, tariff # noqa: E402
|
||||
from chargersim import SimCharger # noqa: E402
|
||||
from named_absence import first, nth, present # noqa: E402
|
||||
import ev04_peak as P # noqa: E402
|
||||
import ev18_peak as H # noqa: E402
|
||||
|
||||
fails = []
|
||||
|
||||
|
||||
def check(name, cond):
|
||||
print(f" {'ok ' if cond else 'FAIL'} {name}")
|
||||
if not cond:
|
||||
fails.append(name)
|
||||
|
||||
|
||||
AIM = H.AIM
|
||||
CAR = 1380.0
|
||||
E = H.E
|
||||
# Measured on base 9fdce02 with this file's own runs: the seconds of
|
||||
# goodwe_peak_soc_floor in the honest shapes, which must not come later now. An
|
||||
# honest shape steps the house at E, and the meter shows it at E+1.
|
||||
T5_BASE = [E + 1] # also T6 (T5 shape), T8, T9(a), T10(b) T5
|
||||
T7_BASE = E + 72
|
||||
T9B_BASE = [] # 400 W real: never uncorroborated (Findings)
|
||||
T9C_BASE = E + 1 # 100 W real: never trusted at the edge
|
||||
T10A_T5_BASE = [E + 2] # the guard disengages at E+1 (no battery reading)
|
||||
T11_BASE = [E + 13] # SAFETY-87: ALARM_HOLD_S after the step
|
||||
T13_BASE = [E + 301]
|
||||
T15_T5_BASE = [E + 10] # x10: one cycle
|
||||
|
||||
# =========================================================================== #
|
||||
print("1. UNIT: car_cycle ACROSS A QUARTER EDGE (a real `_carq`, not preset)")
|
||||
# =========================================================================== #
|
||||
BS = datetime(2026, 11, 17, 21, 15, tzinfo=timezone.utc) # the edge E
|
||||
|
||||
|
||||
class _Car(ctl_car.CarMixin):
|
||||
def __init__(self):
|
||||
self.o = {"ev_batt_cover": True}
|
||||
self.w = CAR
|
||||
self._now = 0.0
|
||||
self.site_batt_w, self.site_rating_w = 0.0, 9600.0
|
||||
self.store = type("S", (), {"data": {}, "set": lambda s, k, v: 0})()
|
||||
self.car_init({}, self.store)
|
||||
|
||||
def car_now(self):
|
||||
return self._now
|
||||
|
||||
def car_alarm_w(self):
|
||||
return self.w
|
||||
|
||||
class car: # noqa: N801
|
||||
@staticmethod
|
||||
def status(*_a):
|
||||
return "charging"
|
||||
|
||||
|
||||
class _G:
|
||||
"""Floor-limited, the floor leaves nothing (floor_w 0), wants power."""
|
||||
def __init__(self, wants=True, within_aim=False):
|
||||
self.floor_limited, self.saturated = True, False
|
||||
self.floor_w, self.able_w, self.ceiling_w = 0.0, None, AIM + 50.0
|
||||
self.engaged, self.blind = True, None
|
||||
self.wanted_w = 300.0 if wants else 0.0
|
||||
self.within_aim = within_aim
|
||||
|
||||
|
||||
def urun(secs, grid, batt, w, *, x=1, mono_x=None, c=None, guard=None):
|
||||
"""`car_cycle` once per entry of `secs` (seconds from the edge E, `x` fake
|
||||
seconds apart). `grid(t)` is the meter (house + car - batteries),
|
||||
`batt(t)` the site battery reading, `w(t)` the trusted car figure. Returns
|
||||
(car, {t: car_explains})."""
|
||||
c = c or _Car()
|
||||
mono_x = x if mono_x is None else mono_x
|
||||
done, out = {}, {}
|
||||
for t in secs:
|
||||
q = t // 900
|
||||
bs, el = BS + timedelta(seconds=900 * q), t - 900 * q
|
||||
g = float(grid(t))
|
||||
d = done.get(bs, g * el)
|
||||
p = tariff.Projection(
|
||||
projected_w=(d + g * (900 - el)) / 900.0,
|
||||
elapsed_w=(d / el if el else g), elapsed_s=float(el),
|
||||
covered_frac=1.0, complete=False, block_start=bs, held_w=g)
|
||||
done[bs] = d + g * x
|
||||
c._now = 10000.0 + t * mono_x / x
|
||||
c.w, c.site_batt_w = w(t), batt(t)
|
||||
c.car_cycle(p, guard(t) if guard else _G(), AIM, None)
|
||||
out[t] = c.car_explains
|
||||
return c, out
|
||||
|
||||
|
||||
def const(v):
|
||||
return lambda t: v
|
||||
|
||||
|
||||
def run_of(d, t0, t1):
|
||||
return [d[t] for t in sorted(d) if t0 <= t <= t1]
|
||||
|
||||
|
||||
# --- T1: the car figure untrusted for the edge's first cycles --------------- #
|
||||
def t1(x=1, mono_x=None):
|
||||
_c, ex = urun(range(-30, 121, x), const(13000.0 + CAR), const(0.0),
|
||||
lambda t: None if 0 <= t <= 2 * x else CAR, x=x,
|
||||
mono_x=mono_x)
|
||||
return ex
|
||||
|
||||
|
||||
ex = t1()
|
||||
print(f" T1 explains E-1..E+5: {run_of(ex, -1, 5)}")
|
||||
check("T1 PRECONDITION: before the edge the car (trusted) explains the "
|
||||
"excess (house 13 000 W, car 1 380 W, grid 14 380 W)",
|
||||
all(run_of(ex, -30, -1)) and len(run_of(ex, -30, -1)) == 30)
|
||||
check("T1 (Expected 5): while the car figure is unknown (E+0..E+2) it "
|
||||
"explains nothing, so the alarm stands", not any(run_of(ex, 0, 2)))
|
||||
_c1b, ex1b = urun(range(-30, 121), const(12500.0 + CAR - 800.0), const(800.0),
|
||||
lambda t: None if 0 <= t <= 2 else CAR)
|
||||
check("T1b (the EV-10 path: the grid lands under the aim, the batteries at "
|
||||
"0 W would miss; house 12 500 W, b 800 W): unknown E+0..E+2, released "
|
||||
"at E+3 and explained to E+120",
|
||||
not any(run_of(ex1b, 0, 2)) and all(run_of(ex1b, 3, 120))
|
||||
and len(run_of(ex1b, 3, 120)) == 118)
|
||||
check("T1 (Expected 3): released at the first trusted cycle (E+3) and "
|
||||
"explained to E+120 (base: latched False to E+120)",
|
||||
all(run_of(ex, 3, 120)) and len(run_of(ex, 3, 120)) == 118)
|
||||
|
||||
# --- T2c: the battery W boundary, graded on the lower of two readings ------- #
|
||||
def t2c(b_of):
|
||||
_c, ex = urun(range(0, 6), lambda t: 14000.0 + CAR - b_of(t), b_of,
|
||||
const(CAR))
|
||||
return run_of(ex, 0, 5)
|
||||
|
||||
|
||||
e391, e389 = t2c(const(391.0)), t2c(const(389.0))
|
||||
e395 = t2c(lambda t: 395.0 if t == 0 else 385.0)
|
||||
print(f" T2c 391 W {e391}, 389 W {e389}, 395 then 385 W {e395}")
|
||||
check("T2c: b steady at 391 W (house alone with the real batteries lands "
|
||||
"13 609 W, aim + 9 W): the car explains from E+0", all(e391)
|
||||
and len(e391) == 6)
|
||||
check("T2c: b at 389 W (13 611 W, aim + 11 W): it does not, from E+0",
|
||||
not any(e389) and len(e389) == 6)
|
||||
check("T2c: readings 395 then 385 W: graded on 385 W, no explanation from "
|
||||
"the second cycle on", not any(e395[1:]) and len(e395) == 6)
|
||||
|
||||
# --- T4: ALARM_MISS_W, batteries at 0 W -------------------------------------- #
|
||||
e09 = run_of(urun(range(0, 6), const(13609.0 + CAR), const(0.0),
|
||||
const(CAR))[1], 0, 5)
|
||||
e11 = run_of(urun(range(0, 6), const(13611.0 + CAR), const(0.0),
|
||||
const(CAR))[1], 0, 5)
|
||||
check("T4 unit: the house alone at aim + 9 W: the car explains from E+0; at "
|
||||
"aim + 11 W it does not", all(e09) and len(e09) == 6 and not any(e11))
|
||||
|
||||
# --- T8 / N2: 0 W and tiny cars ---------------------------------------------- #
|
||||
e0 = run_of(urun(range(-5, 30), const(14000.0 - 800.0), const(800.0),
|
||||
const(0.0))[1], -5, 29)
|
||||
e50 = run_of(urun(range(-5, 30), const(14090.0 + 50.0), const(0.0),
|
||||
const(50.0))[1], -5, 29)
|
||||
check("T8 unit: a 0 W car never explains, whatever the batteries give (T2 "
|
||||
"shape, b 800 W)", not any(e0) and len(e0) == 35)
|
||||
check("T8 unit: a 50 W car with the house at 14 090 W never explains",
|
||||
not any(e50) and len(e50) == 35)
|
||||
# N2: a car that drew 11 kW earlier in the quarter and now reports 0 W
|
||||
c0, ex0 = urun(range(0, 400), lambda t: 2600.0 + (11040.0 if t < 300 else 0.0),
|
||||
const(0.0), lambda t: 11040.0 if t < 300 else 0.0)
|
||||
check("N2: a trusted 0 W figure explains nothing, also after the car drew "
|
||||
"earlier in the quarter", not any(run_of(ex0, 300, 399)))
|
||||
|
||||
# --- T8 unit: a car known to draw nothing is not an unknown car ------------- #
|
||||
class _Tracker:
|
||||
"""The two things `_car_idle` reads: the reading, and its fresh power."""
|
||||
def __init__(self, available):
|
||||
self.reading = CH.ChargerReading(available=available, state="B",
|
||||
charging=False, power_w=0.0)
|
||||
|
||||
def car_w(self, _now):
|
||||
return 0.0 if self.reading.available else None
|
||||
|
||||
@staticmethod
|
||||
def status(*_a):
|
||||
return "charging"
|
||||
|
||||
|
||||
def idle_then_charging(available):
|
||||
c = _Car()
|
||||
c.car = _Tracker(available)
|
||||
_c, ex = urun(range(0, 900),
|
||||
lambda t: 14090.0 if t < 60 else 13000.0 + CAR, const(0.0),
|
||||
lambda t: None if t < 60 else CAR, c=c)
|
||||
return ex
|
||||
|
||||
|
||||
exi, exu = idle_then_charging(True), idle_then_charging(False)
|
||||
check("T8 unit: a car known idle (mode3 B, 0 W, fresh) while the house alone "
|
||||
"misses (14 090 W): that house need is latched, so the car charging "
|
||||
"from E+60 does not explain the quarter (test_ev10's `swapped` case)",
|
||||
not any(run_of(exi, 0, 899)))
|
||||
check("T8 unit: the same with the charger unavailable (unknown car): the "
|
||||
"alarm stands while unknown and is released at E+60 (Expected 5)",
|
||||
not any(run_of(exu, 0, 59)) and all(run_of(exu, 60, 899)))
|
||||
|
||||
# --- T10(a) unit: the battery reading lost for one cycle --------------------- #
|
||||
cA, eA = urun(range(-3, 10), const(14000.0 + CAR - 800.0),
|
||||
lambda t: None if t == 1 else 800.0, const(CAR))
|
||||
check("T10(a) unit, T2 shape: the cycle with no battery reading explains "
|
||||
"nothing (no last-known W credited); the next ones do",
|
||||
eA.get(1) is False and eA.get(0) is True and all(run_of(eA, 2, 9))
|
||||
and len(run_of(eA, 2, 9)) == 8)
|
||||
|
||||
# --- T13 unit: a house need seen with a trusted car stays latched ----------- #
|
||||
c13, e13 = urun(range(-5, 1000),
|
||||
lambda t: (15500.0 if 300 <= t < 360 else 13000.0) + CAR,
|
||||
const(0.0), const(CAR))
|
||||
check("T13 unit: the house steps to 15 500 W at E+300 for 60 s (landing "
|
||||
"without the car 14 667 W): not explained from E+300 to the quarter's "
|
||||
"end, though the house is back at 13 000 W from E+360",
|
||||
all(run_of(e13, 0, 299)) and not any(run_of(e13, 300, 899))
|
||||
and len(run_of(e13, 300, 899)) == 600)
|
||||
check("T13 unit: ...and released by the new quarter", all(run_of(e13, 900, 999)))
|
||||
c13g, e13g = urun(range(0, 400),
|
||||
lambda t: (15500.0 if 100 <= t < 160 else 13000.0) + CAR,
|
||||
const(0.0), const(CAR),
|
||||
guard=lambda t: _G(wants=not (t == 250)))
|
||||
check("T13 unit: ...or by the guard no longer wanting power (EV-10)",
|
||||
not any(run_of(e13g, 100, 249)) and all(run_of(e13g, 251, 399)))
|
||||
|
||||
# --- T14: no flicker --------------------------------------------------------- #
|
||||
def floor_edges(ex):
|
||||
"""Per quarter, False -> True edges of the floor alarm the stub implies
|
||||
(floor-limited, within_aim False, not explained)."""
|
||||
out, was = {}, False
|
||||
for t in sorted(ex):
|
||||
al = not ex[t]
|
||||
if al and not was:
|
||||
out[t // 900] = out.get(t // 900, 0) + 1
|
||||
was = al
|
||||
return out
|
||||
|
||||
|
||||
_ca, eta = urun(range(0, 1200),
|
||||
lambda t: 13610.0 + (40.0 if int(t // 7) % 2 else -40.0) + CAR,
|
||||
const(0.0), const(CAR))
|
||||
_cb, etb = urun(range(0, 1200),
|
||||
lambda t: 14000.0 + CAR - (400.0 if int(t // 7) % 2 else 800.0),
|
||||
lambda t: 400.0 if int(t // 7) % 2 else 800.0, const(CAR))
|
||||
fa, fb = floor_edges(eta), floor_edges(etb)
|
||||
print(f" T14 alarm edges per quarter: (a) {fa} (b) {fb}")
|
||||
check("T14(a): the house alone straddles aim + 10 W by 40 W every 7 s: at "
|
||||
"most one alarm edge per quarter", all(v <= 1 for v in fa.values()))
|
||||
check("T14(b): T2 shape with b alternating 400 / 800 W every 7 s: no alarm "
|
||||
"edge at all (base: one per quarter)", fb == {})
|
||||
|
||||
# --- T15 unit: x10 ------------------------------------------------------------ #
|
||||
ex10 = t1(x=10)
|
||||
check("T15 unit x10 (wall and mono 10 s a cycle): T1 the same; released "
|
||||
"within 1 cycle (E+30, the first trusted cycle)",
|
||||
not any(run_of(ex10, 0, 20)) and all(run_of(ex10, 30, 120))
|
||||
and all(run_of(ex10, -30, -10)))
|
||||
ex10m = t1(x=10, mono_x=1)
|
||||
check("T15 unit, mono x1 and wall x10: the same verdicts (the edge comes from "
|
||||
"the projection's block_start, not from mono)",
|
||||
not any(run_of(ex10m, 0, 20)) and all(run_of(ex10m, 30, 120)))
|
||||
|
||||
# =========================================================================== #
|
||||
print("\n2. THE REAL CONTROLLER ACROSS THE EDGE (N=2, both at the reserve)")
|
||||
# =========================================================================== #
|
||||
|
||||
|
||||
RUNS = [] # (name, alarm edges) of every run, for N5
|
||||
|
||||
|
||||
def summary(name, r, tr):
|
||||
RUNS.append((name, H.edges(tr)))
|
||||
w = H.window(tr, E - 120, E + 900)
|
||||
lim = [x for x in w if x["lim"]]
|
||||
print(f" {name}: alarms {[t - E for t in H.alarms(r)]} edges "
|
||||
f"{[t - E for t in H.edges(tr)]} red {len(H.red_secs(tr))} s "
|
||||
f"(first {[t - E for t in H.red_secs(tr)[:1]]}) errors "
|
||||
f"{len(H.errors(tr))} limited {len(lim)} explained "
|
||||
f"{sum(1 for x in lim if x['explains'])} cmd {H.commands(r, tr)}")
|
||||
return w, lim
|
||||
|
||||
|
||||
def quiet(r, tr):
|
||||
"""No floor notification, no ERROR, no red peak_guard row, E-120..E+900."""
|
||||
return H.alarms(r) == [] and H.red_secs(tr) == [] and H.errors(tr) == []
|
||||
|
||||
|
||||
def all_explained(lim, t0=E - 120):
|
||||
return bool(lim) and all(x["explains"] for x in lim if x["t"] >= t0)
|
||||
|
||||
|
||||
ZERO = const(0.0)
|
||||
|
||||
|
||||
def honest(w):
|
||||
"""An honest shape steps at the edge, so Off has no alarm before it."""
|
||||
return H.shape(w, at=E)
|
||||
|
||||
# --- T2: the rig F-A shape ---------------------------------------------------- #
|
||||
r2, tr2 = H.run(H.shape(14000.0), a=ZERO, b=const(800.0))
|
||||
w2, lim2 = summary("T2", r2, tr2)
|
||||
check("T2 PRECONDITION: limited at the reserve from the edge, the car trusted, "
|
||||
"b 800 W, grid excess 980 W < car",
|
||||
present(first(x for x in w2 if x["t"] == E and x["lim"]))
|
||||
and all(x["w"] == CAR and x["batt"] == 800.0 for x in lim2))
|
||||
check("T2: no goodwe_peak_soc_floor, no PEAK_GUARD_FLOOR_LIMITED ERROR, no "
|
||||
"red peak_guard row in E-120..E+900 (base: alarm at E+0, red to E+900)",
|
||||
quiet(r2, tr2))
|
||||
check("T2: the car explains every floor-limited cycle, E+0..E+10 among them",
|
||||
all_explained(lim2) and len([x for x in lim2 if x["t"] <= E + 10]) == 11)
|
||||
|
||||
# --- T2b: the batteries give less later --------------------------------------- #
|
||||
r2i, tr2i = H.run(H.shape(14000.0), a=ZERO,
|
||||
b=lambda t: 800.0 if t < E + 300 else 0.0)
|
||||
summary("T2b(i)", r2i, tr2i)
|
||||
a2i = H.alarms(r2i)
|
||||
check("T2b(i): b drops to 0 W at E+300 (landing without the car 13 733 W): "
|
||||
"the alarm fires within 1 cycle of E+300",
|
||||
len(a2i) == 1 and E + 300 <= nth(a2i, 0) <= E + 301)
|
||||
check("T2b(i): ...and stays to the quarter's end (a house need with a "
|
||||
"trusted car is latched)", all(x["alarm"] and x["red"] for x in
|
||||
H.window(tr2i, E + 302, E + 899)))
|
||||
r2ii, tr2ii = H.run(H.shape(14000.0), a=ZERO,
|
||||
b=lambda t: 800.0 if t < E + 300 else 400.0)
|
||||
summary("T2b(ii)", r2ii, tr2ii)
|
||||
check("T2b(ii): b drops to 400 W (landing 13 467 W): no alarm to E+900",
|
||||
quiet(r2ii, tr2ii))
|
||||
|
||||
# --- T3: batteries at 0 W, and the 11 kW car ---------------------------------- #
|
||||
r3, tr3 = H.run(H.shape(13000.0), a=ZERO, b=ZERO)
|
||||
w3, lim3 = summary("T3", r3, tr3)
|
||||
check("T3: batteries 0 W, house 13 000 W, car 1 380 W: no alarm, no red row, "
|
||||
"the car explains every limited cycle incl. E+0..E+10, one car notice",
|
||||
quiet(r3, tr3) and all_explained(lim3)
|
||||
and len(P.ids(r3, P.OVER)) == 1
|
||||
and all(x["explains"] for x in lim3 if x["t"] <= E + 10))
|
||||
|
||||
|
||||
def plug_at(t0):
|
||||
return {t0: lambda p, c: p.ch.plug_in()}
|
||||
|
||||
|
||||
r3k, tr3k = H.run(H.shape(2600.0, before=2600.0), a=ZERO, b=ZERO, car_a=16,
|
||||
phases=3, aim=6344.0, plug=False, extra=plug_at(E - 120))
|
||||
w3k, lim3k = summary("T3 11 kW", r3k, tr3k)
|
||||
check("T3 11 kW: house 2 600 W, car 11 kW, aim 6 344 W (base P 21:30): no "
|
||||
"alarm, the car explains every limited cycle",
|
||||
quiet(r3k, tr3k) and all_explained(lim3k)
|
||||
and len(P.ids(r3k, P.OVER)) == 1)
|
||||
|
||||
# --- T4 controller ------------------------------------------------------------ #
|
||||
r409, tr409 = H.run(H.shape(13609.0), a=ZERO, b=ZERO)
|
||||
summary("T4 13 609", r409, tr409)
|
||||
check("T4: the house alone at aim + 9 W: no alarm", quiet(r409, tr409))
|
||||
r411, tr411 = H.run(H.shape(13611.0), a=ZERO, b=ZERO)
|
||||
r411o, tr411o = H.run(H.shape(13611.0), a=ZERO, b=ZERO, mode="off")
|
||||
summary("T4 13 611", r411, tr411)
|
||||
summary("T4 13 611 Off", r411o, tr411o)
|
||||
check("T4: at aim + 11 W the alarm at the same cycle as Off (and as base, "
|
||||
"E+0)", H.alarms(r411) == H.alarms(r411o) == [E])
|
||||
|
||||
# --- T5: an honest alarm ------------------------------------------------------ #
|
||||
r5, tr5 = H.run(honest(14090.0), a=ZERO, b=ZERO)
|
||||
r5o, tr5o = H.run(honest(14090.0), a=ZERO, b=ZERO, mode="off")
|
||||
summary("T5", r5, tr5)
|
||||
summary("T5 Off", r5o, tr5o)
|
||||
check("T5: grid excess 1 870 W > car 1 380 W: the alarm and the ERROR at the "
|
||||
"same second as Off and as base (E+1, the step's first sample)",
|
||||
H.alarms(r5) == H.alarms(r5o) == T5_BASE
|
||||
and nth(H.errors(tr5), 0) == nth(H.errors(tr5o), 0) == E + 1)
|
||||
check("T5: the car explains no cycle", not any(x["explains"] for x in tr5))
|
||||
|
||||
|
||||
# --- T6: the car figure unknown across the edge ------------------------------- #
|
||||
def unavailable(t0, t1):
|
||||
return {t0: lambda p, c: p.ch.go_unavailable(True),
|
||||
t1: lambda p, c: p.ch.go_unavailable(False)}
|
||||
|
||||
|
||||
r6, tr6 = H.run(H.shape(13000.0), a=ZERO, b=ZERO,
|
||||
extra=unavailable(E - 20, E + 60))
|
||||
summary("T6 T3 shape", r6, tr6)
|
||||
back = first(x["t"] for x in tr6 if x["t"] >= E + 60 and x["w"] is not None)
|
||||
check("T6 T3 shape: while unknown the car explains nothing and the alarm "
|
||||
"stands from E+0, as base",
|
||||
H.alarms(r6) == [E] and not any(
|
||||
x["explains"] for x in H.window(tr6, E - 5, E + 59))
|
||||
and all(x["alarm"] for x in H.window(tr6, E, E + 59)))
|
||||
check("T6 T3 shape: released within 1 cycle of the first trusted cycle after "
|
||||
"E+60, no new alarm edge to E+900 (base: red to E+900)",
|
||||
present(back) and all(not x["alarm"] and x["explains"] for x in
|
||||
H.window(tr6, back + 1, E + 899))
|
||||
and H.edges(tr6) == [E])
|
||||
r6h, tr6h = H.run(honest(14090.0), a=ZERO, b=ZERO,
|
||||
extra=unavailable(E - 20, E + 60))
|
||||
summary("T6 T5 shape", r6h, tr6h)
|
||||
check("T6 T5 shape: the alarm at the base second and it stands throughout",
|
||||
H.alarms(r6h) == T5_BASE and all(x["alarm"] for x in
|
||||
H.window(tr6h, E + 1, E + 899)))
|
||||
|
||||
|
||||
# --- T7: a frozen car figure, the car really stops ---------------------------- #
|
||||
def frozen_stop(p, c):
|
||||
p.ch.freeze()
|
||||
p.ch.car_full()
|
||||
|
||||
|
||||
r7, tr7 = H.run(honest(14090.0), a=ZERO, b=ZERO, extra={E - 30: frozen_stop})
|
||||
summary("T7", r7, tr7)
|
||||
first7 = nth(H.alarms(r7), 0)
|
||||
untr = first(x["t"] for x in tr7 if x["t"] >= E - 30 and x["w"] is None)
|
||||
check("T7: the alarm within 114 s of the stop (max(60, 40 Wh / 1.38 kW) "
|
||||
"+ 10), no later than base",
|
||||
present(first7) and first7 <= E - 30 + 114 and first7 <= T7_BASE)
|
||||
check("T7: never explained after the figure goes untrusted",
|
||||
present(untr) and not any(x["explains"] for x in tr7 if x["t"] >= untr))
|
||||
|
||||
|
||||
# --- T8: a car at 0 W, and a 50 W car ----------------------------------------- #
|
||||
class Draw(SimCharger):
|
||||
"""A charger that draws `real_w` while charging and reports `say_w`."""
|
||||
def __init__(self, real_w, say_w, **kw):
|
||||
super().__init__(**kw)
|
||||
self.real_w, self.say_w = real_w, say_w
|
||||
|
||||
def target_w(self):
|
||||
return 0.0 if super().target_w() <= 0.0 else self.real_w
|
||||
|
||||
def _build(self):
|
||||
keep, self._frozen_w = self._frozen_w, self.say_w
|
||||
try:
|
||||
return super()._build()
|
||||
finally:
|
||||
self._frozen_w = keep
|
||||
|
||||
|
||||
def full(p, c):
|
||||
p.ch.car_full()
|
||||
|
||||
|
||||
for nm, kw in (("house 14 090 W", dict(house=honest(14090.0), b=ZERO)),
|
||||
("T2 shape", dict(house=honest(14000.0), b=const(800.0)))):
|
||||
r8, tr8 = H.run(a=ZERO, extra={1: full}, **kw)
|
||||
r8o, tr8o = H.run(a=ZERO, extra={1: full}, mode="off", **kw)
|
||||
summary(f"T8 0 W, {nm}", r8, tr8)
|
||||
summary(f"T8 0 W, {nm}, Off", r8o, tr8o)
|
||||
check(f"T8: a car plugged at 0 W, {nm}: the alarm at the same second as "
|
||||
f"Off, nothing explained", H.alarms(r8) == H.alarms(r8o)
|
||||
and H.alarms(r8) != [] and not any(x["explains"] for x in tr8))
|
||||
r8s, tr8s = H.run(honest(14090.0), a=ZERO, b=ZERO,
|
||||
sim=Draw(50.0, 50.0, setpoint_a=6))
|
||||
r8so, tr8so = H.run(honest(14090.0), a=ZERO, b=ZERO, mode="off",
|
||||
sim=Draw(50.0, 50.0, setpoint_a=6))
|
||||
summary("T8 50 W", r8s, tr8s)
|
||||
check("T8: a 50 W car, house 14 090 W: the alarm at the same second as Off, "
|
||||
"nothing explained", H.alarms(r8s) == H.alarms(r8so) == T5_BASE
|
||||
and not any(x["explains"] for x in tr8s))
|
||||
|
||||
# --- T9: a wrong charger reply ------------------------------------------------ #
|
||||
r9a, tr9a = H.run(honest(13900.0), a=ZERO, b=ZERO,
|
||||
sim=Draw(1380.0, 11000.0, setpoint_a=6))
|
||||
summary("T9(a)", r9a, tr9a)
|
||||
check("T9(a): reports 11 kW, read-back 6 A 1-ph (cap 1 518 W): the house "
|
||||
"alone misses, the alarm at the base second",
|
||||
H.alarms(r9a) == T5_BASE and all(x["w"] is None or x["w"] <= 1518.0
|
||||
for x in tr9a))
|
||||
r9b, tr9b = H.run(honest(13900.0), a=ZERO, b=ZERO,
|
||||
sim=Draw(400.0, 1380.0, setpoint_a=6))
|
||||
summary("T9(b)", r9b, tr9b)
|
||||
check("T9(b): reports 1 380 W, draws 400 W: the same alarms as base (none: "
|
||||
"400 W corroborates a 1 380 W figure, CORR_RATIO 0.5; see the dev "
|
||||
"report's Findings)", H.alarms(r9b) == T9B_BASE)
|
||||
r9c, tr9c = H.run(honest(13900.0), a=ZERO, b=ZERO,
|
||||
sim=Draw(100.0, 1380.0, setpoint_a=6))
|
||||
summary("T9(c)", r9c, tr9c)
|
||||
a9c = nth(H.alarms(r9c), 0)
|
||||
check("T9(c): reports 1 380 W, draws 100 W: the first alarm once the figure "
|
||||
"is uncorroborated, at most 104 s + 10 s after the edge, no later than "
|
||||
"base", present(a9c) and a9c <= E + 114 and a9c <= T9C_BASE)
|
||||
print(f" T9(c) alarm edges {[t - E for t in H.edges(tr9c)]} (base: one; "
|
||||
f"the meter's 10 Wh step re-corroborates the figure every 360 s and "
|
||||
f"Expected 3/5 release the alarm then: see the dev report)")
|
||||
|
||||
# --- T10: a lost battery reading, an unavailable charger ---------------------- #
|
||||
for nm, kw in (("T2", dict(house=H.shape(14000.0), b=const(800.0))),
|
||||
("T5", dict(house=honest(14090.0), b=ZERO))):
|
||||
r10, tr10 = H.run(a=ZERO, lost={"b": {E + 1}}, **kw)
|
||||
summary(f"T10(a) {nm}", r10, tr10)
|
||||
gap = first(x for x in tr10 if x["t"] == E + 1)
|
||||
nxt = first(x for x in tr10 if x["t"] == E + 2)
|
||||
check(f"T10(a) {nm}: inverter-b's reading lost at E+1: that cycle grades "
|
||||
f"nothing (P_SAFETY owns a missing input), the next one grades on "
|
||||
f"what is measured", present(gap, nxt) and gap["batt"] is None
|
||||
and nxt["batt"] == (800.0 if nm == "T2" else 0.0))
|
||||
if nm == "T2":
|
||||
check("T10(a) T2: no alarm edge (base: E+0)", quiet(r10, tr10))
|
||||
else:
|
||||
check("T10(a) T5: the same alarm seconds as base",
|
||||
H.alarms(r10) == T10A_T5_BASE)
|
||||
r10b, tr10b = H.run(a=ZERO, extra=unavailable(E + 1, E + 2), **kw)
|
||||
summary(f"T10(b) {nm}", r10b, tr10b)
|
||||
if nm == "T2":
|
||||
check("T10(b) T2: the charger unavailable for one cycle (E+1): the "
|
||||
"alarm stands for that cycle only (Expected 5)",
|
||||
H.edges(tr10b) == [E + 1]
|
||||
and all(not x["alarm"] for x in H.window(tr10b, E + 2, E + 899))
|
||||
and all(x["explains"] for x in H.window(tr10b, E + 2, E + 899)
|
||||
if x["lim"]))
|
||||
else:
|
||||
check("T10(b) T5: the alarm at the base second and it stands",
|
||||
H.alarms(r10b) == T5_BASE and all(
|
||||
x["alarm"] for x in H.window(tr10b, E + 1, E + 899)))
|
||||
|
||||
# --- T11: one battery first (SAFETY-87) --------------------------------------- #
|
||||
for nm, house in (("(i) 17 500 W", 17500.0), ("(ii) 19 000 W", 19000.0)):
|
||||
r11, tr11 = H.run(honest(house), soc={"a": 19.0, "b": 35.0})
|
||||
summary(f"T11{nm}", r11, tr11)
|
||||
if house < 18000.0:
|
||||
check("T11(i): b able, house 17 500 W, car 1 380 W: no alarm across E",
|
||||
H.alarms(r11) == [] and P.ids(r11, *P.ALARMS) == [])
|
||||
else:
|
||||
check("T11(ii): house 19 000 W: the alarm at the base second",
|
||||
[t for t, _n in P.ids(r11, *P.ALARMS)] == T11_BASE)
|
||||
|
||||
# --- T12 (record only): plug-in at E+0, the reserve at E+180 ------------------ #
|
||||
def reserve_at(p, c):
|
||||
p.socs.update({"a": 19.0, "b": 19.0})
|
||||
|
||||
|
||||
r12, tr12 = H.run(H.shape(13000.0), soc={"a": 40.0, "b": 40.0}, plug=False,
|
||||
extra={E: lambda p, c: p.ch.plug_in(), E + 180: reserve_at})
|
||||
summary("T12 (record, F-B)", r12, tr12)
|
||||
|
||||
# --- T13 controller: the latch is kept ---------------------------------------- #
|
||||
r13, tr13 = H.run(H.shape(lambda t: 15500.0 if E + 300 <= t < E + 360
|
||||
else 13000.0), a=ZERO, b=ZERO)
|
||||
summary("T13", r13, tr13)
|
||||
check("T13: the house steps to 15 500 W at E+300 for 60 s: the alarm at "
|
||||
"the base second (E+301, the step's first sample), and red to the "
|
||||
"quarter's end", H.alarms(r13) == T13_BASE and all(
|
||||
x["alarm"] and x["red"] for x in H.window(tr13, E + 301, E + 899)))
|
||||
|
||||
# --- T16: the edge paths ------------------------------------------------------ #
|
||||
for nm, kw in (("(a)(b)(c) SAFETY-91 roll, modes on", {}),
|
||||
("(d) the guard not wanting at the edge",
|
||||
dict(lost={"b": {E}}))):
|
||||
r16, tr16 = H.run(H.shape(13000.0), a=ZERO, b=ZERO, **kw)
|
||||
w16, lim16 = summary(f"T16{nm}", r16, tr16)
|
||||
f16 = first(x for x in tr16 if x["t"] >= E and x["lim"])
|
||||
pre = first(x for x in tr16 if x["t"] == E - 1)
|
||||
check(f"T16{nm}: the car explains from the first limited cycle of the "
|
||||
f"new block, no alarm, no red row, `_carq` key = block_start",
|
||||
present(f16) and quiet(r16, tr16) and all(
|
||||
x["explains"] and x["key"] == x["block"]
|
||||
for x in tr16 if x["t"] >= f16["t"] and x["lim"]))
|
||||
if not kw:
|
||||
print(f" T16(c): within_aim at E-1 {pre['within_aim'] if present(pre) else pre}"
|
||||
" (SAFETY-126's latch carried; not asserted)")
|
||||
else:
|
||||
g0 = first(x for x in tr16 if x["t"] == E)
|
||||
check("T16(d) PRECONDITION: the guard did not want power at E+0",
|
||||
present(g0) and not g0["wants"])
|
||||
|
||||
|
||||
# --- T17: a restart ----------------------------------------------------------- #
|
||||
def restart_at(t0):
|
||||
return {t0: lambda p, c: H.restart(c)}
|
||||
|
||||
|
||||
for nm, kw in (("T2", dict(house=H.shape(14000.0), b=const(800.0))),
|
||||
("T3", dict(house=H.shape(13000.0), b=ZERO)),
|
||||
("T5", dict(house=honest(14090.0), b=ZERO))):
|
||||
rr0, tr0 = H.run(a=ZERO, **kw)
|
||||
for at in (E + 2, E + 300):
|
||||
rr, trr = H.run(a=ZERO, extra=restart_at(at), **kw)
|
||||
summary(f"T17 {nm} restart at E+{at - E}", rr, trr)
|
||||
if nm == "T5":
|
||||
check(f"T17 T5, restart at E+{at - E}: the alarm at the base "
|
||||
f"second and again on the first cycle after the restart, "
|
||||
f"as base; red throughout",
|
||||
H.alarms(rr) == T5_BASE + [at] and len(H.red_secs(trr))
|
||||
== len(H.red_secs(tr0)))
|
||||
else:
|
||||
check(f"T17 {nm}, restart at E+{at - E}: the same as without "
|
||||
f"(no floor notice, no ERROR, no red row)",
|
||||
quiet(rr, trr) and quiet(rr0, tr0))
|
||||
print(f" T17 {nm} car-over notices: twin "
|
||||
f"{[t - E for t, _n in P.ids(rr0, P.OVER)]}, restarted "
|
||||
f"{[t - E for t, _n in P.ids(rr, P.OVER)]} (EV-11's "
|
||||
f"once-per-session state does not survive a restart, as on "
|
||||
f"base)")
|
||||
|
||||
# --- T15 controller: x10 ------------------------------------------------------ #
|
||||
# F2 (out of scope, filed apart): `_car_quarter` caps a cycle's dt at 5 s, so at
|
||||
# 10 s a cycle half the car's energy is counted, and late in the quarter the
|
||||
# house alone seems to miss the aim (T2 from about E+540, T3 E+820, as on base
|
||||
# for T3). The x10 verdicts are graded to E+500; what comes after is printed.
|
||||
F2_FROM = E + 500
|
||||
for nm, kw, want in (
|
||||
("T2", dict(house=H.shape(14000.0), b=const(800.0)), "quiet"),
|
||||
("T3", dict(house=H.shape(13000.0), b=ZERO), "quiet"),
|
||||
("T5", dict(house=honest(14090.0), b=ZERO), "alarm"),
|
||||
("T6", dict(house=H.shape(13000.0), b=ZERO,
|
||||
extra=unavailable(E - 20, E + 60)), "release")):
|
||||
rx, trx = H.run(a=ZERO, x=10, **kw)
|
||||
summary(f"T15 x10 {nm}", rx, trx)
|
||||
early = [x for x in trx if x["t"] < F2_FROM]
|
||||
print(f" T15 x10 {nm}: alarms after E+500 (F2) "
|
||||
f"{[t - E for t in H.alarms(rx) if t >= F2_FROM]}")
|
||||
if want == "quiet":
|
||||
check(f"T15 x10 {nm}: no alarm, no red row, every limited cycle "
|
||||
f"explained, E-120..E+500",
|
||||
not [t for t in H.alarms(rx) if t < F2_FROM]
|
||||
and H.red_secs(trx, t1=F2_FROM - 1) == []
|
||||
and all_explained([x for x in early if x["lim"]]))
|
||||
elif want == "alarm":
|
||||
check("T15 x10 T5: the alarm at the base second (E+10, one cycle)",
|
||||
H.alarms(rx) == T15_T5_BASE)
|
||||
else:
|
||||
bk = first(x["t"] for x in trx if x["t"] >= E + 60
|
||||
and x["w"] is not None)
|
||||
check("T15 x10 T6: the alarm while unknown, released within 1 cycle "
|
||||
"(10 fake s) of the first trusted one, no new edge to E+500",
|
||||
present(bk) and bk <= E + 70
|
||||
and all(not x["alarm"] for x in H.window(trx, bk, F2_FROM - 1))
|
||||
and [t for t in H.edges(trx) if t < F2_FROM] == [E])
|
||||
|
||||
# --- N4: the alarm decision changes no command -------------------------------- #
|
||||
for nm, kw in (("T2", dict(house=H.shape(14000.0), b=const(800.0))),
|
||||
("T5", dict(house=honest(14090.0), b=ZERO))):
|
||||
ra, tra = H.run(a=ZERO, **kw)
|
||||
rb, trb = H.run(a=ZERO, explain_off=True, **kw)
|
||||
check(f"N4 {nm}: the claim, the floor, the battery setpoints and the "
|
||||
f"charger writes are identical whether the car explains or not",
|
||||
H.commands(ra, tra) == H.commands(rb, trb))
|
||||
|
||||
# --- N5: at most one floor-alarm edge per quarter ---------------------------- #
|
||||
def per_quarter(ts):
|
||||
out = {}
|
||||
for t in ts:
|
||||
out[(t - E) // 900] = out.get((t - E) // 900, 0) + 1
|
||||
return out
|
||||
|
||||
|
||||
many = [(nm, ts) for nm, ts in RUNS
|
||||
if not nm.startswith("T9(c)")
|
||||
and any(v > 1 for v in per_quarter(
|
||||
[t for t in ts if not nm.startswith("T15 x10") or t < F2_FROM])
|
||||
.values())]
|
||||
check(f"N5: at most one floor-alarm edge per quarter in every run "
|
||||
f"({len(RUNS)} runs; T9(c) apart, x10 to E+500): {many}", many == [])
|
||||
|
||||
print()
|
||||
print("FAIL: " + ", ".join(fails) if fails else "PASS: every check passed")
|
||||
sys.exit(1 if fails else 0)
|
||||
@@ -0,0 +1,207 @@
|
||||
"""EV-18: the real Controller across one quarter edge `E`, N=2, both units at
|
||||
the peak reserve and the car charging (`ev04_peak.drive`). Used by test_ev18.py.
|
||||
|
||||
The run starts `E` s before an edge (rig.BASE is moved back for the run), with
|
||||
a light house so the first quarter does not raise the month's peak (the aim
|
||||
stays `AIM`). At `E - 120` the house steps to the shape, so the guard first
|
||||
wants power at the edge, as on the rig (EV-15 F-A). `force` makes a unit give
|
||||
what the loop gives below the reserve whatever it is told; `lost` drops its
|
||||
reading for some seconds (the grid still sees it). The trace is one dict per
|
||||
cycle, taken after it.
|
||||
"""
|
||||
|
||||
import hashlib
|
||||
import logging
|
||||
import os
|
||||
import sys
|
||||
from datetime import timedelta
|
||||
|
||||
HERE = os.path.dirname(os.path.abspath(__file__))
|
||||
sys.path.insert(0, HERE)
|
||||
|
||||
import ev04_peak as P # noqa: E402
|
||||
import opt11_identity as rig # noqa: E402
|
||||
import safety81_sim as s81 # noqa: E402
|
||||
from app import peakguard # noqa: E402
|
||||
|
||||
E = 150 # the edge, in run seconds
|
||||
AIM = 13600.0
|
||||
MARGIN = 50.0
|
||||
PRE_W = 5000.0 # the first quarter's house: under the cap
|
||||
FLOOR = "goodwe_peak_soc_floor"
|
||||
OPTS = {"peak_soc_floor": 20, "inverters": [
|
||||
{"name": "inverter-a", "setpoint_entity": "number.sp_a",
|
||||
"soc_entity": "sensor.soc_a", "batt_entity": "sensor.batt_a",
|
||||
"max_w": 5000, "bms_soc_floor": 10},
|
||||
{"name": "inverter-b", "setpoint_entity": "number.sp_b",
|
||||
"soc_entity": "sensor.soc_b", "batt_entity": "sensor.batt_b",
|
||||
"max_w": 4600, "bms_soc_floor": 10}]}
|
||||
|
||||
|
||||
class _Errors(logging.Handler):
|
||||
def __init__(self):
|
||||
super().__init__(logging.ERROR)
|
||||
self.rec = []
|
||||
|
||||
def emit(self, r):
|
||||
self.rec.append(r.getMessage())
|
||||
|
||||
|
||||
ERR = _Errors()
|
||||
_lg = logging.getLogger("goodwe")
|
||||
_lg.addHandler(ERR)
|
||||
_lg.setLevel(logging.ERROR)
|
||||
_lg.propagate = False
|
||||
|
||||
|
||||
class Plant(P.CarPlantN):
|
||||
force = {}
|
||||
lost = {}
|
||||
|
||||
def batt_of(self, u, at):
|
||||
f = self.force.get(u)
|
||||
if f is not None:
|
||||
return float(f(at))
|
||||
return super().batt_of(u, at)
|
||||
|
||||
async def number(self, e, invert=False):
|
||||
for u, secs in self.lost.items():
|
||||
if e == "sensor.batt_" + u and int(self.t) in secs:
|
||||
return None
|
||||
return await super().number(e, invert)
|
||||
|
||||
|
||||
def shape(after, before=PRE_W, at=None):
|
||||
"""The house: `before` until `at` (E - 120), then `after` (W or fn(t))."""
|
||||
at = E - 120 if at is None else at
|
||||
return lambda t: before if t < at else (after(t) if callable(after)
|
||||
else after)
|
||||
|
||||
|
||||
def run(house, *, a=None, b=None, lost=None, car_a=6, phases=1, aim=AIM,
|
||||
mode="manual", dur=None, extra=None, sim=None, soc=None, plug=True,
|
||||
x=1, mono_x=None, explain_off=False):
|
||||
"""One run; returns (run, trace). `x`: fake seconds per cycle (wall and
|
||||
monotonic both; `mono_x` sets the monotonic rate apart). `explain_off`:
|
||||
the car never explains (for the control-identity check)."""
|
||||
force = {}
|
||||
if a is not None:
|
||||
force["a"] = a
|
||||
if b is not None:
|
||||
force["b"] = b
|
||||
cls = type("Plant", (Plant,), {"force": force, "lost": lost or {}})
|
||||
tr = []
|
||||
n_err = [len(ERR.rec)]
|
||||
dur = E + 900 if dur is None else dur
|
||||
|
||||
def hook(plant, c):
|
||||
orig = c.car_settle
|
||||
if explain_off:
|
||||
c._car_explains_alarm = lambda *a_, **k_: False
|
||||
if mono_x is not None and mono_x != x:
|
||||
c.car_now = (lambda f=c.car_now: f() * mono_x / x)
|
||||
|
||||
async def settle():
|
||||
await orig()
|
||||
g = c.peak_guard
|
||||
red = []
|
||||
if plant.t >= E - 130:
|
||||
red = [r_["id"] for r_ in c.checks()
|
||||
if r_["ok"] is False and not r_["warn"]
|
||||
and r_["id"] == "peak_guard"]
|
||||
errs = [m for m in ERR.rec[n_err[0]:]
|
||||
if "may not draw the battery lower" in m]
|
||||
n_err[0] = len(ERR.rec)
|
||||
cl = peakguard.claim(g) if g is not None else None
|
||||
tr.append({
|
||||
"t": plant.t, "explains": c.car_explains,
|
||||
"lim": bool(g is not None and (g.floor_limited
|
||||
or g.saturated)),
|
||||
"within_aim": bool(g is not None and g.within_aim),
|
||||
"wants": bool(g is not None and g.engaged
|
||||
and (g.wanted_w or 0.0) > 0.0),
|
||||
"alarm": c._peak_floor_limited, "red": red, "err": errs,
|
||||
"w": c.car_alarm_w(), "batt": c.site_batt_w,
|
||||
"key": c._carq["key"],
|
||||
"block": (c._peak_proj_real.block_start
|
||||
if c._peak_proj_real is not None else None),
|
||||
"floor_w": g.floor_w if g is not None else None,
|
||||
"lo": getattr(cl, "lo", None),
|
||||
"sp": tuple(i.last_write for i in c.inverters)})
|
||||
c.car_settle = settle
|
||||
|
||||
ev = {0: hook}
|
||||
for t, fn in (extra or {}).items():
|
||||
if t == 0:
|
||||
ev[0] = (lambda p, c, fn=fn: (hook(p, c), fn(p, c)))
|
||||
else:
|
||||
ev[t] = fn
|
||||
socs = soc or {"a": 19.0, "b": 19.0}
|
||||
s = sim
|
||||
if s is None:
|
||||
from chargersim import SimCharger
|
||||
s = SimCharger(setpoint_a=car_a)
|
||||
if x != 1:
|
||||
tick = s.tick
|
||||
s.tick = lambda secs=1.0: tick(secs * x)
|
||||
base, step = rig.BASE, s81.TICK
|
||||
rig.BASE, s81.TICK = base - timedelta(seconds=E), float(x)
|
||||
try:
|
||||
r = P.drive(house, dur=dur, rating=5000.0, soc=socs,
|
||||
cap=aim + MARGIN, phases=phases, n=2, plant_cls=cls,
|
||||
opts=OPTS, dev_w=5000.0, setpoint=car_a, user_a=car_a,
|
||||
mode=mode, events=ev, sim=s, plug=plug)
|
||||
finally:
|
||||
rig.BASE, s81.TICK = base, step
|
||||
return r, tr
|
||||
|
||||
|
||||
def alarms(r):
|
||||
"""Seconds of each goodwe_peak_soc_floor notification."""
|
||||
return [t for t, n in r["raised"] if n == FLOOR]
|
||||
|
||||
|
||||
def window(tr, t0, t1):
|
||||
return [x for x in tr if t0 <= x["t"] <= t1]
|
||||
|
||||
|
||||
def edges(tr):
|
||||
"""Seconds at which the floor alarm goes False -> True."""
|
||||
out, was = [], False
|
||||
for x in tr:
|
||||
if x["alarm"] and not was:
|
||||
out.append(x["t"])
|
||||
was = x["alarm"]
|
||||
return out
|
||||
|
||||
|
||||
def red_secs(tr, t0=None, t1=None):
|
||||
t0 = E - 120 if t0 is None else t0
|
||||
t1 = E + 900 if t1 is None else t1
|
||||
return [x["t"] for x in window(tr, t0, t1) if x["red"]]
|
||||
|
||||
|
||||
def errors(tr):
|
||||
return [x["t"] for x in tr if x["err"]]
|
||||
|
||||
|
||||
def commands(r, tr):
|
||||
"""A digest of every command: the units' setpoints, the charger's writes,
|
||||
and the guard's floor and claim per cycle (N4)."""
|
||||
h = hashlib.sha256()
|
||||
for u in sorted(r["plant"].hists):
|
||||
h.update(repr((u, r["plant"].hists[u])).encode())
|
||||
h.update(repr(r["sim"].writes()).encode())
|
||||
h.update(repr([(x["t"], x["floor_w"], x["lo"], x["sp"])
|
||||
for x in tr]).encode())
|
||||
return h.hexdigest()[:16]
|
||||
|
||||
|
||||
def restart(c):
|
||||
"""A restart as the car side sees it: a fresh `car_init` and an empty
|
||||
corroboration history, and no floor alarm standing."""
|
||||
mode, n, a = c.car_mode, c.car_n, c.car_a
|
||||
c.car_init(c.o, c.store)
|
||||
c.car_mode, c.car_n, c.car_a = mode, n, a
|
||||
c.car._hist.clear()
|
||||
c._peak_floor_limited = False
|
||||
Reference in New Issue
Block a user