@@ -757,6 +757,109 @@ async def _set_amperage(self, target_amperage: int):
 
 ## Version History
 
+### v2.6.0 (2026-06-06)
+**Mass bug-fixing & improvement release — 7 issues (#36–#42)**
+
+A grouped release closing seven reports (six from DJm00n, one from xion2000):
+three confirmed bugs, one log-noise cleanup, one self-tuning enhancement and two
+opt-in features. Fully backward compatible — existing installs see no behaviour
+change unless they map the new optional sensor or set the new numbers.
+
+**#37 — Invalid MDI day icons (BUG).** The daily SOC-target numbers built
+`mdi:calendar-{weekday}` icons (`mdi:calendar-monday`…`-sunday`) that do not
+exist in Material Design Icons, so HA rendered an empty icon. [number.py](custom_components/ev_smart_charger/number.py)
+now maps each day to a valid icon (`mdi:calendar-week` weekdays / `mdi:calendar-weekend`
+weekend). No entity/behaviour change.
+
+**#39 — Hybrid Mode EV_FREE guard hardcoded to 100% (BUG).** In
+[hybrid_inverter_mode.py](custom_components/ev_smart_charger/hybrid_inverter_mode.py)
+the `PRIORITY_EV_FREE` override guard compared `soc_home < 100` while the
+IDLE-entry and keep-alive guards used `evsc_hybrid_battery_full_threshold`. On
+large BMS-managed batteries that sit at 98–99% before briefly touching 100%, a
+user who set the threshold to 98 saw the probe refused. Both sites now use the
+configured `threshold` (default 95% → more permissive than 100, fully
+backward-compatible).
+
+**#41 — Telemetry 302 raw body looked like an error (BUG, cosmetic).**
+[telemetry.py](custom_components/ev_smart_charger/telemetry.py) logged the raw
+response body *before* the status check, so the standard GAS redirect HTML
+(`<!-- GSE Default Error --> Moved Temporarily`) printed on every successful
+302 and read as a failure. The raw-body log now runs only for non-302 (2xx /
+error) responses; the 302 happy path logs a single success line. Delivery/retry
+logic unchanged.
+
+**#40 — INFO log flood at idle (~48k lines/day) (IMPROVEMENT, detection-only).**
+Three components logged verbose INFO blocks on every periodic tick even when
+nothing changed. Now they emit the full block at INFO only when something
+actionable happens, and a single DEBUG line otherwise — no behaviour change, and
+the diagnostic sensors still update every tick.
+- [solar_surplus.py](custom_components/ev_smart_charger/solar_surplus.py): the
+  sensor/decision readout is consolidated after `target_amps` is finalized and
+  gated on `target_amps != current_amps`; the per-tick header, "Priority
+  Balancer:" and "Both targets met" lines and the "Amperage optimal at 0A"
+  confirmation are DEBUG on no-op ticks.
+- [priority_balancer.py](custom_components/ev_smart_charger/priority_balancer.py):
+  the decision block logs at INFO only on the first call and on a state
+  transition (reusing `_last_priority`); stable ticks emit one DEBUG line. The
+  diagnostic-telemetry and change-notification paths are untouched.
+- [night_smart_charge.py](custom_components/ev_smart_charger/night_smart_charge.py):
+  the "WINDOW CHECK DIAGNOSTIC" block (a v1.4.2 debug relic) is now INFO only
+  when the window is active or within 30 minutes of opening; otherwise DEBUG.
+
+**#38 — Slow RIDING_EDGE convergence on Generic chargers (ENHANCEMENT,
+self-tuning).** Generic chargers step in 1 A increments, so RIDING_EDGE took
+~11 ticks (6→17 A) vs ~5 for Tuya. [hybrid_inverter_mode.py](custom_components/ev_smart_charger/hybrid_inverter_mode.py)
+now tracks consecutive stable step-ups (`_consecutive_stepup_count`) and, on a
+Generic charger only, jumps 2 levels per tick after 2 consecutive single-level
+step-ups (capped at `solar_max_amperage`). The counter resets on any step-down
+and on every state transition. Tuya is unaffected (its levels are already
+coarse). No new entity — counts unchanged.
+
+**#36 — Grid loss drains the home battery (FEATURE / SAFETY).** On hybrid
+"Battery First"/UPS inverters a grid outage is invisible to the integration
+(all power sensors keep reporting), so Night Smart Charge grid mode keeps
+drawing — now from the home battery — during the outage. New **optional
+`grid_available` binary_sensor** (mapped in the Sensors step): when it reads OFF
+(debounced for the grid-import delay, default 30 s) the grid-mode session stops
+terminally. **Fail-safe** ([power_model.py](custom_components/ev_smart_charger/power_model.py)
+`is_grid_available`): an unmapped sensor OR an `unavailable`/`unknown` state
+returns `None` and never triggers a stop (so a boot-time / inverter-restart
+`unavailable` cannot spuriously kill the session). Solar Surplus and Hybrid
+Mode need no change (they key off PV surplus). New `STOP_REASON_GRID_LOSS`;
+unmapped → byte-for-byte legacy behaviour. No new helper entity (counts
+unchanged).
+
+**#42 — Customizable nighttime period (FEATURE).** Two opt-in numbers,
+`evsc_nighttime_sunset_offset` and `evsc_nighttime_sunrise_offset` (minutes,
+0–120, default 0). Positive values **extend** the nighttime window that gates
+Solar Surplus (the "SKIPPED: Nighttime" decision): night starts this many
+minutes before sunset and ends this many minutes after sunrise.
+`AstralTimeService.is_nighttime` takes the offsets (default 0 = astronomical,
+byte-for-byte legacy); only the Solar Surplus call passes them — the Smart
+Blocker window and Hybrid Mode daytime gate are intentionally unchanged.
+
+**Entity counts**: +2 always-created numbers (issue #42) →
+`TOTAL_INTEGRATION_ENTITIES` 67→**69**, `TOTAL_INTEGRATION_ENTITIES_NO_BATTERY`
+53→**55**. #36 is a mapped sensor, not a helper (counts unchanged).
+
+**Files**: `number.py` (#37, #42), `hybrid_inverter_mode.py` (#39, #38),
+`telemetry.py` (#41), `solar_surplus.py` (#40, #42), `priority_balancer.py`
+(#40), `night_smart_charge.py` (#40, #36), `power_model.py` (#36),
+`config_flow.py` (#36), `dashboard_manager.py` (#36), `utils/astral_time_service.py`
+(#42), `const.py`, `strings.json` + `translations/{en,it,nl}.json`,
+`frontend/ev-smart-charger-dashboard.js` (#42 steppers + #36 whitelist),
+`manifest.json`; tests: new `tests/test_v260_fixes.py` (#36 fail-safe reader,
+#42 offsets), `tests/test_config_flow.py` (counts 69/55). `VERSION = "2.6.0"`.
+Full suite green except the pre-existing environment-only baseline failures
+(identical on clean master).
+
+**Upgrade priority**: 🟢 RECOMMENDED for hybrid-inverter installs (map
+`grid_available` for outage protection #36) and anyone bothered by the INFO log
+flood (#40). ⚪ Otherwise low-impact — the bug fixes are transparent and the two
+features are opt-in.
+
+---
+
 ### v2.5.1 (2026-06-04)
 **FIX: Stale "SKIPPED: Nighttime" on the Solar Surplus diagnostic + self-diagnosable astral times ([issue #34](https://github.com/antbald/ha-ev-smart-charger/issues/34), xion2000)**
 
 
@@ -54,6 +54,8 @@ Most projects target one charger brand or assume a single-phase home. EV Smart C
 
 > **🔋 New in v2.4.0** — the same **battery-power sensor** now also protects **Night Smart Charge grid mode**. On hybrid "Battery First" inverters, grid-mode charging can silently drain the home battery (grid stays ≈ 0 W) instead of pulling from the grid; v2.4.0 stops the session once the battery is being drained *and* has reached `home_battery_min_soc`, making that floor effective in grid mode just like it already is in battery mode. **No-op without the sensor.** Solves [issue #33](https://github.com/antbald/ha-ev-smart-charger/issues/33).
 
+> **🆕 New in v2.6.0** — mass bug-fix & improvement release (issues #36–#42). Highlights: an optional **`grid_available` binary sensor** ([issue #36](https://github.com/antbald/ha-ev-smart-charger/issues/36)) stops Night Smart Charge grid mode during a **grid outage** so it doesn't drain the home battery on hybrid Battery First / UPS inverters (fail-safe: an unavailable sensor never triggers a false stop); a **customizable nighttime window** ([issue #42](https://github.com/antbald/ha-ev-smart-charger/issues/42)) via two opt-in offset numbers (start before sunset / end after sunrise); and a big **INFO log-noise reduction** ([issue #40](https://github.com/antbald/ha-ev-smart-charger/issues/40)) — idle ticks no longer flood the HA log. Also: valid day icons (#37), faster Generic-charger ramp-up (#38), a consistent Hybrid full-battery threshold (#39), and a cleaner telemetry log (#41). **All backward compatible** — the two features are opt-in.
+
 ---
 
 ## 📸 Preview
@@ -416,9 +418,12 @@ The charger switch entity is used as the unique ID for the config entry. Adding
 | Home consumption | Yes | `W` |
 | Grid import | Yes | `W` |
 | EV charging power (v2.2.0) | No | `W` |
+| Grid available (v2.6.0) | No | `binary_sensor` |
 
 **EV charging power (v2.2.0):** the most reliable signal for whether the car is actually drawing current — when mapped it becomes the single source of truth for charging detection (and the dashboard's green "EV charging" banner), overriding the status string. In three-phase mode map all three per-phase sensors (they are summed) or leave all blank. The sensor must report positive watts while charging; if yours reports negative, wrap it in a template sensor (`{{ states('sensor.your_power') | float(0) | abs }}`) — the diagnostic sensor's `charging_power_w` will read a flat 0 W if the sign is reversed.
 
+**Grid available (v2.6.0 — [issue #36](https://github.com/antbald/ha-ev-smart-charger/issues/36)):** optional `binary_sensor` (on = grid present, off = grid lost), typically exposed by hybrid inverter integrations (e.g. `binary_sensor.inverter_grid`). On hybrid "Battery First"/UPS inverters a grid outage is invisible to the integration (every power sensor keeps reporting), so Night Smart Charge **grid mode** would keep drawing — now from the home battery — during the outage. When mapped and OFF (sustained for the grid-import delay, default 30 s), the grid-mode session stops. **Fail-safe:** an `unavailable`/`unknown` state (e.g. at HA boot or an inverter-integration restart) is treated as "unknown" and never triggers a stop. Leave empty to keep the previous behaviour.
+
 ### Step 4 — PV Forecast
 
 | Field | Required | Unit |
@@ -554,6 +559,8 @@ When a day's flag is **ON** and the EV target is not yet reached at sunrise, Nig
 | `evsc_night_charge_amperage` | `16` | `6–32` | A | Amperage for overnight charging sessions. |
 | `evsc_min_solar_forecast_threshold` | `20` | `0–100` | kWh | If tomorrow's forecast ≥ this value, Night Smart Charge uses home battery mode instead of grid mode. |
 | `evsc_night_pv_handoff_threshold` | `0` | `0–5000` | W | **v2.3.0 (opt-in).** `0` = disabled (stop at astronomical sunrise). When > 0, on `car_ready` OFF days Night Smart Charge continues past sunrise and hands off to Solar Surplus once measured `fv_production` stays ≥ this value for 5 min (hard-capped at `evsc_car_ready_time`). Recommended ~200 W, above your inverter's idle reading. See the high-latitude note in [Night Smart Charge](#night-smart-charge). |
+| `evsc_nighttime_sunset_offset` | `0` | `0–120` | min | **v2.6.0 (opt-in — [issue #42](https://github.com/antbald/ha-ev-smart-charger/issues/42)).** Minutes **before** sunset at which the nighttime window starts. `0` = astronomical sunset. Extends the window where Solar Surplus is skipped ("SKIPPED: Nighttime"). |
+| `evsc_nighttime_sunrise_offset` | `0` | `0–120` | min | **v2.6.0 (opt-in — [issue #42](https://github.com/antbald/ha-ev-smart-charger/issues/42)).** Minutes **after** sunrise at which the nighttime window ends. `0` = astronomical sunrise. Delays when Solar Surplus resumes in the morning. |
 
 ---
 
 
@@ -24,6 +24,7 @@
     CONF_FV_PRODUCTION,
     CONF_FV_PRODUCTION_L2,
     CONF_FV_PRODUCTION_L3,
+    CONF_GRID_AVAILABLE,
     CONF_GRID_IMPORT,
     CONF_GRID_IMPORT_L2,
     CONF_GRID_IMPORT_L3,
@@ -259,6 +260,14 @@ def _sensor_schema(
             vol.Optional(CONF_CHARGING_POWER_L3, **_field_config(current_data.get(CONF_CHARGING_POWER_L3)))
         ] = _entity_selector("sensor")
 
+    # v2.6.0 (issue #36): optional grid-availability binary_sensor. When mapped
+    # and OFF, Night Smart Charge grid mode stops (avoids draining the home
+    # battery during a grid outage on hybrid Battery First/UPS inverters).
+    # Unmapped → byte-for-byte legacy behaviour.
+    fields[
+        vol.Optional(CONF_GRID_AVAILABLE, **_field_config(current_data.get(CONF_GRID_AVAILABLE)))
+    ] = _entity_selector("binary_sensor")
+
     return vol.Schema(fields)
 
 
 
@@ -2,7 +2,7 @@
 
 # ========== INTEGRATION METADATA ==========
 DOMAIN = "ev_smart_charger"
-VERSION = "2.5.1"
+VERSION = "2.6.0"
 DEFAULT_NAME = "EV Smart Charger"
 FRONTEND_URL_BASE = "/api/ev_smart_charger/frontend"
 FRONTEND_CARD_FILENAME = "ev-smart-charger-dashboard.js"
@@ -111,6 +111,13 @@
 CONF_HOME_CONSUMPTION = "home_consumption"
 CONF_GRID_IMPORT = "grid_import"
 CONF_PV_FORECAST = "pv_forecast"
+# v2.6.0 (issue #36): optional binary_sensor reporting grid availability
+# (on = grid present, off = grid lost). On hybrid "Battery First"/UPS inverters
+# a grid outage is invisible to the integration (all power sensors keep
+# reporting), so Night Smart Charge grid mode would keep draining the home
+# battery. When mapped and OFF (sustained), the night session stops. Unmapped =
+# byte-for-byte legacy behaviour.
+CONF_GRID_AVAILABLE = "grid_available"
 
 # Phase mode + per-phase sensors (v2.0.0). The existing keys above act as L1
 # (so single-phase installs are byte-for-byte unchanged); L2/L3 are only mapped
@@ -206,6 +213,14 @@
 # Battery-only helper (meaningless without a home battery).
 HELPER_MAX_BATTERY_DISCHARGE_FOR_EV_SUFFIX = "evsc_max_battery_discharge_for_ev"
 
+# Numbers - Nighttime window (v2.6.0, issue #42). Customise the "nighttime"
+# period that gates Solar Surplus (the "SKIPPED: Nighttime" decision). Both
+# default to 0 = astronomical sunset/sunrise (legacy behaviour). Positive values
+# EXTEND the night window: it starts <sunset_offset> minutes before sunset and
+# ends <sunrise_offset> minutes after sunrise.
+HELPER_NIGHTTIME_SUNSET_OFFSET_SUFFIX = "evsc_nighttime_sunset_offset"
+HELPER_NIGHTTIME_SUNRISE_OFFSET_SUFFIX = "evsc_nighttime_sunrise_offset"
+
 # Numbers - Night Smart Charge
 HELPER_NIGHT_CHARGE_AMPERAGE_SUFFIX = "evsc_night_charge_amperage"
 HELPER_MIN_SOLAR_FORECAST_THRESHOLD_SUFFIX = "evsc_min_solar_forecast_threshold"
@@ -313,6 +328,12 @@
 # Sustained seconds PV must stay >= threshold before handing off (internal, not a helper).
 NIGHT_PV_HANDOFF_SUSTAIN_SECONDS = 300  # 5 minutes
 
+# v2.6.0 (issue #42): nighttime window offsets (minutes). 0 = astronomical
+# sunset/sunrise (legacy). Positive extends the night: starts this many minutes
+# before sunset / ends this many minutes after sunrise.
+DEFAULT_NIGHTTIME_SUNSET_OFFSET = 0  # minutes before sunset
+DEFAULT_NIGHTTIME_SUNRISE_OFFSET = 0  # minutes after sunrise
+
 # ========== NIGHT SMART CHARGE RETRY SETTINGS (v1.6.1) ==========
 NIGHT_CHARGE_START_MAX_RETRIES = 3  # Maximum attempts to start charger
 NIGHT_CHARGE_START_RETRY_DELAYS = [5, 15, 30]  # Seconds between retry attempts (backoff)
@@ -391,21 +412,23 @@
 # v1.8.0 set the baseline to 64 (added 6 Hybrid Mode entities). v1.11.9 added
 # 1 sensor (evsc_night_session_state) → 65. v2.1.0 (issue #29) adds 1 battery-only
 # number (evsc_max_battery_discharge_for_ev) → 66. v2.3.0 (issue #32) adds 1
-# always-created number (evsc_night_pv_handoff_threshold) → 67.
+# always-created number (evsc_night_pv_handoff_threshold) → 67. v2.6.0 (issue #42)
+# adds 2 always-created numbers (nighttime sunset/sunrise offsets) → 69.
 # COUPLING (issue #22): the disabled-helper tolerance in
 # __init__._async_wait_for_helper_registration assumes this equals the number
 # of entities actually created when nothing is disabled. If it drifts above
 # reality (cf. v1.6.20), a single user-disabled entity turns the tolerant
 # startup path back into a hard ConfigEntryNotReady. Keep this in sync.
-TOTAL_INTEGRATION_ENTITIES = 67
+TOTAL_INTEGRATION_ENTITIES = 69
 # Verified count (v2.3.0): 53 entities when running in PV-only mode.
 # Unchanged in v2.1.0: the discharge number is battery-only (skipped in PV-only mode).
 # v2.3.0 (issue #32): evsc_night_pv_handoff_threshold is NOT battery-only → +1 → 53.
+# v2.6.0 (issue #42): 2 nighttime offset numbers are NOT battery-only → +2 → 55.
 # Skipped helpers (13): 2 switches (use_home_battery, preserve_home_battery),
 # 3 numbers (home_battery_min_soc, battery_support_amperage, battery_support_sunset_buffer),
 # 7 daily home min SOC numbers (Monday–Sunday), 1 sensor (today_home_target).
 # Hybrid Mode entities are still created in PV-only mode but stay IDLE (requires soc_home).
-TOTAL_INTEGRATION_ENTITIES_NO_BATTERY = 53
+TOTAL_INTEGRATION_ENTITIES_NO_BATTERY = 55
 
 
 def has_home_battery(config: dict) -> bool:
 
@@ -63,6 +63,7 @@
     CONF_FV_PRODUCTION,
     CONF_FV_PRODUCTION_L2,
     CONF_FV_PRODUCTION_L3,
+    CONF_GRID_AVAILABLE,
     CONF_GRID_IMPORT,
     CONF_GRID_IMPORT_L2,
     CONF_GRID_IMPORT_L3,
@@ -237,6 +238,8 @@ def _build_card_config(entry: ConfigEntry) -> dict[str, Any]:
         "pv_forecast_tomorrow_entity": CONF_PV_FORECAST_TOMORROW,
         # v2.1.0 (issue #29): optional signed battery-power sensor.
         "battery_power_entity": CONF_BATTERY_POWER,
+        # v2.6.0 (issue #36): optional grid-availability binary_sensor.
+        "grid_available_entity": CONF_GRID_AVAILABLE,
     }
     for card_key, conf_key in mapping.items():
         value = data.get(conf_key)