Drop /information/vs/0 version entities per review
mbillow's follow-up review: exposing read-only Software/Firmware (and
Outdoor/Touch IC) version strings is "data for the sake of exposing it" --
no user control, just clutter, and every other registry leaves
/information/vs/0 in the global ignore as identity plumbing. Conforming to
that stance rather than expanding the entity surface for no user story.
- by_type/airconditioner.py: revert to *ignored.IGNORED (no _IGNORED_LESS_INFO
filter); drop airconditioner.INFO from the registry.
- capabilities/airconditioner.py: remove the INFO capability, the _info_version
/_info_items_of_type /_has_info_version helpers, and HREF_INFORMATION.
- translations/{en,nl}.json: drop software_version, firmware_version,
firmware_version_2/3, outdoor_unit_version, touch_ic_version.
- tests: drop the six INFO tests; golden regenerated for 8 AC + dehumidifier.
625 tests pass.
This commit is contained in:
blka committed
1 parent
b18500dec3
commit
1bbecfa5c3
15 files changed
+2
-232
No files matched your search
@@ -12,17 +12,10 @@ Reuses dishwasher.DIAGNOSIS for /diagnosis/vs/0.
|
||||
from ..capabilities import airconditioner, common, dishwasher, ignored
|
||||
from ._base import DeviceRegistry, _build
|
||||
|
||||
# /information/vs/0 is globally ignored (serial/model identity plumbing), but
|
||||
# the AC exposes Software/Firmware version in its items[] -- model those here
|
||||
# and drop the no-entity coverage entry so INFO is the sole cap on the href.
|
||||
# Renamed from the capabilities module's _AC_IGNORED (a list of href strings)
|
||||
# to avoid the two-meaning collision noted in review.
|
||||
_IGNORED_LESS_INFO = [c for c in ignored.IGNORED if c.href != '/information/vs/0']
|
||||
|
||||
REGISTRY = DeviceRegistry(
|
||||
name='airconditioner',
|
||||
capabilities=_build([
|
||||
*_IGNORED_LESS_INFO,
|
||||
*ignored.IGNORED,
|
||||
*common.UNIVERSAL,
|
||||
dishwasher.DIAGNOSIS,
|
||||
airconditioner.CLIMATE,
|
||||
@@ -30,7 +23,6 @@ REGISTRY = DeviceRegistry(
|
||||
airconditioner.AUTO_CLEAN,
|
||||
airconditioner.AIR_FILTER,
|
||||
airconditioner.AIR_QUALITY,
|
||||
airconditioner.INFO,
|
||||
airconditioner.DISPLAY_LIGHT,
|
||||
airconditioner.MUTE_ONCE,
|
||||
airconditioner.CURRENT_LIMIT,
|
||||
|
||||
@@ -86,29 +86,6 @@ def _tropical_night_write(value, rep, href=None):
|
||||
}
|
||||
|
||||
|
||||
def _info_items_of_type(items, type_):
|
||||
return [it for it in (items or [])
|
||||
if isinstance(it, dict) and it.get('x.com.samsung.da.type') == type_]
|
||||
|
||||
|
||||
def _info_version(items, type_, ordinal):
|
||||
"""x.com.samsung.da.number of the ordinal-th /information/vs/0 item of the
|
||||
given type. Boards carry one Software item but 1-3 Firmware items (separate
|
||||
MCUs), plus an Outdoor unit and (window AC) a Touch IC item -- each a
|
||||
distinct version string, so they're exposed per-item rather than collapsed
|
||||
to a single 'first wins' value. None when the ordinal item is absent or
|
||||
carries no number (e.g. tp2x_rac_20k's second Firmware item)."""
|
||||
items = _info_items_of_type(items, type_)
|
||||
if ordinal < len(items):
|
||||
return items[ordinal].get('x.com.samsung.da.number')
|
||||
return None
|
||||
|
||||
|
||||
def _has_info_version(type_, ordinal):
|
||||
return lambda rep, resources: _info_version(
|
||||
rep.get('x.com.samsung.da.items'), type_, ordinal) is not None
|
||||
|
||||
|
||||
def _filter_unit(rep):
|
||||
"""Unit of the filter-usage fields, normalised from filterCapacityUnit
|
||||
('Hour' -> 'h'). Wired through unit_fn so a board advertising a different
|
||||
@@ -178,7 +155,6 @@ HREF_WIND_DIRECTION = '/wind/direction/vs/0' # swing_mode
|
||||
HREF_WIND_OSCILLATION = '/wind/oscillation/vs/0' # swing_mode fallback
|
||||
HREF_CONVENIENT = '/mode/convenient/vs/0' # preset_mode
|
||||
HREF_TEMPS_VS = '/temperatures/vs/0' # vendor temp fallback (items[] array)
|
||||
HREF_INFORMATION = '/information/vs/0' # model/serial + Software/Firmware version items
|
||||
|
||||
CLIMATE_CONSUMED_HREFS = [
|
||||
HREF_POWER, HREF_POWER_VS, HREF_TEMP_CURRENT, HREF_TEMP_DESIRED,
|
||||
@@ -571,42 +547,6 @@ AIR_QUALITY = Capability(
|
||||
),
|
||||
)
|
||||
|
||||
# Software/Firmware version from /information/vs/0 items[] (the href is
|
||||
# globally ignored as identity plumbing; the AC registry drops that entry so
|
||||
# INFO is the sole cap on it). Boards carry one Software item but 1-3 Firmware
|
||||
# items (separate MCUs), plus an Outdoor unit and (window AC) a Touch IC item
|
||||
# -- each a distinct version string, exposed per-item (see _info_version)
|
||||
# rather than collapsed to a single 'first wins' value. Diagnostic, read-only.
|
||||
INFO = Capability(
|
||||
href=HREF_INFORMATION,
|
||||
poll_tier='cold',
|
||||
entities=(
|
||||
SensorDesc(key='software_version', field='x.com.samsung.da.items',
|
||||
icon='mdi:package-variant', entity_category='diagnostic',
|
||||
exists_fn=_has_info_version('Software', 0),
|
||||
value_fn=lambda items: _info_version(items, 'Software', 0)),
|
||||
SensorDesc(key='firmware_version', field='x.com.samsung.da.items',
|
||||
icon='mdi:chip', entity_category='diagnostic',
|
||||
exists_fn=_has_info_version('Firmware', 0),
|
||||
value_fn=lambda items: _info_version(items, 'Firmware', 0)),
|
||||
SensorDesc(key='firmware_version_2', field='x.com.samsung.da.items',
|
||||
icon='mdi:chip', entity_category='diagnostic',
|
||||
exists_fn=_has_info_version('Firmware', 1),
|
||||
value_fn=lambda items: _info_version(items, 'Firmware', 1)),
|
||||
SensorDesc(key='firmware_version_3', field='x.com.samsung.da.items',
|
||||
icon='mdi:chip', entity_category='diagnostic',
|
||||
exists_fn=_has_info_version('Firmware', 2),
|
||||
value_fn=lambda items: _info_version(items, 'Firmware', 2)),
|
||||
SensorDesc(key='outdoor_unit_version', field='x.com.samsung.da.items',
|
||||
icon='mdi:fan', entity_category='diagnostic',
|
||||
exists_fn=_has_info_version('Outdoor', 0),
|
||||
value_fn=lambda items: _info_version(items, 'Outdoor', 0)),
|
||||
SensorDesc(key='touch_ic_version', field='x.com.samsung.da.items',
|
||||
icon='mdi:gesture-tap', entity_category='diagnostic',
|
||||
exists_fn=_has_info_version('Touch IC', 0),
|
||||
value_fn=lambda items: _info_version(items, 'Touch IC', 0)),
|
||||
),
|
||||
)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# AC-scoped coverage: the CLIMATE_CONSUMED_HREFS above (read by the climate
|
||||
|
||||
@@ -522,24 +522,6 @@
|
||||
"air_filter_usage_hours": {
|
||||
"name": "Filter usage hours"
|
||||
},
|
||||
"software_version": {
|
||||
"name": "Software version"
|
||||
},
|
||||
"firmware_version": {
|
||||
"name": "Firmware version"
|
||||
},
|
||||
"firmware_version_2": {
|
||||
"name": "Firmware version (secondary)"
|
||||
},
|
||||
"firmware_version_3": {
|
||||
"name": "Firmware version (tertiary)"
|
||||
},
|
||||
"outdoor_unit_version": {
|
||||
"name": "Outdoor unit version"
|
||||
},
|
||||
"touch_ic_version": {
|
||||
"name": "Touch IC version"
|
||||
},
|
||||
"air_sensing_state": {
|
||||
"name": "Air sensing state"
|
||||
},
|
||||
@@ -695,9 +677,6 @@
|
||||
"hood_filter_usage": {
|
||||
"name": "Filter usage"
|
||||
},
|
||||
"humidity": {
|
||||
"name": "Humidity"
|
||||
},
|
||||
"instance_temperature": {
|
||||
"name": "{instance_name} temperature"
|
||||
},
|
||||
|
||||
@@ -522,24 +522,6 @@
|
||||
"air_filter_usage_hours": {
|
||||
"name": "Filterverbruik (uren)"
|
||||
},
|
||||
"software_version": {
|
||||
"name": "Softwareversie"
|
||||
},
|
||||
"firmware_version": {
|
||||
"name": "Firmwareversie"
|
||||
},
|
||||
"firmware_version_2": {
|
||||
"name": "Firmwareversie (secundair)"
|
||||
},
|
||||
"firmware_version_3": {
|
||||
"name": "Firmwareversie (tertiair)"
|
||||
},
|
||||
"outdoor_unit_version": {
|
||||
"name": "Versie buiteneenheid"
|
||||
},
|
||||
"touch_ic_version": {
|
||||
"name": "Touch-IC-versie"
|
||||
},
|
||||
"air_sensing_state": {
|
||||
"name": "Status luchtmeting"
|
||||
},
|
||||
@@ -695,9 +677,6 @@
|
||||
"hood_filter_usage": {
|
||||
"name": "Filterverbruik"
|
||||
},
|
||||
"humidity": {
|
||||
"name": "Luchtvochtigheid"
|
||||
},
|
||||
"instance_temperature": {
|
||||
"name": "Temperatuur {instance_name}"
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user