Compare commits
22
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8504682d9b | ||
|
|
aff7647460 | ||
|
|
705da781f1 | ||
|
|
6de1a4090e | ||
|
|
ef75db6697 | ||
|
|
9e290f27ee | ||
|
|
37bfff152d | ||
|
|
317b7d0c1b | ||
|
|
ba8e41d310 | ||
|
|
724686c42c | ||
|
|
edccb6ae3f | ||
|
|
4a91f62a36 | ||
|
|
1d4d38db14 | ||
|
|
365a1c4722 | ||
|
|
7be91b56e8 | ||
|
|
2c283218b0 | ||
|
|
ab874797fc | ||
|
|
f5d4e2219a | ||
|
|
86f07abf30 | ||
|
|
b00390c093 | ||
|
|
e913a3c2c0 | ||
|
|
b2db4bf357 |
No files matched your search
@@ -237,32 +237,33 @@ _DEAD_INSTANTANEOUS_POWER = '-500'
|
|||||||
ENERGY_METER = Capability(
|
ENERGY_METER = Capability(
|
||||||
href='/energy/consumption/vs/0',
|
href='/energy/consumption/vs/0',
|
||||||
entities=(
|
entities=(
|
||||||
# `not rep` keeps the empty-{} stub carve-out (see entity._is_included):
|
# No `not rep` stub carve-out (issue #78: a fridge whose
|
||||||
# an explicit exists_fn otherwise bypasses it, which would drop the
|
# /energy/consumption/vs/0 is permanently {} -- it just doesn't
|
||||||
# entity when /device/0 returns a not-yet-fetched stub. On a populated
|
# report energy data -- got all five sensors created anyway and
|
||||||
# rep, hide power only for the dead sentinel or an absent field.
|
# stuck at "Unknown" forever, since an empty {} rep and a
|
||||||
|
# not-yet-fetched stub are indistinguishable from content alone).
|
||||||
|
# Same tradeoff AI_ENERGY_LEVEL below already makes deliberately:
|
||||||
|
# an entity that's unlucky on first-poll timing stays absent until
|
||||||
|
# a reload sees real data, rather than every genuinely-unsupported
|
||||||
|
# resource showing a permanent phantom sensor.
|
||||||
SensorDesc(key='power_watts', field='x.com.samsung.da.instantaneousPower',
|
SensorDesc(key='power_watts', field='x.com.samsung.da.instantaneousPower',
|
||||||
device_class='power', state_class='measurement',
|
device_class='power', state_class='measurement',
|
||||||
unit='W', value_fn=clamp_power,
|
unit='W', value_fn=clamp_power,
|
||||||
exists_fn=lambda rep, resources: not rep or (
|
exists_fn=lambda rep, resources: (
|
||||||
rep.get('x.com.samsung.da.instantaneousPower')
|
rep.get('x.com.samsung.da.instantaneousPower')
|
||||||
not in (None, _DEAD_INSTANTANEOUS_POWER))),
|
not in (None, _DEAD_INSTANTANEOUS_POWER))),
|
||||||
SensorDesc(key='energy_kwh', field='x.com.samsung.da.cumulativePower',
|
SensorDesc(key='energy_kwh', field='x.com.samsung.da.cumulativePower',
|
||||||
device_class='energy',
|
device_class='energy',
|
||||||
state_class='total_increasing', unit='kWh', value_fn=wh_to_kwh,
|
state_class='total_increasing', unit='kWh', value_fn=wh_to_kwh,
|
||||||
exists_fn=lambda rep, resources: (
|
exists_fn=lambda rep, resources: 'x.com.samsung.da.cumulativePower' in rep),
|
||||||
not rep or 'x.com.samsung.da.cumulativePower' in rep)),
|
|
||||||
# cumulativeConsumption is a second, independently-varying running
|
# cumulativeConsumption is a second, independently-varying running
|
||||||
# total alongside cumulativePower -- some fridges (issue #26) report
|
# total alongside cumulativePower -- some fridges (issue #26) report
|
||||||
# both. Self-gates off where only cumulativePower is present. `not
|
# both. Self-gates off where only cumulativePower is present.
|
||||||
# rep or` keeps the same empty-{} stub carve-out as power_watts/
|
|
||||||
# energy_kwh above -- without it, an exists_fn permanently drops the
|
|
||||||
# entity if setup happens to land on a not-yet-fetched stub.
|
|
||||||
SensorDesc(key='power_energy_kwh', field='x.com.samsung.da.cumulativeConsumption',
|
SensorDesc(key='power_energy_kwh', field='x.com.samsung.da.cumulativeConsumption',
|
||||||
device_class='energy',
|
device_class='energy',
|
||||||
state_class='total_increasing', unit='kWh', value_fn=wh_to_kwh,
|
state_class='total_increasing', unit='kWh', value_fn=wh_to_kwh,
|
||||||
exists_fn=lambda rep, resources: (
|
exists_fn=lambda rep, resources: (
|
||||||
not rep or 'x.com.samsung.da.cumulativeConsumption' in rep)),
|
'x.com.samsung.da.cumulativeConsumption' in rep)),
|
||||||
# AI Energy Mode's lifetime savings estimate vs. an unoptimized
|
# AI Energy Mode's lifetime savings estimate vs. an unoptimized
|
||||||
# baseline -- present on some models (e.g. TP1X_REF_21K, issue #21/
|
# baseline -- present on some models (e.g. TP1X_REF_21K, issue #21/
|
||||||
# #27) and absent on others (issue #20/#26), unlike cumulativePower.
|
# #27) and absent on others (issue #20/#26), unlike cumulativePower.
|
||||||
@@ -270,7 +271,7 @@ ENERGY_METER = Capability(
|
|||||||
device_class='energy',
|
device_class='energy',
|
||||||
state_class='total_increasing', unit='kWh', value_fn=wh_to_kwh,
|
state_class='total_increasing', unit='kWh', value_fn=wh_to_kwh,
|
||||||
exists_fn=lambda rep, resources: (
|
exists_fn=lambda rep, resources: (
|
||||||
not rep or 'x.com.samsung.da.cumulativeSavedPower' in rep)),
|
'x.com.samsung.da.cumulativeSavedPower' in rep)),
|
||||||
# Monthly billing-cycle totals -- the completed prior month and the
|
# Monthly billing-cycle totals -- the completed prior month and the
|
||||||
# in-progress current month. Not ever-increasing (each resets at
|
# in-progress current month. Not ever-increasing (each resets at
|
||||||
# month boundary), so no state_class.
|
# month boundary), so no state_class.
|
||||||
@@ -278,12 +279,12 @@ ENERGY_METER = Capability(
|
|||||||
device_class='energy',
|
device_class='energy',
|
||||||
unit='kWh', value_fn=wh_to_kwh,
|
unit='kWh', value_fn=wh_to_kwh,
|
||||||
exists_fn=lambda rep, resources: (
|
exists_fn=lambda rep, resources: (
|
||||||
not rep or 'x.com.samsung.da.monthlyConsumption' in rep)),
|
'x.com.samsung.da.monthlyConsumption' in rep)),
|
||||||
SensorDesc(key='energy_this_month_kwh', field='x.com.samsung.da.thismonthlyConsumption',
|
SensorDesc(key='energy_this_month_kwh', field='x.com.samsung.da.thismonthlyConsumption',
|
||||||
device_class='energy',
|
device_class='energy',
|
||||||
unit='kWh', value_fn=wh_to_kwh,
|
unit='kWh', value_fn=wh_to_kwh,
|
||||||
exists_fn=lambda rep, resources: (
|
exists_fn=lambda rep, resources: (
|
||||||
not rep or 'x.com.samsung.da.thismonthlyConsumption' in rep)),
|
'x.com.samsung.da.thismonthlyConsumption' in rep)),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -414,12 +415,12 @@ SELF_CHECK = Capability(
|
|||||||
icon='mdi:clipboard-check-outline',
|
icon='mdi:clipboard-check-outline',
|
||||||
entity_category='diagnostic'),
|
entity_category='diagnostic'),
|
||||||
# List of error codes from the last self-check; joined for display.
|
# List of error codes from the last self-check; joined for display.
|
||||||
# Not every fridge reports the field, hence the exists_fn.
|
# Not every fridge reports the field, hence the exists_fn (no stub
|
||||||
|
# carve-out -- see ENERGY_METER above).
|
||||||
SensorDesc(key='selfcheck_error', field='x.com.samsung.da.error',
|
SensorDesc(key='selfcheck_error', field='x.com.samsung.da.error',
|
||||||
icon='mdi:alert-circle-outline',
|
icon='mdi:alert-circle-outline',
|
||||||
entity_category='diagnostic',
|
entity_category='diagnostic',
|
||||||
exists_fn=lambda rep, resources: (
|
exists_fn=lambda rep, resources: 'x.com.samsung.da.error' in rep,
|
||||||
not rep or 'x.com.samsung.da.error' in rep),
|
|
||||||
value_fn=lambda v: (', '.join(v) if v else None) if isinstance(v, list) else v),
|
value_fn=lambda v: (', '.join(v) if v else None) if isinstance(v, list) else v),
|
||||||
ButtonDesc(key='selfcheck_start', field='', payload='Start',
|
ButtonDesc(key='selfcheck_start', field='', payload='Start',
|
||||||
icon='mdi:play-circle-outline',
|
icon='mdi:play-circle-outline',
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ COOKTOP_MODE = Capability(
|
|||||||
options, f'OperationState{slot}'
|
options, f'OperationState{slot}'
|
||||||
),
|
),
|
||||||
exists_fn=lambda rep, resources, slot=slot: (
|
exists_fn=lambda rep, resources, slot=slot: (
|
||||||
not rep or _option_value(
|
_option_value(
|
||||||
rep.get('x.com.samsung.da.options'),
|
rep.get('x.com.samsung.da.options'),
|
||||||
f'OperationState{slot}',
|
f'OperationState{slot}',
|
||||||
) is not None
|
) is not None
|
||||||
|
|||||||
@@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
Shared by dryer/dishwasher/oven/washer families.
|
Shared by dryer/dishwasher/oven/washer families.
|
||||||
"""
|
"""
|
||||||
from datetime import datetime, timezone, timedelta
|
import math
|
||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
|
||||||
from ..capability import Capability
|
from ..capability import Capability
|
||||||
from ..entities import BinarySensorDesc, ButtonDesc, NumberDesc, SensorDesc
|
from ..entities import BinarySensorDesc, ButtonDesc, NumberDesc, SensorDesc
|
||||||
@@ -28,17 +29,41 @@ def _int(v):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def _is_active(rep):
|
||||||
|
"""Check if appliance is actively running and cycle is not finished."""
|
||||||
|
return (
|
||||||
|
_SAMSUNG_STATE_TO_OCF.get(rep.get('x.com.samsung.da.state')) == 'active'
|
||||||
|
and rep.get('x.com.samsung.da.progress') != 'Finish'
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _remaining_seconds(raw):
|
||||||
|
"""'HH:MM:SS' (or 'MM:SS') -> total seconds, or None."""
|
||||||
|
if not isinstance(raw, str):
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
parts = [int(p) for p in raw.split(':')]
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
return None
|
||||||
|
|
||||||
|
if len(parts) == 3:
|
||||||
|
h, m, s = parts
|
||||||
|
elif len(parts) == 2:
|
||||||
|
h, m, s = 0, *parts
|
||||||
|
else:
|
||||||
|
return None
|
||||||
|
|
||||||
|
return h * 3600 + m * 60 + s
|
||||||
|
|
||||||
|
|
||||||
def _delay_hours(v):
|
def _delay_hours(v):
|
||||||
"""delayStartTime is a duration until the cycle starts, not a
|
"""delayStartTime is a duration until the cycle starts, not a
|
||||||
wall-clock time -- "01:00" means "1 hour from when you press start",
|
wall-clock time -- "01:00" means "1 hour from when you press start",
|
||||||
not "1 AM"."""
|
not "1 AM"."""
|
||||||
if not v:
|
total_seconds = _remaining_seconds(v)
|
||||||
return 0.0
|
if total_seconds is None:
|
||||||
try:
|
return 0.0 if not v else None
|
||||||
h, m, s = v.split(':')
|
return total_seconds / 3600.0
|
||||||
return int(h) + int(m) / 60 + int(s) / 3600
|
|
||||||
except Exception:
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _format_delay(hours):
|
def _format_delay(hours):
|
||||||
@@ -53,21 +78,33 @@ def _delay_field(rep):
|
|||||||
wall-clock time -- see _delay_hours). Write back whichever key the
|
wall-clock time -- see _delay_hours). Write back whichever key the
|
||||||
device itself is using; default to delayStartTime for hardware that
|
device itself is using; default to delayStartTime for hardware that
|
||||||
reports neither yet (matches prior behavior)."""
|
reports neither yet (matches prior behavior)."""
|
||||||
return ('x.com.samsung.da.delayEndTime' if 'x.com.samsung.da.delayEndTime' in rep
|
return (
|
||||||
else 'x.com.samsung.da.delayStartTime')
|
'x.com.samsung.da.delayEndTime' if 'x.com.samsung.da.delayEndTime' in rep
|
||||||
|
else 'x.com.samsung.da.delayStartTime'
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def _finish_time(remaining_str):
|
def _finish_time(rep):
|
||||||
if not remaining_str:
|
if not _is_active(rep):
|
||||||
return None
|
return None
|
||||||
try:
|
total_s = _remaining_seconds(rep.get('x.com.samsung.da.remainingTime'))
|
||||||
h, m, s = remaining_str.split(':')
|
if not total_s:
|
||||||
total_s = int(h) * 3600 + int(m) * 60 + int(s)
|
|
||||||
if total_s == 0:
|
|
||||||
return None
|
|
||||||
return datetime.now(timezone.utc) + timedelta(seconds=total_s)
|
|
||||||
except Exception:
|
|
||||||
return None
|
return None
|
||||||
|
return datetime.now(timezone.utc) + timedelta(seconds=total_s)
|
||||||
|
|
||||||
|
|
||||||
|
def _completion_minutes(rep):
|
||||||
|
"""Parse remaining time into minutes directly from device payload."""
|
||||||
|
raw = rep.get('x.com.samsung.da.remainingTime') or rep.get('remainingTime')
|
||||||
|
total_s = _remaining_seconds(raw)
|
||||||
|
if total_s is None:
|
||||||
|
return None
|
||||||
|
|
||||||
|
# Avoid the firmware bug where it freezes at 1 minute post-cycle
|
||||||
|
if rep.get('x.com.samsung.da.progress') == 'Finish':
|
||||||
|
return 0
|
||||||
|
|
||||||
|
return math.ceil(total_s / 60)
|
||||||
|
|
||||||
|
|
||||||
# Shared by dryer/dishwasher/oven/washer -- oven.py imports this directly
|
# Shared by dryer/dishwasher/oven/washer -- oven.py imports this directly
|
||||||
@@ -87,6 +124,7 @@ OPERATIONAL_STATE = Capability(
|
|||||||
device_class='enum',
|
device_class='enum',
|
||||||
options=('idle', 'active', 'pause'),
|
options=('idle', 'active', 'pause'),
|
||||||
translation_key='machine_state', value_fn=_to_ocf),
|
translation_key='machine_state', value_fn=_to_ocf),
|
||||||
|
|
||||||
# cycle_active is a bool derived from machine_state; used by the
|
# cycle_active is a bool derived from machine_state; used by the
|
||||||
# adapter to gate oven writes (cycle_active_field='cycle_active').
|
# adapter to gate oven writes (cycle_active_field='cycle_active').
|
||||||
# Harmless for non-oven appliances — just an extra bool in state.
|
# Harmless for non-oven appliances — just an extra bool in state.
|
||||||
@@ -106,21 +144,26 @@ OPERATIONAL_STATE = Capability(
|
|||||||
'Idle' if _SAMSUNG_STATE_TO_OCF.get(rep.get('x.com.samsung.da.state')) != 'active'
|
'Idle' if _SAMSUNG_STATE_TO_OCF.get(rep.get('x.com.samsung.da.state')) != 'active'
|
||||||
else _progress(rep.get('x.com.samsung.da.progress'))
|
else _progress(rep.get('x.com.samsung.da.progress'))
|
||||||
)),
|
)),
|
||||||
|
|
||||||
SensorDesc(key='progress_percentage',
|
SensorDesc(key='progress_percentage',
|
||||||
unit='%', state_class='measurement',
|
unit='%', state_class='measurement',
|
||||||
rep_fn=lambda rep: (
|
rep_fn=lambda rep: (
|
||||||
0 if _SAMSUNG_STATE_TO_OCF.get(rep.get('x.com.samsung.da.state')) != 'active'
|
0 if _SAMSUNG_STATE_TO_OCF.get(rep.get('x.com.samsung.da.state')) != 'active'
|
||||||
else _int(rep.get('x.com.samsung.da.progressPercentage'))
|
else _int(rep.get('x.com.samsung.da.progressPercentage'))
|
||||||
)),
|
)),
|
||||||
|
|
||||||
# Only show finish time when machine is actively running. Samsung
|
# Only show finish time when machine is actively running. Samsung
|
||||||
# firmware leaves a stale remainingTime after a cycle ends, and
|
# firmware leaves a stale remainingTime after a cycle ends, and
|
||||||
# freezes it at '00:01:00' when progress reaches 'Finish'.
|
# freezes it at '00:01:00' when progress reaches 'Finish'.
|
||||||
SensorDesc(key='finish_time', device_class='timestamp',
|
SensorDesc(key='finish_time', device_class='timestamp',
|
||||||
rep_fn=lambda rep: (
|
rep_fn=_finish_time),
|
||||||
None if _SAMSUNG_STATE_TO_OCF.get(rep.get('x.com.samsung.da.state')) != 'active'
|
|
||||||
or rep.get('x.com.samsung.da.progress') == 'Finish'
|
SensorDesc(key='completion_minutes',
|
||||||
else _finish_time(rep.get('x.com.samsung.da.remainingTime'))
|
icon='mdi:clock-outline', unit='min',
|
||||||
)),
|
device_class='duration', state_class='measurement',
|
||||||
|
exists_fn=lambda rep, resources: _completion_minutes(rep) is not None,
|
||||||
|
rep_fn=_completion_minutes),
|
||||||
|
|
||||||
NumberDesc(key='delay_start_hours', icon='mdi:timer-plus-outline',
|
NumberDesc(key='delay_start_hours', icon='mdi:timer-plus-outline',
|
||||||
device_class='duration', unit='h',
|
device_class='duration', unit='h',
|
||||||
native_min=0, native_max=24, step=1,
|
native_min=0, native_max=24, step=1,
|
||||||
@@ -140,6 +183,7 @@ OPERATIONAL_STATE = Capability(
|
|||||||
write_fn=lambda p, rep, href=None: (
|
write_fn=lambda p, rep, href=None: (
|
||||||
['operational', 'state', 'vs', '0'],
|
['operational', 'state', 'vs', '0'],
|
||||||
{'x.com.samsung.da.state': p})),
|
{'x.com.samsung.da.state': p})),
|
||||||
|
|
||||||
STOP_BUTTON,
|
STOP_BUTTON,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@@ -400,7 +400,9 @@
|
|||||||
"7e": "Self-Clean",
|
"7e": "Self-Clean",
|
||||||
"86": "Deep Wash",
|
"86": "Deep Wash",
|
||||||
"8f": "Intense Cold",
|
"8f": "Intense Cold",
|
||||||
"96": "Less Microfiber"
|
"96": "Less Microfiber",
|
||||||
|
"2b": "AI Wash",
|
||||||
|
"2a": "Jeans"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"washer_dry_level": {
|
"washer_dry_level": {
|
||||||
@@ -509,6 +511,9 @@
|
|||||||
"finish_time": {
|
"finish_time": {
|
||||||
"name": "Estimated finish"
|
"name": "Estimated finish"
|
||||||
},
|
},
|
||||||
|
"completion_minutes": {
|
||||||
|
"name": "Completion time"
|
||||||
|
},
|
||||||
"freezer_temperature": {
|
"freezer_temperature": {
|
||||||
"name": "Freezer temperature"
|
"name": "Freezer temperature"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -400,7 +400,9 @@
|
|||||||
"7e": "Zelfreinigend",
|
"7e": "Zelfreinigend",
|
||||||
"86": "Diep wassen",
|
"86": "Diep wassen",
|
||||||
"8f": "Intensief koud",
|
"8f": "Intensief koud",
|
||||||
"96": "Minder microvezels"
|
"96": "Minder microvezels",
|
||||||
|
"2b": "AI Wash",
|
||||||
|
"2a": "Spijkerbroek"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"washer_dry_level": {
|
"washer_dry_level": {
|
||||||
@@ -509,6 +511,9 @@
|
|||||||
"finish_time": {
|
"finish_time": {
|
||||||
"name": "Geschatte eindtijd"
|
"name": "Geschatte eindtijd"
|
||||||
},
|
},
|
||||||
|
"completion_minutes": {
|
||||||
|
"name": "Voltooiingstijd"
|
||||||
|
},
|
||||||
"freezer_temperature": {
|
"freezer_temperature": {
|
||||||
"name": "Vriezertemperatuur"
|
"name": "Vriezertemperatuur"
|
||||||
},
|
},
|
||||||
|
|||||||
-6
@@ -6,19 +6,13 @@
|
|||||||
"diagnosis_status",
|
"diagnosis_status",
|
||||||
"display_light",
|
"display_light",
|
||||||
"dust",
|
"dust",
|
||||||
"energy_kwh",
|
|
||||||
"energy_last_month_kwh",
|
|
||||||
"energy_saved_kwh",
|
|
||||||
"energy_this_month_kwh",
|
|
||||||
"fan_direction",
|
"fan_direction",
|
||||||
"fan_speed_level",
|
"fan_speed_level",
|
||||||
"filter_progress",
|
"filter_progress",
|
||||||
"fine_dust",
|
"fine_dust",
|
||||||
"odor",
|
"odor",
|
||||||
"operating_mode",
|
"operating_mode",
|
||||||
"power_energy_kwh",
|
|
||||||
"power_switch",
|
"power_switch",
|
||||||
"power_watts",
|
|
||||||
"super_fine_dust"
|
"super_fine_dust"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
+1
@@ -3,6 +3,7 @@
|
|||||||
"alarm_code",
|
"alarm_code",
|
||||||
"auto_release_dry",
|
"auto_release_dry",
|
||||||
"child_lock",
|
"child_lock",
|
||||||
|
"completion_minutes",
|
||||||
"cycle",
|
"cycle",
|
||||||
"cycle_active",
|
"cycle_active",
|
||||||
"delay_start_hours",
|
"delay_start_hours",
|
||||||
|
|||||||
Vendored
+1
@@ -3,6 +3,7 @@
|
|||||||
"alarm_code",
|
"alarm_code",
|
||||||
"buzzer_sound",
|
"buzzer_sound",
|
||||||
"child_lock",
|
"child_lock",
|
||||||
|
"completion_minutes",
|
||||||
"cycle",
|
"cycle",
|
||||||
"cycle_active",
|
"cycle_active",
|
||||||
"delay_start_hours",
|
"delay_start_hours",
|
||||||
|
|||||||
Vendored
+1
@@ -5,6 +5,7 @@
|
|||||||
"bubble_soak",
|
"bubble_soak",
|
||||||
"buzzer_sound",
|
"buzzer_sound",
|
||||||
"child_lock",
|
"child_lock",
|
||||||
|
"completion_minutes",
|
||||||
"cycle",
|
"cycle",
|
||||||
"cycle_active",
|
"cycle_active",
|
||||||
"delay_start_hours",
|
"delay_start_hours",
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
"alarm_code",
|
"alarm_code",
|
||||||
"bubble_soak",
|
"bubble_soak",
|
||||||
"child_lock",
|
"child_lock",
|
||||||
|
"completion_minutes",
|
||||||
"cycle",
|
"cycle",
|
||||||
"cycle_active",
|
"cycle_active",
|
||||||
"delay_start_hours",
|
"delay_start_hours",
|
||||||
|
|||||||
+1
@@ -2,6 +2,7 @@
|
|||||||
"state_keys": [
|
"state_keys": [
|
||||||
"alarm_code",
|
"alarm_code",
|
||||||
"child_lock",
|
"child_lock",
|
||||||
|
"completion_minutes",
|
||||||
"cycle",
|
"cycle",
|
||||||
"cycle_active",
|
"cycle_active",
|
||||||
"delay_start_hours",
|
"delay_start_hours",
|
||||||
|
|||||||
@@ -156,13 +156,17 @@ class TestEnergyMeter:
|
|||||||
kwh = next(e for e in common.ENERGY_METER.entities if e.key == 'energy_kwh')
|
kwh = next(e for e in common.ENERGY_METER.entities if e.key == 'energy_kwh')
|
||||||
assert kwh.exists_fn({'x.com.samsung.da.cumulativePower': '58900'}, {}) is True
|
assert kwh.exists_fn({'x.com.samsung.da.cumulativePower': '58900'}, {}) is True
|
||||||
|
|
||||||
def test_both_entities_included_on_empty_stub(self):
|
def test_both_entities_hidden_on_empty_rep(self):
|
||||||
"""An empty {} rep means the resource exists but data isn't fetched yet
|
"""Issue #78: a permanently-{} rep (a fridge that just doesn't report
|
||||||
(see entity._is_included) -- include both so sub-polls populate them."""
|
energy data) must not spawn a phantom sensor stuck at "Unknown"
|
||||||
|
forever -- an empty {} rep and a not-yet-fetched stub are
|
||||||
|
indistinguishable from content alone, so this deliberately drops the
|
||||||
|
old stub carve-out (same tradeoff AI_ENERGY_LEVEL already makes,
|
||||||
|
see TestAiEnergyLevelStubDoesNotDecideThePlatform)."""
|
||||||
pw = next(e for e in common.ENERGY_METER.entities if e.key == 'power_watts')
|
pw = next(e for e in common.ENERGY_METER.entities if e.key == 'power_watts')
|
||||||
kwh = next(e for e in common.ENERGY_METER.entities if e.key == 'energy_kwh')
|
kwh = next(e for e in common.ENERGY_METER.entities if e.key == 'energy_kwh')
|
||||||
assert pw.exists_fn({}, {}) is True
|
assert pw.exists_fn({}, {}) is False
|
||||||
assert kwh.exists_fn({}, {}) is True
|
assert kwh.exists_fn({}, {}) is False
|
||||||
|
|
||||||
def test_power_watts_hidden_when_field_absent_in_populated_rep(self):
|
def test_power_watts_hidden_when_field_absent_in_populated_rep(self):
|
||||||
"""A populated rep that lacks instantaneousPower must not spawn a
|
"""A populated rep that lacks instantaneousPower must not spawn a
|
||||||
@@ -319,11 +323,11 @@ class TestSelfCheckError:
|
|||||||
desc = self._desc()
|
desc = self._desc()
|
||||||
assert desc.exists_fn({'x.com.samsung.da.status': 'Ready'}, {}) is False
|
assert desc.exists_fn({'x.com.samsung.da.status': 'Ready'}, {}) is False
|
||||||
|
|
||||||
def test_exists_for_empty_stub_rep(self):
|
def test_hidden_for_empty_rep(self):
|
||||||
"""An empty {} rep is /device/0's not-yet-fetched-stub carve-out --
|
"""Issue #78: no stub carve-out -- see ENERGY_METER's
|
||||||
must be included-for-now, same as ENERGY_METER's fields."""
|
test_both_entities_hidden_on_empty_rep for why."""
|
||||||
desc = self._desc()
|
desc = self._desc()
|
||||||
assert desc.exists_fn({}, {}) is True
|
assert desc.exists_fn({}, {}) is False
|
||||||
|
|
||||||
def test_value_joins_list(self):
|
def test_value_joins_list(self):
|
||||||
desc = self._desc()
|
desc = self._desc()
|
||||||
|
|||||||
@@ -4,10 +4,11 @@ from custom_components.localthings.registry.capabilities import laundry
|
|||||||
|
|
||||||
class TestCourseHelpers:
|
class TestCourseHelpers:
|
||||||
def test_parses_edit_course_list(self):
|
def test_parses_edit_course_list(self):
|
||||||
raw = 'EditCourseList_1C1D211B1E29243328262722202325322F2E30662D8F96'
|
raw = 'EditCourseList_1C1D211B1E29243328262722202325322F2E30662D8F962B2A'
|
||||||
assert laundry.parse_edit_course_list(raw) == [
|
assert laundry.parse_edit_course_list(raw) == [
|
||||||
'1C', '1D', '21', '1B', '1E', '29', '24', '33', '28', '26', '27',
|
'1C', '1D', '21', '1B', '1E', '29', '24', '33', '28', '26', '27',
|
||||||
'22', '20', '23', '25', '32', '2F', '2E', '30', '66', '2D', '8F', '96',
|
'22', '20', '23', '25', '32', '2F', '2E', '30', '66', '2D', '8F', '96',
|
||||||
|
'2B', '2A'
|
||||||
]
|
]
|
||||||
|
|
||||||
def test_parse_edit_course_list_handles_missing_or_malformed(self):
|
def test_parse_edit_course_list_handles_missing_or_malformed(self):
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
"""Unit tests for operational state capabilities."""
|
||||||
|
|
||||||
from custom_components.localthings.registry.capabilities.operational import OPERATIONAL_STATE
|
from custom_components.localthings.registry.capabilities.operational import OPERATIONAL_STATE
|
||||||
|
|
||||||
|
|
||||||
@@ -24,6 +26,42 @@ class TestProgressPercentage:
|
|||||||
assert desc.rep_fn(rep) == 42
|
assert desc.rep_fn(rep) == 42
|
||||||
|
|
||||||
|
|
||||||
|
class TestCompletionMinutes:
|
||||||
|
"""Unit tests for completion_minutes entity."""
|
||||||
|
|
||||||
|
def test_completion_minutes_parsing(self):
|
||||||
|
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'completion_minutes')
|
||||||
|
|
||||||
|
# 1 hour 25 mins 30 secs -> 85 mins + 1 sec ceiling = 86 mins
|
||||||
|
rep = {'x.com.samsung.da.remainingTime': '01:25:30'}
|
||||||
|
assert desc.rep_fn(rep) == 86
|
||||||
|
|
||||||
|
# Exact minutes: 1 hour 30 mins 00 secs -> 90 mins
|
||||||
|
rep_exact = {'x.com.samsung.da.remainingTime': '01:30:00'}
|
||||||
|
assert desc.rep_fn(rep_exact) == 90
|
||||||
|
|
||||||
|
def test_completion_minutes_fallback_key(self):
|
||||||
|
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'completion_minutes')
|
||||||
|
rep = {'remainingTime': '00:45:00'}
|
||||||
|
assert desc.rep_fn(rep) == 45
|
||||||
|
|
||||||
|
def test_completion_minutes_stale_finish_gated(self):
|
||||||
|
"""Firmware freezes remainingTime at '00:01:00' when progress reaches 'Finish'.
|
||||||
|
Should return 0 to prevent stuck values."""
|
||||||
|
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'completion_minutes')
|
||||||
|
rep = {
|
||||||
|
'x.com.samsung.da.progress': 'Finish',
|
||||||
|
'x.com.samsung.da.remainingTime': '00:01:00',
|
||||||
|
}
|
||||||
|
assert desc.rep_fn(rep) == 0
|
||||||
|
|
||||||
|
def test_completion_minutes_missing_or_invalid(self):
|
||||||
|
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'completion_minutes')
|
||||||
|
|
||||||
|
rep = {}
|
||||||
|
assert desc.rep_fn(rep) is None
|
||||||
|
|
||||||
|
|
||||||
class TestDelayFieldFallback:
|
class TestDelayFieldFallback:
|
||||||
def test_reads_delay_end_time_when_delay_start_time_absent(self):
|
def test_reads_delay_end_time_when_delay_start_time_absent(self):
|
||||||
from custom_components.localthings.registry.capabilities.operational import OPERATIONAL_STATE
|
from custom_components.localthings.registry.capabilities.operational import OPERATIONAL_STATE
|
||||||
@@ -53,4 +91,4 @@ class TestDelayFieldFallback:
|
|||||||
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'delay_start_hours')
|
desc = next(e for e in OPERATIONAL_STATE.entities if e.key == 'delay_start_hours')
|
||||||
rep = {'x.com.samsung.da.delayStartTime': '00:00:00'}
|
rep = {'x.com.samsung.da.delayStartTime': '00:00:00'}
|
||||||
path, body = desc.write_fn(1.5, rep)
|
path, body = desc.write_fn(1.5, rep)
|
||||||
assert body == {'x.com.samsung.da.delayStartTime': '1:30:00'}
|
assert body == {'x.com.samsung.da.delayStartTime': '1:30:00'}
|
||||||
Reference in new issue
Block a user