Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d7b4298092 | ||
|
|
af7e96e5e5 | ||
|
|
918d44ab33 | ||
|
|
678ea13895 | ||
|
|
984f4335a0 | ||
|
|
89a2eb0b74 | ||
|
|
6bf37597f8 | ||
|
|
63043ea219 | ||
|
|
39ca1df232 | ||
|
|
6c0546beb0 | ||
|
|
79dfcde2bb | ||
|
|
de06a2c6f5 | ||
|
|
9a76f1a968 | ||
|
|
0020756aab | ||
|
|
0381fffbe1 | ||
|
|
07d23d2eed | ||
|
|
fb4a449591 | ||
|
|
776b84ca20 | ||
|
|
34b81e8aeb |
@@ -1,5 +1,10 @@
|
||||
# Changelog
|
||||
|
||||
### Not in a release yet
|
||||
|
||||
- A new *Car* card on Home shows an Alfen charger: whether a car is connected, its power and today's energy. It only reads the charger, and the car's power no longer counts in the House tile or in what the batteries plan for the night. It is off until you choose a charger in Settings ([[EV-03]]).
|
||||
- During a real peak, a battery in its maintenance charge now stays paused instead of switching between charging and giving, and the batteries give only what keeps the peak under the limit ([[MAINT-28]]).
|
||||
|
||||
## 0.22.0
|
||||
|
||||
**A minor bump: a battery's monthly charge now gets the cheap night, the plan knows about the 7-day wait, a slow meter is followed more gently, and one peak-guard stop no longer costs a night charge its whole period. No option changes.**
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
# MAINT-28 - during a real peak the maintenance charge stays paused
|
||||
|
||||
**Status: fix-forward after the rig FAIL (TEST-23, f3f9483).** Tests: `test_maint28.py`, `test_maint28b.py`. No option added; the peak aim, the month peak and the MAINT-13 numbers are unchanged. MAINT-24 follow-up (rig test finding F-1, `reports/MAINT-24-test-report.md`).
|
||||
|
||||
## What happened (rig x10, house 6.5 kW, month aim 5.95 kW, A in maintenance CHARGE)
|
||||
`peakguard.shaping_suspended()` pauses the charge while the forecast is over the aim or the guard is engaged. MAINT-24 moved the aim from 3450 W to the month aim (SAFETY-80), so the pause no longer lasts the whole peak: the guard gives, its projection drops under 5950 W and it idles ("heading for 5 6xx W, under this month's peak"), the pause ends, the floor charges A 150-460 W, the grid goes to 6.3-6.9 kW, the guard trips again. A flipped charge/give 468 times in 45 min (base 02eac3b 11). The quarters stayed at the aim; the cost was a battery working against itself and a grid that swung 5.4-6.9 kW.
|
||||
|
||||
## The change
|
||||
`peakguard.shaping_held(suspended, held, forecast, aim, house)`: `suspended` is the old `shaping_suspended()`, and once it was true the pause stays until the house (`grid + battery power`, the load without our own charge) is `MAINT_RESUME_UNDER_W` = 300 W under the aim. A guard that is engaged or a forecast over the aim still pauses at once. House unread: the forecast stands in; neither read: no pause (SAFETY-63). `ctl_cycle.py` keeps the flag in `_maint_peak_hold`. The hold is for N=2 and up, and only where MAINT-24 moved the aim (a banked month peak above `peak_cap_w`, so the aim is above cap minus margin). Elsewhere the old rule stays, byte for byte: SAFETY-87's N=1 digests (`n1_charge_low`) and SAFETY-119's N=2 charge at 5050 W over a 5000 W cap with no banked peak are pinned, and 1b5f7c9 behaves as 02eac3b there (a chase that was not a MAINT-24 regression).
|
||||
|
||||
Why the house and not the forecast: while A gives, the forecast sits just under the aim by design, so no forecast margin is both safe and reachable. The house is the meter reading plus the batteries' power (`grid + site_batt_w`): the net demand the meter would see with no battery at work. Solar is already in it, and that is right: the aim is a limit on what the meter takes, so a sunny hour that lowers the net demand is real room, and a cloud that raises it brings the hold back at once. It is not the gross load, and it would be wrong to add PV back (that would hold the pause on room the meter really has). It does not stay put when a battery steps: see "Fix-forward" below.
|
||||
|
||||
Why 300 W: the house wanders +-50 W; once the charge resumes it settles at (aim - house) / 2, so 300 W gives at least 150 W, three times the noise, and charging less than that is not worth a restart.
|
||||
|
||||
The flag lives only while the charge-only branch is taken: every cycle that reaches the maintenance loop starts it at False, so a maintenance that ended, a mode change or a missing aim cannot carry a stale True into the next charge (test_maint28.py part 1b). `cycle()` has two returns before that loop, and the flag is kept through them on purpose: "inputs missing" and "readings late" (SAFETY-128) are holds of under `stale_after` seconds that write nothing and decide nothing, so the next full cycle sees the same charge and the same peak. A missed poll must not end a peak pause; a reset there would restart the charge on it (`_maint_shape_suspended` is kept through them the same way).
|
||||
|
||||
It only ever keeps the maintenance charge off. No cut-back is delayed or weakened: the guard's claim is filed as before. While the pause is held, the pack in CHARGE gives only its share of the guard's floor (0 W if the guard holds it at its reserve), and the batteries together give only what the guard needs (see Fix-forward, F-2 and H-1). The first version let A give for the house; it was dropped.
|
||||
|
||||
## Numbers (sim, real `cycle()`, A rated 2500 W)
|
||||
House 3000 -> 6500 W for 45 min -> 3000 W, +-50 W every 5 s, banked month peak 6000 W (aim 5950 W), forecast = quarter average so far plus the rest at the present grid (`scratch/MAINT-28/dev/m28_repro.py`; `test_maint28.py` runs the same shape for 15 min to keep the suite short).
|
||||
|
||||
| 45 min load | base 02eac3b | 1b5f7c9 | MAINT-28 (f3f9483, without the lag) |
|
||||
|---|---|---|---|
|
||||
| A charge/give reversals | 0 | 52 | 1 (the first trip) |
|
||||
| A charging seconds in the load (of 2700) | 0 | 367 | 301 (before the first trip) |
|
||||
| quarter averages (W) | 5959 5950 5950 5438 5502 | 5356 5923 5924 5041 4479 | 5356 4012 4000 4226 4476 |
|
||||
| A out / in (kWh) | 0.65 / 0 | 0.45 / 0.51 | 1.67 / 0.56 |
|
||||
| charge back after the load | - | 3 s | 3 s |
|
||||
|
||||
Rig (MAINT-24 test report, F-1): 468 reversals in 45 min on 1b5f7c9, 11 on 02eac3b. Live shape (house 3000 W): no pause, A 1475 W, as MAINT-24.
|
||||
|
||||
## Tests and mutants
|
||||
`test_maint28.py`: part 1 the real peak, 1b the stale hold, 2 `shaping_held()` edges, 3 the unchanged cases (digests equal 1b5f7c9). On 1b5f7c9 itself (hold stubbed out) part 1 and 1b fail. Mutants, each red: M1 hold state not kept (`held` always False: the 1b5f7c9 behaviour); M2 resume line `-` to `+`; M3 house not passed; M4 the per-cycle reset removed; M5 the N=1 gate removed (digest `n1_peak`: N=1, banked peak, house 6500 W); M6 the aim gate removed (digest `n2_nobank`).
|
||||
|
||||
## Not changed
|
||||
MAINT-24's rate and its tests, N=1, the drain, modes off (digests of 1b5f7c9). The pause for a late or missing forecast.
|
||||
|
||||
## Fix-forward (rig FAIL F-1, F-2; `reports/MAINT-28-test-report.md`)
|
||||
The sim had no battery-reading lag, and the first version said the 300 W line is far larger than the lag moves the estimate. That was wrong. The rig publishes a battery's power every 10 s; the meter is newer. After each guard step charge -> give (+500-1000 W) the next meter reading shows the give and the battery reading still shows the charge, so `grid + site_batt_w` drops by the step, under the 5650 W line: 69/69, 132/133, 215/215, 51/51 releases at a median 5430 W with the house at 6450 W or more. Test: `test_maint28b.py`, sim `Lag.batt_period_s`.
|
||||
|
||||
**F-1: the pause ends only on a settled estimate.** `Controller._batts_settled()` is False from a step UP of a unit's command (`MAINT_STEP_W` = 100 W more give or less charge, the SAFETY-128 pending size) until its reading changed `PLANT_SETTLE_S` (6 s) after the step, or `BATT_OBLIGED_S` (17 s) have passed. `peakguard.shaping_held(..., settled)` then keeps the pause. A step down makes the estimate err high, which only holds the pause, so it waits for nothing. Measured in the 45 min sim, pause on: settled, the estimate was at most 146 W under the real house (0 cycles over 300 W); not settled, up to 1933 W under (725 of 1611 cycles over 300 W). Sim, 45 min, house 6500 W: 83 of 83 releases on a stale estimate (f3f9483) -> 0; flips 148 -> 1 (1b5f7c9 210). Charge is back 4 s after the load (12 s in test_maint28b), not 0: the first settled estimate. No cut-back is touched.
|
||||
|
||||
**F-2 and the cap.** Owner 2026-11-13 ("1" = cap): while the pause holds, the pack in maintenance CHARGE gives only what the guard claims for the peak, at any SoC; other packs unchanged (replaced by H-1 below). Owner 2026-11-13 ("ok max", relayed by the manager): accepted "while the hold is on, the pack in maintenance CHARGE gives at most the largest floor the peak guard claimed in the current quarter" (about 0.37 kWh per 45-min peak in the sim; quarters at or under the aim).
|
||||
|
||||
**H-1 (review 2026-11-14, owner decision 2026-11-14): the batteries together give only what the guard needs.** With the cap on A alone, the loop gave for the whole house with B (Cheap hours): in the live-try shape (A 11 % in CHARGE, B 25 %, house 6.5 kW for 90 min) B gave 4.6 kW, went from 25 to 10 % in 43 min, and two quarters were 6502 and 6499 W against the month peak 6000 W. So while the pause holds, `_m28_share()` also files one site limit (source `charge`, `P_MAINT_SHAPE`, per-site `_m28_site`): `hi` = the largest floor of the period, never under this cycle's floor. The guard's claim is not cut: `hi` is at least the floor, `P_PEAK` outranks `P_MAINT_SHAPE`, and `_peak_on_able` still places the whole floor. Outside the hold nothing is filed. Live try, same shape (test_maint28b): quarters 5357 to 5911 W (aim 5950), B 0.86 kWh and ends at 20.6 % (1b5f7c9: 1.0 kWh, 19.8 %), B switches give/idle once, A never. The re-pinned `n2_charge_banked` quarters are 3349 and 3950 W (aim 3950).
|
||||
|
||||
The rule as built (`Controller._m28_share()`): while the pause holds (N>=2, month aim above the cap) the pack gets a unit limit `hi` = the largest part of the guard's floor placed on it in this 15-minute period. Its part in a cycle is the floor less what the other units are placed at in this cycle's split without that limit, so a part the guard's split puts on the other pack is not this pack's. A pack the guard holds at its reserve (`peak_guard.held`) gets 0 W and its part starts again from 0 W. The largest part is kept per unit (`_m28_hi`, keyed by the unit) and dropped in a new period or when the pause ends; only one pack can be in maintenance CHARGE anyway (`maintenance.arbitrate()`, one slot per site).
|
||||
|
||||
Why the largest of the period and not the present part: the guard alone lands the quarter 9.5-10 W over its aim in the sim (SAFETY-126: its own projection ends on 5950.0 W but the meter reading it counts lags the true grid), and with the present part only, test_maint28 part 1 ends at 5960.1 W; the largest of the period lets the loop keep A up and it ends at 5925 W. Why not `hi` = 0 W: with the other pack under its reserve the guard needs this one (test_maint28b, house 12 kW, B at 18 %: A gives 1.07 kWh for the guard).
|
||||
|
||||
Tests (test_maint28b, 13-min load, A 5 kW): A at 49 %: SoC drop 0.64 point (the owner's 0.37 kWh per 45 min is 0.70 point here; the check is <= 0.70). Both packs able, B on Cheap hours: B is placed nothing, A's limit is the period's largest floor (3087 W) and A gives 3081 W. B on Solar first (it gives for the house): A's limit stays under the period's largest floor by 500 W or more in 740 of 744 paused cycles, and the quarters stay under the aim.
|
||||
|
||||
Sim, rig shape, 45 min, house 6500 W (load from minute 10), A in CHARGE at 49 %, B 30 % on Cheap hours: A gives 0.17 kWh (f3f9483 0.44), SoC 50.5 -> 49.0 %, charge/give flips 1, give/idle switches 1, quarters 5358 5897 5911 5176 4477 W, charge back 4 s after the load; B gives 0.23 kWh (before H-1 3.04, f3f9483 0.32). test_safety84 n2_charge_banked: banked quarters 3349 and 3950 W against the aim 3950 W.
|
||||
|
||||
Mutants, each red: the freshness check dropped (always settled); the cap dropped; the other units' placement dropped (part = the whole floor); one cap for the site instead of per unit; the 0 W for a held pack dropped (all in `test_maint28b.py`); the period's largest dropped (present part only: `test_maint28.py` part 1 quarter 5960 W); `_batts_settled()` replaced by True at the hold in ctl_cycle.py (the 45-min rig shape in `test_maint28b.py`, one stale release); the site limit dropped (the live try in `test_maint28b.py`: quarters 6502 and 6499 W, B 2.91 kWh to 10.0 %).
|
||||
@@ -251,6 +251,10 @@ The label and description each setting shows on the Configuration tab, in tab or
|
||||
| Safety | Opposing inverters time (s) | `circulation_hold_s` | For two or more inverters: how long they may push against each other before a safety stop. Derived value, leave it unchanged. |
|
||||
| Safety | Not delivering alarm after (s) | `delivery_hold_s` | For two or more inverters: how long one may fall short of its share before an alarm, which changes nothing. Derived value, leave it unchanged. |
|
||||
| Safety | Shadow mode | `shadow_mode` | The add-on makes every decision but keeps every inverter at 0 W. 'auto' does this while control is stopped, 'on' always, 'off' never. |
|
||||
| Car charger | Charger | `ev_charger` | Which car charger the add-on reads. Off leaves everything as it is. This version only reads the charger and never changes it. |
|
||||
| Car charger | Current setting entity | `ev_current_entity` | The entity that sets the charger's current. The add-on finds the charger's other entities from its name. |
|
||||
| Car charger | Charger limit (A) | `ev_max_a` | The most current the charger may ever be asked for. Never above what the charger reports. Lower it for a weaker fuse or cable. |
|
||||
| Car charger | Phases | `ev_phases` | How many phases the charger may use: 1, 3, or 1 and 3 (auto). |
|
||||
| Advanced | Start control on boot | `auto_start` | Off by default. Leave it off until the site is commissioned, so someone presses Start after each restart. |
|
||||
| Advanced | Control gain | `gain` | How much of the remaining error control corrects each cycle. Measured on real hardware, do not raise it. |
|
||||
| Advanced | Largest change per cycle (W) | `slew_w` | How far the command may move in one cycle. 0 follows “Inverter rating” and is recommended. |
|
||||
@@ -3269,6 +3273,57 @@ row is printed **always**, including when it is zero: a row that reports
|
||||
staleness only once it is stale cannot be told from one that never reports
|
||||
it.
|
||||
|
||||
### Car charger
|
||||
|
||||
The add-on can read your car charger and show it on **Home**, on a *Car* card. In
|
||||
this version it only reads. It never changes the charger, so it is safe to run
|
||||
beside your own automation. Later versions will add charging modes.
|
||||
|
||||
| option | meaning |
|
||||
|---|---|
|
||||
| `ev_charger` | `off` (the default: nothing changes at all) or `alfen_ha`, an Alfen charger through its Home Assistant integration. |
|
||||
| `ev_current_entity` | The charger's current setting, for example `number.wallbox_power_connector_max_current_socket_1`. The add-on finds the charger's other entities from this name. |
|
||||
| `ev_max_a` | The most current the charger may ever be asked for. It cannot be higher than the station limit the charger reports. |
|
||||
| `ev_phases` | `1`, `3` or `auto` (1 and 3). |
|
||||
|
||||
**What the Car card shows.** The state (Charging, Connected waiting, No car
|
||||
connected, Car is full, Charger not reachable), the power and current, and the
|
||||
energy charged today. The car's power is taken out of the **House** tile and out
|
||||
of the house profile that plans the batteries' night charge, so the batteries
|
||||
no longer buy energy for a car that charged last night. The peak limit works as
|
||||
before: the car is still part of what the grid meter sees.
|
||||
|
||||
**When the charger does not answer.** After 30 seconds the card says *Charger
|
||||
not reachable* and one amber row appears. After 5 minutes one notification
|
||||
follows. While the car reading is older than 15 seconds the House tile shows no
|
||||
reading, and that moment is left out of the house profile, rather than guessing
|
||||
how much the car took.
|
||||
|
||||
**Another controller.** If the charger's current changes while the add-on writes
|
||||
nothing, something else sets it, usually your own automation. The page then shows
|
||||
the grey row *Another controller changes the charger*. That is expected while
|
||||
you migrate.
|
||||
|
||||
**Moving your own automation to the add-on.** Each step can be undone.
|
||||
|
||||
1. Install this version and set `ev_charger` to `alfen_ha`. The add-on reads the
|
||||
charger and writes nothing. Compare the card with your automation for a few
|
||||
days.
|
||||
2. When a later version adds charging modes, switch your automation **off**
|
||||
(do not delete it) in the evening with the car unplugged, then choose the
|
||||
add-on's Manual mode with the current your helper held. Plug in and check the
|
||||
current on the card and on the charger's display.
|
||||
3. On the next sunny day, choose Solar, with *spare sun goes first to* set as
|
||||
your priority switch was.
|
||||
4. Keep your Home Assistant helpers for a week. To go back, set the add-on mode
|
||||
to Off and switch the automation on. After that you can delete the helpers and
|
||||
the automation.
|
||||
|
||||
Never let the automation and the add-on both write the charger.
|
||||
|
||||
**Home Assistant entities.** With MQTT the add-on adds three sensors:
|
||||
`goodwe_car_power`, `goodwe_car_state` and `goodwe_car_today_kwh`.
|
||||
|
||||
### Site
|
||||
|
||||
| option | meaning |
|
||||
@@ -3388,6 +3443,14 @@ battery goes on as before. Check that the add-on can reach the internet and that
|
||||
the price service token is right. The notification goes by itself when a price
|
||||
is back. It is shown only while the monthly battery cycle is switched on.
|
||||
|
||||
### Charger not reachable
|
||||
|
||||
The add-on has not been able to read the car charger for 5 minutes, because its
|
||||
entities are unavailable or the charger's login is off. The charger keeps its
|
||||
last setting. The add-on changes nothing on the charger in any case. Check the
|
||||
charger's integration in Home Assistant. The notification goes by itself when
|
||||
the charger answers again.
|
||||
|
||||
### For installers: notifications
|
||||
|
||||
A fixed tariff beside the price service raises no notification: it is the
|
||||
@@ -3414,6 +3477,7 @@ default `info` hides it.
|
||||
| Meter reading may be stuck | alarm | `goodwe_meter_frozen` | SAFETY-18 |
|
||||
| Battery cycle did not finish | warning | `goodwe_maint_failed_<name>` | MAINT-13 |
|
||||
| No prices | warning | `goodwe_no_prices` | PRICE-01 |
|
||||
| Charger not reachable | warning | `goodwe_charger_unreachable` | EV-03 |
|
||||
|
||||
**The Details link.** Home Assistant 2026.2 and newer show add-on pages at
|
||||
`/config/app/<slug>/documentation`; 2026.5 removed the old
|
||||
|
||||
@@ -0,0 +1,691 @@
|
||||
"""EV-03: the car charger seam, and the Alfen driver behind Home Assistant.
|
||||
|
||||
SHAPED LIKE `app/drivers.py`'s `Driver` (DECISIONS/EV-03-charger-seam.md): one
|
||||
actuator per site, a census key, a read, a clamped write that says whether the
|
||||
charger took it, and a hand-back. A charger is a modulated actuator with a fail
|
||||
state, not one of DEV-01's on/off loads.
|
||||
|
||||
THIS CARD NEVER WRITES TO THE CHARGER. `write_current`, `write_phases` and
|
||||
`release` are defined so the seam is whole, and NOTHING in the controller calls
|
||||
them: Off is the only mode. test_ev03.py greps the controller for a call and
|
||||
proves a full cycle makes no service call that names a charger entity.
|
||||
|
||||
VALUES ARE BELIEVED ONLY IN THEIR OWN UNIT (as TEL-11 does for power): power in
|
||||
a power unit, energy in a kWh unit, current in A. A reading in another unit is
|
||||
absent, never converted by a guess. ABSENCE IS NEVER ZERO.
|
||||
|
||||
The pure half (`CarTracker`, the state words, the entity table) takes its clock
|
||||
as an argument, so the checks need no sleep.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import re
|
||||
from dataclasses import dataclass
|
||||
|
||||
from .hass import BAD_STATES
|
||||
from .solarfc import KWH_PER
|
||||
|
||||
OFF = "off"
|
||||
ALFEN_HA = "alfen_ha"
|
||||
#: the `ev_charger` values the options accept
|
||||
SELECTABLE = (OFF, ALFEN_HA)
|
||||
PHASES_CHOICES = ("1", "3", "auto")
|
||||
|
||||
# config.yaml's shipped defaults, mirrored (test_defaults_pin.py checks it).
|
||||
EV_OPTION_DEFAULTS = {"ev_charger": "off", "ev_current_entity": "",
|
||||
"ev_max_a": 16, "ev_phases": "auto"}
|
||||
|
||||
|
||||
def max_a(opts: dict):
|
||||
"""`ev_max_a` as a float, or None when it is not a number."""
|
||||
raw = opts.get("ev_max_a", EV_OPTION_DEFAULTS["ev_max_a"])
|
||||
if raw is None or raw == "":
|
||||
raw = EV_OPTION_DEFAULTS["ev_max_a"]
|
||||
try:
|
||||
return float(raw)
|
||||
except (TypeError, ValueError):
|
||||
return None
|
||||
|
||||
MIN_A = 6.0 # IEC 61851: no car charges below 6 A
|
||||
ENTITY_MAX_A = 40.0 # the Alfen current entity's own range
|
||||
|
||||
# Reachability and the car card's timers, in seconds.
|
||||
UNREACHABLE_S = 30.0 # entities unavailable / login off this long
|
||||
NOTIFY_S = 300.0 # then one warning notification
|
||||
FULL_B_S = 60.0 # mode3 B with current allowed this long: car full
|
||||
FULL_C_S = 600.0 # mode3 C under FULL_C_W this long: car full
|
||||
FULL_C_W = 200.0
|
||||
WRITER_HOLD_S = 3600.0 # "another controller" stays shown this long
|
||||
IDLE_A = 1.0 # a phase under this draws nothing
|
||||
|
||||
# role -> (entity domain, suffix after `<x>_`). `current` is the setpoint, the
|
||||
# one the installer names; the rest are derived by swapping its suffix.
|
||||
SETPOINT_SUFFIX = "power_connector_max_current_socket_1"
|
||||
ROLES = {
|
||||
"current": ("number", SETPOINT_SUFFIX),
|
||||
"readback": ("sensor", "main_active_max_current_socket_1"),
|
||||
"state": ("sensor", "mode3_state_socket_1"),
|
||||
"display": ("sensor", "display_state_socket_1"),
|
||||
"power": ("sensor", "active_power_total_socket_1"),
|
||||
"energy": ("sensor", "meter_reading_socket_1"),
|
||||
"l1": ("sensor", "current_l1_socket_1"),
|
||||
"l2": ("sensor", "current_l2_socket_1"),
|
||||
"l3": ("sensor", "current_l3_socket_1"),
|
||||
"station": ("number", "max_station_current"),
|
||||
"station_active": ("sensor", "main_station_active_max_current_socket_1"),
|
||||
"phases_set": ("select", "installation_max_allowed_phases"),
|
||||
"phases_read": ("sensor", "connector_1_max_allowed_of_phases"),
|
||||
"error": ("sensor", "display_error_number_socket_1"),
|
||||
"login": ("binary_sensor", "https_api_login_status"),
|
||||
}
|
||||
#: a missing one of these refuses the charger (not the add-on). `power` is one
|
||||
#: of them: without it the car's power is unknown for good, House would show no
|
||||
#: reading for ever and the house profile would drop every sample.
|
||||
#: The power entity must also read in a Home Assistant power unit (`POWER_UNITS`).
|
||||
REQUIRED = ("current", "readback", "state", "power")
|
||||
_SETPOINT_RE = re.compile(r"^number\.(?P<x>.+)_" + SETPOINT_SUFFIX + "$")
|
||||
|
||||
_ROLE_ORDER = tuple(ROLES)
|
||||
#: power unit -> W. The probe and the reading both use this one table.
|
||||
_W_PER = {"mW": 0.001, "W": 1.0, "kW": 1000.0, "MW": 1000000.0}
|
||||
POWER_UNITS = tuple(_W_PER)
|
||||
|
||||
|
||||
def census_key(entity) -> str:
|
||||
"""The SAFETY-28 form: stripped, lowercase."""
|
||||
return str(entity or "").strip().lower()
|
||||
|
||||
|
||||
def entities_for(setpoint) -> dict:
|
||||
"""role -> entity id, derived from the setpoint entity by its suffix.
|
||||
Empty when the setpoint does not end the way the Alfen integration names it."""
|
||||
m = _SETPOINT_RE.match(str(setpoint or "").strip())
|
||||
if not m:
|
||||
return {}
|
||||
x = m.group("x")
|
||||
return {role: f"{dom}.{x}_{suffix}" for role, (dom, suffix) in ROLES.items()}
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------- #
|
||||
# What a read gives
|
||||
# --------------------------------------------------------------------------- #
|
||||
@dataclass(frozen=True)
|
||||
class ChargerReading:
|
||||
"""One read of the charger. None means "did not answer", never zero."""
|
||||
|
||||
available: bool = False # the integration answers
|
||||
state: str | None = None # mode3: "A", "B", "C", ... or None
|
||||
connected: bool | None = None
|
||||
charging: bool | None = None
|
||||
power_w: float | None = None
|
||||
energy_kwh: float | None = None # the meter, total increasing
|
||||
current_a: tuple = () # per phase, as many as read
|
||||
setpoint_a: float | None = None # the entity the installer named
|
||||
allowed_a: float | None = None # read-back of the limit the charger applies
|
||||
phases_allowed: int | None = None
|
||||
station_a: float | None = None # the charger's own station limit
|
||||
error: str | None = None # None: no error (or not read)
|
||||
display: str | None = None
|
||||
why: str = "" # for the log only, "" when available
|
||||
|
||||
|
||||
def _state_obj(obj):
|
||||
"""(text, unit, attributes) of a state object, or (None, "", {})."""
|
||||
if not isinstance(obj, dict):
|
||||
return None, "", {}
|
||||
raw = str(obj.get("state", "")).strip()
|
||||
attrs = obj.get("attributes") if isinstance(obj.get("attributes"), dict) else {}
|
||||
unit = str(attrs.get("unit_of_measurement") or "").strip()
|
||||
return (None if raw.lower() in BAD_STATES else raw), unit, attrs
|
||||
|
||||
|
||||
def _amps(obj):
|
||||
raw, unit, _ = _state_obj(obj)
|
||||
if raw is None:
|
||||
return None
|
||||
try:
|
||||
v = float(raw)
|
||||
except ValueError:
|
||||
return None
|
||||
if v != v:
|
||||
return None
|
||||
if unit == "A":
|
||||
return v
|
||||
if unit == "mA":
|
||||
return v / 1000.0
|
||||
return None
|
||||
|
||||
|
||||
def _watts(obj):
|
||||
"""Power in W, believed only in a power unit (its own copy of the rule: the
|
||||
PV channel's reader stays out of the charger's, test_pv.py part 6)."""
|
||||
raw, unit, _ = _state_obj(obj)
|
||||
if raw is None or unit not in _W_PER:
|
||||
return None
|
||||
try:
|
||||
v = float(raw) * _W_PER[unit]
|
||||
except ValueError:
|
||||
return None
|
||||
return v if v == v else None
|
||||
|
||||
|
||||
def _kwh(obj):
|
||||
raw, unit, _ = _state_obj(obj)
|
||||
if raw is None or unit not in KWH_PER:
|
||||
return None
|
||||
try:
|
||||
v = float(raw) * KWH_PER[unit]
|
||||
except ValueError:
|
||||
return None
|
||||
return v if v == v and v >= 0 else None
|
||||
|
||||
|
||||
def _phases(obj):
|
||||
raw, _u, _ = _state_obj(obj)
|
||||
m = re.match(r"\s*([13])\s*phase", raw or "", re.I)
|
||||
return int(m.group(1)) if m else None
|
||||
|
||||
|
||||
_MODE3 = re.compile(r"^(?:STATE[_ ]?)?([A-F])$", re.I)
|
||||
|
||||
|
||||
def mode3_letter(text) -> str | None:
|
||||
m = _MODE3.match(str(text or "").strip())
|
||||
return m.group(1).upper() if m else None
|
||||
|
||||
|
||||
def display_class(text) -> str | None:
|
||||
"""The fallback when mode3 is missing: firmware wording, so only the words
|
||||
the owner's automation keys on. `connected`, `charging`, `none` or None."""
|
||||
t = str(text or "").lower()
|
||||
if not t:
|
||||
return None
|
||||
if "wait vehicle" in t or "ev connected" in t or "cable connected" in t:
|
||||
return "connected"
|
||||
if "charging" in t:
|
||||
return "charging"
|
||||
if t in ("available", "ready", "idle"):
|
||||
return "none"
|
||||
return None
|
||||
|
||||
|
||||
def reading_from_states(states: dict) -> ChargerReading:
|
||||
"""A `ChargerReading` from `{role: state object or None}`. Pure."""
|
||||
def txt(role):
|
||||
return _state_obj(states.get(role))[0]
|
||||
|
||||
login, state_o = txt("login"), states.get("state")
|
||||
# Reachable: the three entities the card cannot do without answer, and the
|
||||
# login sensor is not off.
|
||||
gone = [r for r in REQUIRED if txt(r) is None]
|
||||
if gone or (login or "").lower() == "off":
|
||||
why = ("login off" if not gone else
|
||||
"no answer from " + ", ".join(gone))
|
||||
return ChargerReading(available=False, why=why)
|
||||
# A power entity that answers but cannot be believed (a unit the add-on
|
||||
# cannot convert, no unit, not a number) makes the reading UNAVAILABLE, so
|
||||
# it goes down the visible "Charger not reachable" path instead of leaving
|
||||
# the car's power unknown for good with nothing said.
|
||||
if _watts(states.get("power")) is None:
|
||||
return ChargerReading(available=False, why="power unit")
|
||||
letter = mode3_letter(txt("state"))
|
||||
disp = txt("display")
|
||||
cls = display_class(disp)
|
||||
power = _watts(states.get("power"))
|
||||
currents = tuple(a for a in (_amps(states.get(k)) for k in ("l1", "l2", "l3"))
|
||||
if a is not None)
|
||||
if letter is not None:
|
||||
connected, charging = letter in "BCD", letter in "CD"
|
||||
elif cls is not None:
|
||||
connected, charging = cls in ("connected", "charging"), cls == "charging"
|
||||
else:
|
||||
connected = charging = None
|
||||
err = txt("error")
|
||||
err_none = err is None or err.strip().startswith("0")
|
||||
return ChargerReading(
|
||||
available=True, state=letter, connected=connected, charging=charging,
|
||||
power_w=power, energy_kwh=_kwh(states.get("energy")),
|
||||
current_a=currents, setpoint_a=_amps(states.get("current")),
|
||||
allowed_a=_amps(states.get("readback")),
|
||||
phases_allowed=_phases(states.get("phases_read")),
|
||||
station_a=_first(_amps(states.get("station_active")),
|
||||
_amps(states.get("station"))),
|
||||
error=None if err_none else err, display=disp)
|
||||
|
||||
|
||||
def _first(*vals):
|
||||
return next((v for v in vals if v is not None), None)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ChargerProbe:
|
||||
"""A read-only look: which derived entities exist."""
|
||||
|
||||
setpoint: str = ""
|
||||
found: tuple = () # ((role, entity), ...)
|
||||
missing: tuple = ()
|
||||
station_a: float | None = None
|
||||
derived: bool = True # False: the setpoint's name does not fit
|
||||
power_unit: str | None = None # the power entity's unit, when it is
|
||||
# reading a number and that unit is not W or kW (an unavailable entity
|
||||
# has no unit to judge: that is the unreachable path, not a refusal)
|
||||
|
||||
@property
|
||||
def required_missing(self) -> tuple:
|
||||
return tuple(r for r, _e in self.missing if r in REQUIRED)
|
||||
|
||||
@property
|
||||
def ok(self) -> bool:
|
||||
return (self.derived and not self.required_missing
|
||||
and self.power_unit is None)
|
||||
|
||||
|
||||
def probe_from(setpoint, exists) -> ChargerProbe:
|
||||
"""`exists(entity) -> state object or None`. Pure; the caller reads."""
|
||||
ents = entities_for(setpoint)
|
||||
if not ents:
|
||||
return ChargerProbe(setpoint=str(setpoint or ""), derived=False)
|
||||
found, missing = [], []
|
||||
for role in _ROLE_ORDER:
|
||||
(found if exists(ents[role]) is not None else missing).append(
|
||||
(role, ents[role]))
|
||||
st = {r: exists(e) for r, e in ents.items()}
|
||||
raw, unit, _ = _state_obj(st.get("power"))
|
||||
bad_unit = None
|
||||
if raw is not None and unit not in POWER_UNITS:
|
||||
try:
|
||||
float(raw)
|
||||
bad_unit = unit or "none"
|
||||
except ValueError:
|
||||
pass
|
||||
return ChargerProbe(str(setpoint), tuple(found), tuple(missing),
|
||||
station_a=_first(_amps(st.get("station_active")),
|
||||
_amps(st.get("station"))),
|
||||
power_unit=bad_unit)
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------- #
|
||||
# The seam
|
||||
# --------------------------------------------------------------------------- #
|
||||
class ChargerNotBound(RuntimeError):
|
||||
pass
|
||||
|
||||
|
||||
class ChargerDriver:
|
||||
"""One charger's I/O. Constructed from the options with no Home Assistant;
|
||||
`bind()` gives it one. Everything that talks to the world is a coroutine."""
|
||||
|
||||
name = ""
|
||||
writer_key = "ev_current_entity"
|
||||
brand = ""
|
||||
words: dict = {}
|
||||
|
||||
@classmethod
|
||||
def from_options(cls, opts: dict) -> "ChargerDriver":
|
||||
raise NotImplementedError
|
||||
|
||||
def bind(self, hass) -> "ChargerDriver":
|
||||
return self
|
||||
|
||||
def bind_getter(self, getter) -> "ChargerDriver":
|
||||
return self
|
||||
|
||||
def bound(self) -> bool:
|
||||
return True
|
||||
|
||||
def configured(self) -> bool:
|
||||
raise NotImplementedError
|
||||
|
||||
def actuator_id(self) -> str:
|
||||
raise NotImplementedError
|
||||
|
||||
def entities(self) -> dict:
|
||||
return {}
|
||||
|
||||
async def limits(self) -> tuple:
|
||||
"""`(min_a, max_a, phases)`; None where unread."""
|
||||
raise NotImplementedError
|
||||
|
||||
async def read(self) -> ChargerReading:
|
||||
raise NotImplementedError
|
||||
|
||||
# --- the write side. DEFINED, UNUSED BY THE CONTROLLER IN THIS CARD. ----
|
||||
async def write_current(self, a: float) -> bool:
|
||||
raise NotImplementedError
|
||||
|
||||
async def write_phases(self, n: int) -> bool:
|
||||
raise NotImplementedError
|
||||
|
||||
async def release(self, mode: str) -> bool:
|
||||
raise NotImplementedError
|
||||
|
||||
async def probe(self) -> ChargerProbe:
|
||||
raise NotImplementedError
|
||||
|
||||
|
||||
class AlfenHaDriver(ChargerDriver):
|
||||
"""The Alfen behind its Home Assistant integration (`alfen_wallbox`)."""
|
||||
|
||||
name = ALFEN_HA
|
||||
brand = "Alfen"
|
||||
|
||||
def __init__(self, current_entity="", limit_a=16.0):
|
||||
self.current_entity = str(current_entity or "").strip()
|
||||
self.max_a = float(limit_a)
|
||||
self._ents = entities_for(self.current_entity)
|
||||
self._hass = None
|
||||
self._getter = None
|
||||
|
||||
@classmethod
|
||||
def from_options(cls, opts: dict) -> "AlfenHaDriver":
|
||||
amps = max_a(opts)
|
||||
return cls(opts.get("ev_current_entity", ""),
|
||||
EV_OPTION_DEFAULTS["ev_max_a"] if amps is None else amps)
|
||||
|
||||
@classmethod
|
||||
def actuator_id_of(cls, opts: dict) -> str:
|
||||
return str(opts.get("ev_current_entity") or "").strip()
|
||||
|
||||
def bind(self, hass):
|
||||
self._hass, self._getter = hass, None
|
||||
return self
|
||||
|
||||
def bind_getter(self, getter):
|
||||
self._hass, self._getter = None, getter
|
||||
return self
|
||||
|
||||
def bound(self) -> bool:
|
||||
return self._hass is not None or self._getter is not None
|
||||
|
||||
def _h(self):
|
||||
hass = self._getter() if self._getter is not None else self._hass
|
||||
if hass is None:
|
||||
raise ChargerNotBound("the charger has no Home Assistant")
|
||||
return hass
|
||||
|
||||
def configured(self) -> bool:
|
||||
return bool(self._ents)
|
||||
|
||||
def actuator_id(self) -> str:
|
||||
return self.current_entity
|
||||
|
||||
def entities(self) -> dict:
|
||||
return dict(self._ents)
|
||||
|
||||
async def _states(self, roles=_ROLE_ORDER) -> dict:
|
||||
import asyncio
|
||||
hass = self._h()
|
||||
got = await asyncio.gather(*(hass.state(self._ents[r]) for r in roles))
|
||||
return dict(zip(roles, got))
|
||||
|
||||
async def limits(self) -> tuple:
|
||||
st = await self._states(("station", "station_active", "phases_read"))
|
||||
return (MIN_A, _first(_amps(st["station_active"]), _amps(st["station"])),
|
||||
_phases(st["phases_read"]))
|
||||
|
||||
async def read(self) -> ChargerReading:
|
||||
if not self.configured():
|
||||
return ChargerReading(why="not set up")
|
||||
return reading_from_states(await self._states())
|
||||
|
||||
async def probe(self) -> ChargerProbe:
|
||||
st = await self._states()
|
||||
by_ent = {self._ents[r]: o for r, o in st.items()}
|
||||
return probe_from(self.current_entity, by_ent.get)
|
||||
|
||||
# --- the write side, UNUSED in EV-03 --------------------------------------
|
||||
async def write_current(self, a: float) -> bool:
|
||||
a = max(0.0, min(float(a), self.max_a, ENTITY_MAX_A))
|
||||
return await self._h().set_number(self.current_entity, a)
|
||||
|
||||
async def write_phases(self, n: int) -> bool:
|
||||
if n not in (1, 3):
|
||||
return False
|
||||
return await self._h().call("select", "select_option", {
|
||||
"entity_id": self._ents["phases_set"],
|
||||
"option": "1 Phase" if n == 1 else "3 Phases"})
|
||||
|
||||
async def release(self, mode: str) -> bool:
|
||||
return await self.write_current(0.0) if mode == "solar" else True
|
||||
|
||||
|
||||
class UnavailableCharger(ChargerDriver):
|
||||
"""No charger: `ev_charger` is off, or the charger is refused. `why` says
|
||||
which, for the Car card; nothing is read and nothing is written."""
|
||||
|
||||
name = OFF
|
||||
|
||||
def __init__(self, why="off", wanted=""):
|
||||
self.why = why
|
||||
self.wanted = wanted
|
||||
|
||||
@classmethod
|
||||
def from_options(cls, opts: dict):
|
||||
return cls()
|
||||
|
||||
def configured(self) -> bool:
|
||||
return False
|
||||
|
||||
def actuator_id(self) -> str:
|
||||
return ""
|
||||
|
||||
async def limits(self) -> tuple:
|
||||
return None, None, None
|
||||
|
||||
async def read(self) -> ChargerReading:
|
||||
return ChargerReading(why=self.why)
|
||||
|
||||
async def write_current(self, a):
|
||||
return False
|
||||
|
||||
async def write_phases(self, n):
|
||||
return False
|
||||
|
||||
async def release(self, mode):
|
||||
return False
|
||||
|
||||
async def probe(self) -> ChargerProbe:
|
||||
return ChargerProbe()
|
||||
|
||||
|
||||
def mode_of(opts: dict) -> str:
|
||||
v = str((opts or {}).get("ev_charger") or OFF).strip()
|
||||
return v if v in SELECTABLE else OFF
|
||||
|
||||
|
||||
def build(opts: dict) -> ChargerDriver:
|
||||
"""The driver the options name. Off, or a name this build lacks, is
|
||||
`UnavailableCharger`; nothing here touches Home Assistant."""
|
||||
which = mode_of(opts)
|
||||
if which == ALFEN_HA:
|
||||
drv = AlfenHaDriver.from_options(opts)
|
||||
if drv.configured():
|
||||
return drv
|
||||
return UnavailableCharger("not set up", which)
|
||||
return UnavailableCharger("off")
|
||||
|
||||
|
||||
def census_entity(opts: dict) -> str:
|
||||
"""The charger setpoint the SAFETY-28 census counts: only while a charger
|
||||
is switched on (an off charger writes nothing)."""
|
||||
if mode_of(opts) == OFF:
|
||||
return ""
|
||||
return str(opts.get("ev_current_entity") or "").strip()
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------- #
|
||||
# The car's state, kept over time
|
||||
# --------------------------------------------------------------------------- #
|
||||
CHARGING, WAITING, NONE_, FULL, UNREACH, SETUP, FAULT = (
|
||||
"charging", "waiting", "none", "full", "unreach", "setup", "fault")
|
||||
|
||||
|
||||
@dataclass
|
||||
class CarTracker:
|
||||
"""What the cycle learns about the car from the readings. Pure, clocked by
|
||||
the caller (monotonic seconds for timers, UTC datetimes for the words).
|
||||
|
||||
FRESHNESS (the rule applied, and the one decision EV-03 makes about a stale
|
||||
car reading): the car's power counts only while the last GOOD reading is not
|
||||
older than `stale_s`, the same `stale_input_s` bound the meter reading has.
|
||||
Older than that, `fresh()` is False and the House tile and the house profile
|
||||
say they do not know, instead of keeping the last car figure."""
|
||||
|
||||
stale_s: float = 15.0
|
||||
reading: ChargerReading | None = None
|
||||
last_ok: float | None = None
|
||||
bad_since: float | None = None
|
||||
bad_since_utc: object = None
|
||||
notified: bool = False
|
||||
state_since_utc: object = None
|
||||
last_status: str | None = None
|
||||
last_good: ChargerReading | None = None
|
||||
last_good_utc: object = None
|
||||
b_since: float | None = None
|
||||
c_low_since: float | None = None
|
||||
writer_at_utc: object = None
|
||||
_prev: tuple | None = None
|
||||
# today's energy
|
||||
day: str | None = None
|
||||
today_kwh: float | None = None
|
||||
last_kwh: float | None = None
|
||||
persist: bool = False # set when `today` changed, for the store
|
||||
|
||||
def observe(self, r: ChargerReading, now: float, now_utc, day: str):
|
||||
self.reading = r
|
||||
usable = r.available and r.power_w is not None
|
||||
if r.available:
|
||||
self.bad_since = None
|
||||
self.bad_since_utc = None
|
||||
elif self.bad_since is None:
|
||||
self.bad_since, self.bad_since_utc = now, now_utc
|
||||
if usable:
|
||||
self.last_ok = now
|
||||
self.last_good, self.last_good_utc = r, now_utc
|
||||
if r.available:
|
||||
self._writer(r, now_utc)
|
||||
self._energy(r, day)
|
||||
self._timers(r, now)
|
||||
self._status_edge(now, now_utc)
|
||||
|
||||
# -- reachability ----------------------------------------------------------
|
||||
def unreachable(self, now: float) -> bool:
|
||||
return self.bad_since is not None and now - self.bad_since >= UNREACHABLE_S
|
||||
|
||||
def notify_due(self, now: float) -> bool:
|
||||
return (self.bad_since is not None and not self.notified
|
||||
and now - self.bad_since >= NOTIFY_S)
|
||||
|
||||
def fresh(self, now: float) -> bool:
|
||||
return self.last_ok is not None and now - self.last_ok <= self.stale_s
|
||||
|
||||
def car_w(self, now: float):
|
||||
"""The car's power now, or None (unknown) when the reading is not fresh
|
||||
OR the current reading carries no power. Never the last good figure: a
|
||||
read that says "no power" contradicts it, and absence is never zero. It
|
||||
never raises (telemetry has no foot in the control path)."""
|
||||
r = self.reading
|
||||
if not self.fresh(now) or r is None or not r.available \
|
||||
or r.power_w is None:
|
||||
return None
|
||||
try:
|
||||
return max(0.0, float(r.power_w))
|
||||
except (TypeError, ValueError):
|
||||
return None
|
||||
|
||||
# -- the two-writer detector ----------------------------------------------
|
||||
def _writer(self, r, now_utc):
|
||||
cur = (r.setpoint_a, r.allowed_a)
|
||||
prev = self._prev
|
||||
if prev is not None:
|
||||
for a, b in zip(prev, cur):
|
||||
if a is not None and b is not None and a != b:
|
||||
self.writer_at_utc = now_utc
|
||||
# keep the last known value where one read came back empty
|
||||
self._prev = tuple(b if b is not None else (prev[i] if prev else None)
|
||||
for i, b in enumerate(cur))
|
||||
|
||||
def other_writer(self, now_utc) -> bool:
|
||||
t = self.writer_at_utc
|
||||
return t is not None and (now_utc - t).total_seconds() <= WRITER_HOLD_S
|
||||
|
||||
# -- today's kWh -----------------------------------------------------------
|
||||
def load(self, saved):
|
||||
if isinstance(saved, dict):
|
||||
try:
|
||||
self.day = str(saved["day"])
|
||||
self.today_kwh = float(saved["kwh"])
|
||||
self.last_kwh = (None if saved.get("last") is None
|
||||
else float(saved["last"]))
|
||||
except (KeyError, TypeError, ValueError):
|
||||
self.day = self.today_kwh = self.last_kwh = None
|
||||
|
||||
def dump(self) -> dict:
|
||||
return {"day": self.day, "kwh": round(self.today_kwh or 0.0, 3),
|
||||
"last": self.last_kwh}
|
||||
|
||||
def _energy(self, r, day):
|
||||
e = r.energy_kwh
|
||||
if self.day != day:
|
||||
self.day, self.today_kwh = day, 0.0
|
||||
self.last_kwh = e
|
||||
self.persist = True
|
||||
return
|
||||
if e is None:
|
||||
return
|
||||
if self.last_kwh is not None:
|
||||
# a meter that goes back has been reset: count from its new zero
|
||||
d = e - self.last_kwh if e >= self.last_kwh else e
|
||||
if d:
|
||||
self.today_kwh = (self.today_kwh or 0.0) + d
|
||||
self.persist = True
|
||||
self.last_kwh = e
|
||||
if self.today_kwh is None:
|
||||
self.today_kwh = 0.0
|
||||
|
||||
# -- the car's state -------------------------------------------------------
|
||||
def _timers(self, r, now):
|
||||
allowed = r.allowed_a is not None and r.allowed_a >= MIN_A
|
||||
self.b_since = (self.b_since if self.b_since is not None else now) \
|
||||
if (r.state == "B" and allowed) else None
|
||||
low = (r.state == "C" and allowed and r.power_w is not None
|
||||
and r.power_w < FULL_C_W)
|
||||
self.c_low_since = (self.c_low_since if self.c_low_since is not None
|
||||
else now) if low else None
|
||||
|
||||
def status(self, now: float, configured: bool = True):
|
||||
"""One of the state words, or None before the first reading."""
|
||||
if not configured:
|
||||
return SETUP
|
||||
if self.unreachable(now):
|
||||
return UNREACH
|
||||
r = self.reading
|
||||
if r is None or not r.available:
|
||||
return None if self.last_good is None else self.last_status
|
||||
if r.state in ("E", "F"): # the charger's own error states
|
||||
return FAULT
|
||||
if r.state == "A" or (r.state is None and r.connected is False):
|
||||
return NONE_
|
||||
if r.state in ("B", "C", "D") or r.connected:
|
||||
if self.b_since is not None and now - self.b_since >= FULL_B_S:
|
||||
return FULL
|
||||
if self.c_low_since is not None and \
|
||||
now - self.c_low_since >= FULL_C_S:
|
||||
return FULL
|
||||
return CHARGING if r.charging else WAITING
|
||||
return None
|
||||
|
||||
def _status_edge(self, now, now_utc):
|
||||
s = self.status(now)
|
||||
if s != self.last_status and s is not None:
|
||||
self.last_status, self.state_since_utc = s, now_utc
|
||||
elif s is None and self.last_status is None:
|
||||
pass
|
||||
|
||||
def phases_in_use(self) -> int | None:
|
||||
r = self.reading
|
||||
if r is None or not r.current_a:
|
||||
return None
|
||||
n = sum(1 for a in r.current_a if a >= IDLE_A)
|
||||
return n or None
|
||||
@@ -401,6 +401,29 @@ class AlarmsMixin:
|
||||
await self.hass.call("persistent_notification", "dismiss",
|
||||
messages.prices_back().data())
|
||||
|
||||
async def check_charger(self) -> None:
|
||||
"""EV-03. One warning notification when the car charger has not
|
||||
answered for 5 minutes, taken down when it does; the WARNING log line
|
||||
is edge-logged. READ ONLY: this raises a notification and calls no
|
||||
service on the charger."""
|
||||
if not self.charger.configured():
|
||||
return
|
||||
now = self.car_now()
|
||||
self.car_log_edges(now)
|
||||
if self.car.notify_due(now) and not self._car_announced:
|
||||
self._car_announced = True
|
||||
self.car.notified = True
|
||||
since = brussels(self.car.bad_since_utc)
|
||||
await self.hass.call("persistent_notification", "create",
|
||||
messages.charger_unreachable(
|
||||
f"{since:%H:%M}",
|
||||
self.charger.brand or "Alfen").data())
|
||||
elif self.car.bad_since is None and self._car_announced:
|
||||
self._car_announced = False
|
||||
self.car.notified = False
|
||||
await self.hass.call("persistent_notification", "dismiss",
|
||||
messages.charger_back().data())
|
||||
|
||||
async def check_fixed_note(self) -> None:
|
||||
"""PRICE-01 G1. First cycle only: one INFO line when `static_profile`
|
||||
sits beside `price_service` (the plan's last fallback, not a fault, so
|
||||
|
||||
@@ -29,7 +29,7 @@ from . import shadow
|
||||
from .price import Uncertainty
|
||||
from .tariff import next_quarter
|
||||
from .watchdog import loop_is_following
|
||||
from .ctl_trade import pack_energy_of
|
||||
from .ctl_trade import M28_REASON, pack_energy_of
|
||||
from .rows import why_key, why_raised
|
||||
|
||||
_LOG = logging.getLogger("goodwe")
|
||||
@@ -537,6 +537,10 @@ class CycleMixin:
|
||||
|
||||
# maintenance ⚠️ ONE PASS PER PACK, AND `arbitrate()` IS WHY THE LIST
|
||||
# STAYS SHORT. (DECISIONS/MAIN-orchestration-archive.md)
|
||||
# MAINT-28: the hold lives only while the charge-only branch is taken;
|
||||
# kept through the two short holds above on purpose
|
||||
# (DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md).
|
||||
_peak_held, self._maint_peak_hold = self._maint_peak_hold, False
|
||||
for inv, result in zip(self.inverters, maint_results):
|
||||
if result.owns_setpoint:
|
||||
# PER-INVERTER: §12's recalibration is a PACK procedure, filed
|
||||
@@ -564,8 +568,18 @@ class CycleMixin:
|
||||
maint_aim = peakguard.quarter_target_w(
|
||||
float(self.o.get("peak_cap_w", 3500)),
|
||||
self.peak_margin_w, _reading)
|
||||
if peakguard.shaping_suspended(
|
||||
self.peak_guard, self.peak_fc, maint_aim):
|
||||
# MAINT-28: hold the pause in a real peak.
|
||||
# DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md
|
||||
house = (None if self.grid is None or self.site_batt_w is None
|
||||
else float(self.grid) + float(self.site_batt_w))
|
||||
_susp = peakguard.shaping_suspended(
|
||||
self.peak_guard, self.peak_fc, maint_aim)
|
||||
_m28 = (len(self.inverters) > 1
|
||||
and maint_aim > self.peak_aim_w())
|
||||
self._maint_peak_hold = peakguard.shaping_held(
|
||||
_susp, _peak_held and _m28, self.peak_fc, maint_aim,
|
||||
house, self._batts_settled())
|
||||
if self._maint_peak_hold:
|
||||
# Edge-logged: level-logging here would write one line per
|
||||
# cycle for as long as the event lasts and flush the 40-line
|
||||
# action log of the very context that explains it.
|
||||
@@ -575,6 +589,18 @@ class CycleMixin:
|
||||
"suspended so the peak claim is not "
|
||||
"contradicted",
|
||||
hint=messages.hint("maint_paused"))
|
||||
# MAINT-28: while held this pack gives at most the most of
|
||||
# the guard's floor placed on it this period
|
||||
# (`_m28_share()`).
|
||||
# DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md
|
||||
shape = ((0.0 if self.peak_guard is not None
|
||||
and inv.name in self.peak_guard.held
|
||||
else max([c.lo for c in claims
|
||||
if c.source == peakguard.SOURCE]
|
||||
+ [self._m28_was(self.actuator_of(
|
||||
"maintenance", inv), now)],
|
||||
default=0.0), M28_REASON)
|
||||
if _m28 else None)
|
||||
else:
|
||||
self._maint_shape_suspended = False
|
||||
hi = 0.0
|
||||
@@ -591,10 +617,12 @@ class CycleMixin:
|
||||
floor = self._charge_headroom(floor, claims)
|
||||
if floor > 0:
|
||||
hi, reason = -floor, "cheap-window charge"
|
||||
shape = (hi, reason)
|
||||
if shape is not None:
|
||||
# PER-INVERTER, like the SET above and for the same reason -
|
||||
# the shaping is about the pack being charged, which is `inv`.
|
||||
claims.append(Claim.limit("maintenance", P_MAINT_SHAPE, hi=hi,
|
||||
reason=reason,
|
||||
claims.append(Claim.limit("maintenance", P_MAINT_SHAPE,
|
||||
hi=shape[0], reason=shape[1],
|
||||
actuator=self.actuator_of("maintenance",
|
||||
inv)))
|
||||
|
||||
@@ -842,6 +870,9 @@ class CycleMixin:
|
||||
self.loop_clamp_facts = ()
|
||||
self._loop_decision = None
|
||||
|
||||
# MAINT-28: a paused pack gives at most its largest part of the floor
|
||||
# in this period.
|
||||
self._m28_share(claims, now)
|
||||
# SAFETY-28. A new resolution is a new tick, and the previous record is
|
||||
# stale from this line onwards. Incremented BEFORE resolve() so that the
|
||||
# record resolve() builds is stamped with the tick it is for.
|
||||
@@ -1016,6 +1047,7 @@ class CycleMixin:
|
||||
# Not a safety check, so it is one of the cheap ones: an attribute test
|
||||
# and, on a change only, one Home Assistant call.
|
||||
await self.check_price_gap()
|
||||
await self.check_charger()
|
||||
await self.check_fixed_note()
|
||||
|
||||
# SAFETY-31's alarm, and its boundary is the LATCH, not a number: it
|
||||
|
||||
@@ -13,7 +13,9 @@ from . import freshness
|
||||
from . import lateness
|
||||
from . import messages
|
||||
from . import pv as pv_read
|
||||
from . import chargers
|
||||
from .price import brussels, price_option, provider_configured
|
||||
from .hass import OUTAGE
|
||||
from .price_chain import uses_chain
|
||||
from .static_tariff import static_status
|
||||
from .rows import tariff_plan_row
|
||||
@@ -48,6 +50,10 @@ FC_HOLD_KEY = "solar_fc_hold"
|
||||
FORECAST_READ_S = 60.0
|
||||
|
||||
|
||||
# EV-03: the car's energy today, kept so a restart does not lose it.
|
||||
CAR_TODAY_KEY = "car_today"
|
||||
|
||||
|
||||
class InputsMixin:
|
||||
def _readings_late(self, standing_w):
|
||||
"""SAFETY-128: update the answer gate; seconds the late verdict has
|
||||
@@ -102,6 +108,95 @@ class InputsMixin:
|
||||
return "input"
|
||||
|
||||
# -- io ------------------------------------------------------------------
|
||||
# -- EV-03: the car charger, READ ONLY ----------------------------------------
|
||||
@property
|
||||
def car_enabled(self) -> bool:
|
||||
"""`ev_charger` is on, whether or not the charger could be set up."""
|
||||
return chargers.mode_of(self.o) != chargers.OFF
|
||||
|
||||
def car_now(self) -> float:
|
||||
return freshness.monotonic()
|
||||
|
||||
def car_term(self) -> tuple:
|
||||
"""`(car_w, unknown)`: what the House tile and the house profile take
|
||||
out for the car. `(0.0, False)` with no charger, so a site without one
|
||||
is exactly as before. With one, a reading older than `stale_input_s`
|
||||
(the meter's own bound) is UNKNOWN, never the last figure: the tile
|
||||
shows no reading and the profile leaves that moment out."""
|
||||
if not self.charger.configured():
|
||||
return 0.0, False
|
||||
w = self.car.car_w(self.car_now())
|
||||
return (0.0, True) if w is None else (w, False)
|
||||
|
||||
async def _read_charger(self, now_mono: float) -> None:
|
||||
"""One read of the charger, and what the tracker learns from it. It
|
||||
never raises (telemetry has no foot in the control path) and it only
|
||||
reads: nothing here, or anywhere in this card, writes to the charger."""
|
||||
now_utc = datetime.now(timezone.utc)
|
||||
day = brussels(now_utc).date().isoformat()
|
||||
try:
|
||||
if not self._charger_probed:
|
||||
pr = await asyncio.wait_for(self.charger.probe(), 5.0)
|
||||
if OUTAGE.waiting():
|
||||
raise RuntimeError("Home Assistant is not answering")
|
||||
self._charger_probed = True
|
||||
self._judge_probe(pr)
|
||||
if not self.charger.configured():
|
||||
return
|
||||
reading = await asyncio.wait_for(self.charger.read(), 5.0)
|
||||
except Exception as err: # noqa: BLE001
|
||||
_LOG.debug("The charger could not be read: %s", err)
|
||||
reading = chargers.ChargerReading(why="no answer")
|
||||
self.car.observe(reading, now_mono, now_utc, day)
|
||||
if self.car.persist:
|
||||
self.car.persist = False
|
||||
self.store.set(CAR_TODAY_KEY, self.car.dump())
|
||||
|
||||
def _judge_probe(self, pr) -> None:
|
||||
"""A charger whose setpoint, read-back or state entity is missing, or
|
||||
whose limit is above the station limit, is REFUSED: the add-on starts
|
||||
and the Car card says so. Said once."""
|
||||
why = None
|
||||
if not pr.ok and pr.power_unit is not None \
|
||||
and not pr.required_missing:
|
||||
why = "unit"
|
||||
_LOG.warning("The car charger is not set up, because its power "
|
||||
"has no power unit: CHARGER_POWER_UNIT.")
|
||||
_LOG.debug("The charger power entity reads in %r.", pr.power_unit)
|
||||
elif not pr.ok:
|
||||
why = "not_found"
|
||||
_LOG.warning("The car charger is not set up, because Home "
|
||||
"Assistant has no entity it needs: CHARGER_NOT_FOUND.")
|
||||
_LOG.debug("Charger entities missing: %s.",
|
||||
", ".join(e for _r, e in pr.missing) or "the name")
|
||||
else:
|
||||
amps = chargers.max_a(self.o)
|
||||
if pr.station_a is not None and amps is not None \
|
||||
and amps > pr.station_a:
|
||||
why = "limit"
|
||||
_LOG.warning("The charger limit is above what the charger "
|
||||
"allows, so the charger is not used: "
|
||||
"CHARGER_LIMIT.")
|
||||
_LOG.debug("ev_max_a %.0f A, station limit %.0f A.", amps,
|
||||
pr.station_a)
|
||||
if why is not None:
|
||||
self.charger_refused = why
|
||||
self.charger = chargers.UnavailableCharger(why, chargers.ALFEN_HA)
|
||||
|
||||
def car_log_edges(self, now_mono: float) -> None:
|
||||
"""One WARNING when the charger goes unreachable, one INFO when it is
|
||||
back. Edge-logged, never every cycle."""
|
||||
down = self.car.unreachable(now_mono)
|
||||
if down and not self._car_down_logged:
|
||||
self._car_down_logged = True
|
||||
_LOG.warning("The car charger does not answer, so the Car card has "
|
||||
"no reading: CHARGER_UNREACHABLE.")
|
||||
_LOG.debug("The charger entities read unavailable, or its login "
|
||||
"is off, for %.0f s.", chargers.UNREACHABLE_S)
|
||||
elif not down and self._car_down_logged and self.car.bad_since is None:
|
||||
self._car_down_logged = False
|
||||
_LOG.info("The car charger answers again.")
|
||||
|
||||
@property
|
||||
def pv_roster(self) -> tuple:
|
||||
"""Every configured PV production entity, or `()` (TEL-11/TEL-12). ONE
|
||||
@@ -209,6 +304,10 @@ class InputsMixin:
|
||||
_reads = [self._read_unit(inv, now_mono) for inv in self.inverters]
|
||||
if self.pv_roster:
|
||||
_reads.append(self._read_pv())
|
||||
# EV-03: the charger, read only, in the same gather. Nothing is added
|
||||
# without a charger, so a site with none runs exactly as before.
|
||||
if self.charger.configured():
|
||||
_reads.append(self._read_charger(now_mono))
|
||||
# OPT-11 P4: the solar forecast, in the same gather (a slow sensor must
|
||||
# not delay control), at most once per FORECAST_READ_S.
|
||||
if self.fc_entity is not None and (
|
||||
|
||||
@@ -15,7 +15,8 @@ from .freeze import rail_unreachable, rail_w
|
||||
from .hass import OUTAGE
|
||||
from .maintenance import IDLE
|
||||
from .mqtt import (
|
||||
announced_units, optional_keys, parse_command, unit_slugs, unit_state_key,
|
||||
PAYLOAD_NONE, announced_units, optional_keys, parse_command, unit_slugs,
|
||||
unit_state_key,
|
||||
)
|
||||
from . import peakguard
|
||||
from . import pv as pv_read
|
||||
@@ -135,6 +136,10 @@ class StatusMixin:
|
||||
if "pv" in optional_keys(self.o):
|
||||
values["pv"] = (None if self.pv_w is None
|
||||
else round(self.pv_w, 1))
|
||||
# EV-03: the car, only with a charger switched on (the same predicate
|
||||
# that announces the three sensors). Absence is `None`, never 0.
|
||||
if "car_state" in optional_keys(self.o):
|
||||
values.update(self.car_values())
|
||||
# ⚠️ ONLY when P1 ingestion is running: the ESP32's stale-input
|
||||
# watchdog subscribes to sensor.goodwe_p1_sample_age and forces layer-1
|
||||
# failsafe at max_age_s, so with meter_source off a published age would
|
||||
@@ -161,6 +166,41 @@ class StatusMixin:
|
||||
values.update(self.mode_values())
|
||||
self.mqtt.publish(values)
|
||||
|
||||
# -- EV-03: the car charger ------------------------------------------------
|
||||
def car_rows(self) -> list:
|
||||
"""The charger's status rows: amber when it is not set up or does not
|
||||
answer, grey while something else changes it."""
|
||||
if not self.charger.configured():
|
||||
return [{"ok": False, "warn": True, "id": "charger_setup",
|
||||
"text": messages.row_charger_setup()}]
|
||||
out = []
|
||||
if self.car.unreachable(self.car_now()):
|
||||
out.append({"ok": False, "warn": True, "id": "charger",
|
||||
"text": messages.row_charger_unreach(
|
||||
f"{brussels(self.car.bad_since_utc):%H:%M}")})
|
||||
if self.car.other_writer(datetime.now(timezone.utc)):
|
||||
out.append({"ok": True, "warn": True, "id": "charger_writer",
|
||||
"text": messages.row_charger_writer()})
|
||||
return out
|
||||
|
||||
def car_values(self) -> dict:
|
||||
"""The MQTT values for the three car sensors."""
|
||||
now = self.car_now()
|
||||
state = self.car.status(now, self.charger.configured())
|
||||
r = self.car.reading
|
||||
down = state in (None, "unreach", "setup")
|
||||
with homeview.in_lang("en"):
|
||||
word = homeview.car_state_word(state)
|
||||
return {
|
||||
"car_state": word,
|
||||
# `ABSENT_AS_UNKNOWN` stays the one PV key (test_pv.py): an absent
|
||||
# car figure is HA's own "no value" payload, sent by name.
|
||||
"car_power": (PAYLOAD_NONE if down or r is None
|
||||
or r.power_w is None else round(r.power_w, 1)),
|
||||
"car_today_kwh": (PAYLOAD_NONE if self.car.today_kwh is None
|
||||
else round(self.car.today_kwh, 3)),
|
||||
}
|
||||
|
||||
# -- UI ------------------------------------------------------------------
|
||||
def checks(self, when: datetime | None = None) -> list:
|
||||
"""The status rows. `when` is the reference time for anything billed by
|
||||
@@ -613,6 +653,9 @@ class StatusMixin:
|
||||
out.append({"ok": False, "warn": True, "id": "pv",
|
||||
"text": messages.row_pv_stray(
|
||||
_inv_list.index(ent) + 1)})
|
||||
# EV-03: the car charger's rows, only with a charger switched on.
|
||||
if self.car_enabled:
|
||||
out.extend(self.car_rows())
|
||||
return out
|
||||
|
||||
def status_payload(self, lang: str = "en") -> dict:
|
||||
|
||||
@@ -10,7 +10,7 @@ from datetime import datetime, timedelta, timezone
|
||||
from . import arbitrage
|
||||
from .arbiter import (
|
||||
ACTUATOR_SITE, Claim, P_MAINTENANCE, P_MAINT_SHAPE, P_PEAK, SET,
|
||||
pre_resolve,
|
||||
pre_resolve, resolve,
|
||||
)
|
||||
from . import allocator
|
||||
from . import dayplan
|
||||
@@ -19,6 +19,7 @@ from . import packmode
|
||||
from . import priceruns
|
||||
from . import solarfc
|
||||
from . import control as _ctl
|
||||
from . import freshness
|
||||
from . import messages
|
||||
from .maintenance import CHARGE, DRAIN, HOLD, IDLE, MaintConfig, POWER_MOVING
|
||||
from .mqtt import MODE_LABELS, USE_OFF, USE_ON, unit_slugs, unit_state_key
|
||||
@@ -49,6 +50,13 @@ EDGE_HOLD_S = _ctl.PLANT_SETTLE_S
|
||||
HOUSE_PROFILE_KEY = "house_profile"
|
||||
|
||||
|
||||
# MAINT-28: a step of a battery's command, in W, after which its reading is not
|
||||
# current until a changed one arrives (`Controller._batts_settled()`).
|
||||
MAINT_STEP_W = 100.0
|
||||
# MAINT-28: the reason on a paused pack's cap (`Controller._m28_share()`).
|
||||
M28_REASON = "peak hold"
|
||||
|
||||
|
||||
# OPT-34: the level of a night grid charge that has started, so it does not
|
||||
# drop when the forecast goes (`Controller._latch_charge()`).
|
||||
CHARGE_LATCH_KEY = "night_charge_latch"
|
||||
@@ -380,8 +388,18 @@ class TradeMixin:
|
||||
price_now = None
|
||||
house = (None if self.grid is None or self.site_batt_w is None
|
||||
else float(self.grid) + float(self.site_batt_w))
|
||||
# EV-03: the car is not the house. Out of the profile that plans the
|
||||
# batteries' night charge; with a charger whose reading is not fresh
|
||||
# the moment is left out (None), not guessed.
|
||||
# ONLY the profile's sample: `house` below stays what it was, since
|
||||
# the battery decision's input is not part of this card.
|
||||
house_sample = house
|
||||
if house is not None:
|
||||
_car_w, _car_unknown = self.car_term()
|
||||
house_sample = (None if _car_unknown else max(0.0, house - _car_w)
|
||||
if _car_w else house)
|
||||
if self.house_profile is not None and \
|
||||
self.house_profile.add(now, house):
|
||||
self.house_profile.add(now, house_sample):
|
||||
self.store.set(HOUSE_PROFILE_KEY, self.house_profile.dump())
|
||||
targets = self.plan_targets()
|
||||
if targets is None:
|
||||
@@ -711,6 +729,80 @@ class TradeMixin:
|
||||
lo = hi = float(inv.batt)
|
||||
self._read_span[inv.name] = (min(lo, cmd), max(hi, cmd), since)
|
||||
|
||||
def _batts_settled(self) -> bool:
|
||||
"""MAINT-28: False while a battery reading may pre-date a step UP of
|
||||
its command, so `grid + site_batt_w` is a new grid and an old battery.
|
||||
DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md"""
|
||||
now, ok = self._now_mono, True
|
||||
if now is None:
|
||||
return True
|
||||
for inv in self.inverters:
|
||||
cmd = float(inv.standing_w())
|
||||
seen = self._m28_step.get(inv.name)
|
||||
if seen is None:
|
||||
seen = self._m28_step[inv.name] = (cmd, None)
|
||||
elif abs(cmd - seen[0]) >= MAINT_STEP_W:
|
||||
seen = self._m28_step[inv.name] = (
|
||||
cmd, now if cmd > seen[0] else seen[1])
|
||||
at = seen[1]
|
||||
if at is None or now - at >= freshness.BATT_OBLIGED_S:
|
||||
continue
|
||||
got = inv.batt_fresh.changed_mono
|
||||
if got is None or got < at + freshness.PLANT_SETTLE_S:
|
||||
ok = False
|
||||
return ok
|
||||
|
||||
def _m28_share(self, claims, now) -> None:
|
||||
"""MAINT-28: each paused pack's cap (0 W if the guard holds it at its
|
||||
reserve) set to the largest part of the guard's floor left to it in
|
||||
this 15-minute period: the floor less what the other units are placed
|
||||
at in this cycle's split without the cap. Kept per unit in `_m28_hi`,
|
||||
dropped while the unit is not paused or is held. Also one site limit,
|
||||
the period's largest floor, so the other pack does not give for the
|
||||
house (`_m28_site`).
|
||||
DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md"""
|
||||
floor = max((c.lo for c in claims if c.source == peakguard.SOURCE),
|
||||
default=0.0)
|
||||
g = self.peak_guard
|
||||
held = {self.actuator_of("maintenance", inv) for inv in self.inverters
|
||||
if g is not None and inv.name in g.held}
|
||||
q, seen = int(now.timestamp() // 900), set()
|
||||
site = any(c.source == "maintenance" and c.reason == M28_REASON
|
||||
and c.actuator != ACTUATOR_SITE for c in claims)
|
||||
for i, c in enumerate(claims):
|
||||
if c.source != "maintenance" or c.reason != M28_REASON \
|
||||
or c.actuator == ACTUATOR_SITE or c.actuator in held:
|
||||
continue
|
||||
seen.add(c.actuator)
|
||||
shares = resolve(claims[:i] + claims[i + 1:], units=self.units,
|
||||
live=self.live_units(), weights=self.pack_weights,
|
||||
reserve=self._held_back()).shares
|
||||
part = max(0.0, floor - sum(float(w) for u, w in shares.items()
|
||||
if u != c.actuator))
|
||||
hi = max(part, self._m28_was(c.actuator, now))
|
||||
self._m28_hi[c.actuator] = (q, hi)
|
||||
claims[i] = dataclasses.replace(c, hi=hi)
|
||||
# A unit not paused (or held at its reserve) starts again from 0 W.
|
||||
for u in set(self._m28_hi) - seen:
|
||||
del self._m28_hi[u]
|
||||
# Site: while the pause holds, the packs together give at most the
|
||||
# period's largest floor, never under this cycle's (the guard's claim
|
||||
# and P_PEAK outrank this one anyway).
|
||||
if not site:
|
||||
self._m28_site = (None, 0.0)
|
||||
return
|
||||
hi = max(floor, self._m28_site[1] if self._m28_site[0] == q else 0.0)
|
||||
self._m28_site = (q, hi)
|
||||
claims.append(Claim.limit("charge", P_MAINT_SHAPE, hi=hi,
|
||||
reason=M28_REASON,
|
||||
actuator=ACTUATOR_SITE))
|
||||
|
||||
def _m28_was(self, u, now) -> float:
|
||||
"""MAINT-28: unit `u`'s cap so far in this 15-minute period, 0 W in
|
||||
a new one (`_m28_share()`)."""
|
||||
q, hi = self._m28_hi.get(u, (None, 0.0))
|
||||
return hi if q == int(now.timestamp() // 900) else 0.0
|
||||
|
||||
def _reseed_drop(self, live) -> None:
|
||||
"""SAFETY-96, N>=2: a battery that drops out of the split (stale link)
|
||||
leaves the loop's start point, so the others take over at one slew step
|
||||
|
||||
@@ -72,16 +72,26 @@ def flow(w, *, shadow=False):
|
||||
return "resting"
|
||||
|
||||
|
||||
def now_block(*, grid_w, pv_w, batt_w, has_solar, shadow, settled=True):
|
||||
def now_block(*, grid_w, pv_w, batt_w, has_solar, shadow, settled=True,
|
||||
car_w=0.0, car_unknown=False):
|
||||
"""The four tiles. `house_w` needs all three readings, so without a solar
|
||||
reading it is None rather than a number that leaves the sun out."""
|
||||
reading it is None rather than a number that leaves the sun out.
|
||||
|
||||
EV-03: `car_w` is what a car charger takes, and it is not the house, so it
|
||||
is taken out of House (the Car card shows it). `car_unknown` is a charger
|
||||
whose reading is not fresh: House then has no figure rather than one that
|
||||
may hold the car. Both default to "no charger", the figure as before."""
|
||||
house, disagree = None, False
|
||||
if has_solar and None not in (grid_w, pv_w, batt_w):
|
||||
house = float(grid_w) + float(pv_w) + float(batt_w)
|
||||
house = float(grid_w) + float(pv_w) + float(batt_w) - float(car_w or 0.0)
|
||||
if car_unknown:
|
||||
house = None
|
||||
# The three are read at slightly different moments, so the sum can dip
|
||||
# under zero. Inside the idle band that is 0 W; beyond it the readings
|
||||
# disagree and no house figure is shown.
|
||||
if house < -IDLE_W:
|
||||
if house is None:
|
||||
pass
|
||||
elif house < -IDLE_W:
|
||||
house, disagree = None, True
|
||||
elif house < 0.0:
|
||||
house = 0.0
|
||||
@@ -1070,6 +1080,7 @@ ATTN_DOCS = {
|
||||
"not_keeping_up": messages.T_LOOP_BOUND,
|
||||
"circulating": messages.T_CIRCULATING,
|
||||
"delivery": messages.S_NOT_DELIVERING,
|
||||
"charger": messages.T_CHARGER_UNREACH,
|
||||
}
|
||||
|
||||
|
||||
@@ -1187,7 +1198,10 @@ def _build(c, *, level, checks, now, held=None, waiting=False):
|
||||
"sub": banner_sub(kind)},
|
||||
"now": now_block(grid_w=c.grid, pv_w=c.pv_w, batt_w=c.site_batt_w,
|
||||
has_solar=bool(c.pv_roster), shadow=shadow,
|
||||
settled=settled),
|
||||
settled=settled,
|
||||
**dict(zip(("car_w", "car_unknown"),
|
||||
c.car_term()))),
|
||||
"car": car_block(c, now),
|
||||
"batteries": rows,
|
||||
"plan": plan,
|
||||
"modes_on": bool(getattr(c, "modes_on", False)),
|
||||
@@ -1208,6 +1222,89 @@ def _docs_url():
|
||||
messages._site["ha"])
|
||||
|
||||
|
||||
# --------------------------------------------------------------------------- #
|
||||
# EV-03: the Car card. READ ONLY: Off is the only mode in this version.
|
||||
# --------------------------------------------------------------------------- #
|
||||
_CAR_KIND = {"charging": "ok", "full": "ok", "unreach": "warn",
|
||||
"setup": "warn", "fault": "warn"}
|
||||
|
||||
|
||||
def car_state_word(key) -> str:
|
||||
return _t("car.state." + (key if key else "wait"))
|
||||
|
||||
|
||||
def car_phases_word(n) -> str:
|
||||
return _t("car.phase_one") if n == 1 else _t("car.phase_many", n=n)
|
||||
|
||||
|
||||
def _car_big(key, c, r, good):
|
||||
if key == "charging" and r is not None and r.power_w is not None:
|
||||
parts = [_dec(f"{r.power_w / 1000:.1f}")
|
||||
+ " kW"]
|
||||
amps = (r.allowed_a if r.allowed_a is not None
|
||||
else max(r.current_a) if r.current_a else None)
|
||||
if amps is not None:
|
||||
parts.append(f"{amps:.0f} A")
|
||||
n = c.car.phases_in_use()
|
||||
if n:
|
||||
parts.append(car_phases_word(n))
|
||||
return " · ".join(parts)
|
||||
if key == "unreach":
|
||||
t = c.car.last_good_utc
|
||||
return (_t("car.big.seen", t=hhmm(t)) if t is not None
|
||||
else _t("car.big.no_reading"))
|
||||
if key == "charging": # the reading is too old
|
||||
return _t("car.big.no_reading")
|
||||
return _t("car.big." + (key or "wait"))
|
||||
|
||||
|
||||
def _car_why(key, c, good):
|
||||
brand = (getattr(c.charger, "brand", "") or "Alfen")
|
||||
if key == "unreach":
|
||||
r = c.car.reading
|
||||
if r is not None and r.why == "power unit":
|
||||
return _t("car.why.unreach_unit")
|
||||
a = None if good is None else good.setpoint_a
|
||||
if a is None and good is not None:
|
||||
a = good.allowed_a
|
||||
if a is not None:
|
||||
return _t("car.why.unreach_a", a=f"{a:.0f}", brand=brand)
|
||||
return _t("car.why.unreach", brand=brand)
|
||||
if key == "setup":
|
||||
why = {"not_found": "not_found", "limit": "limit",
|
||||
"unit": "unit"}.get(
|
||||
c.charger_refused or "", "name")
|
||||
return _t("car.why." + why)
|
||||
return _t("car.why." + (key if key else "wait"))
|
||||
|
||||
|
||||
def car_block(c, now):
|
||||
"""The Car card for `/status`, or None when no charger is switched on (the
|
||||
page then draws nothing, as before)."""
|
||||
if not getattr(c, "car_enabled", False):
|
||||
return None
|
||||
mono = c.car_now()
|
||||
configured = c.charger.configured()
|
||||
key = c.car.status(mono, configured)
|
||||
r = c.car.reading if configured else None
|
||||
good = c.car.last_good
|
||||
fresh = configured and c.car.fresh(mono)
|
||||
today = None
|
||||
if configured and c.car.today_kwh is not None:
|
||||
today = _t("car.today", kwh=_kwh(c.car.today_kwh))
|
||||
return {
|
||||
"state": key or "wait",
|
||||
"chip": car_state_word(key),
|
||||
"kind": _CAR_KIND.get(key, "muted"),
|
||||
"big": _car_big(key, c, r if fresh else None, good),
|
||||
"today": today,
|
||||
"why": _car_why(key, c, good),
|
||||
"mode": "off",
|
||||
"power_w": (None if not fresh or r is None or r.power_w is None
|
||||
else round(float(r.power_w), 1)),
|
||||
}
|
||||
|
||||
|
||||
# =========================================================================== #
|
||||
# The words. STYLE.md: plain, short, present tense. A plan line is at most
|
||||
# two sentences of at most 12 words each (UX-13 design, section 4); a title at
|
||||
@@ -1715,6 +1812,13 @@ def _samples() -> list:
|
||||
out += [("plan", day_note(k, pct=70, name="Battery A", at="08:15",
|
||||
kwh="9.2 kWh", count="6.4 kWh"))
|
||||
for k in words["day"]]
|
||||
out += [("title", _t("car.state." + k)) for k in words["car"]["state"]]
|
||||
out += [("plan", _t("car.big." + k, t="09:12")) for k in
|
||||
words["car"]["big"]]
|
||||
out += [("plan", _t("car.why." + k, a="10", brand="Alfen"))
|
||||
for k in words["car"]["why"]]
|
||||
out += [("plan", _t("car.today", kwh="14.2 kWh")),
|
||||
("plan", "11.0 kW · 16 A · " + _t("car.phase_many", n=3))]
|
||||
out += [("plan", line_no_trade(k)) for k in
|
||||
("not_covered", "no_prices", "peak", "not_firm", "not_worth",
|
||||
"no_level")]
|
||||
|
||||
@@ -42,6 +42,7 @@ from .arbiter import (
|
||||
P_SAFETY, SET, Claim, Resolution, actuator_for, pre_resolve, resolve,
|
||||
)
|
||||
from . import allocator
|
||||
from . import chargers
|
||||
from . import dayplan
|
||||
from . import modetrade
|
||||
from . import packmode
|
||||
@@ -505,6 +506,10 @@ class Controller(InputsMixin, WritesMixin, TradeMixin, CycleMixin, AlarmsMixin,
|
||||
self._land_batt_prev = None
|
||||
self._peak_needed = False
|
||||
self._maint_shape_suspended = False
|
||||
self._maint_peak_hold = False # MAINT-28
|
||||
self._m28_step = {} # MAINT-28: unit -> (command, step at)
|
||||
self._m28_hi = {} # MAINT-28: unit -> (period, cap)
|
||||
self._m28_site = (None, 0.0) # MAINT-28: (period, site cap)
|
||||
# OPT-11: battery modes, off by default (SAFETY-10 section 1). Each
|
||||
# battery's mode and on/off switch live in the store, not in options,
|
||||
# so a change applies at once (`pack_use`, `pack_mode`).
|
||||
@@ -560,6 +565,17 @@ class Controller(InputsMixin, WritesMixin, TradeMixin, CycleMixin, AlarmsMixin,
|
||||
self._charge_latch = _load_latch(
|
||||
(getattr(store, "data", None) or {}).get(CHARGE_LATCH_KEY),
|
||||
datetime.now(timezone.utc))
|
||||
# EV-03: the car charger, READ ONLY. Off builds `UnavailableCharger`,
|
||||
# which reads nothing, so a site without a charger is unchanged.
|
||||
self.charger = chargers.build(opts)
|
||||
self.charger.bind_getter(lambda: self.hass)
|
||||
self.car = chargers.CarTracker(
|
||||
stale_s=float(opts.get("stale_input_s", 15) or 15))
|
||||
self.car.load((getattr(store, "data", None) or {}).get("car_today"))
|
||||
self.charger_refused = None
|
||||
self._charger_probed = False
|
||||
self._car_down_logged = False
|
||||
self._car_announced = False
|
||||
self.house_profile = None
|
||||
if self.fc_entity is not None:
|
||||
self.house_profile = dayplan.HouseProfile(
|
||||
|
||||
@@ -186,6 +186,8 @@ T_OUTPUT_CLAMP_NL = "Vermogensvraag te hoog"
|
||||
T_PEAK_SATURATED_NL = "Belasting te hoog voor de batterij"
|
||||
T_METER_FROZEN_NL = "Meter staat mogelijk vast"
|
||||
TITLE_NL = {T_LOOP_BOUND: T_LOOP_BOUND_NL, T_OUTPUT_CLAMP: T_OUTPUT_CLAMP_NL}
|
||||
T_CHARGER_UNREACH = "Charger not reachable"
|
||||
T_CHARGER_UNREACH_NL = "Laadpaal onbereikbaar"
|
||||
T_NO_PRICES = "No prices"
|
||||
T_NO_PRICES_NL = "Prijzen ontbreken"
|
||||
|
||||
@@ -198,6 +200,7 @@ ID_NOT_DELIVERING = "goodwe_not_delivering_{slug}"
|
||||
ID_METER_FROZEN = "goodwe_meter_frozen"
|
||||
ID_MAINT_FAILED = "goodwe_maint_failed_{slug}"
|
||||
ID_NO_PRICES = "goodwe_no_prices"
|
||||
ID_CHARGER_UNREACH = "goodwe_charger_unreachable"
|
||||
# PRICE-01: an earlier build raised a card with this id. Nothing raises it now;
|
||||
# the add-on only dismisses it at start.
|
||||
OLD_FIXED_CARD_ID = "goodwe_fixed_tariff_unused"
|
||||
@@ -465,6 +468,43 @@ def row_no_prices(since=None, now=None) -> str:
|
||||
"Nog geen prijzen, onderhoud wacht.")
|
||||
|
||||
|
||||
def charger_unreachable(since_text_, brand="Alfen") -> Notice:
|
||||
"""EV-03: the car charger has not answered for 5 minutes. Said once."""
|
||||
en = (f"The add-on cannot reach the car charger since {since_text_}, so "
|
||||
f"check the {brand} integration in Home Assistant.")
|
||||
nl = (f"De add-on kan de laadpaal niet bereiken sinds {since_text_}, dus "
|
||||
f"controleer de {brand}-integratie in Home Assistant.")
|
||||
return Notice(ID_CHARGER_UNREACH, WARNING, T_CHARGER_UNREACH, en,
|
||||
body_nl=f"{T_CHARGER_UNREACH_NL}. {nl}")
|
||||
|
||||
|
||||
def charger_back() -> Dismiss:
|
||||
"""EV-03: takes the 'Charger not reachable' notification down."""
|
||||
return Dismiss(ID_CHARGER_UNREACH)
|
||||
|
||||
|
||||
def row_charger_unreach(since_text_) -> str:
|
||||
"""EV-03: the amber row while the charger does not answer."""
|
||||
return Bi(f"The add-on cannot reach the charger since {since_text_}.",
|
||||
f"De add-on kan de laadpaal niet bereiken sinds {since_text_}.")
|
||||
|
||||
|
||||
def row_charger_writer() -> str:
|
||||
"""EV-03: the grey row while something else sets the charger's current."""
|
||||
return Bi("Something else changes the charger, and this add-on only reads "
|
||||
"it.",
|
||||
"Iets anders wijzigt de laadpaal en deze add-on leest alleen.")
|
||||
|
||||
|
||||
def row_charger_setup() -> str:
|
||||
"""EV-03: the amber row when the charger's entities are not found."""
|
||||
return Bi("The add-on cannot find the charger, so check its entity in "
|
||||
"Settings.",
|
||||
"De add-on vindt de laadpaal niet, dus controleer de entiteit "
|
||||
"bij Instellingen.")
|
||||
|
||||
|
||||
|
||||
def row_maint_waits(until_text: str) -> str:
|
||||
"""MAINT-13: the status row while a failed cycle waits."""
|
||||
return Bi(f"Waits until {until_text} after a cycle that did not finish.",
|
||||
@@ -1661,6 +1701,9 @@ def status_samples() -> list:
|
||||
("row_no_prices", AMBER, row_no_prices(*_SINCE_SAMPLE)),
|
||||
("row_no_prices", AMBER, row_no_prices(*_SINCE_OLDER)),
|
||||
("row_no_prices", AMBER, row_no_prices()),
|
||||
("row_charger_unreach", AMBER, row_charger_unreach("09:12")),
|
||||
("row_charger_writer", GREEN, row_charger_writer()),
|
||||
("row_charger_setup", AMBER, row_charger_setup()),
|
||||
]
|
||||
|
||||
|
||||
@@ -1696,6 +1739,7 @@ def samples() -> list:
|
||||
no_prices(*_SINCE_SAMPLE),
|
||||
no_prices(*_SINCE_OLDER),
|
||||
no_prices(),
|
||||
charger_unreachable("09:12"),
|
||||
]
|
||||
|
||||
|
||||
@@ -1758,6 +1802,11 @@ LABELS = {
|
||||
"solar_trust_pct": "Trust in the forecast",
|
||||
"p1_phase_import_entities": "Import entities per phase",
|
||||
"p1_phase_export_entities": "Export entities per phase",
|
||||
# EV-03
|
||||
"ev_charger": "Charger",
|
||||
"ev_current_entity": "Current setting entity",
|
||||
"ev_max_a": "Charger limit",
|
||||
"ev_phases": "Phases",
|
||||
}
|
||||
|
||||
|
||||
@@ -1838,6 +1887,10 @@ LABELS_NL = {
|
||||
"solar_trust_pct": "Vertrouwen in de prognose",
|
||||
"p1_phase_import_entities": "Afname-entiteiten per fase",
|
||||
"p1_phase_export_entities": "Injectie-entiteiten per fase",
|
||||
"ev_charger": "Laadpaal",
|
||||
"ev_current_entity": "Entiteit van de laadstroom",
|
||||
"ev_max_a": "Laadpaalgrens",
|
||||
"ev_phases": "Fasen",
|
||||
}
|
||||
# The inverter list shows two of them under a shorter name.
|
||||
UNIT_LABELS_NL = {"setpoint_entity": "Setpoint-entiteit",
|
||||
|
||||
@@ -139,6 +139,11 @@ SENSORS = [
|
||||
# a charge-power limit, or the optimiser declining to charge.
|
||||
OPTIONAL_SENSORS = [
|
||||
("pv", "goodwe_pv_power", "PV power", "W", "power", "measurement", None),
|
||||
# EV-03: only with a car charger switched on. Read only: there are no
|
||||
# command entities in this version.
|
||||
("car_power", "goodwe_car_power", "Car power", "W", "power", "measurement", "mdi:car-electric"),
|
||||
("car_state", "goodwe_car_state", "Car state", None, None, None, "mdi:ev-station"),
|
||||
("car_today_kwh", "goodwe_car_today_kwh", "Car energy today", "kWh", "energy", "total_increasing", "mdi:ev-station"),
|
||||
]
|
||||
|
||||
# ⚠️ HA's OWN "this sensor has no value" PAYLOAD, and the one place this add-on
|
||||
@@ -192,7 +197,11 @@ def optional_keys(opts: dict) -> tuple:
|
||||
# `_load()` is the same decision for the same kind of reason. Measured, not
|
||||
# assumed: move this line to module scope and test_mqtt.py part 8 dies.
|
||||
from . import pv as _pv
|
||||
return ("pv",) if _pv.entities(opts) else ()
|
||||
from . import chargers as _ch # EV-03: same reason
|
||||
out = ("pv",) if _pv.entities(opts) else ()
|
||||
if _ch.census_entity(opts):
|
||||
out += ("car_power", "car_state", "car_today_kwh")
|
||||
return out
|
||||
|
||||
|
||||
BASE = "goodwe_ctl"
|
||||
|
||||
@@ -28,6 +28,10 @@ FLOOR_AT_SOC_FLOOR = "the battery level is at or below the peak reserve"
|
||||
|
||||
SOURCE = "peak"
|
||||
|
||||
# MAINT-28. Watts the house must sit under the aim before a paused maintenance
|
||||
# charge resumes. DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md.
|
||||
MAINT_RESUME_UNDER_W = 300.0
|
||||
|
||||
# Mirror of config.yaml's peak options, pinned to the file by
|
||||
# test_peakguard.py. Not a read: `decide()` takes them as arguments.
|
||||
PEAK_OPTION_DEFAULTS = {
|
||||
@@ -446,6 +450,25 @@ def shaping_suspended(decision, peak_forecast_w, cap_w) -> bool:
|
||||
return decision is not None and decision.engaged
|
||||
|
||||
|
||||
def shaping_held(suspended, held, peak_forecast_w, aim_w, house_w,
|
||||
settled=True) -> bool:
|
||||
"""MAINT-28. `suspended` (`shaping_suspended()`'s answer), kept on while
|
||||
`held` until the house is `MAINT_RESUME_UNDER_W` under `aim_w`
|
||||
(`peak_forecast_w` stands in for an unread house; neither read: not held,
|
||||
as SAFETY-63) and `settled` (no battery reading older than its last
|
||||
command step, so `house_w` is not a new grid plus an old battery). Only
|
||||
ever pauses the maintenance charge, never a cut-back.
|
||||
DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md."""
|
||||
if suspended:
|
||||
return True
|
||||
if not held:
|
||||
return False
|
||||
level = house_w if house_w is not None else peak_forecast_w
|
||||
if level is None:
|
||||
return False
|
||||
return level > float(aim_w) - MAINT_RESUME_UNDER_W or not settled
|
||||
|
||||
|
||||
def cap_floor(decision, cap_w):
|
||||
"""SAFETY-128: the floor no higher than `cap_w` (the command standing while
|
||||
the readings have not answered it), or `decision` unchanged when None.
|
||||
|
||||
@@ -82,7 +82,7 @@ import os
|
||||
|
||||
import aiohttp
|
||||
|
||||
from . import messages
|
||||
from . import chargers, messages
|
||||
from .configui import changed_keys
|
||||
from .inverter import build_roster
|
||||
from .validate import validate_startup_config, validate_unit_ranges
|
||||
@@ -362,6 +362,18 @@ async def problems_and_ranges(opts: dict, hass=None, notes=None):
|
||||
unread = [unit.driver.actuator_id() for unit in units
|
||||
if unit.driver.configured() and unit.dev_min is None
|
||||
and unit.dev_max is None]
|
||||
# EV-03: the charger limit may not exceed the station limit the charger
|
||||
# reports. A read only; a charger that does not answer skips the check.
|
||||
if hass is not None and chargers.mode_of(opts) != chargers.OFF:
|
||||
drv = chargers.build(opts)
|
||||
if drv.configured():
|
||||
_lo, station, _ph = await drv.bind(hass).limits()
|
||||
amps = chargers.max_a(opts)
|
||||
if station is not None and amps is not None and amps > station:
|
||||
problems.append(
|
||||
f"{messages.setting('ev_max_a')} is {amps:.0f} A, but the "
|
||||
f"charger allows at most {station:.0f} A. Lower it to "
|
||||
f"{station:.0f} A or less.")
|
||||
return problems, unread
|
||||
|
||||
|
||||
|
||||
@@ -272,3 +272,8 @@ table.fct th,table.fct td{padding:4px 3px;text-align:right;border-bottom:1px sol
|
||||
table.fct th:first-child,table.fct td:first-child{text-align:left}
|
||||
table.fct th{color:var(--muted);font-weight:600}
|
||||
.ymax{position:absolute;top:-2px;left:2px;font-size:10px;color:var(--faint);pointer-events:none}
|
||||
|
||||
/* EV-03: the Car card */
|
||||
.car-big{font-size:20px;font-weight:700;line-height:1.3;margin:8px 0 2px;font-variant-numeric:tabular-nums}
|
||||
.car-lab{margin:12px 0 4px;color:var(--muted)}
|
||||
.car-why{display:grid;grid-template-columns:auto 1fr;gap:10px;margin-top:12px}
|
||||
|
||||
@@ -113,7 +113,8 @@
|
||||
const setup = S.setup_only === true;
|
||||
banner($("#home-banner"), S.level, setup ? t("setup_only.name") : S.banner, structured ? S.state.sub : setup ? t("setup_only.description") : "", S.level === "bad" ? "alert" : null);
|
||||
["#c-now", "#c-plan", "#c-peak", "#c-attn"].forEach((id) => { $(id).hidden = !structured; });
|
||||
if (structured) { renderNow(); renderPlan(); renderPeak(); renderAttention(); }
|
||||
if (structured) { renderNow(); renderCar(); renderPlan(); renderPeak(); renderAttention(); }
|
||||
else $("#c-car").hidden = true;
|
||||
renderControl(structured, setup);
|
||||
renderDetails(!structured && !setup);
|
||||
renderBatteries(force);
|
||||
@@ -145,6 +146,20 @@
|
||||
h("div", { class: "small muted", style: "grid-column:1/-1" }, b.now))));
|
||||
}
|
||||
|
||||
/* ---------------- Home: the car (read only) ---------------- */
|
||||
function renderCar() {
|
||||
const c = S.car;
|
||||
$("#c-car").hidden = !c;
|
||||
if (!c) return;
|
||||
const chip = $("#car-chip");
|
||||
chip.textContent = c.chip;
|
||||
chip.className = "chip" + (c.kind === "warn" ? " rs" : c.kind === "ok" ? " now" : "");
|
||||
$("#car-big").textContent = c.big;
|
||||
$("#car-today").textContent = c.today || "";
|
||||
$("#car-today").hidden = !c.today;
|
||||
$("#car-why").textContent = c.why;
|
||||
}
|
||||
|
||||
/* ---------------- Home: today's plan ---------------- */
|
||||
const LEGEND = [["cheap", "background:var(--cheap)"], ["dear", "background:repeating-linear-gradient(135deg,var(--dear) 0 3px,transparent 3px 5px)"],
|
||||
["grid", "background:var(--accent)"], ["give", "background:repeating-linear-gradient(135deg,var(--house) 0 3px,transparent 3px 5px)"],
|
||||
|
||||
@@ -39,6 +39,16 @@
|
||||
<div id="home-batts" style="margin-top:6px"></div>
|
||||
</div>
|
||||
|
||||
<div class="card" id="c-car" hidden>
|
||||
<div class="row spread"><h2 data-t="car.name"></h2><span class="chip" id="car-chip"></span></div>
|
||||
<div class="car-big" id="car-big"></div>
|
||||
<div class="small muted" id="car-today"></div>
|
||||
<div class="small car-lab" data-t="car.mode"></div>
|
||||
<div class="seg" role="radiogroup" id="car-mode" data-t-label="car.mode"><button type="button" role="radio" aria-checked="true" data-t="car.mode_off"></button></div>
|
||||
<p class="tiny muted" style="margin:6px 0 0" data-t="car.help_off.description"></p>
|
||||
<div class="car-why small"><span class="muted" data-t="car.why"></span><span id="car-why"></span></div>
|
||||
</div>
|
||||
|
||||
<div class="card" id="c-plan">
|
||||
<div class="row spread"><h2 data-t="plan.name"></h2><span class="chip tiny muted" id="verdict"></span></div>
|
||||
<div class="small" id="plan-head"></div>
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
"inverters": {"name": "Inverters and batteries", "description": "The inverters the add-on controls, and your solar."},
|
||||
"tariff": {"name": "Tariff and prices", "description": "What you pay and are paid per kWh."},
|
||||
"safety": {"name": "Safety limits", "description": "The peak limit, starting and stopping, and the safety stops."},
|
||||
"car": {"name": "Car charger", "description": "Which charger the add-on reads, and its limits."},
|
||||
"maintenance": {"name": "Maintenance", "description": "The monthly battery cycle and the log."},
|
||||
"tuning": {"name": "Control tuning", "description": "For support only, because these were measured on real hardware."}
|
||||
},
|
||||
@@ -33,6 +34,8 @@
|
||||
"fallback": {"none": "None", "fixed": "One price", "daynight": "Day and night", "custom": "Other time windows"},
|
||||
"region": {"flanders": "Flanders, Fluvius Antwerpen", "own": "I enter my own figure"},
|
||||
"meter_source": {"off": "One grid power entity", "ha_dsmr": "Import and export entities", "mqtt_p1": "Meter over MQTT", "ha_signed": "One net power entity", "homewizard_local": "HomeWizard meter on the network"},
|
||||
"ev_charger": {"off": "None", "alfen_ha": "Alfen (Home Assistant integration)"},
|
||||
"ev_phases": {"1": "1 phase", "3": "3 phases", "auto": "1 and 3"},
|
||||
"meter_phases": {"1": "1 phase", "3": "3 phases"},
|
||||
"shadow_mode": {"auto": "Automatic", "on": "Always on", "off": "Off"},
|
||||
"price_provider": {"generic_dayahead": "Day-ahead market price", "custom_formula": "Your own price formula", "manual_csv": "A price file", "price_service": "Your own price service"},
|
||||
@@ -87,6 +90,7 @@
|
||||
"loading": "Loading the forecast."
|
||||
},
|
||||
"peak": {"name": "Peak limit", "this_month": "This month's peak", "limit": "Limit", "none": "None recorded yet", "unreadable": "Cannot be read now"},
|
||||
"car": {"name": "Car", "mode": "Mode", "mode_off": "Off", "help_off": {"description": "The add-on leaves the charger alone."}, "why": "Why"},
|
||||
"attention": {"name": "Needs attention", "nothing": "Nothing to look at", "to_look": "to look at", "details": "Details", "alarm": "Alarm", "warning": "Warning", "info": "Info"},
|
||||
"control": {"name": "Control", "stop": "Stop control", "start": "Start control", "maint_start": "Start a battery cycle now", "maint_abort": "Stop the battery cycle", "docs": "Add-on documentation", "more": "More actions"},
|
||||
"details": {"name": "Details for installers", "rows": "Status rows", "checks": "Checks", "event": "Last event"},
|
||||
@@ -296,6 +300,28 @@
|
||||
"waiting": "Control resumes by itself when Home Assistant answers.",
|
||||
"warning": "See Needs attention below."
|
||||
},
|
||||
"car": {
|
||||
"state": {"charging": "Charging", "waiting": "Connected, waiting", "none": "No car connected", "full": "Car is full", "unreach": "Charger not reachable", "setup": "Charger not set up", "fault": "Charger fault", "wait": "No reading yet"},
|
||||
"big": {"waiting": "Connected, not charging.", "none": "Nothing to charge.", "full": "The car is full.", "seen": "Last seen at {t}.", "no_reading": "No reading.", "setup": "Not set up.", "fault": "The charger reports a fault.", "wait": "No reading yet."},
|
||||
"phase_one": "1 phase",
|
||||
"phase_many": "{n} phases",
|
||||
"today": "{kwh} charged today.",
|
||||
"why": {
|
||||
"charging": "The charger is charging the car. The add-on leaves it alone.",
|
||||
"waiting": "The car is connected and not charging. The add-on leaves the charger alone.",
|
||||
"none": "No car is connected.",
|
||||
"full": "The car stopped charging by itself.",
|
||||
"unreach_a": "The charger keeps its last setting, {a} A. Check the {brand} integration in Home Assistant.",
|
||||
"unreach_unit": "The charger's power is in a unit the add-on cannot use. Check it in Home Assistant.",
|
||||
"unreach": "The add-on cannot read the charger. Check the {brand} integration in Home Assistant.",
|
||||
"not_found": "The add-on cannot find the charger. Check the current setting entity in Settings.",
|
||||
"unit": "The charger power has no power unit. Check the charger in Settings.",
|
||||
"limit": "The charger limit is above what the charger allows. Lower it in Settings.",
|
||||
"name": "The current setting entity does not fit the charger. Check it in Settings.",
|
||||
"fault": "The charger reports a fault. Check it at the charger itself.",
|
||||
"wait": "Waiting for the first reading."
|
||||
}
|
||||
},
|
||||
"tile": {
|
||||
"not_set_up": "Not set up",
|
||||
"no_reading": "No reading",
|
||||
@@ -499,6 +525,9 @@
|
||||
"estop": "Emergency stop",
|
||||
"pv": "Solar reading",
|
||||
"solar_forecast": "Solar forecast",
|
||||
"charger": "Charger not reachable",
|
||||
"charger_writer": "Something else changes the charger",
|
||||
"charger_setup": "Charger not set up",
|
||||
"none": "Inverter connection"
|
||||
},
|
||||
"months": ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
"inverters": {"name": "Omvormers en batterijen", "description": "De omvormers die de add-on regelt, en uw zonnepanelen."},
|
||||
"tariff": {"name": "Tarief en prijzen", "description": "Wat u per kWh betaalt en terugkrijgt."},
|
||||
"safety": {"name": "Veiligheidsgrenzen", "description": "De piekgrens, starten en stoppen, en de veiligheidsstops."},
|
||||
"car": {"name": "Laadpaal", "description": "Welke laadpaal de add-on leest, en haar grenzen."},
|
||||
"maintenance": {"name": "Onderhoud", "description": "De maandelijkse batterijcyclus en het logboek."},
|
||||
"tuning": {"name": "Afstelling van de regeling", "description": "Alleen voor support, want deze zijn gemeten op echte hardware."}
|
||||
},
|
||||
@@ -33,6 +34,8 @@
|
||||
"fallback": {"none": "Geen", "fixed": "Eén prijs", "daynight": "Dag en nacht", "custom": "Andere tijdvakken"},
|
||||
"region": {"flanders": "Vlaanderen, Fluvius Antwerpen", "own": "Ik vul zelf een bedrag in"},
|
||||
"meter_source": {"off": "Eén entiteit voor netvermogen", "ha_dsmr": "Entiteiten voor afname en injectie", "mqtt_p1": "Meter via MQTT", "ha_signed": "Eén entiteit voor nettovermogen", "homewizard_local": "HomeWizard-meter op het netwerk"},
|
||||
"ev_charger": {"off": "Geen", "alfen_ha": "Alfen (Home Assistant-integratie)"},
|
||||
"ev_phases": {"1": "1 fase", "3": "3 fasen", "auto": "1 en 3"},
|
||||
"meter_phases": {"1": "1 fase", "3": "3 fasen"},
|
||||
"shadow_mode": {"auto": "Automatisch", "on": "Altijd aan", "off": "Uit"},
|
||||
"price_provider": {"generic_dayahead": "Day-aheadprijs van de markt", "custom_formula": "Uw eigen prijsformule", "manual_csv": "Een prijsbestand", "price_service": "Uw eigen prijsdienst"},
|
||||
@@ -84,6 +87,7 @@
|
||||
"loading": "De prognose wordt geladen."
|
||||
},
|
||||
"peak": {"name": "Piekgrens", "this_month": "Piek van deze maand", "limit": "Grens", "none": "Nog niets gemeten", "unreadable": "Nu niet leesbaar"},
|
||||
"car": {"name": "Auto", "mode": "Modus", "mode_off": "Uit", "help_off": {"description": "De add-on laat de laadpaal met rust."}, "why": "Waarom"},
|
||||
"attention": {"name": "Vraagt aandacht", "nothing": "Niets om na te kijken", "to_look": "na te kijken", "details": "Details", "alarm": "Alarm", "warning": "Waarschuwing", "info": "Info"},
|
||||
"control": {"name": "Regeling", "stop": "Regeling stoppen", "start": "Regeling starten", "maint_start": "Nu een batterijcyclus starten", "maint_abort": "Batterijcyclus stoppen", "docs": "Documentatie van de add-on", "more": "Meer acties"},
|
||||
"details": {"name": "Details voor installateurs", "rows": "Statusregels", "checks": "Controles", "event": "Laatste gebeurtenis"},
|
||||
@@ -250,6 +254,28 @@
|
||||
"verdict": {"held": "Op 0 W gehouden", "stopped": "Gestopt", "cycle": "Vandaag maandelijkse cyclus", "trade": "Handelt op prijs", "house": "Volgt het huis"},
|
||||
"pill": {"running": "Actief", "shadow": "Schaduwmodus", "stopped": "Gestopt", "alarm": "Heeft u nu nodig", "waiting": "Wacht op Home Assistant", "warning": "Actief, met een waarschuwing"},
|
||||
"banner_sub": {"running": "De batterijen volgen het plan hieronder.", "shadow": "De plannen hieronder tonen wat de add-on zou doen.", "stopped": "Start de regeling hieronder als u klaar bent.", "alarm": "Zie Vraagt aandacht hieronder voor wat u moet doen.", "waiting": "De regeling gaat vanzelf verder zodra Home Assistant antwoordt.", "warning": "Zie Vraagt aandacht hieronder."},
|
||||
"car": {
|
||||
"state": {"charging": "Laadt", "waiting": "Aangesloten, wacht", "none": "Geen auto aangesloten", "full": "Auto is vol", "unreach": "Laadpaal onbereikbaar", "setup": "Laadpaal niet ingesteld", "fault": "Laadpaalstoring", "wait": "Nog geen meting"},
|
||||
"big": {"waiting": "Aangesloten, laadt niet.", "none": "Niets te laden.", "full": "De auto is vol.", "seen": "Laatst gezien om {t}.", "no_reading": "Geen meting.", "setup": "Niet ingesteld.", "fault": "De laadpaal meldt een storing.", "wait": "Nog geen meting."},
|
||||
"phase_one": "1 fase",
|
||||
"phase_many": "{n} fasen",
|
||||
"today": "Vandaag {kwh} geladen.",
|
||||
"why": {
|
||||
"charging": "De laadpaal laadt de auto. De add-on laat haar met rust.",
|
||||
"waiting": "De auto is aangesloten en laadt niet. De add-on laat de laadpaal met rust.",
|
||||
"none": "Er is geen auto aangesloten.",
|
||||
"full": "De auto is zelf gestopt met laden.",
|
||||
"unreach_a": "De laadpaal houdt haar laatste instelling, {a} A. Controleer de {brand}-integratie in Home Assistant.",
|
||||
"unreach_unit": "De laadpaal meldt vermogen in een onbruikbare eenheid. Controleer de eenheid in Home Assistant.",
|
||||
"unreach": "De add-on kan de laadpaal niet lezen. Controleer de {brand}-integratie in Home Assistant.",
|
||||
"not_found": "De add-on vindt de laadpaal niet. Controleer de entiteit van de laadstroom bij Instellingen.",
|
||||
"unit": "Het vermogen van de laadpaal heeft geen vermogenseenheid. Controleer de laadpaal bij Instellingen.",
|
||||
"limit": "De laadpaalgrens is hoger dan de laadpaal toestaat. Verlaag ze bij Instellingen.",
|
||||
"name": "De entiteit van de laadstroom past niet bij de laadpaal. Controleer ze bij Instellingen.",
|
||||
"fault": "De laadpaal meldt een storing. Controleer ze aan de laadpaal zelf.",
|
||||
"wait": "Wacht op de eerste meting."
|
||||
}
|
||||
},
|
||||
"tile": {"not_set_up": "Niet ingesteld", "no_reading": "Geen meting", "producing": "Produceert", "not_producing": "Produceert niet", "needs_solar": "Zonnemeting nodig", "not_adding_up": "Metingen kloppen niet", "using": "Verbruikt", "taking": "Neemt af van het net", "feeding": "Injecteert", "balanced": "In evenwicht", "giving": "Levert stroom", "charging": "Laadt", "resting": "Rust"},
|
||||
"now": {
|
||||
"no_reading": "Geen meting van deze batterij.",
|
||||
@@ -420,6 +446,9 @@
|
||||
"estop": "Noodstop",
|
||||
"pv": "Meting van de zonnepanelen",
|
||||
"solar_forecast": "Zonneprognose",
|
||||
"charger": "Laadpaal onbereikbaar",
|
||||
"charger_writer": "Iets anders wijzigt de laadpaal",
|
||||
"charger_setup": "Laadpaal niet ingesteld",
|
||||
"none": "Verbinding met de omvormer"
|
||||
},
|
||||
"months": ["januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december"]
|
||||
|
||||
@@ -77,6 +77,7 @@ _MAINT = (("maintenance_enabled", "==", True),)
|
||||
_ONE = (("inverter_count", "==", 1),)
|
||||
_SEVERAL = (("inverter_count", ">", 1),)
|
||||
_PHASES = (("meter_phases", ">", 1),)
|
||||
_CAR = (("ev_charger", "!=", "off"),)
|
||||
# One inverter stored flat has no name or capacity (uimodel._roster_encode).
|
||||
_LISTED = (("inverter_shape", "!=", "flat"),)
|
||||
|
||||
@@ -222,6 +223,17 @@ GROUPS = (
|
||||
Field("delivery_hold_s", LOCKED, "s", step=5, show=_SEVERAL),
|
||||
), collapsed=True),
|
||||
)),
|
||||
# EV-03: the car charger, read only. Everything after the choice shows
|
||||
# only while a charger is switched on.
|
||||
Group("car", (
|
||||
Part("", (
|
||||
Field("ev_charger", CHOICE, simple=True),
|
||||
Field("ev_current_entity", ENTITY, kind="number", simple=True,
|
||||
show=_CAR),
|
||||
Field("ev_max_a", SLIDER, "A", simple=True, show=_CAR),
|
||||
Field("ev_phases", SEGMENTED, simple=True, show=_CAR),
|
||||
)),
|
||||
)),
|
||||
Group("maintenance", (
|
||||
Part("", (
|
||||
Field("maintenance_enabled", TOGGLE),
|
||||
|
||||
@@ -332,7 +332,7 @@ import math
|
||||
import re
|
||||
from typing import NamedTuple
|
||||
|
||||
from . import dayplan, messages, pv, solarfc
|
||||
from . import chargers, dayplan, messages, pv, solarfc
|
||||
from .arbitrage import enabled as arbitrage_on
|
||||
from .control import SLEW_RAIL_FRAC, LOOP_TICK_S, PLANT_SETTLE_S
|
||||
from . import drivers
|
||||
@@ -667,6 +667,34 @@ def _labels(keys, joiner: str = "and") -> str:
|
||||
return f" {joiner} ".join(S(k) for k in keys)
|
||||
|
||||
|
||||
def _charger_problems(opts: dict, writers: dict) -> list[str]:
|
||||
"""EV-03: the car charger options. A charger whose entities are missing is
|
||||
refused at run time (the Car card says so), not here: it never stops the
|
||||
add-on. What stops it is a setpoint that an inverter also writes."""
|
||||
out: list[str] = []
|
||||
raw = opts.get("ev_charger", chargers.OFF)
|
||||
if raw not in (None, "") and str(raw).strip() not in chargers.SELECTABLE:
|
||||
out.append(f"{S('ev_charger')} is {messages.shown(raw)}. Choose "
|
||||
f"{', '.join(chargers.SELECTABLE)}.")
|
||||
return out
|
||||
if chargers.mode_of(opts) == chargers.OFF:
|
||||
return out
|
||||
ph = opts.get("ev_phases", chargers.EV_OPTION_DEFAULTS["ev_phases"])
|
||||
if str(ph).strip() not in chargers.PHASES_CHOICES:
|
||||
out.append(f"{S('ev_phases')} is {messages.shown(ph)}. Choose 1, 3 or "
|
||||
"auto.")
|
||||
amps = chargers.max_a(opts)
|
||||
if amps is None or not chargers.MIN_A <= amps <= chargers.ENTITY_MAX_A:
|
||||
out.append(f"{S('ev_max_a')} is {messages.shown(opts.get('ev_max_a'))}"
|
||||
f". Set it from {chargers.MIN_A:.0f} to "
|
||||
f"{chargers.ENTITY_MAX_A:.0f} A.")
|
||||
entity = chargers.census_entity(opts)
|
||||
if entity and drivers.census_key(entity) in writers:
|
||||
out.append(f"{S('ev_current_entity')} is {entity}, which an inverter "
|
||||
"also uses. Give the charger its own entity.")
|
||||
return out
|
||||
|
||||
|
||||
def _roster_problems(opts: dict) -> list[str]:
|
||||
"""Rule 9 (CFG-04): the `inverters:` roster, refused where it cannot mean
|
||||
what it says.
|
||||
@@ -956,6 +984,12 @@ def validate_startup_config(opts: dict, dev_min=None, dev_max=None,
|
||||
f"{actuator}: {', '.join(who)}. Give each inverter its own "
|
||||
"setpoint entity.")
|
||||
|
||||
# --- EV-03: the car charger's setpoint is a writer too ---------------------
|
||||
# Counted in the census beside the inverters', and kept apart from
|
||||
# `actuator_writers()` so setup-only mode still reads "no inverter". An
|
||||
# inverter's entity named as the charger is two writers on one actuator.
|
||||
problems.extend(_charger_problems(opts, writers))
|
||||
|
||||
# --- 9. CFG-04's roster, graded BEFORE anything reads a per-unit number --
|
||||
# ⚠️ FIRST, THOUGH IT IS THE NEWEST RULE. Rules 5 and 6 below now ask the
|
||||
# roster what one unit may be commanded, so a roster that is nonsense has to
|
||||
@@ -1921,6 +1955,7 @@ def config_notes(opts: dict, *, entities: dict | None = None,
|
||||
notes: list[Note] = []
|
||||
if entities is not None:
|
||||
_entity_notes(notes, opts, entities)
|
||||
_charger_notes(notes, opts, entities)
|
||||
cap = _number(opts, "peak_cap_w", None)
|
||||
if month_peak_w is not None and cap is not None and cap < month_peak_w:
|
||||
_advise(notes, "warn", ("peak_cap_w",),
|
||||
@@ -1932,6 +1967,110 @@ def config_notes(opts: dict, *, entities: dict | None = None,
|
||||
return notes
|
||||
|
||||
|
||||
def charger_probe_rows(opts: dict, entities: dict | None) -> dict:
|
||||
"""EV-03: the settings panel's read-only look at the charger. `entities` is
|
||||
Home Assistant's list by id (None: it did not answer). Nothing is written.
|
||||
`{"ok", "found": [[role, entity]], "missing": [[role, entity]], "limit_a",
|
||||
"state"}`; `state` is `off`, `no_name` (the setpoint is not named the way
|
||||
the charger's integration names it), `unread`, `ok` or `missing`."""
|
||||
if chargers.mode_of(opts) == chargers.OFF:
|
||||
return {"ok": False, "found": [], "missing": [], "limit_a": None,
|
||||
"state": "off"}
|
||||
setpoint = str(opts.get("ev_current_entity") or "").strip()
|
||||
if not chargers.entities_for(setpoint):
|
||||
return {"ok": False, "found": [], "missing": [], "limit_a": None,
|
||||
"state": "no_name" if setpoint else "empty"}
|
||||
if entities is None:
|
||||
return {"ok": False, "found": [], "missing": [], "limit_a": None,
|
||||
"state": "unread"}
|
||||
def state_obj(e):
|
||||
row = entities.get(e)
|
||||
return None if row is None else {
|
||||
"state": row.get("state"),
|
||||
"attributes": {"unit_of_measurement": row.get("unit")}}
|
||||
pr = chargers.probe_from(setpoint, state_obj)
|
||||
return {"ok": pr.ok, "found": [list(x) for x in pr.found],
|
||||
"missing": [list(x) for x in pr.missing], "limit_a": pr.station_a,
|
||||
"power_unit": pr.power_unit,
|
||||
"state": "ok" if pr.ok else "missing"}
|
||||
|
||||
|
||||
# The roles the "Found:" note names, in words (EV-03).
|
||||
_CHARGER_WORDS = (
|
||||
("state", "car state", "autostatus"), ("power", "power", "vermogen"),
|
||||
("energy", "energy", "energie"), ("readback", "read-back", "terugmelding"),
|
||||
("phases_read", "phases", "fasen"),
|
||||
("station", "the charger limit", "de laadpaalgrens"))
|
||||
|
||||
|
||||
def charger_probe_for(setpoint: str, entities: dict | None) -> dict:
|
||||
"""`charger_probe_rows()` for a setpoint entity typed on the page."""
|
||||
return charger_probe_rows({"ev_charger": chargers.ALFEN_HA,
|
||||
"ev_current_entity": setpoint}, entities)
|
||||
|
||||
|
||||
def _charger_notes(notes, opts: dict, entities: dict) -> None:
|
||||
"""EV-03: a note for each charger entity Home Assistant does not have, and
|
||||
one when the limit is above the charger's own. Never a refusal."""
|
||||
look = charger_probe_rows(opts, entities)
|
||||
key = ("ev_current_entity",)
|
||||
if look["state"] == "no_name":
|
||||
_advise(notes, "warn", key,
|
||||
f"{S('ev_current_entity')} must be named like the Alfen "
|
||||
"integration's current setting, so the charger is not read.",
|
||||
nl=f"{SN('ev_current_entity')} moet heten zoals de "
|
||||
"stroominstelling van de Alfen-integratie, dus de laadpaal "
|
||||
"wordt niet gelezen.")
|
||||
return
|
||||
if look["state"] == "empty":
|
||||
_advise(notes, "warn", key,
|
||||
f"{S('ev_current_entity')} is empty, so the charger is not "
|
||||
"read.",
|
||||
nl=f"{SN('ev_current_entity')} is leeg, dus de laadpaal wordt "
|
||||
"niet gelezen.")
|
||||
return
|
||||
if look["state"] not in ("ok", "missing"):
|
||||
return
|
||||
for role, entity in look["missing"]:
|
||||
required = role in chargers.REQUIRED
|
||||
# A missing required entity (current, read-back, car state or power)
|
||||
# means the charger is not used: the Car card says "not set up".
|
||||
if required:
|
||||
_advise(notes, "warn", key,
|
||||
f"Home Assistant has no entity {entity}, which the "
|
||||
"charger needs, so it is not used.",
|
||||
nl=f"Home Assistant kent {entity} niet, die de laadpaal "
|
||||
"nodig heeft, dus ze wordt niet gebruikt.")
|
||||
else:
|
||||
_advise(notes, "info", key,
|
||||
f"Home Assistant has no entity {entity}, which the "
|
||||
"charger can also use.",
|
||||
nl=f"Home Assistant kent {entity} niet, die de laadpaal "
|
||||
"ook kan gebruiken.")
|
||||
if look.get("power_unit") is not None:
|
||||
_advise(notes, "warn", key,
|
||||
"The charger's power does not read in a power unit, so the "
|
||||
"charger is not used.",
|
||||
nl="Het vermogen van de laadpaal heeft geen vermogenseenheid, dus "
|
||||
"ze wordt niet gebruikt.")
|
||||
lim = look["limit_a"]
|
||||
if look["ok"]:
|
||||
have = {r for r, _e in look["found"]}
|
||||
words = [(w_en, w_nl) for r, w_en, w_nl in _CHARGER_WORDS if r in have]
|
||||
tail_en = f", {lim:.0f} A" if lim is not None else ""
|
||||
_advise(notes, "ok", key,
|
||||
"Found: " + ", ".join(w[0] for w in words) + tail_en + ".",
|
||||
nl="Gevonden: " + ", ".join(w[1] for w in words) + tail_en
|
||||
+ ".")
|
||||
amps = chargers.max_a(opts)
|
||||
if lim is not None and amps is not None and amps > lim:
|
||||
_advise(notes, "warn", ("ev_max_a",),
|
||||
f"{S('ev_max_a')} is above the {lim:.0f} A the charger "
|
||||
"reports, so lower it.",
|
||||
nl=f"{SN('ev_max_a')} is hoger dan de {lim:.0f} A die de "
|
||||
"laadpaal meldt, dus verlaag ze.")
|
||||
|
||||
|
||||
def _entity_notes(notes, opts: dict, entities: dict, bad=()) -> None:
|
||||
"""A note for each entity these options read that Home Assistant does not
|
||||
have, or that reads in kW where watts are taken. A missing entity whose
|
||||
|
||||
@@ -51,7 +51,8 @@ from aiohttp import web
|
||||
from . import messages, price, selfconfig, uipage, uitext
|
||||
from .haentities import EntityCache
|
||||
from .homeview import priced_hours, region_of
|
||||
from .validate import config_notes, note_text, setup_checks
|
||||
from .validate import (charger_probe_for, config_notes, note_text,
|
||||
setup_checks)
|
||||
from .config_page import CONFIG_PAGE
|
||||
from .configui import (changed_keys, field_model, hide_secrets, keep_secrets,
|
||||
problems_by_field, secret_keys)
|
||||
@@ -474,6 +475,14 @@ def build_app(controller, selfcfg=None) -> web.Application:
|
||||
return web.json_response(await entities.reading(one))
|
||||
return web.json_response(await entities.payload(kind))
|
||||
|
||||
async def config_charger(request):
|
||||
"""EV-03: the settings page's read-only look at the car charger: which
|
||||
entities Home Assistant has and which it lacks. Reads the cached entity
|
||||
list and writes nothing, anywhere."""
|
||||
rows, _age = await entities.get(max_age=5.0)
|
||||
return web.json_response(charger_probe_for(
|
||||
str(request.query.get("entity") or "")[:255], rows))
|
||||
|
||||
app = web.Application()
|
||||
app.add_routes([
|
||||
web.get("/", index),
|
||||
@@ -486,6 +495,7 @@ def build_app(controller, selfcfg=None) -> web.Application:
|
||||
web.post("/config/save", config_save),
|
||||
web.post("/config/restart", config_restart),
|
||||
web.get("/ha/entities", ha_entities),
|
||||
web.get("/config/charger", config_charger),
|
||||
])
|
||||
return app
|
||||
|
||||
|
||||
@@ -872,6 +872,18 @@ options:
|
||||
# be reached by accident.
|
||||
shadow_mode: "auto"
|
||||
|
||||
# ==========================================================================
|
||||
# CAR CHARGER - read only (EV-03)
|
||||
# ==========================================================================
|
||||
# `off` is the shipped value and means NO CHANGE AT ALL: nothing is read,
|
||||
# shown or announced, and the House tile and the house profile are as before.
|
||||
# `alfen_ha` reads the charger through its Home Assistant integration. THIS
|
||||
# VERSION NEVER WRITES TO THE CHARGER; later cards add the modes.
|
||||
ev_charger: "off"
|
||||
ev_current_entity: ""
|
||||
ev_max_a: 16
|
||||
ev_phases: "auto"
|
||||
|
||||
# ==========================================================================
|
||||
# ADVANCED - the control law and diagnostics
|
||||
# ==========================================================================
|
||||
@@ -1249,6 +1261,17 @@ schema:
|
||||
# long as nobody notices.
|
||||
shadow_mode: list(auto|on|off)
|
||||
|
||||
# ==========================================================================
|
||||
# CAR CHARGER - read only (EV-03)
|
||||
# ==========================================================================
|
||||
# `ev_current_entity` is the charger's current setpoint; the other entities
|
||||
# are found from its name. `ev_max_a` may not exceed the charger's own station
|
||||
# limit (the settings page and the start check read it).
|
||||
ev_charger: list(off|alfen_ha)
|
||||
ev_current_entity: str?
|
||||
ev_max_a: int(6,40)
|
||||
ev_phases: list(1|3|auto)
|
||||
|
||||
# ==========================================================================
|
||||
# ADVANCED - the control law and diagnostics
|
||||
# ==========================================================================
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,288 @@
|
||||
"""Runnable check for MAINT-28. `python3 test_maint28.py`
|
||||
|
||||
MAINT-24 follow-up. With A in maintenance CHARGE and a real peak (house over
|
||||
the month aim), MAINT-24's pause ended every time the guard idled: the
|
||||
forecast dipped under the aim, the floor charged A, the guard tripped again,
|
||||
and A flipped charge/give every few seconds (rig x10: 468 flips in 45 min,
|
||||
base 02eac3b 11). Now the pause is held (`peakguard.shaping_held()`) until the
|
||||
house is MAINT_RESUME_UNDER_W under the aim.
|
||||
|
||||
All on the real Controller through `cycle()` (tools/opt20_scen.py): cheap
|
||||
window, cap 3500 / margin 50, a month peak of 6000 W banked (aim 5950 W), a
|
||||
peak forecast like the live sensor (quarter average so far, the rest at the
|
||||
present grid), house +-50 W every 5 s.
|
||||
|
||||
1. A real peak (house 3000 W, then 6500 W for 15 min, then 3000 W): once the
|
||||
guard has stepped in, A does not charge and does not flip; every quarter is
|
||||
at or under the aim; A's charge is back within 10 cycles after the load.
|
||||
2. peakguard.shaping_held(): the pure rule, with its edges.
|
||||
3. Unchanged: the MAINT-24 live shape (A 1475 W, no pause), N=1, the SAFETY-78
|
||||
drain and battery modes off (digests of release/1.0 1b5f7c9, as
|
||||
test_maint24.py).
|
||||
Mutations: DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md.
|
||||
Read MUTATION.md before you report a survivor.
|
||||
"""
|
||||
|
||||
import logging
|
||||
import os
|
||||
import random
|
||||
import sys
|
||||
|
||||
HERE = os.path.dirname(os.path.abspath(__file__))
|
||||
sys.path.insert(0, HERE)
|
||||
sys.path.insert(0, os.path.join(HERE, "tools"))
|
||||
logging.disable(logging.WARNING)
|
||||
|
||||
import opt11p3_replay as rp # noqa: E402
|
||||
import opt20_scen as sc # noqa: E402
|
||||
from app import ctl_cycle, peakguard, tariff # noqa: E402
|
||||
from app.maintenance import DRAIN, IDLE, MaintResult # noqa: E402
|
||||
|
||||
fails = []
|
||||
|
||||
|
||||
def check(name, cond):
|
||||
print(f" {'ok ' if cond else 'FAIL'} {name}")
|
||||
if not cond:
|
||||
fails.append(name)
|
||||
|
||||
|
||||
CH = sc.MAINT_CHARGE
|
||||
MONTH_PEAK = 6000.0
|
||||
AIM = MONTH_PEAK - 50.0
|
||||
DRAIN_R = MaintResult(DRAIN, True, 2000.0, False, [])
|
||||
T0 = sc.at(2.0) # a quarter boundary
|
||||
PRE, LOAD, POST = 120.0, 900.0, 120.0 # s (CI time: short runs)
|
||||
|
||||
|
||||
def stepped_house(base_w, hi_w):
|
||||
"""[(t_utc, W)]: base_w, then hi_w from PRE for LOAD s, +-50 W per 5 s."""
|
||||
rnd = random.Random(28)
|
||||
out = [(sc.UTC0.timestamp() - 10, base_w)]
|
||||
for t in range(0, int(PRE + LOAD + POST), 5):
|
||||
w = hi_w if PRE <= t < PRE + LOAD else base_w
|
||||
out.append((T0.timestamp() + t, w + rnd.uniform(-50.0, 50.0)))
|
||||
return out
|
||||
|
||||
|
||||
def scen(*, a=None, tick=None, soc=(49.0, 30.0), house=None, house_w=3000.0,
|
||||
peak=MONTH_PEAK, fc="grid", n=2, variant="p3_ch_sell", dur=600.0):
|
||||
"""`a`: A's forced maintenance result. `fc`: "grid" (follows the grid),
|
||||
"quarter" (quarter average so far, the rest at the present grid, like the
|
||||
live sensor) or None (no forecast entity). Returns (rows, stats, c)."""
|
||||
rows = []
|
||||
q = dict(q=None, s=0.0, last=None, start=None)
|
||||
|
||||
def patch(c):
|
||||
if tick is not None:
|
||||
c.maints[0].tick = (
|
||||
lambda now, soc_, blocked_by=None, gate_open=True: tick(now))
|
||||
elif a is not None:
|
||||
c.maints[0].tick = (
|
||||
lambda now, soc_, blocked_by=None, gate_open=True: a)
|
||||
if peak is not None:
|
||||
orig_peak = c.peak.peak
|
||||
|
||||
def peak_(now):
|
||||
r = orig_peak(now)
|
||||
return tariff.PeakReading(tariff.OBSERVED,
|
||||
getattr(r, "month", ""), peak)
|
||||
c.peak.peak = peak_
|
||||
orig = c.cycle
|
||||
susp = []
|
||||
c._m28_susp = susp
|
||||
|
||||
async def cyc():
|
||||
c.cheap = True
|
||||
if fc and c.grid is not None:
|
||||
g = float(c.grid)
|
||||
if fc == "grid":
|
||||
c.peak_fc = g
|
||||
else:
|
||||
# the replay's clock; not main_files.live (it parses
|
||||
# every app file per access: ~0.1 s a cycle).
|
||||
now = ctl_cycle.datetime.now()
|
||||
qi = int(now.timestamp() // 900)
|
||||
if q["q"] != qi:
|
||||
q.update(q=qi, s=0.0, last=now, start=now)
|
||||
el = (now - q["start"]).total_seconds()
|
||||
q["s"] += g * (now - q["last"]).total_seconds()
|
||||
q["last"] = now
|
||||
c.peak_fc = (q["s"] + g * (900.0 - el)) / 900.0
|
||||
await orig()
|
||||
susp.append(bool(c._maint_shape_suspended))
|
||||
c.cycle = cyc
|
||||
|
||||
def cb(c, h, now, pr):
|
||||
sh = dict(c.allocation.shares) if c.allocation is not None \
|
||||
and c.allocation.shares else {}
|
||||
rows.append(dict(
|
||||
now=now, grid=h.grid(), shares=sh,
|
||||
action=getattr(c.arb, "action", None),
|
||||
reason=getattr(c.arb, "reason", None) or "",
|
||||
roles=dict(c.mode_tick.roles) if c.mode_tick else {},
|
||||
why=c.mode_tick.why if c.mode_tick else None,
|
||||
p={u: p.p for u, p in h.plants.items()},
|
||||
t=(now - T0).total_seconds(), a=h.plants["a"].p,
|
||||
susp=c._m28_susp[-1], hold=bool(getattr(c, "_maint_peak_hold", False))))
|
||||
|
||||
src = house if house is not None else [(sc.UTC0.timestamp() - 10, house_w)]
|
||||
stats, c = rp.run(variant, src, sc.WPTS, T0, dur, check=cb, lag=sc.LAG,
|
||||
n=n, soc0={"a": soc[0], "b": soc[1]},
|
||||
choice=sc.CH_CH, refuse=(), patch=patch,
|
||||
extra={"cycle_cost_threshold_eur": 0.10})
|
||||
return rows, stats, c
|
||||
|
||||
|
||||
def flips(rs):
|
||||
"""Reversals of A between charging and giving (beyond 50 W)."""
|
||||
n, s = 0, 0
|
||||
for r in rs:
|
||||
v = 1 if r["a"] > 50 else -1 if r["a"] < -50 else 0
|
||||
if v and s and v != s:
|
||||
n += 1
|
||||
if v:
|
||||
s = v
|
||||
return n
|
||||
|
||||
|
||||
# ============================================================================ #
|
||||
print("1. a real peak: house 3000 W, 6500 W for 15 min, 3000 W")
|
||||
rows, st, c = scen(a=CH, house=stepped_house(3000.0, 6500.0), fc="quarter",
|
||||
dur=PRE + LOAD + POST)
|
||||
end = PRE + LOAD
|
||||
trip = next((r["t"] for r in rows if r["t"] >= PRE and r["a"] > 50), None)
|
||||
load = [r for r in rows if trip is not None and trip <= r["t"] < end]
|
||||
after = [r for r in rows if r["t"] >= end]
|
||||
back = next((i for i, r in enumerate(after) if r["a"] < -50), None) # cycles
|
||||
print(f" first give at {trip}, flips in the load {flips(load)}, charge s in"
|
||||
f" the load {sum(1 for r in load if r['a'] < -50)}, charge back "
|
||||
f"{back} cycles after it, quarters "
|
||||
f"{[round(a[0] / a[1]) for a in st['quarters'].values()]}")
|
||||
check("the guard stepped in once the projection went over the aim",
|
||||
trip is not None)
|
||||
check("from the first give to the load's end A does not flip",
|
||||
flips(load) == 0)
|
||||
check("...and does not charge at all", not any(r["a"] < -50 for r in load))
|
||||
check("...the pause is on in every one of those cycles",
|
||||
all(r["susp"] for r in load))
|
||||
check("every quarter at or under the month aim",
|
||||
max(a[0] / a[1] for a in st["quarters"].values()) <= AIM + 1.0)
|
||||
check("after the load A's charge is back within 10 cycles (1 s each)",
|
||||
back is not None and back <= 10)
|
||||
tail = [r["a"] for r in after[10:]]
|
||||
check("...and stays on: at least 150 W (half the resume margin), no give",
|
||||
tail and sum(tail) / len(tail) <= -150.0 and max(tail) <= 50.0)
|
||||
|
||||
# ============================================================================ #
|
||||
print("\n1b. the hold does not outlive the charge: a stale True must not "
|
||||
"pause the next charge")
|
||||
# The idle window opens on a quarter boundary, so the new charge meets a
|
||||
# fresh quarter whose projection (house 5700 W) is under the aim.
|
||||
HI_START, HI_END, IDLE_END, B_END = 300.0, 900.0, 1000.0, 1300.0
|
||||
|
||||
|
||||
def _house_b():
|
||||
rnd = random.Random(29)
|
||||
out = [(sc.UTC0.timestamp() - 10, 3000.0)]
|
||||
for t in range(0, int(B_END) + 100, 5):
|
||||
w = 3000.0 if t < HI_START else 6500.0 if t < HI_END else 5700.0
|
||||
out.append((T0.timestamp() + t, w + rnd.uniform(-50.0, 50.0)))
|
||||
return out
|
||||
|
||||
|
||||
def _tick_b(now):
|
||||
t = (now - T0).total_seconds()
|
||||
return MaintResult(IDLE, False, None, False, []) \
|
||||
if HI_END <= t < IDLE_END else CH
|
||||
|
||||
|
||||
rb, sb, cb_ = scen(tick=_tick_b, house=_house_b(), fc="quarter", dur=B_END)
|
||||
held_before = [r for r in rb if HI_START <= r["t"] < HI_END and r["hold"]]
|
||||
idle_rows = [r for r in rb if HI_END <= r["t"] < IDLE_END]
|
||||
later = [r["a"] for r in rb if IDLE_END + 10.0 <= r["t"] < B_END]
|
||||
print(f" hold on {len(held_before)} cycles before; in the idle window "
|
||||
f"{sum(r['hold'] for r in idle_rows)} of {len(idle_rows)}; A after "
|
||||
f"{sum(later) / len(later):+.0f} W (house 5700 W: 125 W)")
|
||||
check("the hold was on in the peak", len(held_before) > 100)
|
||||
check("it is off in every cycle the charge-only branch is not taken",
|
||||
not any(r["hold"] for r in idle_rows))
|
||||
check("a new maintenance charge at house 5700 W (over the resume line) "
|
||||
"starts at once: (5950 - 5700) / 2 = 125 W, not paused",
|
||||
sum(later) / len(later) <= -60.0)
|
||||
|
||||
# ============================================================================ #
|
||||
print("\n2. peakguard.shaping_held()")
|
||||
|
||||
|
||||
def held(was, decision, fc, aim, house):
|
||||
return peakguard.shaping_held(
|
||||
peakguard.shaping_suspended(decision, fc, aim), was, fc, aim, house)
|
||||
|
||||
|
||||
U = peakguard.MAINT_RESUME_UNDER_W
|
||||
eng = peakguard.PeakDecision(engaged=True, floor_w=100.0, ceiling_w=6000.0,
|
||||
ceiling_from="x", target_w=AIM)
|
||||
idle = peakguard.PeakDecision(engaged=False, floor_w=None, ceiling_w=6000.0,
|
||||
ceiling_from="x", target_w=AIM)
|
||||
check("the old conjunction still pauses: forecast over the aim; guard engaged",
|
||||
held(False, idle, AIM + 1, AIM, 3000.0)
|
||||
and held(False, eng, None, AIM, 3000.0))
|
||||
check("not held and not suspended: not paused", not held(False, idle, AIM - 1,
|
||||
AIM, 6500.0))
|
||||
check("held: stays paused while the house is over the aim minus the margin",
|
||||
held(True, idle, AIM - 1, AIM, 6500.0)
|
||||
and held(True, idle, AIM - 1, AIM, AIM - U + 1))
|
||||
check("held: resumes when the house is the margin under the aim",
|
||||
not held(True, idle, AIM - 1, AIM, AIM - U)
|
||||
and not held(True, idle, AIM - 1, AIM, 3000.0))
|
||||
check("held, house unread: the forecast stands in; neither read: resumes "
|
||||
"(SAFETY-63)",
|
||||
held(True, idle, AIM - 1, AIM, None)
|
||||
and not held(True, idle, AIM - U, AIM, None)
|
||||
and not held(True, idle, None, AIM, None))
|
||||
check("a guard that is engaged pauses whatever the house reads",
|
||||
held(True, eng, AIM - 1, AIM, 3000.0))
|
||||
|
||||
# ============================================================================ #
|
||||
print("\n3. unchanged: the live shape, N=1, the drain, modes off")
|
||||
rl, sl, cl = scen(a=CH)
|
||||
body = rl[len(rl) // 6:]
|
||||
mean_a = sum(r["a"] for r in body) / len(body)
|
||||
print(f" A {mean_a:+.0f} W, paused {sum(cl._m28_susp)} cycles")
|
||||
check("MAINT-24 live shape: A charges 1475 W and the pause never comes",
|
||||
-1500.0 <= mean_a <= -1440.0 and not any(cl._m28_susp))
|
||||
d1 = sc.digest(scen(a=CH, n=1, fc=None, peak=None)[0])
|
||||
dd = sc.digest(scen(a=DRAIN_R, soc=(60.0, 30.0), peak=None, fc=None)[0])
|
||||
dm = sc.digest(scen(a=CH, variant="modes_off", peak=None, fc=None)[0])
|
||||
d2n = sc.digest(scen(a=CH, house_w=5000.0, peak=None, fc="grid")[0])
|
||||
d1p = sc.digest(scen(a=CH, n=1, fc=None, house_w=6500.0)[0])
|
||||
AT_BASE = {
|
||||
"n2_nobank": "f9053833891794ead8b3f44db4030ded8c4b43681e25e8a19882105d3593f20d",
|
||||
"n1_peak": "3e451c536bea8270469fffe578c5a7199431e0e7ba4902413406b0afe2bb0fd1",
|
||||
"n1": "02ecc3011c559df050ae5321ceb6b24cf79342ae35f1a289fbd1a749c86f1d10",
|
||||
"drain": "bfcf9a643dfffff21d0a8417426d2088377a8f64afbc544732b1635a77775d8a",
|
||||
"off": "6f4ec14578d8ed59fc7721485d037f3c1fb086abae7c52f28c9e9155cf2107b0",
|
||||
}
|
||||
got = {"n2_nobank": d2n, "n1_peak": d1p, "n1": d1, "drain": dd, "off": dm}
|
||||
for k in AT_BASE:
|
||||
print(f" {k} {'same' if got[k] == AT_BASE[k] else 'DIFFERS'} "
|
||||
f"{got[k]}")
|
||||
check("N=1 with A in maintenance charge and no forecast entity: equal to "
|
||||
"release/1.0 1b5f7c9", got["n1"] == AT_BASE["n1"])
|
||||
check("N=1 in a real peak above a banked month peak (house 6500 W, the guard steps in): equal "
|
||||
"to 1b5f7c9, the hold is for N=2 and up", got["n1_peak"] == AT_BASE["n1_peak"])
|
||||
check("N=2 in a real peak with no banked peak (house 5000 W over the aim "
|
||||
"3450 W): equal to 1b5f7c9, the hold is for a month aim above the cap",
|
||||
got["n2_nobank"] == AT_BASE["n2_nobank"])
|
||||
check("the SAFETY-78 drain beside a charger: equal to 1b5f7c9",
|
||||
got["drain"] == AT_BASE["drain"])
|
||||
check("battery modes off: equal to 1b5f7c9", got["off"] == AT_BASE["off"])
|
||||
|
||||
print()
|
||||
if fails:
|
||||
print(f"{len(fails)} FAILED:")
|
||||
for f in fails:
|
||||
print(f" - {f}")
|
||||
sys.exit(1)
|
||||
print("all checks passed")
|
||||
@@ -0,0 +1,485 @@
|
||||
"""Runnable check for MAINT-28 fix-forward. `python3 test_maint28b.py`
|
||||
|
||||
The rig failed MAINT-28 (TEST-23, f3f9483): the hold of the maintenance pause
|
||||
ended at almost every guard step (F-1), and while it stuck, the pack in
|
||||
maintenance CHARGE gave its full rating for the house below its peak reserve
|
||||
(F-2). test_maint28.py missed both because its battery reading has no lag. Here
|
||||
the battery register is published every 10 s and held (`Lag.batt_period_s`),
|
||||
the meter reading is 2 s old, as on the rig; the rating is the rig's A (5 kW).
|
||||
|
||||
All on the real Controller through `cycle()` (tools/opt20_scen.py): cheap
|
||||
window, cap 3500 / margin 50, a month peak of 6000 W banked (aim 5950 W), a
|
||||
peak forecast like the live sensor, house +-50 W every 5 s, 3000 W then
|
||||
6500 W for 13 min (over a quarter boundary), then 3000 W.
|
||||
|
||||
1. A real peak, A in CHARGE above its peak reserve: A flips charge/give a few
|
||||
times (base 1b5f7c9: dozens), no release of the pause on an estimate that
|
||||
mixes a new grid with an old battery reading, quarters at or under the aim,
|
||||
A's charge back after the load.
|
||||
2. F-2 and the cap (owner 2026-11-13): while the pause holds, A gives at most
|
||||
the largest part of the guard's floor placed on it in the 15-min period,
|
||||
at any SoC (never under its reserve; SoC drop within the owner-accepted
|
||||
give); with both packs able, never over the period's largest floor, and
|
||||
when B is placed part of it A's limit is its own part, not the whole floor;
|
||||
one unit's limit is its own (two packs in CHARGE never share it); with the
|
||||
other pack under its reserve, A still gives for the guard.
|
||||
3. The mirror: B in CHARGE, under its reserve at the load: it gives nothing
|
||||
for the house.
|
||||
4. Unchanged: the MAINT-24 live shape (A 1475 W, B no grid trade), with the
|
||||
same lag on.
|
||||
5. `peakguard.shaping_held()` with `settled`, and `Controller._batts_settled()`.
|
||||
6. H-1 (owner 2026-11-14): while the pause holds the batteries together give
|
||||
only what the guard needs. The live try (A 11 %, B 25 %, 90 min at 6.5 kW)
|
||||
and, for the F-1 wiring, the 45-min rig shape.
|
||||
Mutations: DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md.
|
||||
Read MUTATION.md before you report a survivor.
|
||||
"""
|
||||
|
||||
import logging
|
||||
import os
|
||||
import random
|
||||
import sys
|
||||
from datetime import timedelta
|
||||
|
||||
HERE = os.path.dirname(os.path.abspath(__file__))
|
||||
sys.path.insert(0, HERE)
|
||||
sys.path.insert(0, os.path.join(HERE, "tools"))
|
||||
logging.disable(logging.WARNING)
|
||||
|
||||
import opt11p3_replay as rp # noqa: E402
|
||||
import opt20_scen as sc # noqa: E402
|
||||
from app import (ctl_cycle, ctl_trade, freshness, maintenance, # noqa: E402
|
||||
packmode, peakguard, tariff)
|
||||
|
||||
fails = []
|
||||
|
||||
|
||||
def check(name, cond):
|
||||
print(f" {'ok ' if cond else 'FAIL'} {name}")
|
||||
if not cond:
|
||||
fails.append(name)
|
||||
|
||||
|
||||
rp.RATING, rp.CAP_KWH = 5000.0, 15.36 # the rig's A
|
||||
LAG = rp.Lag(dead_s=1.0, meter_s=2.0, batt_s=1.0, p1_s=0.35, tick=1.0,
|
||||
tau_s=2.0, ramp_w_s=1e9, batt_period_s=10.0)
|
||||
CH = sc.MAINT_CHARGE
|
||||
MONTH_PEAK = 6000.0
|
||||
AIM = MONTH_PEAK - 50.0
|
||||
LINE = AIM - getattr(peakguard, "MAINT_RESUME_UNDER_W", 300.0)
|
||||
T0 = sc.at(2.0) # a quarter boundary
|
||||
PRE, LOAD, POST = 120.0, 780.0, 120.0 # s (CI time: short runs)
|
||||
RESERVE = 20.0 # peak_soc_floor default
|
||||
|
||||
|
||||
def stepped_house(base_w, hi_w, load=LOAD, pre=PRE):
|
||||
rnd = random.Random(28)
|
||||
out = [(sc.UTC0.timestamp() - 10, base_w)]
|
||||
for t in range(0, int(pre + load + POST), 5):
|
||||
w = hi_w if pre <= t < pre + load else base_w
|
||||
out.append((T0.timestamp() + t, w + rnd.uniform(-50.0, 50.0)))
|
||||
return out
|
||||
|
||||
|
||||
def scen(*, unit="a", soc=49.0, other=30.0, house=None, house_w=3000.0,
|
||||
peak=MONTH_PEAK, dur=PRE + LOAD + POST, fc="quarter", n=2,
|
||||
choice=None):
|
||||
"""`unit` is in maintenance CHARGE (forced result), at `soc`, the other at
|
||||
`other`. Rows: the plants' power and SoC, the pause flag, the add-on's house
|
||||
estimate and the real house."""
|
||||
rows = []
|
||||
q = dict(q=None, s=0.0, last=None, start=None)
|
||||
idx = 0 if unit == "a" else 1
|
||||
o = "b" if unit == "a" else "a"
|
||||
|
||||
def patch(c):
|
||||
c.maints[idx].tick = (
|
||||
lambda now, soc_, blocked_by=None, gate_open=True: CH)
|
||||
if peak is not None:
|
||||
orig_peak = c.peak.peak
|
||||
|
||||
def peak_(now):
|
||||
r = orig_peak(now)
|
||||
return tariff.PeakReading(tariff.OBSERVED,
|
||||
getattr(r, "month", ""), peak)
|
||||
c.peak.peak = peak_
|
||||
orig = c.cycle
|
||||
|
||||
async def cyc():
|
||||
c.cheap = True
|
||||
if fc and c.grid is not None:
|
||||
g = float(c.grid)
|
||||
now = ctl_cycle.datetime.now() # the replay's clock
|
||||
qi = int(now.timestamp() // 900)
|
||||
if q["q"] != qi:
|
||||
q.update(q=qi, s=0.0, last=now, start=now)
|
||||
el = (now - q["start"]).total_seconds()
|
||||
q["s"] += g * (now - q["last"]).total_seconds()
|
||||
q["last"] = now
|
||||
c.peak_fc = (q["s"] + g * (900.0 - el)) / 900.0
|
||||
await orig()
|
||||
c.cycle = cyc
|
||||
|
||||
def cb(c, h, now, pr):
|
||||
est = (None if c.grid is None or c.site_batt_w is None
|
||||
else float(c.grid) + float(c.site_batt_w))
|
||||
g = c.peak_guard
|
||||
floor = (float(g.floor_w) if g is not None and g.engaged
|
||||
and g.floor_w is not None else 0.0)
|
||||
sh = (dict(c.allocation.shares) if c.allocation is not None
|
||||
and c.allocation.shares else {})
|
||||
au = c.actuator_of("maintenance", c.inverters[idx])
|
||||
ao = c.actuator_of("maintenance", c.inverters[1 - idx])
|
||||
rows.append(dict(
|
||||
t=(now - T0).total_seconds(), grid=h.grid(), u=h.plants[unit].p,
|
||||
o=h.plants[o].p, soc=h.plants[unit].soc, soc_o=h.plants[o].soc,
|
||||
hold=bool(getattr(c, "_maint_peak_hold", False)), est=est,
|
||||
floor=floor, share_u=float(sh.get(au, 0.0)),
|
||||
hi_u=next((float(pl.hi) for pl in (c.allocation.plans
|
||||
if c.allocation else ())
|
||||
if pl.unit == au), None),
|
||||
share_o=float(sh.get(ao, 0.0)),
|
||||
house=h.grid() + sum(p.p for p in h.plants.values())))
|
||||
|
||||
src = house if house is not None else [(sc.UTC0.timestamp() - 10, house_w)]
|
||||
ch = dict(sc.CH_CH if choice is None else choice)
|
||||
stats, c = rp.run("p3_ch_sell", src, sc.WPTS, T0, dur, check=cb, lag=LAG,
|
||||
n=n, soc0={unit: soc, o: other}, choice=ch,
|
||||
refuse=(), patch=patch,
|
||||
extra={"cycle_cost_threshold_eur": 0.10})
|
||||
return rows, stats, c
|
||||
|
||||
|
||||
def flips(rs, k="u"):
|
||||
n, s = 0, 0
|
||||
for r in rs:
|
||||
v = 1 if r[k] > 50 else -1 if r[k] < -50 else 0
|
||||
if v and s and v != s:
|
||||
n += 1
|
||||
if v:
|
||||
s = v
|
||||
return n
|
||||
|
||||
|
||||
def releases(rows):
|
||||
"""Cycles in the load where the pause ended: (row, estimate under the
|
||||
release line while the real house was over it)."""
|
||||
out = []
|
||||
for p, r in zip(rows, rows[1:]):
|
||||
if PRE <= r["t"] < PRE + LOAD and p["hold"] and not r["hold"]:
|
||||
out.append((r, r["est"] is not None and r["est"] < LINE
|
||||
and r["house"] >= LINE))
|
||||
return out
|
||||
|
||||
|
||||
def quarters_ok(st):
|
||||
# SAFETY-126: a landing 0-7 W over the aim is not an overrun.
|
||||
return (max(a[0] / a[1] for a in st["quarters"].values())
|
||||
<= AIM + peakguard.ALARM_MISS_W)
|
||||
|
||||
|
||||
def show(tag, rows, st):
|
||||
load = [r for r in rows if PRE <= r["t"] < PRE + LOAD]
|
||||
rel = releases(rows)
|
||||
print(f" {tag}: flips {flips(load)}, charge s "
|
||||
f"{sum(1 for r in load if r['u'] < -50)}, releases {len(rel)} "
|
||||
f"(stale {sum(1 for _r, s in rel if s)}), lowest SoC "
|
||||
f"{min(r['soc'] for r in rows):.1f} %, give kWh "
|
||||
f"{sum(r['u'] for r in load if r['u'] > 0) / 3.6e6:.2f}, quarters "
|
||||
f"{[round(a[0] / a[1], 1) for a in st['quarters'].values()]}")
|
||||
|
||||
|
||||
# ============================================================================ #
|
||||
print("1. a real peak, A in CHARGE at 49 % (above its reserve), the battery "
|
||||
"reading lagging")
|
||||
rows, st, c = scen(house=stepped_house(3000.0, 6500.0))
|
||||
show("A 49 %", rows, st)
|
||||
load = [r for r in rows if PRE <= r["t"] < PRE + LOAD]
|
||||
rel = releases(rows)
|
||||
after = [r for r in rows if r["t"] >= PRE + LOAD]
|
||||
back = next((i for i, r in enumerate(after) if r["u"] < -50), None)
|
||||
print(f" A's charge back {back} s after the load")
|
||||
check("A flips charge/give 3 times or fewer in the 13 min (1b5f7c9: 60, "
|
||||
"f3f9483: 11)", flips(load) <= 3)
|
||||
check("the pause never ends on an estimate under the release line while the "
|
||||
"real house is over it", not any(s for _r, s in rel))
|
||||
check("every quarter at or under the month aim",
|
||||
quarters_ok(st))
|
||||
check("after the load A's charge is back within 20 cycles (1 s each: a 10 s "
|
||||
"register period plus its settle time, 16 s)",
|
||||
back is not None and back <= 20)
|
||||
|
||||
# M-1 (review 2026-11-14): the F-1 wiring, `_batts_settled()` read at the hold
|
||||
# in ctl_cycle.py. With `settled=True` there the 13-min load above still passes;
|
||||
# the rig shape (the load starts 10 min into the quarter, 45 min long) does not.
|
||||
RIG_PRE, RIG_LOAD = 600.0, 2700.0
|
||||
rows, st, c = scen(house=stepped_house(3000.0, 6500.0, RIG_LOAD, RIG_PRE),
|
||||
dur=RIG_PRE + RIG_LOAD + POST)
|
||||
load45 = [r for r in rows if RIG_PRE <= r["t"] < RIG_PRE + RIG_LOAD]
|
||||
rel45 = [(r, s_) for p, r in zip(rows, rows[1:])
|
||||
if RIG_PRE <= r["t"] < RIG_PRE + RIG_LOAD and p["hold"]
|
||||
and not r["hold"]
|
||||
for s_ in [r["est"] is not None and r["est"] < LINE
|
||||
and r["house"] >= LINE]]
|
||||
print(f" A 49 %, 45 min: flips {flips(load45)}, releases {len(rel45)} "
|
||||
f"(stale {sum(1 for _r, s_ in rel45 if s_)}), quarters "
|
||||
f"{[round(a[0] / a[1]) for a in st['quarters'].values()]}")
|
||||
check("45 min: A flips charge/give 3 times or fewer (f3f9483: 148)",
|
||||
flips(load45) <= 3)
|
||||
check("45 min: no release of the pause on a stale estimate (f3f9483: 83 of 83)",
|
||||
not any(s_ for _r, s_ in rel45))
|
||||
check("45 min: every quarter at or under the month aim", quarters_ok(st))
|
||||
|
||||
# ============================================================================ #
|
||||
print("\n2. the cap: while the pause holds, A gives at most the largest part "
|
||||
"of the guard's floor placed on it this period")
|
||||
rows, st, c = scen(soc=RESERVE + 1.0, house=stepped_house(3000.0, 6500.0))
|
||||
show("A 21 %", rows, st)
|
||||
check("A gives only the guard's claim, under 0.15 kWh (f3f9483 0.94)",
|
||||
sum(r["u"] for r in rows if r["u"] > 0) / 3.6e6 < 0.15)
|
||||
check("A never goes under its peak reserve in the peak (rig: to 10 %)",
|
||||
min(r["soc"] for r in rows) >= RESERVE - 0.5)
|
||||
check("every quarter at or under the month aim", quarters_ok(st))
|
||||
rows, st, c = scen(house=stepped_house(3000.0, 6500.0))
|
||||
soc_start = max(r["soc"] for r in rows if r["t"] <= PRE + 5.0)
|
||||
drop = soc_start - min(r["soc"] for r in rows if r["t"] >= PRE)
|
||||
print(f" A at 49 %: SoC drop {drop:.2f} point")
|
||||
# Owner 2026-11-13 accepted about 0.37 kWh per 45-min peak with the cap
|
||||
# (DECISIONS): 0.37 * 13 / 45 = 0.107 kWh in this load, 0.70 point of
|
||||
# 15.36 kWh. Measured 0.64.
|
||||
check("A at 49 %: its SoC drops no more than the owner-accepted give allows "
|
||||
"(0.70 point in the 13 min; f3f9483 6.1)", drop <= 0.70)
|
||||
rows, st, c = scen(soc=49.0, other=18.2, house=stepped_house(3000.0, 12000.0))
|
||||
show("A 49 %, B 18 % under its reserve, house 12000 W", rows, st)
|
||||
load = [r for r in rows if PRE <= r["t"] < PRE + LOAD]
|
||||
check("the guard's own claim stands: with B under its reserve A gives for "
|
||||
"the peak (over 0.2 kWh; the cap yields to the guard)",
|
||||
sum(r["u"] for r in load if r["u"] > 0) / 3.6e6 > 0.2)
|
||||
g = [("give" if r["u"] > 50 else "idle") for r in load]
|
||||
sw = sum(1 for x, y in zip(g, g[1:]) if x != y)
|
||||
print(f" give/idle switches of A in the load: {sw}")
|
||||
check("...give/idle switches of A at most 10 in the 13 min", sw <= 10)
|
||||
|
||||
def period_max(rows, f):
|
||||
"""Per row: the largest f(row) over the paused rows of its 15-minute
|
||||
period so far (0 W outside the pause), as the owner rule reads."""
|
||||
out, q, m = [], None, 0.0
|
||||
for r in rows:
|
||||
qi = int((T0.timestamp() + r["t"]) // 900)
|
||||
if qi != q or not r["hold"]:
|
||||
q, m = qi, 0.0
|
||||
if r["hold"]:
|
||||
m = max(m, f(r))
|
||||
out.append(m)
|
||||
return out
|
||||
|
||||
|
||||
for tag, ch, hi_w in (("B on Cheap hours", None, 9000.0),
|
||||
("B on Solar first (it gives for the house too)",
|
||||
{"a": sc.CH_CH["a"],
|
||||
"b": (True, packmode.SOLAR_FIRST, False)},
|
||||
12000.0)):
|
||||
rows, st, c = scen(soc=49.0, other=40.0, choice=ch,
|
||||
house=stepped_house(3000.0, hi_w))
|
||||
show(f"A 49 %, B 40 %, both able, {tag}, house {hi_w:.0f} W", rows, st)
|
||||
mf = period_max(rows, lambda r: r["floor"])
|
||||
held_rows = [(r, m) for r, m in zip(rows, mf)
|
||||
if r["hold"] and r["floor"] > 0.0 and r["hi_u"] is not None]
|
||||
n = max(1, len(held_rows))
|
||||
over = sum(1 for r, m in held_rows if r["share_u"] > m + 2.0)
|
||||
# the whole floor, as far as A's rating lets it be A's limit
|
||||
under = sum(1 for r, m in held_rows
|
||||
if r["hi_u"] < min(m, rp.RATING) - 500.0)
|
||||
print(f" {len(held_rows)} paused cycles with a guard floor (mean "
|
||||
f"{sum(r['floor'] for r, _m in held_rows) / n:.0f} W, period's "
|
||||
f"largest {sum(m for _r, m in held_rows) / n:.0f} W): A's limit "
|
||||
f"{sum(r['hi_u'] for r, _m in held_rows) / n:.0f} W, A "
|
||||
f"{sum(r['share_u'] for r, _m in held_rows) / n:.0f} W, B "
|
||||
f"{sum(r['share_o'] for r, _m in held_rows) / n:.0f} W; A over the "
|
||||
f"period's largest floor in {over}; A's limit 500 W or more under it"
|
||||
f" (or A's rating) in {under}")
|
||||
check(f"{tag}: the pause holds with a guard floor for over 5 min",
|
||||
len(held_rows) >= 300)
|
||||
check("...A never gives more than the largest guard floor of the period "
|
||||
"(owner 2026-11-13)", over == 0)
|
||||
if ch is not None:
|
||||
check("...B is placed part of the floor, so A's limit is its own part,"
|
||||
" 500 W or more under the period's largest floor (or A's "
|
||||
"rating) in 9 of 10 cycles (not the whole floor)",
|
||||
under >= 0.9 * len(held_rows))
|
||||
check("...every quarter at or under the month aim", quarters_ok(st))
|
||||
|
||||
rows, st, c = scen(soc=18.2, other=30.0, house=stepped_house(3000.0, 12000.0))
|
||||
show("A 18 % under its reserve, B 30 % able, house 12000 W", rows, st)
|
||||
check("the guard places its claim on the other pack: A under its reserve "
|
||||
"gives under 0.05 kWh and its SoC stays at 18 %",
|
||||
sum(r["u"] for r in rows if r["u"] > 0) / 3.6e6 < 0.05
|
||||
and min(r["soc"] for r in rows) >= 18.0)
|
||||
|
||||
# H-1 (review 2026-11-14, owner decision): while the pause holds, the packs
|
||||
# together give only what the guard needs. The live try: A 11 % in CHARGE (under
|
||||
# its reserve), B 25 % on Cheap hours, 90 min at 6.5 kW.
|
||||
LIVE = 5400.0
|
||||
rp.CAP_KWH = 20.48 # the rig's B; A gives nothing here
|
||||
rows, st, c = scen(soc=11.0, other=25.0,
|
||||
house=stepped_house(3000.0, 6500.0, LIVE, RIG_PRE),
|
||||
dur=RIG_PRE + LIVE + POST)
|
||||
rp.CAP_KWH = 15.36
|
||||
qs = [a[0] / a[1] for a in st["quarters"].values()]
|
||||
load = [r for r in rows if RIG_PRE <= r["t"] < RIG_PRE + LIVE]
|
||||
gb = sum(r["o"] for r in load if r["o"] > 0) / 3.6e6
|
||||
|
||||
|
||||
def switches(k):
|
||||
g = [("give" if r[k] > 50 else "idle") for r in load]
|
||||
return sum(1 for x, y in zip(g, g[1:]) if x != y)
|
||||
|
||||
|
||||
b_low = min((r["soc_o"] for r in rows), default=0.0)
|
||||
print(f" live try: quarters {[round(q) for q in qs]}, B gives {gb:.2f} kWh, "
|
||||
f"B lowest {b_low:.1f} %, give/idle switches A "
|
||||
f"{switches('u')}, B {switches('o')}")
|
||||
check("live try: every quarter at or under the aim + 10 W (07d23d2: 6502 and "
|
||||
"6499 W against the month peak 6000 W)", max(qs) <= AIM + 10.0)
|
||||
check("live try: B gives about its guard part, under 1.5 kWh (1b5f7c9 1.0; "
|
||||
"07d23d2 4.6 kW, 25 -> 10 % in 43 min)", gb < 1.5)
|
||||
check("live try: B's SoC never goes under 19.8 % (1b5f7c9 19.8)",
|
||||
b_low >= 19.8)
|
||||
check("live try: give/idle switches of B at most 40 in the 90 min",
|
||||
switches("o") <= 40)
|
||||
|
||||
# ============================================================================ #
|
||||
print("\n3. mirror: B in CHARGE at 18 % (under its reserve), A on Cheap hours")
|
||||
rows, st, c = scen(unit="b", soc=18.2, other=30.0,
|
||||
house=stepped_house(3000.0, 6500.0))
|
||||
show("B 18 %", rows, st)
|
||||
check("B gives nothing for the house: its SoC never goes under 18 %",
|
||||
min(r["soc"] for r in rows) >= 18.0)
|
||||
check("every quarter at or under the month aim", quarters_ok(st))
|
||||
|
||||
# ============================================================================ #
|
||||
print("\n4. unchanged: the MAINT-24 live shape with the lagging reading")
|
||||
rl, sl, cl = scen(house_w=3000.0, dur=600.0)
|
||||
body = rl[len(rl) // 6:]
|
||||
mean_a = sum(r["u"] for r in body) / len(body)
|
||||
mean_b = sum(r["o"] for r in body) / len(body)
|
||||
print(f" A {mean_a:+.0f} W, B {mean_b:+.0f} W, pause "
|
||||
f"{sum(r['hold'] for r in rl)} cycles")
|
||||
check("A charges about 1475 W (-1500..-1440) and the pause never comes",
|
||||
-1500.0 <= mean_a <= -1440.0 and not any(r["hold"] for r in rl))
|
||||
check("B does not trade with the grid (Cheap hours, nothing to charge it)",
|
||||
abs(mean_b) < 100.0)
|
||||
|
||||
# ============================================================================ #
|
||||
print("\n5. peakguard.shaping_held() with `settled`; Controller._batts_settled()")
|
||||
check("the rule exists (MAINT_STEP_W, _batts_settled)",
|
||||
hasattr(ctl_trade, "MAINT_STEP_W") and hasattr(ctl_trade.TradeMixin,
|
||||
"_batts_settled"))
|
||||
if not hasattr(ctl_trade, "MAINT_STEP_W"):
|
||||
print(f"\n{len(fails)} FAILED:")
|
||||
for f in fails:
|
||||
print(f" - {f}")
|
||||
sys.exit(1)
|
||||
U = peakguard.MAINT_RESUME_UNDER_W
|
||||
idle = peakguard.PeakDecision(engaged=False, floor_w=None, ceiling_w=6000.0,
|
||||
ceiling_from="x", target_w=AIM)
|
||||
|
||||
|
||||
def held(was, fc, house, settled):
|
||||
return peakguard.shaping_held(
|
||||
peakguard.shaping_suspended(idle, fc, AIM), was, fc, AIM, house,
|
||||
settled)
|
||||
|
||||
|
||||
check("held, house under the line but not settled: stays paused",
|
||||
held(True, AIM - 1, AIM - U - 100.0, False))
|
||||
check("held, house under the line and settled: resumes",
|
||||
not held(True, AIM - 1, AIM - U - 100.0, True))
|
||||
check("not held: settled makes no difference",
|
||||
not held(False, AIM - 1, 6500.0, False))
|
||||
check("neither the house nor the forecast read: no pause, settled or not "
|
||||
"(SAFETY-63)",
|
||||
not held(True, None, None, False))
|
||||
|
||||
|
||||
class _Fresh:
|
||||
def __init__(self, changed):
|
||||
self.changed_mono = changed
|
||||
|
||||
|
||||
class _Inv:
|
||||
def __init__(self, name, cmd, changed):
|
||||
self.name, self.cmd = name, cmd
|
||||
self.batt_fresh = _Fresh(changed)
|
||||
|
||||
def standing_w(self):
|
||||
return self.cmd
|
||||
|
||||
|
||||
class _Ctl:
|
||||
_batts_settled = getattr(ctl_trade.TradeMixin, "_batts_settled", None)
|
||||
|
||||
def __init__(self, invs):
|
||||
self.inverters, self._m28_step, self._now_mono = invs, {}, 0.0
|
||||
|
||||
|
||||
S = freshness.PLANT_SETTLE_S
|
||||
a = _Inv("a", -1500.0, 0.0)
|
||||
k = _Ctl([a, _Inv("b", 0.0, 0.0)])
|
||||
check("no step seen yet: settled", k._batts_settled())
|
||||
a.cmd = 500.0
|
||||
k._now_mono = 100.0
|
||||
check("a step up of the command: not settled", not k._batts_settled())
|
||||
k._now_mono = 100.0 + S - 0.5
|
||||
a.batt_fresh.changed_mono = 100.0 + S - 1.0
|
||||
check("...a reading that arrived before step + settle does not count",
|
||||
not k._batts_settled())
|
||||
a.batt_fresh.changed_mono = 100.0 + S
|
||||
k._now_mono = 100.0 + S
|
||||
check("...one that arrived at step + settle does", k._batts_settled())
|
||||
a.cmd = 3000.0
|
||||
k._now_mono = 200.0
|
||||
check("a second step up; the old reading is not current",
|
||||
not k._batts_settled())
|
||||
k._now_mono = 200.0 + freshness.BATT_OBLIGED_S
|
||||
check("...and a reading that never changes is waited for no longer than "
|
||||
"BATT_OBLIGED_S", k._batts_settled())
|
||||
a.cmd = -1500.0
|
||||
k._now_mono = 400.0
|
||||
check("a step down (less give: the estimate errs high) is no step",
|
||||
k._batts_settled())
|
||||
a2 = _Inv("a", -1500.0, 0.0)
|
||||
k2 = _Ctl([a2])
|
||||
k2._batts_settled()
|
||||
a2.cmd, k2._now_mono = -1500.0 + ctl_trade.MAINT_STEP_W - 1.0, 1.0
|
||||
check("a move under ctl_trade.MAINT_STEP_W is no step", k2._batts_settled())
|
||||
a2.cmd = -1500.0 + ctl_trade.MAINT_STEP_W
|
||||
check("...one of ctl_trade.MAINT_STEP_W is", not k2._batts_settled())
|
||||
|
||||
# Per unit: the cap so far lives under each unit's own key, and only one pack
|
||||
# can be in maintenance CHARGE at all (maintenance.arbitrate(): one slot).
|
||||
au, ab = (cl.actuator_of("maintenance", i) for i in cl.inverters)
|
||||
t = T0 + timedelta(seconds=60)
|
||||
cl._m28_hi = {au: (int(t.timestamp() // 900), 3000.0)}
|
||||
check("the period's cap is kept per unit: A's 3000 W is not B's",
|
||||
cl._m28_was(au, t) == 3000.0 and cl._m28_was(ab, t) == 0.0)
|
||||
check("...and it starts again from 0 W in the next 15-minute period",
|
||||
cl._m28_was(au, t + timedelta(seconds=900)) == 0.0)
|
||||
|
||||
|
||||
class _M:
|
||||
def __init__(self, name):
|
||||
self.name, self.phase = name, maintenance.CHARGE
|
||||
|
||||
|
||||
check("maintenance.arbitrate(): with two packs in CHARGE only the first keeps "
|
||||
"the slot", maintenance.arbitrate([_M("a"), _M("b")], t)[1] != ""
|
||||
and maintenance.arbitrate([_M("a"), _M("b")], t)[0] == "")
|
||||
|
||||
print()
|
||||
if fails:
|
||||
print(f"{len(fails)} FAILED:")
|
||||
for f in fails:
|
||||
print(f" - {f}")
|
||||
sys.exit(1)
|
||||
print("all checks passed")
|
||||
@@ -1148,7 +1148,10 @@ check("⚠️ MAIN.PY ACTUALLY PASSES `weights=`, AND IT PASSES THE METHOD RATHE
|
||||
"could do - and no fixture anywhere could see that, because every check "
|
||||
"calls `resolve()` for itself. A method, not a dict, because the "
|
||||
"weighting is direction-dependent and the direction is stage 2's output",
|
||||
len(_resolve_calls) == 1 and _w_arg == ["self.pack_weights"])
|
||||
# MAINT-28 added a second call (`_m28_share()`'s split without the
|
||||
# paused pack's cap); it must pass the same method, as the cycle's does.
|
||||
len(_resolve_calls) >= 1
|
||||
and _w_arg == ["self.pack_weights"] * len(_resolve_calls))
|
||||
|
||||
# ⚠️ AC 3 SAYS `unmet_w` MUST BE **VISIBLE**, AND `Allocation.explain()` IS ONLY
|
||||
# HALF OF THAT. The other half is main.py putting it in the action log, which no
|
||||
|
||||
@@ -116,6 +116,7 @@ from math import inf, isinf
|
||||
from pathlib import Path
|
||||
|
||||
from app import messages
|
||||
from app import ctl_cycle as _ctl_cycle
|
||||
from app import peakguard
|
||||
from named_absence import first, given, nth, present
|
||||
|
||||
@@ -2787,9 +2788,22 @@ def cycle_claims(run):
|
||||
return out, (seen[-1] if seen else [])
|
||||
|
||||
|
||||
def run_cycle(ctl):
|
||||
asyncio.get_event_loop_policy().new_event_loop().run_until_complete(
|
||||
ctl.cycle())
|
||||
def run_cycle(ctl, at=None):
|
||||
"""One `Controller.cycle()`. `at` pins the `now` that cycle() takes
|
||||
(ctl_cycle.py:49) so a fixture laid up to `at` does not age with host load.
|
||||
Other modules still read the real clock. CI-17."""
|
||||
real_dt = _ctl_cycle.datetime
|
||||
if at is not None:
|
||||
class _Pinned(datetime):
|
||||
@classmethod
|
||||
def now(cls, tz=None):
|
||||
return at if tz is None else at.astimezone(tz)
|
||||
_ctl_cycle.datetime = _Pinned
|
||||
try:
|
||||
asyncio.get_event_loop_policy().new_event_loop().run_until_complete(
|
||||
ctl.cycle())
|
||||
finally:
|
||||
_ctl_cycle.datetime = real_dt
|
||||
return ctl
|
||||
|
||||
|
||||
@@ -2801,11 +2815,15 @@ def run_cycle(ctl):
|
||||
EVE_MEAN_W = sum(EVE_W) / len(EVE_W)
|
||||
c_src, _ = built(TMP / "sources.db")
|
||||
c_src.auto, c_src.batt, c_src.soc = True, 0.0, 100.0
|
||||
# CI-17: ONE read of the clock, and every cycle on c_src runs AT it. The
|
||||
# telegrams end here; `cycle()` used to read the real clock again, 1.3 s later
|
||||
# per cycle under --cpus 0.25, so by the 23rd cycle of the sweep the meter's
|
||||
# last telegram was older than `max_hold_s` (30 s), the guard counted the gap at
|
||||
# its ceiling and filed `peak@site` (ctl_cycle.py:49 -> p1.py max_hold_s).
|
||||
_SRC_NOW = datetime.now(timezone.utc)
|
||||
_blk_src = datetime.fromtimestamp(
|
||||
int(datetime.now(timezone.utc).timestamp() // QUARTER_S) * QUARTER_S,
|
||||
timezone.utc)
|
||||
for _i in range(0, int((datetime.now(timezone.utc)
|
||||
- _blk_src).total_seconds()) + 1, 5):
|
||||
int(_SRC_NOW.timestamp() // QUARTER_S) * QUARTER_S, timezone.utc)
|
||||
for _i in range(0, int((_SRC_NOW - _blk_src).total_seconds()) + 1, 5):
|
||||
c_src.p1.submit(sample(_blk_src + timedelta(seconds=_i), EVE_MEAN_W))
|
||||
c_src.grid = EVE_MEAN_W
|
||||
|
||||
@@ -2817,7 +2835,7 @@ SRC_SWEEP = sorted({float(s) for s in range(0, 101, 5)}
|
||||
IDLE_SRC = {}
|
||||
for _soc in SRC_SWEEP:
|
||||
c_src.soc = _soc
|
||||
_, _cl = cycle_claims(lambda: run_cycle(c_src))
|
||||
_, _cl = cycle_claims(lambda: run_cycle(c_src, at=_SRC_NOW))
|
||||
IDLE_SRC[_soc] = frozenset(c.source for c in _cl)
|
||||
IDLE_SETS = set(IDLE_SRC.values())
|
||||
print(f" a real idle cycle at {len(SRC_SWEEP)} states of charge "
|
||||
@@ -3141,7 +3159,7 @@ _b2, _restore_b2 = second_inverter(c_src)
|
||||
_b2.bms_soc_floor = c_src.inverters[0].bms_soc_floor
|
||||
_n2_writes_before = len(c_src.hass.per_entity)
|
||||
try:
|
||||
_, _cl2 = cycle_claims(lambda: run_cycle(c_src))
|
||||
_, _cl2 = cycle_claims(lambda: run_cycle(c_src, at=_SRC_NOW))
|
||||
_n2_target, _n2_reason = c_src.target, c_src.reason
|
||||
_n2_events = list(c_src.events)
|
||||
_n2_writes = c_src.hass.per_entity[_n2_writes_before:]
|
||||
@@ -3337,7 +3355,7 @@ check("...and the action log no longer carries the 'no writer' refusal, "
|
||||
_nw, _restore_nw = second_inverter(c_src, name="inverter-c", setpoint="")
|
||||
_nw_writes_before = len(c_src.hass.per_entity)
|
||||
try:
|
||||
_, _cl_nw = cycle_claims(lambda: run_cycle(c_src))
|
||||
_, _cl_nw = cycle_claims(lambda: run_cycle(c_src, at=_SRC_NOW))
|
||||
_nw_target, _nw_reason = c_src.target, c_src.reason
|
||||
_nw_events = list(c_src.events)
|
||||
_nw_writes = c_src.hass.per_entity[_nw_writes_before:]
|
||||
@@ -3382,16 +3400,21 @@ check("...and the 0 W is NOT what the site target happened to be - the same "
|
||||
# method is asked, which is what makes this a check on `live_units()` instead of
|
||||
# a check on a lambda this file wrote.
|
||||
_bs, _restore_bs = second_inverter(c_src)
|
||||
_bs.rejected_since = datetime.now(timezone.utc) - timedelta(
|
||||
seconds=app_main.LINK_STALE_S + 5)
|
||||
# CI-17: from `_SRC_NOW`, the instant the pinned cycles run at; the real clock
|
||||
# is later, so `live_units()` (real clock) and the cycle (pinned) agree.
|
||||
_bs.rejected_since = _SRC_NOW - timedelta(seconds=app_main.LINK_STALE_S + 5)
|
||||
_bs.last_write_ok = False
|
||||
_stale_writes_before = len(c_src.hass.per_entity)
|
||||
try:
|
||||
check("CI-17: the pinned clock and the real clock agree that inverter B's "
|
||||
"link is stale, so the cycle and `live_units()` see the same roster",
|
||||
not _bs.is_live(_SRC_NOW)[0]
|
||||
and not _bs.is_live(datetime.now(timezone.utc))[0])
|
||||
check("PRECONDITION: the SHIPPED `live_units()` - not a lambda - drops the "
|
||||
"inverter whose writes have been rejected for a whole layer-1 window, "
|
||||
"and keeps the healthy one",
|
||||
c_src.live_units() == ("inverter-a",))
|
||||
_, _cl_stale = cycle_claims(lambda: run_cycle(c_src))
|
||||
_, _cl_stale = cycle_claims(lambda: run_cycle(c_src, at=_SRC_NOW))
|
||||
_stale_target = c_src.target
|
||||
_stale_alloc = c_src.allocation
|
||||
_stale_events = list(c_src.events)
|
||||
@@ -3433,14 +3456,13 @@ check("⚠️ AND IT DOES NOT ABSORB IT SILENTLY, which is the whole of AC 6 and
|
||||
# state `live_units()`'s own docstring warns about - the sole inverter dropping
|
||||
# takes the SITE to 0 W - so it is driven here rather than left as a sentence.
|
||||
_bd, _restore_bd = second_inverter(c_src)
|
||||
_gone = datetime.now(timezone.utc) - timedelta(
|
||||
seconds=app_main.LINK_STALE_S + 5)
|
||||
_gone = _SRC_NOW - timedelta(seconds=app_main.LINK_STALE_S + 5) # CI-17: as above
|
||||
_bd.rejected_since, _bd.last_write_ok = _gone, False
|
||||
c_src.inverters[0].rejected_since = _gone
|
||||
c_src.inverters[0].last_write_ok = False
|
||||
_dead_writes_before = len(c_src.hass.per_entity)
|
||||
try:
|
||||
_, _cl_dead = cycle_claims(lambda: run_cycle(c_src))
|
||||
_, _cl_dead = cycle_claims(lambda: run_cycle(c_src, at=_SRC_NOW))
|
||||
_dead_target, _dead_reason = c_src.target, c_src.reason
|
||||
_dead_alloc = c_src.allocation
|
||||
_dead_events = list(c_src.events)
|
||||
|
||||
@@ -481,6 +481,17 @@ print("\n8. the N=1 and N=2 digests")
|
||||
# quarter's room, as at N=2, so the guard no longer steps in and discharges.
|
||||
# The banked quarters go 3461.9 -> 3450.0 W (aim 3450) and 3938.9 -> 3950.0
|
||||
# W (aim 3950). n1_charge_dear (no cheap window) is unchanged.
|
||||
# MAINT-28 re-pinned n2_charge_banked: in the 5000 W load (over the 3950 W
|
||||
# aim) the maintenance charge no longer restarts at -125 W after each guard
|
||||
# stop (t=1550 s, 64 of 480 rows); the pause is held until the load is gone
|
||||
# (DECISIONS/MAINT-28-hold-the-pause-in-a-peak.md). MAINT-28 fix-forward
|
||||
# re-pinned it again: while the pause holds A gives at most the largest part
|
||||
# of the guard's floor placed on it this period, so rows 288-479 (t = 1440 s
|
||||
# on, 192 of 480) differ: a "peak hold" limit claim on A and A's share. Round 5
|
||||
# (H-1) re-pinned it again: one site limit, the period's largest floor, so the
|
||||
# batteries give only what the guard needs. Its banked quarters stay at or
|
||||
# under the aim 3950 W (3349 and 3950 W; f3f9483 3349 and 2527 W), graded
|
||||
# below. The other five are equal.
|
||||
PINNED = {
|
||||
"n1_charge":
|
||||
"00f0a16b3ac1bd2830e9e0aaac8923fd9d1736c2bc6c543669bdd35b2fb542e9",
|
||||
@@ -493,8 +504,14 @@ PINNED = {
|
||||
"n2_charge_dear":
|
||||
"aa2bbc677a8e2274b25ba1170de1b1635e08a3bd93105e2a38a9bb1575b5b6db",
|
||||
"n2_charge_banked":
|
||||
"a6973faea916e4c88ca1770047f94478346eeb1efa4889b154fad0747f91267f",
|
||||
"358ebd2a23fe7c7f52f441b60391e40c6605e32bcfb109fa0ff4502d4070745e",
|
||||
}
|
||||
_nb_rows, _nb = s84.run(**s84.SCENARIOS["n2_charge_banked"])
|
||||
print(f" n2_charge_banked banked quarters {[round(v, 1) for v in banked(_nb)]}"
|
||||
f" W (aim 3950)")
|
||||
check("...and in the re-pinned n2_charge_banked every banked quarter is at or "
|
||||
"under the aim 3950 W",
|
||||
len(banked(_nb)) >= 2 and all(v <= 3950.0 + 1.0 for v in banked(_nb)))
|
||||
_now = s84.digests()
|
||||
for k in PINNED:
|
||||
print(f" {k} {'same' if _now[k] == PINNED[k] else 'DIFFERS'} "
|
||||
|
||||
@@ -637,9 +637,10 @@ _routes = sorted({(r.method, r.get_info().get("path"))
|
||||
for r in _app.router.routes() if r.method != "HEAD"})
|
||||
print(" " + " ".join(f"{m} {p}" for m, p in _routes))
|
||||
check("the configuration surface adds five routes, UX-13 one GET and "
|
||||
"UX-54 one more GET (the Forecast tab), and none touches the three "
|
||||
"UX-54 one more GET (the Forecast tab), EV-03 one read-only GET (the car "
|
||||
"charger probe), and none touches the three "
|
||||
"that were there",
|
||||
_routes == [("GET", "/"), ("GET", "/config"), ("GET", "/config/model"),
|
||||
_routes == [("GET", "/"), ("GET", "/config"), ("GET", "/config/charger"), ("GET", "/config/model"),
|
||||
("GET", "/forecast"), ("GET", "/ha/entities"),
|
||||
("GET", "/status"),
|
||||
("POST", "/action"), ("POST", "/config/restart"),
|
||||
|
||||
@@ -80,12 +80,13 @@ for _g in LAYOUT["groups"]:
|
||||
_flat += [(_g["id"], _s) for _s in _f.get("fields", [])]
|
||||
_keys = [f["key"] for _g, f in _flat]
|
||||
FIELD = {f["key"]: f for _g, f in _flat}
|
||||
check("the six groups, in the design's order",
|
||||
check("the seven groups, in the design's order",
|
||||
[g["id"] for g in LAYOUT["groups"]]
|
||||
== ["meter", "inverters", "tariff", "safety", "maintenance", "tuning"]
|
||||
== ["meter", "inverters", "tariff", "safety", "car", "maintenance",
|
||||
"tuning"]
|
||||
and [g["name"] for g in LAYOUT["groups"]]
|
||||
== ["Meter", "Inverters and batteries", "Tariff and prices",
|
||||
"Safety limits", "Maintenance", "Control tuning"])
|
||||
"Safety limits", "Car charger", "Maintenance", "Control tuning"])
|
||||
check(f"every field of the table is on the page once ({len(_keys)} fields)",
|
||||
sorted(_keys) == sorted(f.key for _g, _p, f in L.fields())
|
||||
and len(_keys) == len(set(_keys)))
|
||||
@@ -146,7 +147,7 @@ check("a page-only field names the option keys it writes, for the grey key "
|
||||
== ["pv_entities", "pv_entity", "pv_invert_entities"]
|
||||
and "static_profile" in field(FIELD, "ui.contract")["writes"])
|
||||
check("without a Supervisor schema the page still draws, with no ranges",
|
||||
len(uipage.layout([], {})["groups"]) == 6)
|
||||
len(uipage.layout([], {})["groups"]) == 7)
|
||||
|
||||
# --------------------------------------------------------------------------- #
|
||||
print("\n2. the page script names no option key")
|
||||
|
||||
@@ -205,10 +205,11 @@ print("\n4. task ordering, and the labels that carry it")
|
||||
# prefixes appear in the file as CONTIGUOUS RUNS in the task order. A group
|
||||
# whose members are scattered renders as a jumble however good each label is.
|
||||
GROUPS = ["Hardware", "Meter", "Limits", "Tariff", "Maintenance", "Safety",
|
||||
"Advanced"]
|
||||
"Car charger", "Advanced"]
|
||||
NL_GROUPS = {"Hardware": "Hardware", "Meter": "Meter", "Limits": "Grenzen",
|
||||
"Tariff": "Tarief", "Maintenance": "Onderhoud",
|
||||
"Safety": "Veiligheid", "Advanced": "Geavanceerd"}
|
||||
"Safety": "Veiligheid", "Car charger": "Laadpaal",
|
||||
"Advanced": "Geavanceerd"}
|
||||
_prefixes = []
|
||||
for key in ORDER:
|
||||
name = TR["en"]["configuration"][key]["name"]
|
||||
|
||||
@@ -0,0 +1,268 @@
|
||||
#!/usr/bin/env python3
|
||||
"""EV-03: a model of an Alfen car charger behind Home Assistant, for the unit
|
||||
tests and, later, for TEST-23.
|
||||
|
||||
WHERE IT LIVES, AND WHY. The rig's hardware sims (`hwsim.py`, `plantsim.py`) are
|
||||
in the infra repo admin/goodwe under `sim/`, pinned by `.gitea/infra-pin`; there
|
||||
is no `sim/` in this repository. This card may write only to this repository, so
|
||||
the model sits beside the add-on's other tools. Moving it next to `hwsim.py` is a
|
||||
copy: it imports nothing from the add-on.
|
||||
|
||||
WHAT IT MODELS (every entity the add-on's Alfen driver reads, with the names and
|
||||
units the leeyuentuen/alfen_wallbox integration gives, from the owner's export):
|
||||
|
||||
* mode3 state A (no car), B (connected, not charging), C (charging)
|
||||
* power that RAMPS to what the car takes (`RAMP_W_S`), 1 or 3 phases
|
||||
* the current setpoint, its read-back, the station limit (16 A at the owner's)
|
||||
* a full car (it stops by itself: state B with the current still allowed)
|
||||
* the integration going unavailable, and the login sensor off
|
||||
|
||||
from chargersim import SimCharger, FakeHa
|
||||
c = SimCharger("wallbox"); c.plug_in(); c.set_current(10); c.tick(30)
|
||||
ha = FakeHa(c) # a Home Assistant that serves its states
|
||||
|
||||
`FakeHa` has the methods the add-on calls (`state`, `number`, `states`,
|
||||
`set_number`, `call`) and RECORDS every write, so a test can prove none happened.
|
||||
`python3 chargersim.py --selftest` runs the model's own checks. `serve(port)`
|
||||
answers the REST calls the add-on makes (`GET /api/states[/<id>]`), for a rig.
|
||||
"""
|
||||
|
||||
import json
|
||||
import sys
|
||||
|
||||
VOLTS = 230.0
|
||||
RAMP_W_S = 3000.0 # how fast the power follows its target
|
||||
MIN_A = 6.0
|
||||
|
||||
|
||||
class SimCharger:
|
||||
def __init__(self, name="wallbox", station_a=16.0, setpoint_a=10.0,
|
||||
phases_allowed=1, kwh=4004.85):
|
||||
self.x = name
|
||||
self.station_a = float(station_a)
|
||||
self.setpoint_a = float(setpoint_a)
|
||||
self.readback_a = float(setpoint_a)
|
||||
self.phases_allowed = phases_allowed
|
||||
self.car_phases = 3 # what the car can use
|
||||
self.state = "A"
|
||||
self.full = False
|
||||
self.power_w = 0.0
|
||||
self.kwh = float(kwh)
|
||||
self.unavailable = False
|
||||
self.login_on = True
|
||||
self.error = "0: No Error"
|
||||
|
||||
# -- the world acts on it -------------------------------------------------
|
||||
def plug_in(self, car_phases=3):
|
||||
self.car_phases = car_phases
|
||||
self.full = False
|
||||
self.state = "B"
|
||||
|
||||
def unplug(self):
|
||||
self.state, self.power_w = "A", 0.0
|
||||
|
||||
def car_full(self):
|
||||
self.full = True
|
||||
|
||||
def set_current(self, a):
|
||||
"""What an automation (or, later, this add-on) does to the setpoint."""
|
||||
a = max(0.0, min(float(a), self.station_a))
|
||||
self.setpoint_a = self.readback_a = a
|
||||
|
||||
def set_phases(self, n):
|
||||
self.phases_allowed = 3 if n == 3 else 1
|
||||
|
||||
def fault(self, letter="E"):
|
||||
"""mode3 E or F: the charger's own error states."""
|
||||
self.state, self.power_w = letter, 0.0
|
||||
|
||||
def go_unavailable(self, on=True):
|
||||
self.unavailable = bool(on)
|
||||
|
||||
def login(self, on=True):
|
||||
self.login_on = bool(on)
|
||||
|
||||
# -- time -----------------------------------------------------------------
|
||||
@property
|
||||
def phases_used(self):
|
||||
return min(self.car_phases, self.phases_allowed)
|
||||
|
||||
def target_w(self):
|
||||
if self.state == "A" or self.full or self.setpoint_a < MIN_A:
|
||||
return 0.0
|
||||
return self.setpoint_a * VOLTS * self.phases_used
|
||||
|
||||
def tick(self, seconds=1.0):
|
||||
for _ in range(int(max(1, round(seconds)))):
|
||||
if self.state in ("E", "F"): # a fault: nothing flows, it stays
|
||||
self.power_w = 0.0
|
||||
continue
|
||||
if self.state != "A":
|
||||
self.state = "C" if self.target_w() > 0 else "B"
|
||||
tgt = self.target_w()
|
||||
step = RAMP_W_S
|
||||
if self.power_w < tgt:
|
||||
self.power_w = min(tgt, self.power_w + step)
|
||||
else:
|
||||
self.power_w = max(tgt, self.power_w - step)
|
||||
self.kwh += self.power_w / 3.6e6
|
||||
|
||||
# -- what Home Assistant would serve ---------------------------------------
|
||||
def _amps(self):
|
||||
per = (self.power_w / (VOLTS * self.phases_used)
|
||||
if self.phases_used and self.power_w else 0.0)
|
||||
return [per if i < self.phases_used else 0.0 for i in range(3)]
|
||||
|
||||
def states(self) -> dict:
|
||||
x = self.x
|
||||
bad = "unavailable" if self.unavailable else None
|
||||
|
||||
def st(eid, value, unit=None, **attrs):
|
||||
a = dict(attrs)
|
||||
if unit:
|
||||
a["unit_of_measurement"] = unit
|
||||
return eid, {"entity_id": eid,
|
||||
"state": bad or str(value), "attributes": a}
|
||||
amps = self._amps()
|
||||
rows = [
|
||||
st(f"number.{x}_power_connector_max_current_socket_1",
|
||||
f"{self.setpoint_a:g}", "A", min=0, max=40, step=1),
|
||||
st(f"sensor.{x}_main_active_max_current_socket_1",
|
||||
f"{self.readback_a:g}", "A"),
|
||||
st(f"sensor.{x}_mode3_state_socket_1", f"STATE_{self.state}"),
|
||||
st(f"sensor.{x}_display_state_socket_1",
|
||||
{"A": "Available", "B": "EV Connected",
|
||||
"C": "Charging Normal"}.get(self.state, "Error")),
|
||||
st(f"sensor.{x}_active_power_total_socket_1",
|
||||
f"{self.power_w:.0f}", "W"),
|
||||
st(f"sensor.{x}_meter_reading_socket_1", f"{self.kwh:.2f}",
|
||||
"kWh"),
|
||||
st(f"sensor.{x}_current_l1_socket_1", f"{amps[0]:.1f}", "A"),
|
||||
st(f"sensor.{x}_current_l2_socket_1", f"{amps[1]:.1f}", "A"),
|
||||
st(f"sensor.{x}_current_l3_socket_1", f"{amps[2]:.1f}", "A"),
|
||||
st(f"number.{x}_max_station_current", f"{self.station_a:g}", "A"),
|
||||
st(f"sensor.{x}_main_station_active_max_current_socket_1",
|
||||
f"{self.station_a:g}", "A"),
|
||||
st(f"select.{x}_installation_max_allowed_phases",
|
||||
"3 Phases" if self.phases_allowed == 3 else "1 Phase"),
|
||||
st(f"sensor.{x}_connector_1_max_allowed_of_phases",
|
||||
"3 Phases" if self.phases_allowed == 3 else "1 Phase"),
|
||||
st(f"sensor.{x}_display_error_number_socket_1", self.error),
|
||||
(f"binary_sensor.{x}_https_api_login_status",
|
||||
{"entity_id": f"binary_sensor.{x}_https_api_login_status",
|
||||
"state": bad or ("on" if self.login_on else "off"),
|
||||
"attributes": {"device_class": "connectivity"}}),
|
||||
]
|
||||
return dict(rows)
|
||||
|
||||
|
||||
class FakeHa:
|
||||
"""A Home Assistant that serves a `SimCharger` (and any `extra` states) and
|
||||
records every service call and number write it is given."""
|
||||
|
||||
session = None
|
||||
token = ""
|
||||
read_only = False
|
||||
|
||||
def __init__(self, charger=None, extra=None):
|
||||
self.charger = charger
|
||||
self.extra = dict(extra or {})
|
||||
self.calls = [] # (domain, service, data)
|
||||
self.sets = [] # (entity, value)
|
||||
|
||||
def _all(self):
|
||||
out = dict(self.extra)
|
||||
if self.charger is not None:
|
||||
out.update(self.charger.states())
|
||||
return out
|
||||
|
||||
async def state(self, entity_id):
|
||||
return self._all().get(entity_id)
|
||||
|
||||
async def states(self):
|
||||
return list(self._all().values())
|
||||
|
||||
async def number(self, entity_id, invert=False):
|
||||
s = self._all().get(entity_id)
|
||||
try:
|
||||
v = float(s["state"])
|
||||
except (TypeError, ValueError, KeyError):
|
||||
return None
|
||||
return -v if invert else v
|
||||
|
||||
async def limits(self, _entity_id):
|
||||
return (-5000.0, 5000.0, 1.0)
|
||||
|
||||
async def set_number(self, entity_id, value):
|
||||
self.sets.append((entity_id, value))
|
||||
return True
|
||||
|
||||
async def call(self, domain, service, data=None):
|
||||
self.calls.append((domain, service, data))
|
||||
return True
|
||||
|
||||
def charger_writes(self):
|
||||
"""Every write or service call that names a charger entity."""
|
||||
x = self.charger.x if self.charger else "\0"
|
||||
hits = [s for s in self.sets if x in s[0]]
|
||||
hits += [c for c in self.calls if x in json.dumps(c[2] or {})]
|
||||
return hits
|
||||
|
||||
|
||||
def serve(sim, port=8123):
|
||||
"""Answer `GET /api/states` and `GET /api/states/<id>` from `sim`, for a
|
||||
rig. Reads only: any POST answers 405, so nothing can write the model."""
|
||||
import http.server
|
||||
|
||||
class H(http.server.BaseHTTPRequestHandler):
|
||||
def do_GET(self):
|
||||
rows = sim.states()
|
||||
path = self.path.split("?")[0].rstrip("/")
|
||||
if path.endswith("/api/states"):
|
||||
body = list(rows.values())
|
||||
else:
|
||||
body = rows.get(path.rsplit("/api/states/", 1)[-1])
|
||||
self.send_response(200 if body is not None else 404)
|
||||
self.send_header("Content-Type", "application/json")
|
||||
self.end_headers()
|
||||
self.wfile.write(json.dumps(body).encode())
|
||||
|
||||
def do_POST(self):
|
||||
self.send_response(405)
|
||||
self.end_headers()
|
||||
|
||||
def log_message(self, *_a):
|
||||
pass
|
||||
|
||||
srv = http.server.ThreadingHTTPServer(("0.0.0.0", port), H)
|
||||
return srv
|
||||
|
||||
|
||||
def _selftest():
|
||||
c = SimCharger()
|
||||
assert c.states()[f"sensor.wallbox_mode3_state_socket_1"]["state"] == "STATE_A"
|
||||
c.plug_in(); c.tick(1)
|
||||
assert c.state == "B" or c.state == "C"
|
||||
c.set_current(10); c.set_phases(3); c.tick(5)
|
||||
assert c.state == "C" and abs(c.power_w - 10 * 230 * 3) < 1, c.power_w
|
||||
c.set_phases(1); c.tick(5)
|
||||
assert abs(c.power_w - 2300) < 1
|
||||
c.set_current(5); c.tick(5)
|
||||
assert c.state == "B" and c.power_w == 0 # under 6 A: paused
|
||||
c.set_current(10); c.car_full(); c.tick(5)
|
||||
assert c.state == "B" and c.power_w == 0 and c.readback_a == 10
|
||||
c.go_unavailable()
|
||||
assert c.states()[f"sensor.wallbox_active_power_total_socket_1"]["state"] \
|
||||
== "unavailable"
|
||||
c.go_unavailable(False); c.login(False)
|
||||
assert c.states()["binary_sensor.wallbox_https_api_login_status"]["state"] == "off"
|
||||
print("chargersim selftest ok")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
if "--selftest" in sys.argv:
|
||||
_selftest()
|
||||
else:
|
||||
srv = serve(SimCharger(), int(sys.argv[1]) if len(sys.argv) > 1 else 8123)
|
||||
print("serving the charger model, GET only; Ctrl-C stops it")
|
||||
srv.serve_forever()
|
||||
@@ -116,10 +116,15 @@ class Lag:
|
||||
after the reading (the HA source's debounce), so a cycle just after a
|
||||
quarter boundary can still see the old block; `tick` the cycle period;
|
||||
`tau_s` / `ramp_w_s` the battery's own lag (TEST-23's plant: `dead_s` 1,
|
||||
no lag or ramp)."""
|
||||
no lag or ramp). `batt_period_s` (MAINT-28): the battery register is
|
||||
published every that many seconds and held between (the rig: 10 s), so its
|
||||
reading is `batt_s` plus up to a period older than the meter's; None keeps
|
||||
the constant age."""
|
||||
|
||||
def __init__(self, dead_s=1.0, meter_s=1.0, batt_s=1.0, p1_s=0.35,
|
||||
tick=1.0, sub=0.25, tau_s=3.0, ramp_w_s=800.0):
|
||||
tick=1.0, sub=0.25, tau_s=3.0, ramp_w_s=800.0,
|
||||
batt_period_s=None):
|
||||
self.batt_period_s = batt_period_s
|
||||
self.dead_s, self.meter_s, self.batt_s = dead_s, meter_s, batt_s
|
||||
self.p1_s, self.tick, self.sub = p1_s, tick, sub
|
||||
self.tau_s, self.ramp_w_s = tau_s, ramp_w_s
|
||||
@@ -211,6 +216,11 @@ class Hass:
|
||||
if e.startswith("sensor.batt"):
|
||||
# A real reading jitters by a few watts; a dead-flat one is a
|
||||
# stale register to the add-on (SAFETY-37), which is not modelled.
|
||||
if self.lag is not None and self.lag.batt_period_s:
|
||||
per = self.lag.batt_period_s
|
||||
ts = math.floor((self.t - self.lag.batt_s) / per) * per
|
||||
j = (ord(u) * 31 + int(ts)) % 7 - 3
|
||||
return float(round(self._past(self.t - ts)[1][u]) + j)
|
||||
j = (ord(u) * 31 + int(self.t)) % 7 - 3
|
||||
p = self.plants[u].p if self.lag is None else \
|
||||
self._past(self.lag.batt_s)[1][u]
|
||||
|
||||
@@ -36,7 +36,7 @@ sys.path.insert(0, os.path.join(HERE, "tools"))
|
||||
|
||||
from aiohttp import web as aioweb # noqa: E402
|
||||
|
||||
from app import homeview, packmode, web # noqa: E402
|
||||
from app import chargers, freshness, homeview, packmode, web # noqa: E402
|
||||
from app.main import Controller # noqa: E402
|
||||
from app.maintenance import DRAIN # noqa: E402
|
||||
from app.setuponly import SetupOnly # noqa: E402
|
||||
@@ -44,6 +44,7 @@ from app.peakguard import PeakDecision # noqa: E402
|
||||
from app.price import PricePoint, PriceProduct, PriceRead # noqa: E402
|
||||
from app.static_tariff import TariffPlan # noqa: E402
|
||||
import translations_lint as TL # noqa: E402
|
||||
from chargersim import SimCharger # noqa: E402
|
||||
|
||||
PRICES = [.24, .22, .21, .20, .21, .22, .24, .27, .26, .22, .18, .16, .15,
|
||||
.14, .16, .19, .23, .28, .33, .36, .34, .29, .26, .24]
|
||||
@@ -104,6 +105,61 @@ class Hass:
|
||||
return STATES
|
||||
|
||||
|
||||
# EV-03: the car states. A charger model behind the demo's Home Assistant; the
|
||||
# real `Controller._read_charger()` reads it, so the card is what the add-on
|
||||
# draws, not a picture.
|
||||
CAR_STATES = ("car", "car_none", "car_waiting", "car_full", "car_unreach",
|
||||
"car_setup")
|
||||
CAR_ENTITY = "number.wallbox_power_connector_max_current_socket_1"
|
||||
SIM = SimCharger()
|
||||
|
||||
|
||||
class CarHass(Hass):
|
||||
async def state(self, e):
|
||||
return SIM.states().get(e) or await super().state(e)
|
||||
|
||||
async def states(self):
|
||||
return list(STATES) + list(SIM.states().values())
|
||||
|
||||
|
||||
def car_setup(state):
|
||||
"""Put the model in the state's situation."""
|
||||
global SIM
|
||||
SIM = SimCharger(name="other" if state == "car_setup" else "wallbox")
|
||||
if state in ("car", "car_unreach"):
|
||||
SIM.plug_in()
|
||||
SIM.set_phases(3)
|
||||
SIM.set_current(16)
|
||||
elif state == "car_waiting":
|
||||
SIM.plug_in()
|
||||
SIM.set_current(0)
|
||||
elif state == "car_full":
|
||||
SIM.plug_in()
|
||||
SIM.set_current(10)
|
||||
SIM.car_full()
|
||||
SIM.tick(12)
|
||||
|
||||
|
||||
async def car_feed(c, state):
|
||||
"""The cycle's own read, once a second, like the control loop."""
|
||||
backdated = False
|
||||
n = 0
|
||||
while True:
|
||||
n += 1
|
||||
if state == "car_unreach" and n == 4:
|
||||
SIM.go_unavailable()
|
||||
SIM.tick(1)
|
||||
await c._read_charger(freshness.monotonic())
|
||||
if state == "car_unreach" and c.car.bad_since is not None \
|
||||
and not backdated:
|
||||
backdated = True # 12 minutes in, so the row and the note show
|
||||
c.car.bad_since -= 720.0
|
||||
c.car.bad_since_utc -= timedelta(seconds=720)
|
||||
if state == "car_full" and c.car.b_since is not None and n < 3:
|
||||
c.car.b_since -= 120.0 # the full dwell has passed
|
||||
await asyncio.sleep(1.0)
|
||||
|
||||
|
||||
KETTLE_READS = (-10, 1990, 1990, -10)
|
||||
KETTLE_COUNT = [0]
|
||||
|
||||
@@ -244,7 +300,13 @@ def controller(state):
|
||||
opts = dict(OPTS, shadow_mode="on" if state == "shadow" else "off")
|
||||
if state in P3:
|
||||
opts["battery_modes_enabled"] = True
|
||||
c = Controller(opts, Hass(), Store(), Pub(), stop=asyncio.Event())
|
||||
hass = Hass()
|
||||
if state in CAR_STATES:
|
||||
car_setup(state)
|
||||
opts.update(ev_charger="alfen_ha", ev_current_entity=CAR_ENTITY,
|
||||
ev_max_a=16, ev_phases="auto")
|
||||
hass = CarHass()
|
||||
c = Controller(opts, hass, Store(), Pub(), stop=asyncio.Event())
|
||||
c.auto = True
|
||||
now = datetime.now(timezone.utc)
|
||||
day0, _day1 = homeview.local_day(now)
|
||||
@@ -264,6 +326,12 @@ def controller(state):
|
||||
inv.last_write = 0.0
|
||||
c.grid = -10.0 if state != "shadow" else -2810.0
|
||||
c.pv_w = 3900.0
|
||||
if state in CAR_STATES:
|
||||
# 11 kW to the car on top of a 1.6 kW house, all from the roof
|
||||
c.grid, c.pv_w = 0.0, (12600.0 if state == "car" else 2400.0)
|
||||
for inv in c.inverters:
|
||||
inv.batt = 0.0
|
||||
c.car.stale_s = 15.0
|
||||
if state == "alarm":
|
||||
c.inverters[0].sign_wd.tripped = True
|
||||
if state in P3:
|
||||
@@ -327,9 +395,17 @@ async def main(state, port, host="127.0.0.1"):
|
||||
battery_modes_enabled=state in P3,
|
||||
inverters=[dict(i, bms_soc_floor=10)
|
||||
for i in OPTS["inverters"]])
|
||||
runner = aioweb.AppRunner(web.build_app(c, Supervisor(stored)))
|
||||
stored.update(ev_charger=c.o.get("ev_charger", "off"),
|
||||
ev_current_entity=c.o.get("ev_current_entity", ""),
|
||||
ev_max_a=c.o.get("ev_max_a", 16),
|
||||
ev_phases=c.o.get("ev_phases", "auto"))
|
||||
app = web.build_app(c, Supervisor(stored))
|
||||
runner = aioweb.AppRunner(app)
|
||||
await runner.setup()
|
||||
await aioweb.TCPSite(runner, host, port).start()
|
||||
if state in CAR_STATES:
|
||||
asyncio.get_running_loop().create_task(car_feed(c, state))
|
||||
main.app = app
|
||||
print(f"serving {state} on http://127.0.0.1:{port}/", flush=True)
|
||||
await asyncio.Event().wait()
|
||||
|
||||
|
||||
@@ -283,6 +283,18 @@ configuration:
|
||||
shadow_mode:
|
||||
name: "Safety · Shadow mode"
|
||||
description: "The add-on makes every decision but keeps every inverter at 0 W. 'auto' does this while control is stopped, 'on' always, 'off' never."
|
||||
ev_charger:
|
||||
name: "Car charger · Charger"
|
||||
description: "Which car charger the add-on reads. Off leaves everything as it is. This version only reads the charger and never changes it."
|
||||
ev_current_entity:
|
||||
name: "Car charger · Current setting entity"
|
||||
description: "The entity that sets the charger's current. The add-on finds the charger's other entities from its name."
|
||||
ev_max_a:
|
||||
name: "Car charger · Charger limit (A)"
|
||||
description: "The most current the charger may ever be asked for. Never above what the charger reports. Lower it for a weaker fuse or cable."
|
||||
ev_phases:
|
||||
name: "Car charger · Phases"
|
||||
description: "How many phases the charger may use: 1, 3, or 1 and 3 (auto)."
|
||||
auto_start:
|
||||
name: "Advanced · Start control on boot"
|
||||
description: "Off by default. Leave it off until the site is commissioned, so someone presses Start after each restart."
|
||||
|
||||
@@ -264,6 +264,18 @@ configuration:
|
||||
shadow_mode:
|
||||
name: "Veiligheid · Schaduwmodus"
|
||||
description: "De add-on neemt elke beslissing maar houdt elke omvormer op 0 W. 'auto' doet dit zolang de regeling gestopt is, 'on' altijd, 'off' nooit."
|
||||
ev_charger:
|
||||
name: "Laadpaal · Laadpaal"
|
||||
description: "Welke laadpaal de add-on leest. Uit laat alles zoals het is. Deze versie leest de laadpaal alleen en wijzigt niets."
|
||||
ev_current_entity:
|
||||
name: "Laadpaal · Entiteit van de laadstroom"
|
||||
description: "De entiteit die de stroom van de laadpaal instelt. De add-on vindt de andere entiteiten van de laadpaal via de naam."
|
||||
ev_max_a:
|
||||
name: "Laadpaal · Laadpaalgrens (A)"
|
||||
description: "De hoogste stroom die aan de laadpaal gevraagd mag worden. Nooit hoger dan wat de laadpaal meldt. Verlaag ze voor een zwakkere zekering of kabel."
|
||||
ev_phases:
|
||||
name: "Laadpaal · Fasen"
|
||||
description: "Hoeveel fasen de laadpaal mag gebruiken: 1, 3, of 1 en 3 (auto)."
|
||||
auto_start:
|
||||
name: "Geavanceerd · Regeling starten bij opstarten"
|
||||
description: "Staat standaard uit. Laat het uit tot de installatie in dienst is, zodat iemand na elke herstart op Start drukt."
|
||||
|
||||
Reference in New Issue
Block a user