Merge pull request #134 from partach/claude/expand-felicity-card-B7dl4

Sanity check fixes: expose multi-objective knobs in UI, fix doc drift

Author: partach

CLAUDE.md

@@ -127,14 +127,21 @@ the cheapest scheduled slot. This compensates for deficit shrinking as PV
 confidence recovers mid-day — without it, early expensive slots would
 execute while later cheaper slots got dropped from a re-plan.
 
-### State Transitions (coordinator.py:1195-1231)
+### State Transitions (coordinator.py `_transition_to_state`, ~1425-1482)
 
 | State | econ_rule_1_enable | Voltage | SOC | Power |
 |---|---|---|---|---|
 | charging | 1 | voltage_level (default 58V) | charge_max (default 100%) | safe_max_power (W) |
-| discharging | 2 | discharge_min_voltage (default 50V) | discharge_min (default 20%) | safe_max_power (W) |
+| discharging | 2 | discharge_min_voltage (default 50V) | discharge floor (see below) | safe_max_power (W) |
 | idle | 0 | *(not written)* | *(not written)* | *(not written)* |
 
+**Discharge SOC floor**: in auto mode (grid_mode active) the discharging
+SOC register is written from the *computed* `_reserve_target_pct`
+(the planned reserve target), not the raw `battery_discharge_min_level`.
+This makes the inverter's hardware floor match the schedule's intended
+reserve rather than the absolute minimum. When the EMS is off it falls
+back to the user's `discharge_min` setting.
+
 ### Model Differences
 
 | Aspect | TREX-5 | TREX-10 | TREX-25 | TREX-50 |
@@ -337,7 +344,7 @@ in the UI.
 
 ---
 
-## Safe Power Management (coordinator.py:1077-1193)
+## Safe Power Management (coordinator.py `_check_safe_power`, ~1307-1424)
 
 Monitors grid current per phase and adjusts inverter power:
 
@@ -398,11 +405,14 @@ Fetches `energy_state` history from HA API (throttled 60s), shows what actually
 | price_threshold_level | number | 1-10 | 5 | Manual price level |
 | battery_charge_max_level | number | 30-100% | 100 | Max SOC for charging |
 | battery_discharge_min_level | number | 10-70% | 20 | Min SOC for discharging |
-| battery_capacity_kwh | number | 1-100 kWh | 10 | Usable battery capacity |
+| battery_capacity_kwh | number | 1-200 kWh | 10 | Usable battery capacity |
 | efficiency_factor | number | 0.70-1.00 | 0.90 | Round-trip efficiency |
-| daily_consumption_estimate | number | 0-100 kWh | 10 | Fallback consumption |
+| daily_consumption_estimate | number | 0-120 kWh | 10 | Fallback consumption |
 | reserve_target_pct | number | 0-100% | 0 | Fixed reserve floor (0=dynamic) |
 | arbitrage_price_delta | number | 0-0.50 €/kWh | 0 | Price spread for full charge |
+| battery_cycle_cost_eur_kwh | number | 0-0.50 €/kWh | 0 | Battery wear cost (profitability filter) |
+| optimization_priority | select | cost/longevity/self_consumption | cost | Multi-objective strategy |
+| block_export_on_negative_price | select | on/off | on | Skip sell scheduling at p < 0 |
 | max_amperage_per_phase | number | 10-63 A | 16 | Grid current limit |
 | voltage_level | number | 48-60 V | 58 | Charge voltage setpoint |
 | discharge_min_voltage | number | 48-55 V | 50 | Discharge voltage floor |
@@ -675,7 +685,23 @@ other entities) to be unusable on fresh installs.
 keys (`max_amperage_per_phase`, `safe_power_management`,
 `battery_cycle_cost_eur_kwh`, `optimization_priority`,
 `block_export_on_negative_price`) so new installations get them
-written at setup time.
+written at setup time.  The migration block `defaults_to_set` in
+`__init__.py` (runs on every `async_setup_entry`) mirrors the same
+keys so *existing* installs upgrading to a newer version backfill
+missing options too.
+
+#### C6. UI Entities for Multi-Objective Knobs — IMPLEMENTED
+The three knobs added in the lifecycle overhaul previously had no UI
+control — they lived only in `entry.options` defaults and could not be
+changed by the user.  They now have entities:
+- `battery_cycle_cost_eur_kwh` → number (0-0.50 €/kWh, number.py)
+- `optimization_priority` → select (cost/longevity/self_consumption, select.py)
+- `block_export_on_negative_price` → select (on/off, select.py)
+
+Because `block_export_on_negative_price` is stored as a string ("on"/"off")
+by the select but consumed as a bool by `EMSConfig`, the coordinator
+converts it: `str(opts.get(..., "on")).lower() not in ("off","false","0")`.
+This also tolerates the legacy bool value from earlier installs.
 
 ### Deferred Items (Need Separate Iteration)
 

