Electric-Special/ha-core
1
0
Fork 0
mirror of https://github.com/Electric-Special/ha-core.git synced 2026-03-21 03:03:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

add support for multi tariff meter data in iometer (#161767)

Browse Source 
Co-authored-by: Joostlek <joostlek@outlook.com>
This commit is contained in:
torben-iometer
2026-02-19 00:23:46 +01:00
committed by GitHub
parent 0f874f7f03
commit e9be363f29
6 changed files with 676 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
homeassistant/components/iometer/sensor.py
View File

@@ -86,6 +86,22 @@ SENSOR_TYPES: list[IOmeterEntityDescription] = [
options=["entered", "pending", "missing", "unknown"],
value_fn=lambda data: data.status.device.core.pin_status or STATE_UNKNOWN,
),
IOmeterEntityDescription(
key="consumption_tariff_t1",
translation_key="consumption_tariff_t1",
native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
device_class=SensorDeviceClass.ENERGY,
state_class=SensorStateClass.TOTAL,
value_fn=lambda data: data.reading.get_consumption_tariff_T1(),
),
IOmeterEntityDescription(
key="consumption_tariff_t2",
translation_key="consumption_tariff_t2",
native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
device_class=SensorDeviceClass.ENERGY,
state_class=SensorStateClass.TOTAL,
value_fn=lambda data: data.reading.get_consumption_tariff_T2(),
),
IOmeterEntityDescription(
key="total_consumption",
translation_key="total_consumption",

6
homeassistant/components/iometer/strings.json
View File

@@ -39,6 +39,12 @@
"battery_level": {
"name": "Battery level"
},
"consumption_tariff_t1": {
"name": "Consumption Tariff T1"
},
"consumption_tariff_t2": {
"name": "Consumption Tariff T2"
},
"core_bridge_rssi": {
"name": "Signal strength Core/Bridge"
},

2
tests/components/iometer/__init__.py
View File

@@ -10,7 +10,7 @@ from tests.common import MockConfigEntry
async def setup_platform(
hass: HomeAssistant, config_entry: MockConfigEntry, platforms: list[Platform]
) -> MockConfigEntry:
) -> None:
"""Fixture for setting up the IOmeter platform."""
config_entry.add_to_hass(hass)

2
tests/components/iometer/fixtures/reading.json
View File

@@ -6,6 +6,8 @@
"time": "2024-11-11T11:11:11Z",
"registers": [
{ "obis": "01-00:01.08.00*ff", "value": 1234.5, "unit": "Wh" },
{ "obis": "01-00:01.08.01*ff", "value": 1904.5, "unit": "Wh" },
{ "obis": "01-00:01.08.02*ff", "value": 9876.21, "unit": "Wh" },
{ "obis": "01-00:02.08.00*ff", "value": 5432.1, "unit": "Wh" },
{ "obis": "01-00:10.07.00*ff", "value": 100, "unit": "W" }
]

622
tests/components/iometer/snapshots/test_sensor.ambr Normal file
View File

@@ -0,0 +1,622 @@
# serializer version: 1
# name: test_all_sensors[sensor.iometer_1isk0000000000_battery_level-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
'entity_id': 'sensor.iometer_1isk0000000000_battery_level',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'object_id_base': 'Battery level',
'options': dict({
}),
'original_device_class': <SensorDeviceClass.BATTERY: 'battery'>,
'original_icon': None,
'original_name': 'Battery level',
'platform': 'iometer',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': 'battery_level',
'unique_id': '01JQ6G5395176MAAWKAAPEZHV6_battery_level',
'unit_of_measurement': '%',
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_battery_level-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'battery',
'friendly_name': 'IOmeter-1ISK0000000000 Battery level',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'unit_of_measurement': '%',
}),
'context': <ANY>,
'entity_id': 'sensor.iometer_1isk0000000000_battery_level',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '100',
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_consumption_tariff_t1-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.TOTAL: 'total'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
'entity_id': 'sensor.iometer_1isk0000000000_consumption_tariff_t1',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'object_id_base': 'Consumption Tariff T1',
'options': dict({
'sensor': dict({
'suggested_display_precision': 0,
}),
}),
'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
'original_icon': None,
'original_name': 'Consumption Tariff T1',
'platform': 'iometer',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': 'consumption_tariff_t1',
'unique_id': '01JQ6G5395176MAAWKAAPEZHV6_consumption_tariff_t1',
'unit_of_measurement': <UnitOfEnergy.WATT_HOUR: 'Wh'>,
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_consumption_tariff_t1-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'energy',
'friendly_name': 'IOmeter-1ISK0000000000 Consumption Tariff T1',
'state_class': <SensorStateClass.TOTAL: 'total'>,
'unit_of_measurement': <UnitOfEnergy.WATT_HOUR: 'Wh'>,
}),
'context': <ANY>,
'entity_id': 'sensor.iometer_1isk0000000000_consumption_tariff_t1',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '1904.5',
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_consumption_tariff_t2-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.TOTAL: 'total'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
'entity_id': 'sensor.iometer_1isk0000000000_consumption_tariff_t2',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'object_id_base': 'Consumption Tariff T2',
'options': dict({
'sensor': dict({
'suggested_display_precision': 0,
}),
}),
'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
'original_icon': None,
'original_name': 'Consumption Tariff T2',
'platform': 'iometer',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': 'consumption_tariff_t2',
'unique_id': '01JQ6G5395176MAAWKAAPEZHV6_consumption_tariff_t2',
'unit_of_measurement': <UnitOfEnergy.WATT_HOUR: 'Wh'>,
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_consumption_tariff_t2-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'energy',
'friendly_name': 'IOmeter-1ISK0000000000 Consumption Tariff T2',
'state_class': <SensorStateClass.TOTAL: 'total'>,
'unit_of_measurement': <UnitOfEnergy.WATT_HOUR: 'Wh'>,
}),
'context': <ANY>,
'entity_id': 'sensor.iometer_1isk0000000000_consumption_tariff_t2',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '9876.21',
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_meter_number-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': None,
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
'entity_id': 'sensor.iometer_1isk0000000000_meter_number',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'object_id_base': 'Meter number',
'options': dict({
}),
'original_device_class': None,
'original_icon': 'mdi:meter-electric',
'original_name': 'Meter number',
'platform': 'iometer',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': 'meter_number',
'unique_id': '01JQ6G5395176MAAWKAAPEZHV6_meter_number',
'unit_of_measurement': None,
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_meter_number-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'IOmeter-1ISK0000000000 Meter number',
'icon': 'mdi:meter-electric',
}),
'context': <ANY>,
'entity_id': 'sensor.iometer_1isk0000000000_meter_number',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '1ISK0000000000',
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_pin_status-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'options': list([
'entered',
'pending',
'missing',
'unknown',
]),
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
'entity_id': 'sensor.iometer_1isk0000000000_pin_status',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'object_id_base': 'PIN status',
'options': dict({
}),
'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
'original_icon': None,
'original_name': 'PIN status',
'platform': 'iometer',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': 'pin_status',
'unique_id': '01JQ6G5395176MAAWKAAPEZHV6_pin_status',
'unit_of_measurement': None,
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_pin_status-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'enum',
'friendly_name': 'IOmeter-1ISK0000000000 PIN status',
'options': list([
'entered',
'pending',
'missing',
'unknown',
]),
}),
'context': <ANY>,
'entity_id': 'sensor.iometer_1isk0000000000_pin_status',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': 'entered',
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_power-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
'entity_id': 'sensor.iometer_1isk0000000000_power',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'object_id_base': 'Power',
'options': dict({
'sensor': dict({
'suggested_display_precision': 0,
}),
}),
'original_device_class': <SensorDeviceClass.POWER: 'power'>,
'original_icon': None,
'original_name': 'Power',
'platform': 'iometer',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': None,
'unique_id': '01JQ6G5395176MAAWKAAPEZHV6_power',
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_power-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'power',
'friendly_name': 'IOmeter-1ISK0000000000 Power',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
}),
'context': <ANY>,
'entity_id': 'sensor.iometer_1isk0000000000_power',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '100',
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_power_supply-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'options': list([
'battery',
'wired',
'unknown',
]),
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
'entity_id': 'sensor.iometer_1isk0000000000_power_supply',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'object_id_base': 'Power supply',
'options': dict({
}),
'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
'original_icon': None,
'original_name': 'Power supply',
'platform': 'iometer',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': 'power_status',
'unique_id': '01JQ6G5395176MAAWKAAPEZHV6_power_status',
'unit_of_measurement': None,
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_power_supply-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'enum',
'friendly_name': 'IOmeter-1ISK0000000000 Power supply',
'options': list([
'battery',
'wired',
'unknown',
]),
}),
'context': <ANY>,
'entity_id': 'sensor.iometer_1isk0000000000_power_supply',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': 'battery',
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_signal_strength_core_bridge-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
'entity_id': 'sensor.iometer_1isk0000000000_signal_strength_core_bridge',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'object_id_base': 'Signal strength Core/Bridge',
'options': dict({
}),
'original_device_class': <SensorDeviceClass.SIGNAL_STRENGTH: 'signal_strength'>,
'original_icon': None,
'original_name': 'Signal strength Core/Bridge',
'platform': 'iometer',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': 'core_bridge_rssi',
'unique_id': '01JQ6G5395176MAAWKAAPEZHV6_core_bridge_rssi',
'unit_of_measurement': 'dB',
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_signal_strength_core_bridge-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'signal_strength',
'friendly_name': 'IOmeter-1ISK0000000000 Signal strength Core/Bridge',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'unit_of_measurement': 'dB',
}),
'context': <ANY>,
'entity_id': 'sensor.iometer_1isk0000000000_signal_strength_core_bridge',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '-30',
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_signal_strength_wi_fi-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
'entity_id': 'sensor.iometer_1isk0000000000_signal_strength_wi_fi',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'object_id_base': 'Signal strength Wi-Fi',
'options': dict({
}),
'original_device_class': <SensorDeviceClass.SIGNAL_STRENGTH: 'signal_strength'>,
'original_icon': None,
'original_name': 'Signal strength Wi-Fi',
'platform': 'iometer',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': 'wifi_rssi',
'unique_id': '01JQ6G5395176MAAWKAAPEZHV6_wifi_rssi',
'unit_of_measurement': 'dB',
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_signal_strength_wi_fi-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'signal_strength',
'friendly_name': 'IOmeter-1ISK0000000000 Signal strength Wi-Fi',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'unit_of_measurement': 'dB',
}),
'context': <ANY>,
'entity_id': 'sensor.iometer_1isk0000000000_signal_strength_wi_fi',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '-30',
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_total_consumption-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.TOTAL: 'total'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
'entity_id': 'sensor.iometer_1isk0000000000_total_consumption',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'object_id_base': 'Total consumption',
'options': dict({
'sensor': dict({
'suggested_display_precision': 0,
}),
}),
'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
'original_icon': None,
'original_name': 'Total consumption',
'platform': 'iometer',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': 'total_consumption',
'unique_id': '01JQ6G5395176MAAWKAAPEZHV6_total_consumption',
'unit_of_measurement': <UnitOfEnergy.WATT_HOUR: 'Wh'>,
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_total_consumption-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'energy',
'friendly_name': 'IOmeter-1ISK0000000000 Total consumption',
'state_class': <SensorStateClass.TOTAL: 'total'>,
'unit_of_measurement': <UnitOfEnergy.WATT_HOUR: 'Wh'>,
}),
'context': <ANY>,
'entity_id': 'sensor.iometer_1isk0000000000_total_consumption',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '1234.5',
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_total_production-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.TOTAL: 'total'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
'device_class': None,
'device_id': <ANY>,
'disabled_by': None,
'domain': 'sensor',
'entity_category': None,
'entity_id': 'sensor.iometer_1isk0000000000_total_production',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
'id': <ANY>,
'labels': set({
}),
'name': None,
'object_id_base': 'Total production',
'options': dict({
'sensor': dict({
'suggested_display_precision': 0,
}),
}),
'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
'original_icon': None,
'original_name': 'Total production',
'platform': 'iometer',
'previous_unique_id': None,
'suggested_object_id': None,
'supported_features': 0,
'translation_key': 'total_production',
'unique_id': '01JQ6G5395176MAAWKAAPEZHV6_total_production',
'unit_of_measurement': <UnitOfEnergy.WATT_HOUR: 'Wh'>,
})
# ---
# name: test_all_sensors[sensor.iometer_1isk0000000000_total_production-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'energy',
'friendly_name': 'IOmeter-1ISK0000000000 Total production',
'state_class': <SensorStateClass.TOTAL: 'total'>,
'unit_of_measurement': <UnitOfEnergy.WATT_HOUR: 'Wh'>,
}),
'context': <ANY>,
'entity_id': 'sensor.iometer_1isk0000000000_total_production',
'last_changed': <ANY>,
'last_reported': <ANY>,
'last_updated': <ANY>,
'state': '5432.1',
})
# ---

29
tests/components/iometer/test_sensor.py Normal file
View File

@@ -0,0 +1,29 @@
"""Test the sensors provided by the Powerfox integration."""
from __future__ import annotations
import pytest
from syrupy.assertion import SnapshotAssertion
from homeassistant.const import Platform
from homeassistant.core import HomeAssistant
from homeassistant.helpers import entity_registry as er
from . import setup_platform
from tests.common import MockConfigEntry, snapshot_platform
from tests.components.conftest import AsyncMock
@pytest.mark.usefixtures("entity_registry_enabled_by_default")
async def test_all_sensors(
hass: HomeAssistant,
mock_iometer_client: AsyncMock,
mock_config_entry: MockConfigEntry,
entity_registry: er.EntityRegistry,
snapshot: SnapshotAssertion,
) -> None:
"""Test the Iometer sensors."""
await setup_platform(hass, mock_config_entry, [Platform.SENSOR])
await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)