jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 13:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump PyISY to 3.1.5 and fix bad Z-Wave properties from eisy (#85900)

Browse Source
This commit is contained in:
shbatm 2023-01-14 16:28:57 -06:00 committed by GitHub
parent c478e503e5
commit 913bc827ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
homeassistant/components/isy994/helpers.py
View File

@ -280,32 +280,32 @@ def _is_sensor_a_binary_sensor(isy_data: IsyData, node: Group | Node) -> bool:
def _generate_device_info(node: Node) -> DeviceInfo: def _generate_device_info(node: Node) -> DeviceInfo:
"""Generate the device info for a root node device.""" """Generate the device info for a root node device."""
isy = node.isy isy = node.isy
basename = node.name
device_info = DeviceInfo( device_info = DeviceInfo(
identifiers={(DOMAIN, f"{isy.uuid}_{node.address}")}, identifiers={(DOMAIN, f"{isy.uuid}_{node.address}")},
manufacturer=node.protocol, manufacturer=node.protocol.title(),
name=f"{basename} ({(str(node.address).rpartition(' ')[0] or node.address)})", name=node.name,
via_device=(DOMAIN, isy.uuid), via_device=(DOMAIN, isy.uuid),
configuration_url=isy.conn.url, configuration_url=isy.conn.url,
suggested_area=node.folder, suggested_area=node.folder,
) )
# ISYv5 Device Types can provide model and manufacturer # ISYv5 Device Types can provide model and manufacturer
model: str = "Unknown" model: str = str(node.address).rpartition(" ")[0] or node.address
if node.node_def_id is not None: if node.node_def_id is not None:
model = str(node.node_def_id) model += f": {node.node_def_id}"
# Numerical Device Type # Numerical Device Type
if node.type is not None: if node.type is not None:
model += f" ({node.type})" model += f" ({node.type})"
# Get extra information for Z-Wave Devices # Get extra information for Z-Wave Devices
if node.protocol == PROTO_ZWAVE: if node.protocol == PROTO_ZWAVE and node.zwave_props.mfr_id != "0":
device_info[ATTR_MANUFACTURER] = f"Z-Wave MfrID:{node.zwave_props.mfr_id}" device_info[
ATTR_MANUFACTURER
] = f"Z-Wave MfrID:{int(node.zwave_props.mfr_id):#0{6}x}"
model += ( model += (
f" Type:{node.zwave_props.devtype_gen} " f"Type:{int(node.zwave_props.prod_type_id):#0{6}x} "
f"ProductTypeID:{node.zwave_props.prod_type_id} " f"Product:{int(node.zwave_props.product_id):#0{6}x}"
f"ProductID:{node.zwave_props.product_id}"
) )
device_info[ATTR_MODEL] = model device_info[ATTR_MODEL] = model

2
homeassistant/components/isy994/manifest.json
View File

@ -3,7 +3,7 @@
"name": "Universal Devices ISY/IoX", "name": "Universal Devices ISY/IoX",
"integration_type": "hub", "integration_type": "hub",
"documentation": "https://www.home-assistant.io/integrations/isy994", "documentation": "https://www.home-assistant.io/integrations/isy994",
"requirements": ["pyisy==3.1.4"], "requirements": ["pyisy==3.1.5"],
"codeowners": ["@bdraco", "@shbatm"], "codeowners": ["@bdraco", "@shbatm"],
"config_flow": true, "config_flow": true,
"ssdp": [ "ssdp": [

2
requirements_all.txt
View File

@ -1696,7 +1696,7 @@ pyirishrail==0.0.2
pyiss==1.0.1 pyiss==1.0.1
# homeassistant.components.isy994 # homeassistant.components.isy994
pyisy==3.1.4 pyisy==3.1.5
# homeassistant.components.itach # homeassistant.components.itach
pyitachip2ir==0.0.7 pyitachip2ir==0.0.7

2
requirements_test_all.txt
View File

@ -1215,7 +1215,7 @@ pyiqvia==2022.04.0
pyiss==1.0.1 pyiss==1.0.1
# homeassistant.components.isy994 # homeassistant.components.isy994
pyisy==3.1.4 pyisy==3.1.5
# homeassistant.components.kaleidescape # homeassistant.components.kaleidescape
pykaleidescape==1.0.1 pykaleidescape==1.0.1