evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add entity specific force_update for DSMR (#46111)

Browse source
This commit is contained in:
Joeri 2021-02-08 15:18:36 +01:00 • committed by GitHub
parent 48808978c4
commit 2811e39c5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 65 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

97
homeassistant/components/dsmr/sensor.py
View file

@ -80,35 +80,59 @@ async def async_setup_entry(
dsmr_version = config[CONF_DSMR_VERSION] dsmr_version = config[CONF_DSMR_VERSION]
# Define list of name,obis mappings to generate entities # Define list of name,obis,force_update mappings to generate entities
obis_mapping = [ obis_mapping = [
["Power Consumption", obis_ref.CURRENT_ELECTRICITY_USAGE], ["Power Consumption", obis_ref.CURRENT_ELECTRICITY_USAGE, True],
["Power Production", obis_ref.CURRENT_ELECTRICITY_DELIVERY], ["Power Production", obis_ref.CURRENT_ELECTRICITY_DELIVERY, True],
["Power Tariff", obis_ref.ELECTRICITY_ACTIVE_TARIFF], ["Power Tariff", obis_ref.ELECTRICITY_ACTIVE_TARIFF, False],
["Energy Consumption (tarif 1)", obis_ref.ELECTRICITY_USED_TARIFF_1], ["Energy Consumption (tarif 1)", obis_ref.ELECTRICITY_USED_TARIFF_1, True],
["Energy Consumption (tarif 2)", obis_ref.ELECTRICITY_USED_TARIFF_2], ["Energy Consumption (tarif 2)", obis_ref.ELECTRICITY_USED_TARIFF_2, True],
["Energy Production (tarif 1)", obis_ref.ELECTRICITY_DELIVERED_TARIFF_1], ["Energy Production (tarif 1)", obis_ref.ELECTRICITY_DELIVERED_TARIFF_1, True],
["Energy Production (tarif 2)", obis_ref.ELECTRICITY_DELIVERED_TARIFF_2], ["Energy Production (tarif 2)", obis_ref.ELECTRICITY_DELIVERED_TARIFF_2, True],
["Power Consumption Phase L1", obis_ref.INSTANTANEOUS_ACTIVE_POWER_L1_POSITIVE], [
["Power Consumption Phase L2", obis_ref.INSTANTANEOUS_ACTIVE_POWER_L2_POSITIVE], "Power Consumption Phase L1",
["Power Consumption Phase L3", obis_ref.INSTANTANEOUS_ACTIVE_POWER_L3_POSITIVE], obis_ref.INSTANTANEOUS_ACTIVE_POWER_L1_POSITIVE,
["Power Production Phase L1", obis_ref.INSTANTANEOUS_ACTIVE_POWER_L1_NEGATIVE], False,
["Power Production Phase L2", obis_ref.INSTANTANEOUS_ACTIVE_POWER_L2_NEGATIVE], ],
["Power Production Phase L3", obis_ref.INSTANTANEOUS_ACTIVE_POWER_L3_NEGATIVE], [
["Short Power Failure Count", obis_ref.SHORT_POWER_FAILURE_COUNT], "Power Consumption Phase L2",
["Long Power Failure Count", obis_ref.LONG_POWER_FAILURE_COUNT], obis_ref.INSTANTANEOUS_ACTIVE_POWER_L2_POSITIVE,
["Voltage Sags Phase L1", obis_ref.VOLTAGE_SAG_L1_COUNT], False,
["Voltage Sags Phase L2", obis_ref.VOLTAGE_SAG_L2_COUNT], ],
["Voltage Sags Phase L3", obis_ref.VOLTAGE_SAG_L3_COUNT], [
["Voltage Swells Phase L1", obis_ref.VOLTAGE_SWELL_L1_COUNT], "Power Consumption Phase L3",
["Voltage Swells Phase L2", obis_ref.VOLTAGE_SWELL_L2_COUNT], obis_ref.INSTANTANEOUS_ACTIVE_POWER_L3_POSITIVE,
["Voltage Swells Phase L3", obis_ref.VOLTAGE_SWELL_L3_COUNT], False,
["Voltage Phase L1", obis_ref.INSTANTANEOUS_VOLTAGE_L1], ],
["Voltage Phase L2", obis_ref.INSTANTANEOUS_VOLTAGE_L2], [
["Voltage Phase L3", obis_ref.INSTANTANEOUS_VOLTAGE_L3], "Power Production Phase L1",
["Current Phase L1", obis_ref.INSTANTANEOUS_CURRENT_L1], obis_ref.INSTANTANEOUS_ACTIVE_POWER_L1_NEGATIVE,
["Current Phase L2", obis_ref.INSTANTANEOUS_CURRENT_L2], False,
["Current Phase L3", obis_ref.INSTANTANEOUS_CURRENT_L3], ],
[
"Power Production Phase L2",
obis_ref.INSTANTANEOUS_ACTIVE_POWER_L2_NEGATIVE,
False,
],
[
"Power Production Phase L3",
obis_ref.INSTANTANEOUS_ACTIVE_POWER_L3_NEGATIVE,
False,
],
["Short Power Failure Count", obis_ref.SHORT_POWER_FAILURE_COUNT, False],
["Long Power Failure Count", obis_ref.LONG_POWER_FAILURE_COUNT, False],
["Voltage Sags Phase L1", obis_ref.VOLTAGE_SAG_L1_COUNT, False],
["Voltage Sags Phase L2", obis_ref.VOLTAGE_SAG_L2_COUNT, False],
["Voltage Sags Phase L3", obis_ref.VOLTAGE_SAG_L3_COUNT, False],
["Voltage Swells Phase L1", obis_ref.VOLTAGE_SWELL_L1_COUNT, False],
["Voltage Swells Phase L2", obis_ref.VOLTAGE_SWELL_L2_COUNT, False],
["Voltage Swells Phase L3", obis_ref.VOLTAGE_SWELL_L3_COUNT, False],
["Voltage Phase L1", obis_ref.INSTANTANEOUS_VOLTAGE_L1, False],
["Voltage Phase L2", obis_ref.INSTANTANEOUS_VOLTAGE_L2, False],
["Voltage Phase L3", obis_ref.INSTANTANEOUS_VOLTAGE_L3, False],
["Current Phase L1", obis_ref.INSTANTANEOUS_CURRENT_L1, False],
["Current Phase L2", obis_ref.INSTANTANEOUS_CURRENT_L2, False],
["Current Phase L3", obis_ref.INSTANTANEOUS_CURRENT_L3, False],
] ]
if dsmr_version == "5L": if dsmr_version == "5L":
@ -117,22 +141,26 @@ async def async_setup_entry(
[ [
"Energy Consumption (total)", "Energy Consumption (total)",
obis_ref.LUXEMBOURG_ELECTRICITY_USED_TARIFF_GLOBAL, obis_ref.LUXEMBOURG_ELECTRICITY_USED_TARIFF_GLOBAL,
True,
], ],
[ [
"Energy Production (total)", "Energy Production (total)",
obis_ref.LUXEMBOURG_ELECTRICITY_DELIVERED_TARIFF_GLOBAL, obis_ref.LUXEMBOURG_ELECTRICITY_DELIVERED_TARIFF_GLOBAL,
True,
], ],
] ]
) )
else: else:
obis_mapping.extend( obis_mapping.extend(
[["Energy Consumption (total)", obis_ref.ELECTRICITY_IMPORTED_TOTAL]] [["Energy Consumption (total)", obis_ref.ELECTRICITY_IMPORTED_TOTAL, True]]
) )
# Generate device entities # Generate device entities
devices = [ devices = [
DSMREntity(name, DEVICE_NAME_ENERGY, config[CONF_SERIAL_ID], obis, config) DSMREntity(
for name, obis in obis_mapping name, DEVICE_NAME_ENERGY, config[CONF_SERIAL_ID], obis, config, force_update
)
for name, obis, force_update in obis_mapping
] ]
# Protocol version specific obis # Protocol version specific obis
@ -152,6 +180,7 @@ async def async_setup_entry(
config[CONF_SERIAL_ID_GAS], config[CONF_SERIAL_ID_GAS],
gas_obis, gas_obis,
config, config,
True,
), ),
DerivativeDSMREntity( DerivativeDSMREntity(
"Hourly Gas Consumption", "Hourly Gas Consumption",
@ -159,6 +188,7 @@ async def async_setup_entry(
config[CONF_SERIAL_ID_GAS], config[CONF_SERIAL_ID_GAS],
gas_obis, gas_obis,
config, config,
False,
), ),
] ]
@ -257,7 +287,7 @@ async def async_setup_entry(
class DSMREntity(Entity): class DSMREntity(Entity):
"""Entity reading values from DSMR telegram.""" """Entity reading values from DSMR telegram."""
def __init__(self, name, device_name, device_serial, obis, config): def __init__(self, name, device_name, device_serial, obis, config, force_update):
"""Initialize entity.""" """Initialize entity."""
self._name = name self._name = name
self._obis = obis self._obis = obis
@ -266,6 +296,7 @@ class DSMREntity(Entity):
self._device_name = device_name self._device_name = device_name
self._device_serial = device_serial self._device_serial = device_serial
self._force_update = force_update
self._unique_id = f"{device_serial}_{name}".replace(" ", "_") self._unique_id = f"{device_serial}_{name}".replace(" ", "_")
@callback @callback
@ -341,7 +372,7 @@ class DSMREntity(Entity):
@property @property
def force_update(self): def force_update(self):
"""Force update.""" """Force update."""
return True return self._force_update
@property @property
def should_poll(self): def should_poll(self):

2
tests/components/dsmr/test_sensor.py
View file

@ -183,7 +183,7 @@ async def test_derivative():
config = {"platform": "dsmr"} config = {"platform": "dsmr"}
entity = DerivativeDSMREntity("test", "test_device", "5678", "1.0.0", config) entity = DerivativeDSMREntity("test", "test_device", "5678", "1.0.0", config, False)
await entity.async_update() await entity.async_update()
assert entity.state is None, "initial state not unknown" assert entity.state is None, "initial state not unknown"