fix(dishwasher): model delay start as a duration, not a wall-clock time

x.com.samsung.da.delayStartTime is HH:MM:SS until the cycle starts
(e.g. "01:00" means 1 hour from pressing start), not a time of day. It
was wired up as a time entity with a suspicious hour % 24 wrap -- a
sign it was never really a clock time. Replace with a number entity
(0-24h, 1h steps) that reads/writes the field as elapsed hours.
This commit is contained in:
Marc Billow committed 2026-07-10 20:34:25 -05:00
1 parent c3fb4f5f44
commit 87df3a84df
2 files changed
+24 -13

No files matched your search

@@ -2,10 +2,10 @@
Shared by dryer/dishwasher/oven/washer families. Shared by dryer/dishwasher/oven/washer families.
""" """
from datetime import datetime, timezone, timedelta, time as dt_time from datetime import datetime, timezone, timedelta
from ..capability import Capability from ..capability import Capability
from ..entities import BinarySensorDesc, ButtonDesc, SensorDesc, TimeDesc from ..entities import BinarySensorDesc, ButtonDesc, NumberDesc, SensorDesc
_SAMSUNG_STATE_TO_OCF = { _SAMSUNG_STATE_TO_OCF = {
'Ready': 'idle', 'Run': 'active', 'Running': 'active', 'Ready': 'idle', 'Run': 'active', 'Running': 'active',
@@ -28,16 +28,25 @@ def _int(v):
return None return None
def _parse_hms(v): def _delay_hours(v):
"""delayStartTime is a duration until the cycle starts, not a
wall-clock time -- "01:00" means "1 hour from when you press start",
not "1 AM"."""
if not v: if not v:
return None return 0.0
try: try:
h, m, s = v.split(':') h, m, s = v.split(':')
return dt_time(int(h) % 24, int(m), int(s)) return int(h) + int(m) / 60 + int(s) / 3600
except Exception: except Exception:
return None return None
def _format_delay(hours):
total_minutes = round(max(float(hours), 0) * 60)
h, m = divmod(total_minutes, 60)
return f'{h}:{m:02d}:00'
def _finish_time(remaining_str): def _finish_time(remaining_str):
if not remaining_str: if not remaining_str:
return None return None
@@ -87,12 +96,14 @@ OPERATIONAL_STATE = Capability(
or rep.get('x.com.samsung.da.progress') == 'Finish' or rep.get('x.com.samsung.da.progress') == 'Finish'
else _finish_time(rep.get('x.com.samsung.da.remainingTime')) else _finish_time(rep.get('x.com.samsung.da.remainingTime'))
)), )),
TimeDesc(key='delay_start_time', field='x.com.samsung.da.delayStartTime', NumberDesc(key='delay_start_hours', field='x.com.samsung.da.delayStartTime',
name='Delay start', name='Delay start', icon='mdi:timer-plus-outline',
value_fn=_parse_hms, device_class='duration', unit='h',
write_fn=lambda p, rep, href=None: ( native_min=0, native_max=24, step=1,
['operational', 'state', 'vs', '0'], value_fn=_delay_hours,
{'x.com.samsung.da.delayStartTime': f'{p.hour}:{p.minute:02d}:{p.second:02d}'})), write_fn=lambda p, rep, href=None: (
['operational', 'state', 'vs', '0'],
{'x.com.samsung.da.delayStartTime': _format_delay(p)})),
ButtonDesc(key='start', field='', name='Start cycle', payload='Run', ButtonDesc(key='start', field='', name='Start cycle', payload='Run',
icon='mdi:play', icon='mdi:play',
write_fn=lambda p, rep, href=None: ( write_fn=lambda p, rep, href=None: (
+2 -2
View File
@@ -5,7 +5,7 @@
"child_lock", "child_lock",
"cycle", "cycle",
"cycle_active", "cycle_active",
"delay_start_time", "delay_start_hours",
"diagnosis_status", "diagnosis_status",
"energy_kwh", "energy_kwh",
"finish_time", "finish_time",
@@ -36,7 +36,7 @@
"samsung_dishwasher_child_lock", "samsung_dishwasher_child_lock",
"samsung_dishwasher_cycle", "samsung_dishwasher_cycle",
"samsung_dishwasher_cycle_active", "samsung_dishwasher_cycle_active",
"samsung_dishwasher_delay_start_time", "samsung_dishwasher_delay_start_hours",
"samsung_dishwasher_diagnosis_start", "samsung_dishwasher_diagnosis_start",
"samsung_dishwasher_diagnosis_status", "samsung_dishwasher_diagnosis_status",
"samsung_dishwasher_energy_kwh", "samsung_dishwasher_energy_kwh",