Revert "MAINT-28: during a real peak the maintenance charge stays paused (#247)"
Takes PR #247 (f3f9483) out of release/1.0 so the 19 Nov release ships MAINT-24 + MAINT-25 without MAINT-28. The rig failedf3f9483(reports/MAINT-28-test-report.md) and the fix-forward PR #248 review found a High regression (reports/MAINT-28-fix-review-report.md). MAINT-28 continues on PR #248 after the release. Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude
parent
f3f9483d9c
commit
7bc8ad264b
@@ -537,10 +537,6 @@ 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
|
||||
@@ -568,17 +564,8 @@ class CycleMixin:
|
||||
maint_aim = peakguard.quarter_target_w(
|
||||
float(self.o.get("peak_cap_w", 3500)),
|
||||
self.peak_margin_w, _reading)
|
||||
# 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)
|
||||
self._maint_peak_hold = peakguard.shaping_held(
|
||||
_susp, _peak_held and len(self.inverters) > 1
|
||||
and maint_aim > self.peak_aim_w(),
|
||||
self.peak_fc, maint_aim, house)
|
||||
if self._maint_peak_hold:
|
||||
if peakguard.shaping_suspended(
|
||||
self.peak_guard, self.peak_fc, maint_aim):
|
||||
# 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.
|
||||
|
||||
Reference in New Issue
Block a user