Skip to content

Anti-conflict guard: hysteresis + per-cycle decision log #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
partach merged 1 commit into from
May 27, 2026
+88 −12
Merged

Anti-conflict guard: hysteresis + per-cycle decision log #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,22 @@ The confidence factor can drop to 0.1 early in the day on partially cloudy morni
### 4. Consumption Estimate Sensitivity
The algorithm uses consumption_est/24 for hourly drain — assumes flat consumption. Houses with evening peaks (cooking, heating) may see under-predicted evening drain.

### 5. Anti-Conflict Guard Only Checks Instantaneous Power
The 200W grid import check (suppress discharge when importing) triggers on instantaneous reading. Short spikes (kettle, microwave) can briefly suppress profitable discharge.
### 5. Anti-Conflict Guard Hysteresis — IMPLEMENTED
Previously the 200W grid import check suppressed discharge on a single
tick, causing flipper behaviour (discharge → idle → discharge every
~16s) on short load spikes (kettle, microwave, EV start). Two writes
per flip is brutal on the inverter and customers notice.

Now uses thresholded hysteresis:
- Small/moderate import (200–2000W) must persist for ≥ 2 consecutive
cycles (≈ 32s) before suppression triggers.
- Large import (> 2000W) suppresses immediately (genuine sustained
draw like EV charging or oven preheat).
- After suppression ends, a 60-second cooldown blocks re-suppression
so the inverter stabilises before the next decision.
- Each cycle now logs the grid_power + state decision at DEBUG level
so the flipper pattern is easy to spot in retrospect:
`State decision: desired=X, current=Y, soc=%, price=, threshold=, grid_power=W`

### 6. Generator-Port Solar Workaround
TREX-25/50 with micro-inverters on the generator port need special handling. PV registers read 0, falling back to generator_day_cost_energy. Both backend and frontend handle this but it's fragile.
Expand Down
82 changes: 72 additions & 10 deletions custom_components/ha_felicity/coordinator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,14 @@ def __init__(
# transient state that shouldn't survive a mode change.
self._last_grid_mode: str | None = None

# Anti-conflict hysteresis: count consecutive ticks of grid import
# over the small-spike threshold. Suppress discharge only when
# the import is sustained (≥2 ticks ~ 30s) OR very large (>2 kW).
# Without this filter a kettle/microwave/EV-start spike causes the
# inverter to flip discharge → idle → discharge every ~16 seconds.
self._anticonflict_import_ticks: int = 0
self._anticonflict_suppress_until_ts: float = 0.0

@property
def pv_actual_today_kwh(self) -> float | None:
"""Return actual PV energy generated today in kWh from inverter registers.
Expand Down Expand Up @@ -1736,19 +1744,73 @@ def get_attr(names):

desired_state = self._determine_energy_state(battery_soc)

# Anti-conflict guard: don't export while the house is importing
# (e.g. EV charging pulls from grid while we'd be selling battery — wasteful)
# Anti-conflict guard: don't export while the house is
# importing (e.g. EV charging pulls from grid while we'd
# be selling battery — wasteful round-trip). Uses
# hysteresis to avoid flipping discharge → idle → discharge
# on transient load spikes (kettle, microwave, EV start):
# - small/moderate import (200-2000W) must persist for
# ≥ANTICONFLICT_MIN_TICKS consecutive cycles
# - large import (>2000W) suppresses immediately
# - once suppression ends, hold a cooldown window
# before allowing re-suppression
ANTICONFLICT_SOFT_THRESHOLD_W = 200
ANTICONFLICT_HARD_THRESHOLD_W = 2000
ANTICONFLICT_MIN_TICKS = 2
ANTICONFLICT_COOLDOWN_S = 60
grid_power = None
if desired_state == "discharging":
grid_power = None
if hasattr(self.TypeSpecificHandler, 'determine_grid_power'):
grid_power = self.TypeSpecificHandler.determine_grid_power(new_data)
if grid_power is not None and grid_power > 200: # importing >200W from grid
_LOGGER.info(
"Anti-conflict: suppressing discharge — grid importing %.0fW "
"(would sell battery while buying from grid)",
grid_power,
)
desired_state = "idle"
if grid_power is not None and grid_power > ANTICONFLICT_SOFT_THRESHOLD_W:
self._anticonflict_import_ticks += 1
in_cooldown = time.time() < self._anticonflict_suppress_until_ts
sustained = self._anticonflict_import_ticks >= ANTICONFLICT_MIN_TICKS
large = grid_power > ANTICONFLICT_HARD_THRESHOLD_W
if (sustained or large) and not in_cooldown:
_LOGGER.info(
"Anti-conflict: suppressing discharge — grid importing "
"%.0fW (sustained=%d ticks, large=%s) — would sell "
"battery while buying from grid",
grid_power, self._anticonflict_import_ticks, large,
)
desired_state = "idle"
self._anticonflict_suppress_until_ts = (
time.time() + ANTICONFLICT_COOLDOWN_S
)
else:
_LOGGER.debug(
"Anti-conflict: tolerating brief import %.0fW "
"(tick %d/%d, cooldown=%s) — keeping discharge",
grid_power,
self._anticonflict_import_ticks,
ANTICONFLICT_MIN_TICKS,
in_cooldown,
)
else:
if self._anticonflict_import_ticks > 0:
_LOGGER.debug(
"Anti-conflict: import cleared (was %d ticks), "
"grid_power=%.0fW",
self._anticonflict_import_ticks,
grid_power if grid_power is not None else 0,
)
self._anticonflict_import_ticks = 0
else:
# Not trying to discharge — reset the counter so a
# past spike doesn't carry over into the next
# discharge window.
self._anticonflict_import_ticks = 0

_LOGGER.debug(
"State decision: desired=%s, current=%s, soc=%s%%, "
"price=%s, threshold=%s, grid_power=%s",
desired_state, self._current_energy_state,
f"{battery_soc:.1f}" if battery_soc is not None else "?",
f"{self.current_price:.4f}" if self.current_price is not None else "?",
f"{self.price_threshold:.4f}" if self.price_threshold is not None else "?",
f"{grid_power:.0f}W" if grid_power is not None else "?",
)

if desired_state != self._current_energy_state:
success = await self._transition_to_state(desired_state)
Expand Down
Loading