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

Handle Shelly channel names (if available) for emeters devices (#40820)

Browse Source
This commit is contained in:
Simone Chemelli 2020-10-01 12:07:18 +02:00 committed by Paulus Schoutsen
parent 5c4ba23ca9
commit 37acf9b165
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
homeassistant/components/shelly/entity.py
View File

@ -23,7 +23,12 @@ def temperature_unit(block_info: dict) -> str:
def shelly_naming(self, block, entity_type: str): def shelly_naming(self, block, entity_type: str):
"""Naming for switch and sensors.""" """Naming for switch and sensors."""
entity_name = self.wrapper.name
if not block:
return f"{entity_name} {self.description.name}"
channels = 0 channels = 0
mode = "relays"
if "num_outputs" in self.wrapper.device.shelly: if "num_outputs" in self.wrapper.device.shelly:
channels = self.wrapper.device.shelly["num_outputs"] channels = self.wrapper.device.shelly["num_outputs"]
if ( if (
@ -31,12 +36,21 @@ def shelly_naming(self, block, entity_type: str):
and self.wrapper.device.settings["mode"] == "roller" and self.wrapper.device.settings["mode"] == "roller"
): ):
channels = 1 channels = 1
if block.type == "emeter" and "num_emeters" in self.wrapper.device.shelly:
entity_name = self.wrapper.name channels = self.wrapper.device.shelly["num_emeters"]
mode = "emeters"
if channels > 1 and block.type != "device": if channels > 1 and block.type != "device":
entity_name = self.wrapper.device.settings["relays"][int(block.channel)]["name"] # Shelly EM (SHEM) with firmware v1.8.1 doesn't have "name" key; will be fixed in next firmware release
if "name" in self.wrapper.device.settings[mode][int(block.channel)]:
entity_name = self.wrapper.device.settings[mode][int(block.channel)]["name"]
else:
entity_name = None
if not entity_name: if not entity_name:
entity_name = f"{self.wrapper.name} channel {int(block.channel)+1}" if self.wrapper.model == "SHEM-3":
base = ord("A")
else:
base = ord("1")
entity_name = f"{self.wrapper.name} channel {chr(int(block.channel)+base)}"
if entity_type == "switch": if entity_type == "switch":
return entity_name return entity_name