OPT-23, OPT-28: the day plan counts the sun right, and the night charge covers the expensive-hour shortfall

OPT-23: a state-only forecast is read from now for every span
(Forecast.between since=), so the plan's per-hour sun adds up to the day's
figure, today and tomorrow. Hourly splits are unchanged. The Forecast tab
reads spans the same way.

OPT-28: a Leftover solar battery buys, from the floor, the sum over the
expensive hours of max(0, house - trust x sun), / EFF. Several Leftover
solar batteries hold it together by capacity, the ceiling passes the rest
on, and what none can hold is said (Plan.uncovered_kwh). Home's grid block,
the Batteries line and the mode help (EN + NL) say the level, what it
covers, and that Leftover solar buys only what the sun will not give.

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

goodwe_controller/app/dayplan.py

@@ -7,20 +7,31 @@ turns the level into permission to charge from the grid; main.py rebuilds the
 plan with the price runs (at most every 15 minutes) and keeps a level unless
 it moves by `HYST_KWH` or `HYST_FRAC` (`hold()`).
 
-The sums (OPT-11-design section 1, "Excess solar", with the owner's answers):
+The sums (OPT-11-design section 1, "Excess solar", with the owner's answers;
+OPT-28 for the second):
 * `sun`: trust x the solar the house will not use, between now and the
   expensive run the cheap run is for, x the charge efficiency:
   `trust x sum_h max(0, forecast_h - house_h) x EFF`.
 * Solar first batteries take it first, up to the ceiling. What is left is
   shared by the Leftover solar batteries by their room.
+* `short` (OPT-28): what the house draws in the expensive run that the sun
+  will not give, `sum_h max(0, house_h - trust x forecast_h)` over every
+  hour of the run, early morning and evening. The Leftover solar batteries
+  hold it together: `short / EFF` above the floor, shared by capacity, and
+  a battery that reaches the ceiling passes the rest to the others. What
+  all of them cannot hold (`Plan.uncovered_kwh`) is not bought: the grid
+  carries it at the dear price.
 * Cheap hours only ignores the plan and fills to the ceiling, as in P3 and
   the design (section 1). Skipping the sun's share cost money in the replay
   (PR #156 review: 29.72 against 29.41 EUR on real 2026 prices).
-* A Leftover solar battery charges only up to what the house will draw from
-  it in the expensive runs before the next cheap run, less its share:
-  `min(ceiling, floor + house use / EFF) - share`. So it buys only the
+* A Leftover solar battery charges from the grid up to the level it needs
+  for its part of `short`, less its share of the sun before the run:
+  `min(ceiling, floor + its part / EFF) - share`. So it buys only the
   shortfall, not up to the ceiling.
 * Solar first never charges from the grid (owner, 2026-09-29).
+* A state-only forecast is read from now for every span (`Forecast.between`
+  `since=`, OPT-23), so the hours add up to the day's figure.
+DECISIONS/OPT-23-28-the-night-charge-covers-the-dear-hours.md has the record.
 
 The house profile is the add-on's own measurement, grid + battery power, per
 local hour, over the last `PROFILE_DAYS` days; the estimate for an hour is the
@@ -31,7 +42,7 @@ control decision.
 """
 
 import statistics
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from datetime import datetime, timedelta, timezone
 
 from .packmode import LEFTOVER_SOLAR, SOLAR_FIRST
@@ -154,6 +165,11 @@ class Plan:
     targets: dict               # name -> level % (Leftover solar only)
     need_kwh: dict              # name -> kWh from the grid (0: none)
     share_kwh: dict             # name -> kWh of solar counted for it
+    # OPT-28: the expensive hours' shortfall, the part of it each battery
+    # covers, and what no battery can hold. All kWh on the house's side.
+    short_kwh: float = 0.0
+    cover_kwh: dict = field(default_factory=dict)
+    uncovered_kwh: float = 0.0
 
 
 def _hour_slices(t0, t1):
@@ -171,6 +187,31 @@ def _hour_slices(t0, t1):
     return out
 
 
+def _spread(amount, room, weight):
+    """Share `amount` over the keys of `room` by `weight`, none past its
+    room, what one cannot take passed to the others. Returns `(taken,
+    left)`: what each took and what none could."""
+    got = {k: 0.0 for k in room}
+    left = float(amount)
+    live = {k for k, r in room.items() if r > 1e-9 and weight.get(k, 0) > 0}
+    while left > 1e-9 and live:
+        total = sum(weight[k] for k in live)
+        used, full = 0.0, set()
+        for k in sorted(live):
+            part = left * weight[k] / total
+            free = room[k] - got[k]
+            if part >= free - 1e-9:
+                part = free
+                full.add(k)
+            got[k] += part
+            used += part
+        left -= used
+        if not full:
+            break
+        live -= full
+    return got, max(0.0, left)
+
+
 def _room(p, to_pct):
     if p.capacity_kwh is None or p.soc is None:
         return 0.0
@@ -194,7 +235,7 @@ def plan(forecast, house, runs, now, packs, *, trust_pct, floor_pct,
     trust = max(0.0, min(1.0, float(trust_pct) / 100.0))
     sun = fc_sum = 0.0
     for s, e, h in _hour_slices(now, until.start):
-        pv = forecast.between(s, e)
+        pv = forecast.between(s, e, since=now)
         if pv is None:
             return None             # the span reaches a day with no forecast
         hrs = (e - s).total_seconds() / 3600.0
@@ -212,30 +253,40 @@ def plan(forecast, house, runs, now, packs, *, trust_pct, floor_pct,
     rooms = {p.name: _room(p, ceiling_pct) for p in price}
     total_room = sum(rooms.values())
 
-    # What the house draws in the expensive runs from the one this plan is
-    # for until the next cheap run (or a day), from the profile.
+    # OPT-28: what the house draws in the expensive runs, from the one this
+    # plan is for until the next cheap run (or a day), that the sun will not
+    # give. An hour with sun is read at no less than the night base, as the
+    # sun sum above reads it (the profile is net of the sun the house used);
+    # an hour without is read as measured. A run hour with no forecast counts
+    # no sun.
     horizon = until.start + timedelta(hours=24)
-    use_kwh = 0.0
+    short = 0.0
     for g in runs.give:
         if g.start < until.start or g.start >= horizon:
             continue
         for s, e, h in _hour_slices(g.start, g.end):
-            use_kwh += max(0.0, house_w(h)) * (
-                e - s).total_seconds() / 3600.0 / 1000.0
+            pv = forecast.between(s, e, since=now) or 0.0
+            w = max(0.0, house_w(h))
+            if pv > 0.0:
+                w = max(w, base_w)
+            short += max(0.0, w * (e - s).total_seconds() / 3.6e6
+                         - trust * pv)
     caps = {p.name: float(p.capacity_kwh) for p in price}
-    cap_sum = sum(caps.values()) or 1.0
+    span = max(0.0, float(ceiling_pct) - float(floor_pct))
+    held, left = _spread(short / EFF,
+                         {n: span / 100.0 * c for n, c in caps.items()},
+                         caps)
 
-    targets, need, share = {}, {}, {}
+    targets, need, share, cover = {}, {}, {}, {}
     for p in price:
         sh = excess * rooms[p.name] / total_room if total_room > 0 else 0.0
         sh_pct = sh / caps[p.name] * 100.0
-        want = use_kwh * caps[p.name] / cap_sum / EFF
-        top = min(float(ceiling_pct),
-                  float(floor_pct) + want / caps[p.name] * 100.0)
+        top = float(floor_pct) + held[p.name] / caps[p.name] * 100.0
         level = max(0.0, top - sh_pct)
         targets[p.name] = round(level, 2)
         need[p.name] = round(_room(p, level), 3)
         share[p.name] = round(sh, 3)
+        cover[p.name] = round(held[p.name] * EFF, 3)
     if sun < sf_room:
         verdict = DARK
     elif any(v > 0.05 for v in need.values()):
@@ -243,7 +294,8 @@ def plan(forecast, house, runs, now, packs, *, trust_pct, floor_pct,
     else:
         verdict = SUNNY
     return Plan(verdict, round(sun, 3), round(fc_sum, 3), until.start,
-                targets, need, share)
+                targets, need, share, round(short, 3), cover,
+                round(left * EFF if price else 0.0, 3))
 
 
 def hold(old: dict | None, new: dict, capacity: dict) -> dict:

goodwe_controller/app/dayview.py

@@ -42,12 +42,12 @@ def build(c, status: dict, now: datetime, lang: str = "en") -> dict:
 
 def sun_kwh(fc, now, a, b):
     """kWh the forecast gives in `[a, b)`, `a` at or after `now`, or None.
-    Both ends are measured from `now`: `Forecast.between()` reads its start
-    as the moment the "left today" figure was taken, so a span that starts
-    later would be spread over what is left of the bell, not over its own
-    hours (state-only forecasts, DECISIONS/UX-54-forecast-tab.md)."""
-    hi, lo = fc.between(now, b), fc.between(now, a)
-    return None if hi is None or lo is None else max(0.0, hi - lo)
+    Every span is measured from `now` (`Forecast.between(since=)`, OPT-23),
+    as `dayplan.plan()` measures them: a state-only "left today" figure is
+    the sun from the moment it was taken, so a span that starts later must
+    not be spread over what is left of the bell from its own start
+    (DECISIONS/UX-54-forecast-tab.md)."""
+    return fc.between(a, b, since=now)
 
 
 def _times(run):

goodwe_controller/app/homeview.py

@@ -20,6 +20,7 @@ import contextlib
 from datetime import datetime, timedelta, timezone
 
 from . import arbitrage, messages, peakguard, uitext
+from .dayplan import EFF
 from .maintenance import CHARGE as M_CHARGE, DRAIN as M_DRAIN, HOLD as M_HOLD
 from .maintenance import IDLE as M_IDLE, next_slot_start
 from .packmode import CHEAP_HOURS, GRID_CHARGE_MODES, LEFTOVER_SOLAR, SOLAR_FIRST
@@ -471,9 +472,15 @@ def mode_runs(c, day0, day1, now, shadow, ahead=False, rp=None):
                 continue
             price = run.mean_eur_kwh
             if kind == "grid":
+                cov = plan_cover(c, inv.name)
                 what, why, amount = (run_grid_what(kwh, shadow),
                                      run_cheap_why(price),
                                      run_grid_amount(kwh * price))
+                if cov is not None:
+                    # OPT-28: with a day plan the block says how far it
+                    # charges and what that covers.
+                    what = run_grid_what_to(kwh, cov[0], shadow)
+                    why += " " + run_covers(cov[1])
             elif kind == "sell":
                 # No money line: the price is what the house pays, and a sale
                 # earns the lower injection price (OPT-11 P3 review).
@@ -506,6 +513,24 @@ def plan_need(c, name, soc=None):
         inv.capacity_kwh)
 
 
+def plan_cover(c, name):
+    """OPT-28: `(level %, kWh)` for a battery the day plan charges from the
+    grid: the level it charges to, and the expensive-hour use of the house
+    that charge covers and the sun will not. Read from the level control
+    holds (`plan_targets()`), so Home says what control does. None when the
+    plan buys nothing for it."""
+    dp = getattr(c, "day_plan", None)
+    targets = c.plan_targets() if hasattr(c, "plan_targets") else None
+    inv = next((i for i in c.inverters if i.name == name), None)
+    if dp is None or not targets or name not in targets or inv is None \
+            or not inv.capacity_kwh or targets[name] <= 0.0:
+        return None
+    floor, _ceil = arbitrage.soc_bounds(c.o)
+    cap = float(inv.capacity_kwh)
+    top = targets[name] + dp.share_kwh.get(name, 0.0) / cap * 100.0
+    return targets[name], max(0.0, top - floor) / 100.0 * cap * EFF
+
+
 def plan_state(c):
     """P4: `"plan"` (a day plan is made), `"learning"` (no house profile
     yet), `"no_forecast"` (set but missing or stale), or None (not set, or
@@ -540,6 +565,9 @@ def solar_block(c, now):
     elif fc is not None:
         out["line"] = line_solar(fc.today.kwh, out["count_kwh"],
                                  out["updated"])
+        dp = getattr(c, "day_plan", None)
+        if st == "plan" and dp is not None and dp.uncovered_kwh >= MIN_KWH:
+            out["line"] += " " + line_uncovered(dp.uncovered_kwh)
     return out
 
 
@@ -863,7 +891,8 @@ def battery_rows(c, shadow, running, held=False):
             # knows this cycle. Price and forecast reasons are OPT-11 P3/P4.
             "why_key": why,
             "why": why_words(why, name=cycling if why == "other_cycle"
-                             else other, at=at),
+                             else other, at=at,
+                             **plan_words(c, inv.name, why)),
         })
         if modes_on:
             # OPT-11 P1: the battery's switch and mode, for the Batteries
@@ -1160,6 +1189,10 @@ def _kwh(v) -> str:
     return _dec(f"{float(v):.1f}") + " kWh"
 
 
+def _pct(v) -> str:
+    return _dec(f"{float(v):.0f}") + " %"
+
+
 # Row id -> the title on Home. The row's own sentence is the body, in the
 # page's language (UX-46, `messages.pick`). Five titles are the notification's
 # own title, which test_ui_text.py checks.
@@ -1292,11 +1325,18 @@ def battery_now(soc, batt_w, *, phase, shadow, running, held=False,
     return _t("now.resting")
 
 
-def why_words(key, name=None, at="") -> str:
+def why_words(key, name=None, at="", pct="", kwh="") -> str:
     """One battery's "why" line (UX-13 P3), from `battery_why()`'s key.
     `name`: the battery that refuses, for `other_refuses`; `at`: the
-    give run's time, for `saves`."""
-    return _t("why." + key, name=name or "", at=at)
+    give run's time, for `saves`; `pct` and `kwh`: the planned level and
+    what it covers, for `tops_up` (OPT-28)."""
+    return _t("why." + key, name=name or "", at=at, pct=pct, kwh=kwh)
+
+
+def plan_words(c, name, why) -> dict:
+    """OPT-28: the figures of a `tops_up` line, or nothing."""
+    cov = plan_cover(c, name) if why == "tops_up" else None
+    return {} if cov is None else {"pct": _pct(cov[0]), "kwh": _kwh(cov[1])}
 
 
 def today_words(key) -> str:
@@ -1318,6 +1358,16 @@ def run_grid_what(kwh, shadow) -> str:
     return _w(shadow, "run.grid_what", kwh=_kwh(kwh))
 
 
+def run_grid_what_to(kwh, pct, shadow) -> str:
+    """OPT-28: a grid block of the day plan, with the level it charges to."""
+    return _w(shadow, "run.grid_what_to", kwh=_kwh(kwh), pct=_pct(pct))
+
+
+def run_covers(kwh) -> str:
+    """OPT-28: what a planned grid charge covers."""
+    return _t("run.covers", kwh=_kwh(kwh))
+
+
 # The trade legs and the price line use the feed's own points (a 15-minute
 # period on a quarter-hourly feed), so both name the same price and time.
 def run_grid_why(price) -> str:
@@ -1395,6 +1445,11 @@ def line_solar(fc_kwh, count_kwh, at) -> str:
     return _t("solar.line", kwh=_kwh(fc_kwh), count=_kwh(count_kwh), at=at)
 
 
+def line_uncovered(kwh) -> str:
+    """OPT-28: the batteries cannot hold the expensive hours' shortfall."""
+    return _t("solar.uncovered", kwh=_kwh(kwh))
+
+
 def line_no_trade(key) -> str:
     return "" if key == "off" else _t("no_trade." + key)
 
@@ -1516,6 +1571,7 @@ def _samples() -> list:
         for k in VERDICT:
             out.append(("plan", plan_head(k, sh)))
         out += [("plan", run_grid_what(12.34, sh)),
+                ("plan", run_grid_what_to(12.34, 82, sh)),
                 ("plan", run_give_what(9.6, sh)),
                 ("plan", run_cycle_what(M_IDLE, sh)),
                 ("plan", run_cycle_what(M_DRAIN, sh)),
@@ -1530,6 +1586,7 @@ def _samples() -> list:
                 ("plan", control_text(True, sh)),
                 ("plan", control_text(False, sh))]
     out += [("plan", run_grid_why(0.1412)), ("plan", run_grid_amount(1.23)),
+            ("plan", run_covers(9.4)), ("plan", line_uncovered(2.5)),
             ("plan", run_give_why(0.3612)), ("plan", run_give_amount(3.47)),
             ("plan", run_cycle_why()), ("plan", run_cycle_why(True)),
             ("plan", run_cycle_amount(None)),
@@ -1560,7 +1617,8 @@ def _samples() -> list:
                 out.append(("plan", battery_now(62, w, phase=M_IDLE,
                                                 shadow=False, running=True,
                                                 off=off, peak=peak)))
-    out += [("plan", why_words(k, name="Battery A")) for k in words["why"]]
+    out += [("plan", why_words(k, name="Battery A", pct="82 %",
+                               kwh="9.4 kWh")) for k in words["why"]]
     out += [("plan", today_words(k)) for k in words["today"]]
     out += [("plan", line_solar(9.2, 6.4, "10:15")),
             ("plan", _t("solar.no_forecast")), ("plan", _t("solar.learning"))]

goodwe_controller/app/solarfc.py

@@ -76,12 +76,20 @@ class Forecast:
     tomorrow: Day | None
     at: datetime                # when the sensor last reported
 
-    def between(self, t0: datetime, t1: datetime) -> float | None:
+    def between(self, t0: datetime, t1: datetime,
+                since: datetime | None = None) -> float | None:
         """kWh the sun should give between `t0` (now or later) and `t1`.
         None when the span reaches the sunny hours of a day with no
-        forecast (tomorrow, when its sensor is not set)."""
+        forecast (tomorrow, when its sensor is not set).
+
+        `since` is the moment a state-only "left today" figure counts from
+        (OPT-23): `t0` itself when not given, so a span that starts later
+        than now would be spread over what is left of the bell from its own
+        start. Pass now for every span of a plan, and the spans add up to
+        the figure. An hourly split ignores it."""
         if t1 <= t0:
             return 0.0
+        since = t0 if since is None else since
         last = self.tomorrow or self.today
         if t1 > last.day0 + timedelta(days=1, hours=BELL_FROM_H):
             return None
@@ -92,7 +100,7 @@ class Forecast:
             a = max(t0, day.day0)
             b = min(t1, day.day0 + timedelta(days=1))
             if b > a:
-                total += _day_between(day, a, b, t0)
+                total += _day_between(day, a, b, since)
         return total
 
 
@@ -124,8 +132,12 @@ def _day_between(day: Day, a: datetime, b: datetime, now: datetime) -> float:
                 out += kwh * (hi - lo).total_seconds() / (e - s).total_seconds()
         return out
     # State only: `kwh` is what is left from `max(now, day0)` to the day's
-    # end, spread over the bell.
-    h_from = _hours_since(day.day0, max(now, day.day0))
+    # end, spread over the bell. Nothing of it is before that moment.
+    start = max(now, day.day0)
+    a = max(a, start)
+    if b <= a:
+        return 0.0
+    h_from = _hours_since(day.day0, start)
     left = 1.0 - _bell(h_from)
     if left <= 1e-9:
         return 0.0

goodwe_controller/app/ui_text/en.json

@@ -103,18 +103,18 @@
     "batteries": {"name": "Batteries", "description": "To choose a mode for each battery, turn on battery modes in the settings.", "level": "Level", "now": "Now", "stored": "Stored", "mode": "Mode", "settings": "Change inverter settings",
       "on": "On", "off": "Off",
       "choice": {
-        "solar_first": {"name": "Solar first", "description": "Charges from solar before the other batteries and covers the house."},
-        "leftover_solar": {"name": "Leftover solar", "description": "Gets solar the others cannot take, and gives power in expensive hours."},
-        "cheap_hours": {"name": "Cheap hours only", "description": "Charges in the cheapest hours and gives power in the expensive ones."},
+        "solar_first": {"name": "Solar first", "description": "Charges from solar before the other batteries, covers the house and never charges from the grid."},
+        "leftover_solar": {"name": "Leftover solar", "description": "Gets the solar the others cannot take, buys from the grid only what the sun will not give, and gives power in expensive hours."},
+        "cheap_hours": {"name": "Cheap hours only", "description": "Fills up from the grid in the cheapest hours and gives power in the expensive ones."},
         "off": {"name": "Off", "description": "Rests, and helps only when the peak limit needs it."}
       },
       "today": "Today", "why": "Why",
       "cycle": {"start": "Start cycle", "abort": "Stop cycle", "start_dialog": {"name": "Start a cycle on {name}?", "description": "{name} empties, refills and holds full, which takes a few hours.", "yes": "Start the cycle"}, "abort_dialog": {"name": "Stop the cycle on {name}?", "description": "Every inverter is set to 0 W for a moment, then control carries on.", "yes": "Stop the cycle"}, "toast": {"started": "Cycle started on {name}.", "stopped": "Cycle stopped on {name}."}, "unit": {"description": "There is no battery with that name."}, "busy": {"description": "Only one battery can cycle at a time, and {name} is cycling now."}, "off": {"description": "{name} is switched off, so it cannot start a cycle."}, "idle": {"description": "{name} is not running a cycle."}},
       "modes_off": {"name": "Battery modes are off"},
       "how": {"name": "How the modes work", "description": "Which battery gets solar first, and when each gives power.",
-        "solar_first": {"description": "Solar first gets spare solar before the other batteries, and covers the house at any hour."},
-        "leftover_solar": {"description": "Leftover solar gets the solar the Solar first batteries cannot take, and saves its power for expensive hours."},
-        "cheap_hours": {"description": "Cheap hours only charges in the cheapest hours and gives power in the expensive ones."},
+        "solar_first": {"description": "Solar first gets spare solar before the other batteries, covers the house at any hour and never charges from the grid."},
+        "leftover_solar": {"description": "Leftover solar gets the solar Solar first cannot take, buys only what the sun will not give, and saves its power for expensive hours."},
+        "cheap_hours": {"description": "Cheap hours only fills up from the grid in the cheapest hours and gives power in the expensive ones."},
         "off": {"description": "Off rests the battery and starts no monthly cycle, but the peak limit may still use it."},
         "rules": {"description": "The peak limit and the safety stops come first, and while one battery charges from the grid the others rest."}},
       "toast": {"on": "{name} is on.", "off": "{name} is off.", "mode": "{name}: {mode}."}},
@@ -357,10 +357,10 @@
       "no_prices": "No prices, so it follows the house.",
       "no_spread": "Prices differ too little, so it follows the house.",
       "sun_fills": "Enough sun is forecast, so it does not charge from the grid.",
-      "tops_up": "Too little sun is forecast, so it charges some from the grid.",
+      "tops_up": "It charges from the grid to {pct}. That covers {kwh} of expensive hours the sun will not.",
       "no_forecast": "No solar forecast, so it charges from solar only."
     },
-    "solar": {"line": "Solar still to come today: {kwh}, we count on {count}. Updated {at}.", "no_forecast": "No solar forecast now, so Leftover solar charges from solar only.", "learning": "The add-on is learning your house's use. The plan starts after one full day."},
+    "solar": {"line": "Solar still to come today: {kwh}, we count on {count}. Updated {at}.", "uncovered": "The batteries cannot hold it all. The grid covers {kwh} of the expensive hours.", "no_forecast": "No solar forecast now, so Leftover solar charges from solar only.", "learning": "The add-on is learning your house's use. The plan starts after one full day."},
     "today": {
       "not_planned": "Not planned yet.",
       "no_runs": "No cheap or expensive hours left today.",
@@ -385,6 +385,9 @@
     "run": {
       "grid_what": "Charges up to {kwh} from the grid.",
       "grid_what_would": "Would charge up to {kwh} from the grid.",
+      "grid_what_to": "Charges up to {kwh} from the grid, to {pct}.",
+      "grid_what_to_would": "Would charge up to {kwh} from the grid, to {pct}.",
+      "covers": "It covers {kwh} of expensive hours the sun will not.",
       "grid_why": "Lowest price left, {eur} per kWh.",
       "grid_amount": "Costs up to {eur}.",
       "give_what": "Gives up to {kwh}, to the house first.",

goodwe_controller/app/ui_text/nl.json

@@ -100,18 +100,18 @@
     "batteries": {"name": "Batterijen", "description": "Zet batterijmodi aan in de instellingen om per batterij een modus te kiezen.", "level": "Laadniveau", "now": "Nu", "stored": "Opgeslagen", "mode": "Modus", "settings": "Instellingen van omvormers wijzigen",
       "on": "Aan", "off": "Uit",
       "choice": {
-        "solar_first": {"name": "Eerst zonne-energie", "description": "Laadt met zonne-energie vóór de andere batterijen en dekt het huis."},
-        "leftover_solar": {"name": "Overschot zonne-energie", "description": "Krijgt zonne-energie die de andere niet opnemen, en levert in dure uren."},
-        "cheap_hours": {"name": "Alleen goedkope uren", "description": "Laadt in de goedkoopste uren en levert in de dure uren."},
+        "solar_first": {"name": "Eerst zonne-energie", "description": "Laadt met zonne-energie vóór de andere batterijen, dekt het huis en laadt nooit van het net."},
+        "leftover_solar": {"name": "Overschot zonne-energie", "description": "Krijgt zonne-energie die de andere niet opnemen, koopt van het net alleen wat de zon niet geeft, en levert in dure uren."},
+        "cheap_hours": {"name": "Alleen goedkope uren", "description": "Vult zich vol van het net in de goedkoopste uren en levert in de dure uren."},
         "off": {"name": "Uit", "description": "Rust, en helpt alleen als de piekgrens haar nodig heeft."}
       },
       "today": "Vandaag", "why": "Waarom",
       "cycle": {"start": "Cyclus starten", "abort": "Cyclus stoppen", "start_dialog": {"name": "Cyclus starten op {name}?", "description": "{name} loopt leeg, laadt weer op en blijft vol, wat enkele uren duurt.", "yes": "Cyclus starten"}, "abort_dialog": {"name": "Cyclus stoppen op {name}?", "description": "Elke omvormer gaat even naar 0 W, daarna gaat de regeling verder.", "yes": "Cyclus stoppen"}, "toast": {"started": "Cyclus gestart op {name}.", "stopped": "Cyclus gestopt op {name}."}, "unit": {"description": "Er is geen batterij met die naam."}, "busy": {"description": "Er kan maar één batterij tegelijk een cyclus doen, en {name} is nu bezig."}, "off": {"description": "{name} staat uit en kan dus geen cyclus starten."}, "idle": {"description": "{name} doet nu geen cyclus."}},
       "modes_off": {"name": "Batterijmodi staan uit"},
       "how": {"name": "Zo werken de modi", "description": "Welke batterij eerst zonne-energie krijgt, en wanneer elke batterij levert.",
-        "solar_first": {"description": "Eerst zonne-energie krijgt het overschot vóór de andere batterijen, en dekt het huis op elk uur."},
-        "leftover_solar": {"description": "Overschot zonne-energie krijgt wat de batterijen met Eerst zonne-energie niet opnemen, en spaart haar stroom voor dure uren."},
-        "cheap_hours": {"description": "Alleen goedkope uren laadt in de goedkoopste uren en levert in de dure uren."},
+        "solar_first": {"description": "Eerst zonne-energie krijgt het overschot vóór de andere batterijen, dekt het huis op elk uur en laadt nooit van het net."},
+        "leftover_solar": {"description": "Overschot zonne-energie krijgt wat Eerst zonne-energie niet opneemt, koopt alleen wat de zon niet geeft, en spaart haar stroom voor dure uren."},
+        "cheap_hours": {"description": "Alleen goedkope uren vult zich vol van het net in de goedkoopste uren en levert in de dure uren."},
         "off": {"description": "Uit laat de batterij rusten en start geen maandelijkse cyclus, maar de piekgrens mag haar nog gebruiken."},
         "rules": {"description": "De piekgrens en de veiligheidsstops gaan voor, en terwijl een batterij van het net laadt rusten de andere."}},
       "toast": {"on": "{name} staat aan.", "off": "{name} staat uit.", "mode": "{name}: {mode}."}},
@@ -297,10 +297,10 @@
       "no_prices": "Geen prijzen, dus ze volgt het huis.",
       "no_spread": "De prijzen verschillen te weinig, dus ze volgt het huis.",
       "sun_fills": "Er is genoeg zon voorspeld, dus ze laadt niet van het net.",
-      "tops_up": "Te weinig zon voorspeld, dus ze laadt wat van het net.",
+      "tops_up": "Ze laadt van het net tot {pct}. Dat dekt {kwh} dat de zon in dure uren niet levert.",
       "no_forecast": "Geen zonneprognose, dus ze laadt alleen met zonne-energie."
     },
-    "solar": {"line": "Nog verwachte zon vandaag: {kwh}, we rekenen op {count}. Bijgewerkt om {at}.", "no_forecast": "Nu geen zonneprognose, dus Overschot zonne-energie laadt alleen met zon.", "learning": "De add-on leert eerst het verbruik van uw huis. Het plan start na één volle dag."},
+    "solar": {"line": "Nog verwachte zon vandaag: {kwh}, we rekenen op {count}. Bijgewerkt om {at}.", "uncovered": "De batterijen kunnen niet alles bevatten. Het net dekt {kwh} van de dure uren.", "no_forecast": "Nu geen zonneprognose, dus Overschot zonne-energie laadt alleen met zon.", "learning": "De add-on leert eerst het verbruik van uw huis. Het plan start na één volle dag."},
     "today": {
       "not_planned": "Nog niet gepland.",
       "no_runs": "Vandaag geen goedkope of dure uren meer.",
@@ -325,6 +325,9 @@
     "run": {
       "grid_what": "Laadt tot {kwh} van het net.",
       "grid_what_would": "Zou tot {kwh} van het net laden.",
+      "grid_what_to": "Laadt maximaal {kwh} van het net, tot {pct}.",
+      "grid_what_to_would": "Zou maximaal {kwh} van het net laden, tot {pct}.",
+      "covers": "Dat dekt {kwh} dat de zon in dure uren niet levert.",
       "grid_why": "Laagste prijs die nog over is, {eur} per kWh.",
       "grid_amount": "Kost tot {eur}.",
       "give_what": "Levert tot {kwh}, eerst aan het huis.",