feat: dishwasher cycle/settings entities, stale-state fixes, LED/sound controls
Dishwasher:
- Revert remote_control to BinarySensorDesc ("Smart Control", read-only)
- Add cycle SelectDesc on /course/vs/0 via options-array RMW (AI Wash,
Pre blast, Self clean, Normal, Express 60, Heavy, Pots and pans,
Delicate, Plastic, Baby Care)
- Add Storm Wash+ and Auto release dry SwitchDescs on /course/vs/0
- Add Sanitize SwitchDesc and Smart Dry SelectDesc on /dishwasher/vs/0
- Add Sound volume NumberDesc (0–15 step 5) on /settings/sound/volume/vs/0
- Add Door LED night brightness, night start/end time to DOOR_LED capability
- Add SOUND_VOLUME capability to laundry module
Stale-state fixes (firmware leaves values set after cycle ends):
- finish_time: suppress when machine state is not active
- progress: return 'Idle' when machine state is not active
- water filter: gate WATER_FILTER capability on filterStatus != 'notused'
Translations:
- Add ICESTATUS_RUN → "Making ice" to strings.json and en.json
Tests:
- Update dishwasher and refrigerator golden fixtures to reflect current entity set
- Remove dead test_project_extrapolates_remaining_time (on_observation removed)
This commit is contained in:
1 parent
800b113495
commit
db2148467b
11 files changed
+257
-72
No files matched your search
+20
-16
@@ -1,57 +1,61 @@
|
||||
{
|
||||
"state_keys": [
|
||||
"alarm_code",
|
||||
"auto_release_dry",
|
||||
"child_lock",
|
||||
"child_lock_binary",
|
||||
"completion_minutes",
|
||||
"completion_time",
|
||||
"cycle",
|
||||
"cycle_active",
|
||||
"delay_start_time",
|
||||
"energy_kwh",
|
||||
"filter_status",
|
||||
"filter_usage",
|
||||
"finish_time",
|
||||
"firmware_update",
|
||||
"heated_dry",
|
||||
"led_brightness",
|
||||
"led_night_brightness",
|
||||
"led_night_end",
|
||||
"led_night_light",
|
||||
"led_night_start",
|
||||
"machine_state",
|
||||
"power_state",
|
||||
"power_state_binary",
|
||||
"power_switch",
|
||||
"power_watts",
|
||||
"progress",
|
||||
"progress_percentage",
|
||||
"remote_control",
|
||||
"remote_control_binary",
|
||||
"sanitize",
|
||||
"sound_mode",
|
||||
"sound_volume",
|
||||
"storm_wash",
|
||||
"water_liters"
|
||||
],
|
||||
"discovery_unique_ids": [
|
||||
"samsung_dishwasher_alarm_code",
|
||||
"samsung_dishwasher_auto_release_dry",
|
||||
"samsung_dishwasher_child_lock",
|
||||
"samsung_dishwasher_child_lock_binary",
|
||||
"samsung_dishwasher_completion_minutes",
|
||||
"samsung_dishwasher_completion_time",
|
||||
"samsung_dishwasher_cycle",
|
||||
"samsung_dishwasher_cycle_active",
|
||||
"samsung_dishwasher_delay_start_time",
|
||||
"samsung_dishwasher_energy_kwh",
|
||||
"samsung_dishwasher_filter_status",
|
||||
"samsung_dishwasher_filter_usage",
|
||||
"samsung_dishwasher_finish_time",
|
||||
"samsung_dishwasher_firmware_update",
|
||||
"samsung_dishwasher_heated_dry",
|
||||
"samsung_dishwasher_led_brightness",
|
||||
"samsung_dishwasher_led_night_brightness",
|
||||
"samsung_dishwasher_led_night_end",
|
||||
"samsung_dishwasher_led_night_light",
|
||||
"samsung_dishwasher_led_night_start",
|
||||
"samsung_dishwasher_machine_state",
|
||||
"samsung_dishwasher_pause",
|
||||
"samsung_dishwasher_power_state",
|
||||
"samsung_dishwasher_power_state_binary",
|
||||
"samsung_dishwasher_power_switch",
|
||||
"samsung_dishwasher_power_watts",
|
||||
"samsung_dishwasher_progress",
|
||||
"samsung_dishwasher_progress_percentage",
|
||||
"samsung_dishwasher_remote_control",
|
||||
"samsung_dishwasher_remote_control_binary",
|
||||
"samsung_dishwasher_sanitize",
|
||||
"samsung_dishwasher_sound_mode",
|
||||
"samsung_dishwasher_sound_volume",
|
||||
"samsung_dishwasher_start",
|
||||
"samsung_dishwasher_stop",
|
||||
"samsung_dishwasher_storm_wash",
|
||||
"samsung_dishwasher_water_liters"
|
||||
]
|
||||
}
|
||||
+30
-26
@@ -1,70 +1,74 @@
|
||||
{
|
||||
"state_keys": [
|
||||
"alarm_code",
|
||||
"any_door_open",
|
||||
"auto_door_opener",
|
||||
"autofill",
|
||||
"beverage_zone_mode",
|
||||
"cabinet_light",
|
||||
"cabinet_light_on",
|
||||
"brightness_level",
|
||||
"cabinet_light_dim",
|
||||
"cabinet_light_switch",
|
||||
"cooler_setpoint",
|
||||
"cooler_temperature",
|
||||
"day_brightness",
|
||||
"door_alert",
|
||||
"door_cooler_open",
|
||||
"door_freezer_open",
|
||||
"energy_kwh",
|
||||
"filter_status",
|
||||
"filter_usage",
|
||||
"firmware_update",
|
||||
"ice_maker_enabled",
|
||||
"flex_zone_mode",
|
||||
"freezer_setpoint",
|
||||
"freezer_temperature",
|
||||
"fridge_sound",
|
||||
"ice_night_mode",
|
||||
"icemaker_one_enabled",
|
||||
"icemaker_one_making_status",
|
||||
"icemaker_one_on",
|
||||
"icemaker_one_state",
|
||||
"icemaker_one_type",
|
||||
"icemaker_two_enabled",
|
||||
"icemaker_two_making_status",
|
||||
"icemaker_two_on",
|
||||
"icemaker_two_state",
|
||||
"icemaker_two_type",
|
||||
"night_end",
|
||||
"night_start",
|
||||
"power_watts",
|
||||
"rapid_freezing",
|
||||
"rapid_fridge",
|
||||
"sabbath_mode",
|
||||
"temperature_current_cooler_temp_f",
|
||||
"temperature_current_freezer_temp_f",
|
||||
"temperature_desired_cooler_temp_f",
|
||||
"temperature_desired_freezer_temp_f"
|
||||
"welcome_lighting"
|
||||
],
|
||||
"discovery_unique_ids": [
|
||||
"samsung_refrigerator_alarm_code",
|
||||
"samsung_refrigerator_any_door_open",
|
||||
"samsung_refrigerator_auto_door_opener",
|
||||
"samsung_refrigerator_autofill",
|
||||
"samsung_refrigerator_beverage_zone_mode",
|
||||
"samsung_refrigerator_cabinet_light",
|
||||
"samsung_refrigerator_cabinet_light_on",
|
||||
"samsung_refrigerator_brightness_level",
|
||||
"samsung_refrigerator_cabinet_light_dim",
|
||||
"samsung_refrigerator_cabinet_light_switch",
|
||||
"samsung_refrigerator_cooler_setpoint",
|
||||
"samsung_refrigerator_cooler_temperature",
|
||||
"samsung_refrigerator_day_brightness",
|
||||
"samsung_refrigerator_door_alert",
|
||||
"samsung_refrigerator_door_cooler_open",
|
||||
"samsung_refrigerator_door_freezer_open",
|
||||
"samsung_refrigerator_energy_kwh",
|
||||
"samsung_refrigerator_filter_status",
|
||||
"samsung_refrigerator_filter_usage",
|
||||
"samsung_refrigerator_firmware_update",
|
||||
"samsung_refrigerator_ice_maker_enabled",
|
||||
"samsung_refrigerator_flex_zone_mode",
|
||||
"samsung_refrigerator_freezer_setpoint",
|
||||
"samsung_refrigerator_freezer_temperature",
|
||||
"samsung_refrigerator_fridge_sound",
|
||||
"samsung_refrigerator_ice_night_mode",
|
||||
"samsung_refrigerator_icemaker_one_enabled",
|
||||
"samsung_refrigerator_icemaker_one_making_status",
|
||||
"samsung_refrigerator_icemaker_one_on",
|
||||
"samsung_refrigerator_icemaker_one_state",
|
||||
"samsung_refrigerator_icemaker_one_type",
|
||||
"samsung_refrigerator_icemaker_two_enabled",
|
||||
"samsung_refrigerator_icemaker_two_making_status",
|
||||
"samsung_refrigerator_icemaker_two_on",
|
||||
"samsung_refrigerator_icemaker_two_state",
|
||||
"samsung_refrigerator_icemaker_two_type",
|
||||
"samsung_refrigerator_night_end",
|
||||
"samsung_refrigerator_night_start",
|
||||
"samsung_refrigerator_power_watts",
|
||||
"samsung_refrigerator_rapid_freezing",
|
||||
"samsung_refrigerator_rapid_fridge",
|
||||
"samsung_refrigerator_sabbath_mode",
|
||||
"samsung_refrigerator_temperature_current_cooler_temp_f",
|
||||
"samsung_refrigerator_temperature_current_freezer_temp_f",
|
||||
"samsung_refrigerator_temperature_desired_cooler_temp_f",
|
||||
"samsung_refrigerator_temperature_desired_freezer_temp_f"
|
||||
"samsung_refrigerator_welcome_lighting"
|
||||
]
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
import time
|
||||
from custom_components.localthings.ocf.registry.capabilities.operational import OPERATIONAL_STATE
|
||||
|
||||
|
||||
@@ -12,11 +11,3 @@ def test_machine_state_maps_samsung_to_ocf():
|
||||
def test_active_when_true_only_when_running():
|
||||
assert OPERATIONAL_STATE.active_when({'x.com.samsung.da.state': 'Run'}) is True
|
||||
assert OPERATIONAL_STATE.active_when({'x.com.samsung.da.state': 'Ready'}) is False
|
||||
|
||||
|
||||
def test_project_extrapolates_remaining_time():
|
||||
state = {}
|
||||
OPERATIONAL_STATE.on_observation(state, {'x.com.samsung.da.remainingTime': '1:00:00'})
|
||||
assert 'remaining_anchor' in state
|
||||
out = OPERATIONAL_STATE.project(state, {'machine_state': 'active', 'completion_minutes': 60})
|
||||
assert out['completion_minutes'] <= 60
|
||||
Reference in new issue
Block a user