Clean up microwave PR after main merge: dedupe skill doc, derive cook modes live
The merge from main had left the adding-device-support skill with a stale duplicate "Enum selects need translation support" section (referencing a nonexistent strings.json) sitting alongside the canonical version, and main's new "never hard-code the dump" guidance hadn't landed on this branch at all -- restore it and drop the duplicate. Apply that guidance to the microwave capability itself: MICROWAVE_MODE's cook_mode select was carrying a hardcoded _MICROWAVE_MODES tuple lifted from the single issue #66 dump, even though /mode/vs/0 reports its own live supportedModes list. Switch to options_field and validate writes against the live rep instead of the static vocabulary, so a microwave with a narrower or wider mode set (grill-less models, etc.) isn't stuck with this one unit's options. The microwave entities also shipped with no translations/en.json entries at all (cook_mode, cavity_state, power_level, cavity_temp) -- add them, mirrored into nl.json, and update the affected tests.
This commit is contained in:
5 files changed
+104
-37
No files matched your search
@@ -7,10 +7,12 @@ progress_percentage, operation_time_minutes, finish_time, cook_time, stop),
|
||||
so those capabilities are reused directly from oven.py rather than
|
||||
re-declared here -- see by_type/microwave.py.
|
||||
|
||||
/mode/vs/0's cook-mode vocabulary (MicroWave/MicroWaveGrill/Grill/Autocook)
|
||||
and options-array toggles (only a Sound_On/Off slot on this dump -- no
|
||||
UpperLamp/fastpreheat/NaturalSteam like the oven family) are microwave-
|
||||
specific, so it gets its own capability here. /oven/vs/0 additionally
|
||||
/mode/vs/0's cook-mode select reads its options live from supportedModes
|
||||
(MicroWave/MicroWaveGrill/Grill/Autocook on this dump -- no oven-style
|
||||
Bake/Broil vocabulary applies, and another model's supported set may
|
||||
differ) and its options-array toggles (only a Sound_On/Off slot on this
|
||||
dump -- no UpperLamp/fastpreheat/NaturalSteam like the oven family) are
|
||||
microwave-specific, so it gets its own capability here. /oven/vs/0 additionally
|
||||
reports a powerLevel field (a wattage with the unit embedded in the string,
|
||||
e.g. "700W") the oven family's cavity capability doesn't carry, so it also
|
||||
gets its own.
|
||||
@@ -85,20 +87,11 @@ def _sound_write(p, rep, href=None):
|
||||
}
|
||||
|
||||
|
||||
# Cook modes as reported by /mode/vs/0's supportedModes (issue #66 dump) --
|
||||
# no oven-style Bake/Broil vocabulary applies to a microwave.
|
||||
_MICROWAVE_MODES = (
|
||||
'NoOperation',
|
||||
'MicroWave',
|
||||
'MicroWaveGrill',
|
||||
'Grill',
|
||||
'Autocook',
|
||||
'AutocookCustom',
|
||||
)
|
||||
|
||||
|
||||
def _mode_write(p, rep, href=None):
|
||||
if p not in _MICROWAVE_MODES:
|
||||
# rep is this capability's own /mode/vs/0 rep, so the live
|
||||
# supportedModes list is right here -- no static vocabulary to keep in
|
||||
# sync with devices whose mode set differs (grill-less models, etc.).
|
||||
if p not in (rep.get('x.com.samsung.da.supportedModes') or ()):
|
||||
return None
|
||||
return ['mode', 'vs', '0'], {'x.com.samsung.da.modes': [p]}
|
||||
|
||||
@@ -109,7 +102,7 @@ MICROWAVE_MODE = Capability(
|
||||
entities=(
|
||||
SelectDesc(key='cook_mode', field='x.com.samsung.da.modes',
|
||||
icon='mdi:tune',
|
||||
options=_MICROWAVE_MODES,
|
||||
options_field='x.com.samsung.da.supportedModes',
|
||||
value_fn=lambda v: v[0] if v else None,
|
||||
write_fn=_mode_write),
|
||||
SwitchDesc(key='sound', field='x.com.samsung.da.options',
|
||||
|
||||
@@ -154,6 +154,17 @@
|
||||
"on": "On"
|
||||
}
|
||||
},
|
||||
"cook_mode": {
|
||||
"name": "Cook mode",
|
||||
"state": {
|
||||
"no_operation": "No operation",
|
||||
"micro_wave": "Microwave",
|
||||
"micro_wave_grill": "Microwave + grill",
|
||||
"grill": "Grill",
|
||||
"autocook": "Autocook",
|
||||
"autocook_custom": "Autocook custom"
|
||||
}
|
||||
},
|
||||
"cycle": {
|
||||
"name": "Cycle"
|
||||
},
|
||||
@@ -438,6 +449,12 @@
|
||||
"burner_state": {
|
||||
"name": "Burner {number} state"
|
||||
},
|
||||
"cavity_state": {
|
||||
"name": "Cavity state"
|
||||
},
|
||||
"cavity_temp": {
|
||||
"name": "Cavity temperature"
|
||||
},
|
||||
"clean_level": {
|
||||
"name": "Clean level"
|
||||
},
|
||||
@@ -571,6 +588,9 @@
|
||||
"power_energy_kwh": {
|
||||
"name": "Power energy"
|
||||
},
|
||||
"power_level": {
|
||||
"name": "Power level"
|
||||
},
|
||||
"power_watts": {
|
||||
"name": "Power"
|
||||
},
|
||||
|
||||
@@ -154,6 +154,17 @@
|
||||
"on": "Aan"
|
||||
}
|
||||
},
|
||||
"cook_mode": {
|
||||
"name": "Kookmodus",
|
||||
"state": {
|
||||
"no_operation": "Niet actief",
|
||||
"micro_wave": "Magnetron",
|
||||
"micro_wave_grill": "Magnetron + grill",
|
||||
"grill": "Grill",
|
||||
"autocook": "Automatisch koken",
|
||||
"autocook_custom": "Automatisch koken (aangepast)"
|
||||
}
|
||||
},
|
||||
"cycle": {
|
||||
"name": "Programma"
|
||||
},
|
||||
@@ -438,6 +449,12 @@
|
||||
"burner_state": {
|
||||
"name": "Status brander {number}"
|
||||
},
|
||||
"cavity_state": {
|
||||
"name": "Status ovenruimte"
|
||||
},
|
||||
"cavity_temp": {
|
||||
"name": "Temperatuur ovenruimte"
|
||||
},
|
||||
"clean_level": {
|
||||
"name": "Reinigingsniveau"
|
||||
},
|
||||
@@ -571,6 +588,9 @@
|
||||
"power_energy_kwh": {
|
||||
"name": "Energieverbruik"
|
||||
},
|
||||
"power_level": {
|
||||
"name": "Vermogensniveau"
|
||||
},
|
||||
"power_watts": {
|
||||
"name": "Vermogen"
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user