feat(washer): add label translations for detergent/softener dosing selects
Assumes the LevelCtrl code scheme is None/Low/Medium/High (00-03) on both dispensers -- code 00 has no on-screen equivalent in the app's 3-choice Faible/Moyen/Élevé picker, assumed to be what "Activation" off collapses to -- and Level2Ctrl is Soft/Medium/Hard for detergent water hardness, 1x/2x/3x for softener concentration. detergent_quantity and softener_quantity share one translation_key (same vocabulary), same pattern as fridge.py's shared 'brightness_level' key. Not cross-device verified: only one dump + screenshot set (issue #9) to go on, and the softener concentration reading doesn't cleanly match its screenshot (assumed to be a setting changed between dump and screenshots, not a different code scheme -- see the comment in washer.py).
This commit is contained in:
4 files changed
+74
-5
No files matched your search
@@ -164,11 +164,22 @@ def _drum_clean_last_cleaned(rep):
|
|||||||
# valid raw codes for its field, same hex-pair shape as EditCourseList.
|
# valid raw codes for its field, same hex-pair shape as EditCourseList.
|
||||||
# '<Prefix>Alarm_<On/Off>' is a low-reservoir warning flag.
|
# '<Prefix>Alarm_<On/Off>' is a low-reservoir warning flag.
|
||||||
#
|
#
|
||||||
# Raw codes are shown as-is (no translation_key): unlike Course_XX, there's
|
# Label mapping (entity.select.washer_dosing_quantity/washer_detergent_
|
||||||
# no code->label mapping cross-referenced against multiple devices yet --
|
# water_hardness/washer_softener_concentration in strings.json) is an
|
||||||
# just a single dump's DetergentLevelCtrl_3/SoftenerLevelCtrl_3 plausibly
|
# assumed, not cross-device-verified, reading of the single issue #9 dump +
|
||||||
# matching that same report's screenshot of "Élevé" (High), which isn't
|
# screenshots: LevelCtrl's 4 codes as None/Low/Medium/High (00 has no
|
||||||
# enough to commit a full 00-03 mapping to strings.json.
|
# on-screen equivalent -- the app's Quantité picker only offers
|
||||||
|
# Faible/Moyen/Élevé, i.e. codes 01-03; 00 is assumed to be what
|
||||||
|
# "Activation" off collapses to) matches DetergentLevelCtrl_3/
|
||||||
|
# SoftenerLevelCtrl_3 = "Élevé" on both dispensers. Level2Ctrl's 3 codes as
|
||||||
|
# Soft/Medium/Hard for detergent (Dureté de l'eau: Douce/Moyenne/Dure)
|
||||||
|
# matches DetergentLevel2Ctrl_2 = "Moyenne". The same 3-code shape as
|
||||||
|
# 1x/2x/3x for softener concentration does *not* cleanly match
|
||||||
|
# SoftenerLevel2Ctrl_2 against the screenshot's "3x" -- assumed to be a
|
||||||
|
# setting the user changed in the app between the dump (issue body) and the
|
||||||
|
# screenshots (a later comment), not a different code scheme, since it's
|
||||||
|
# otherwise identical in shape to the detergent side. Revisit if a second
|
||||||
|
# device's dump contradicts this.
|
||||||
def _supported_level_options(resources, prefix):
|
def _supported_level_options(resources, prefix):
|
||||||
rep = resources.get('/course/vs/0') or {}
|
rep = resources.get('/course/vs/0') or {}
|
||||||
raw = _option_value(rep.get('x.com.samsung.da.options'), f'Supported{prefix}')
|
raw = _option_value(rep.get('x.com.samsung.da.options'), f'Supported{prefix}')
|
||||||
@@ -221,6 +232,7 @@ WASHER_COURSE = Capability(
|
|||||||
exists_fn=lambda rep, resources: _drum_clean_last_cleaned(rep) is not None,
|
exists_fn=lambda rep, resources: _drum_clean_last_cleaned(rep) is not None,
|
||||||
rep_fn=_drum_clean_last_cleaned),
|
rep_fn=_drum_clean_last_cleaned),
|
||||||
SelectDesc(key='detergent_quantity', name='Detergent quantity', icon='mdi:cup-water',
|
SelectDesc(key='detergent_quantity', name='Detergent quantity', icon='mdi:cup-water',
|
||||||
|
translation_key='washer_dosing_quantity',
|
||||||
entity_category='config',
|
entity_category='config',
|
||||||
options=_level_options('DetergentLevelCtrl'),
|
options=_level_options('DetergentLevelCtrl'),
|
||||||
exists_fn=lambda rep, resources: bool(
|
exists_fn=lambda rep, resources: bool(
|
||||||
@@ -230,6 +242,7 @@ WASHER_COURSE = Capability(
|
|||||||
write_fn=_level_write('DetergentLevelCtrl')),
|
write_fn=_level_write('DetergentLevelCtrl')),
|
||||||
SelectDesc(key='detergent_water_hardness', name='Detergent water hardness',
|
SelectDesc(key='detergent_water_hardness', name='Detergent water hardness',
|
||||||
icon='mdi:water-opacity',
|
icon='mdi:water-opacity',
|
||||||
|
translation_key='washer_detergent_water_hardness',
|
||||||
entity_category='config',
|
entity_category='config',
|
||||||
options=_level_options('DetergentLevel2Ctrl'),
|
options=_level_options('DetergentLevel2Ctrl'),
|
||||||
exists_fn=lambda rep, resources: bool(
|
exists_fn=lambda rep, resources: bool(
|
||||||
@@ -238,6 +251,7 @@ WASHER_COURSE = Capability(
|
|||||||
rep.get('x.com.samsung.da.options'), 'DetergentLevel2Ctrl'),
|
rep.get('x.com.samsung.da.options'), 'DetergentLevel2Ctrl'),
|
||||||
write_fn=_level_write('DetergentLevel2Ctrl')),
|
write_fn=_level_write('DetergentLevel2Ctrl')),
|
||||||
SelectDesc(key='softener_quantity', name='Softener quantity', icon='mdi:flask-outline',
|
SelectDesc(key='softener_quantity', name='Softener quantity', icon='mdi:flask-outline',
|
||||||
|
translation_key='washer_dosing_quantity',
|
||||||
entity_category='config',
|
entity_category='config',
|
||||||
options=_level_options('SoftenerLevelCtrl'),
|
options=_level_options('SoftenerLevelCtrl'),
|
||||||
exists_fn=lambda rep, resources: bool(
|
exists_fn=lambda rep, resources: bool(
|
||||||
@@ -247,6 +261,7 @@ WASHER_COURSE = Capability(
|
|||||||
write_fn=_level_write('SoftenerLevelCtrl')),
|
write_fn=_level_write('SoftenerLevelCtrl')),
|
||||||
SelectDesc(key='softener_concentration', name='Softener concentration',
|
SelectDesc(key='softener_concentration', name='Softener concentration',
|
||||||
icon='mdi:flask-plus-outline',
|
icon='mdi:flask-plus-outline',
|
||||||
|
translation_key='washer_softener_concentration',
|
||||||
entity_category='config',
|
entity_category='config',
|
||||||
options=_level_options('SoftenerLevel2Ctrl'),
|
options=_level_options('SoftenerLevel2Ctrl'),
|
||||||
exists_fn=lambda rep, resources: bool(
|
exists_fn=lambda rep, resources: bool(
|
||||||
|
|||||||
@@ -78,6 +78,28 @@
|
|||||||
"8f": "Intense Cold",
|
"8f": "Intense Cold",
|
||||||
"96": "Less Microfiber"
|
"96": "Less Microfiber"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"washer_dosing_quantity": {
|
||||||
|
"state": {
|
||||||
|
"00": "None",
|
||||||
|
"01": "Low",
|
||||||
|
"02": "Medium",
|
||||||
|
"03": "High"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"washer_detergent_water_hardness": {
|
||||||
|
"state": {
|
||||||
|
"01": "Soft",
|
||||||
|
"02": "Medium",
|
||||||
|
"03": "Hard"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"washer_softener_concentration": {
|
||||||
|
"state": {
|
||||||
|
"01": "1x",
|
||||||
|
"02": "2x",
|
||||||
|
"03": "3x"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sensor": {
|
"sensor": {
|
||||||
|
|||||||
@@ -78,6 +78,28 @@
|
|||||||
"8f": "Intense Cold",
|
"8f": "Intense Cold",
|
||||||
"96": "Less Microfiber"
|
"96": "Less Microfiber"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"washer_dosing_quantity": {
|
||||||
|
"state": {
|
||||||
|
"00": "None",
|
||||||
|
"01": "Low",
|
||||||
|
"02": "Medium",
|
||||||
|
"03": "High"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"washer_detergent_water_hardness": {
|
||||||
|
"state": {
|
||||||
|
"01": "Soft",
|
||||||
|
"02": "Medium",
|
||||||
|
"03": "Hard"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"washer_softener_concentration": {
|
||||||
|
"state": {
|
||||||
|
"01": "1x",
|
||||||
|
"02": "2x",
|
||||||
|
"03": "3x"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sensor": {
|
"sensor": {
|
||||||
|
|||||||
@@ -185,6 +185,16 @@ class TestDetergentSoftenerDosing:
|
|||||||
assert self._desc('softener_quantity').rep_fn(rep) == '3'
|
assert self._desc('softener_quantity').rep_fn(rep) == '3'
|
||||||
assert self._desc('softener_concentration').rep_fn(rep) == '2'
|
assert self._desc('softener_concentration').rep_fn(rep) == '2'
|
||||||
|
|
||||||
|
def test_translation_keys(self):
|
||||||
|
"""detergent_quantity and softener_quantity share one translation_key
|
||||||
|
(same 00-03 -> None/Low/Medium/High vocabulary on both dispensers,
|
||||||
|
same shape as fridge.py's shared 'brightness_level' key); hardness
|
||||||
|
and concentration each have their own since their labels differ."""
|
||||||
|
assert self._desc('detergent_quantity').translation_key == 'washer_dosing_quantity'
|
||||||
|
assert self._desc('softener_quantity').translation_key == 'washer_dosing_quantity'
|
||||||
|
assert self._desc('detergent_water_hardness').translation_key == 'washer_detergent_water_hardness'
|
||||||
|
assert self._desc('softener_concentration').translation_key == 'washer_softener_concentration'
|
||||||
|
|
||||||
def test_quantity_and_hardness_options_decode_supported_list(self):
|
def test_quantity_and_hardness_options_decode_supported_list(self):
|
||||||
assert self._desc('detergent_quantity').options(_DOSING_RESOURCES) == ['00', '01', '02', '03']
|
assert self._desc('detergent_quantity').options(_DOSING_RESOURCES) == ['00', '01', '02', '03']
|
||||||
assert self._desc('softener_quantity').options(_DOSING_RESOURCES) == ['00', '01', '02', '03']
|
assert self._desc('softener_quantity').options(_DOSING_RESOURCES) == ['00', '01', '02', '03']
|
||||||
|
|||||||
Reference in new issue
Block a user