custom_components/ha_felicity/__init__.py

@@ -191,6 +191,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         "daily_consumption_estimate": 10,
         "price_mode": "manual",
         "safe_power_management": "auto",
+        "reserve_target_pct": 0,
+        "arbitrage_price_delta": 0.0,
+        "max_amperage_per_phase": 16,
+        "battery_cycle_cost_eur_kwh": 0.0,
+        "optimization_priority": "cost",
+        "block_export_on_negative_price": "on",
         "charge_to_full_on_negative_price": "off",
         "discharge_to_make_room_for_negative_price": "off",
         "rule1_time_window": "manual",

custom_components/ha_felicity/config_flow.py

@@ -90,7 +90,7 @@ def _get_default_options(self) -> dict:
             "safe_power_management": self._user_input.get("safe_power_management", "auto"),
             "battery_cycle_cost_eur_kwh": self._user_input.get("battery_cycle_cost_eur_kwh", 0.0),
             "optimization_priority": self._user_input.get("optimization_priority", "cost"),
-            "block_export_on_negative_price": self._user_input.get("block_export_on_negative_price", True),
+            "block_export_on_negative_price": self._user_input.get("block_export_on_negative_price", "on"),
         }
 
     @staticmethod

custom_components/ha_felicity/coordinator.py

@@ -688,9 +688,9 @@ def _calculate_schedule(self, battery_soc: float | None) -> None:
             arbitrage_price_delta=opts.get("arbitrage_price_delta", 0.0),
             battery_cycle_cost_eur_kwh=opts.get("battery_cycle_cost_eur_kwh", 0.0),
             optimization_priority=opts.get("optimization_priority", "cost"),
-            block_export_on_negative_price=opts.get(
-                "block_export_on_negative_price", True
-            ),
+            block_export_on_negative_price=str(
+                opts.get("block_export_on_negative_price", "on")
+            ).lower() not in ("off", "false", "0"),
             charge_to_full_on_negative_price=opts.get(
                 "charge_to_full_on_negative_price", "off"
             ) == "on",

custom_components/ha_felicity/number.py

@@ -175,6 +175,7 @@ async def async_setup_entry(
             step=5,
             unit="%",
             icon="mdi:battery-lock",
+            default_value=0,
         ),
         HA_FelicityInternalNumber(
             coordinator,
@@ -186,6 +187,19 @@ async def async_setup_entry(
             step=0.01,
             unit="€/kWh",
             icon="mdi:cash-multiple",
+            default_value=0.0,
+        ),
+        HA_FelicityInternalNumber(
+            coordinator,
+            entry,
+            option_key="battery_cycle_cost_eur_kwh",
+            name="Battery Cycle Cost",
+            min_val=0,
+            max_val=0.50,
+            step=0.01,
+            unit="€/kWh",
+            icon="mdi:battery-clock",
+            default_value=0.0,
         ),
     ])
 

custom_components/ha_felicity/select.py

@@ -83,6 +83,30 @@ async def async_setup_entry(
         )
     )
 
+    entities.append(
+        HA_FelicitySpecialModeSelect(
+            coordinator=coordinator,
+            entry=entry,
+            option_key="optimization_priority",
+            select_options=["cost", "longevity", "self_consumption"],
+            name="Optimization Priority",
+            icon="mdi:scale-balance",
+            entity_category=EntityCategory.CONFIG,
+        )
+    )
+
+    entities.append(
+        HA_FelicitySpecialModeSelect(
+            coordinator=coordinator,
+            entry=entry,
+            option_key="block_export_on_negative_price",
+            select_options=["on", "off"],
+            name="Block Export On Negative Price",
+            icon="mdi:transmission-tower-export",
+            entity_category=EntityCategory.CONFIG,
+        )
+    )
+
     entities.append(
         HA_FelicitySpecialModeSelect(
             coordinator=coordinator,
@@ -107,9 +131,6 @@ async def async_setup_entry(
         )
     )
 
-    # Rule 1 time-window auto management: on "auto" the integration writes
-    # start_time=00:00 and stop_time=23:59 (Felicity's 24h convention) so
-    # the rule never gates the schedule on time of day.
     entities.append(
         HA_FelicitySpecialModeSelect(
             coordinator=coordinator,
@@ -122,9 +143,6 @@ async def async_setup_entry(
         )
     )
 
-    # Rule 1 weekday-mask auto management: on "auto" the integration writes
-    # effective_week=0x7F (all 7 days) so the rule never gates the schedule
-    # on day of week.
     entities.append(
         HA_FelicitySpecialModeSelect(
             coordinator=coordinator,