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

Remove "meter" from entity names of rainforest_raven sensors (#141487)

Browse Source 
* Fix misleading friendly names of `rainforest_raven` sensors

The three sensors
- power_demand
- total_energy_delivered
- total_energy_received

currently add "meter" in their friendly names.

This does not provide any useful information and is rather irritating instead – it sounds like these are the power demands or consumption of the meter itself. But they are the measured values.

This commit removes "meter" from the names making them simpler and more precise, too.

In addition the sentence-casing of "MAC addresses" is fixed.

* Update test_sensor.ambr

* Update test_sensor.ambr (2)

* Also remove "meter" from Signal strength

* Update test_sensor.ambr (3)

* Change `meter_price` to `energy_price` in strings.json

* Change `meter_price` to `energy_price` in test_sensor.ambr

* Change `meter_price` to `energy_price` in sensor.py
This commit is contained in:
Norbert Rittel 2025-03-28 12:26:51 +01:00 committed by GitHub
parent 65c38d8e31
commit af29159e2f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/rainforest_raven/sensor.py
View File

@ -101,7 +101,7 @@ async def async_setup_entry(
coordinator, coordinator,
RAVEnSensorEntityDescription( RAVEnSensorEntityDescription(
message_key="PriceCluster", message_key="PriceCluster",
translation_key="meter_price", translation_key="energy_price",
key="price", key="price",
native_unit_of_measurement=f"{meter_data['PriceCluster']['currency'].value}/{UnitOfEnergy.KILO_WATT_HOUR}", native_unit_of_measurement=f"{meter_data['PriceCluster']['currency'].value}/{UnitOfEnergy.KILO_WATT_HOUR}",
state_class=SensorStateClass.MEASUREMENT, state_class=SensorStateClass.MEASUREMENT,

14
homeassistant/components/rainforest_raven/strings.json
View File

@ -12,7 +12,7 @@
"step": { "step": {
"meters": { "meters": {
"data": { "data": {
"mac": "Meter MAC Addresses" "mac": "Meter MAC addresses"
} }
}, },
"user": { "user": {
@ -24,27 +24,27 @@
}, },
"entity": { "entity": {
"sensor": { "sensor": {
"meter_price": { "energy_price": {
"name": "Meter price", "name": "Energy price",
"state_attributes": { "state_attributes": {
"rate_label": { "name": "Rate" }, "rate_label": { "name": "Rate" },
"tier": { "name": "Tier" } "tier": { "name": "Tier" }
} }
}, },
"power_demand": { "power_demand": {
"name": "Meter power demand" "name": "Power demand"
}, },
"signal_strength": { "signal_strength": {
"name": "Meter signal strength", "name": "Signal strength",
"state_attributes": { "state_attributes": {
"channel": { "name": "Channel" } "channel": { "name": "Channel" }
} }
}, },
"total_energy_delivered": { "total_energy_delivered": {
"name": "Total meter energy delivered" "name": "Total energy delivered"
}, },
"total_energy_received": { "total_energy_received": {
"name": "Total meter energy received" "name": "Total energy received"
} }
} }
} }

62
tests/components/rainforest_raven/snapshots/test_sensor.ambr
View File

@ -1,5 +1,5 @@
# serializer version: 1 # serializer version: 1
# name: test_sensors[sensor.raven_device_meter_power_demand-entry] # name: test_sensors[sensor.raven_device_power_demand-entry]
EntityRegistryEntrySnapshot({ EntityRegistryEntrySnapshot({
'aliases': set({ 'aliases': set({
}), }),
@ -14,7 +14,7 @@
'disabled_by': None, 'disabled_by': None,
'domain': 'sensor', 'domain': 'sensor',
'entity_category': None, 'entity_category': None,
'entity_id': 'sensor.raven_device_meter_power_demand', 'entity_id': 'sensor.raven_device_power_demand',
'has_entity_name': True, 'has_entity_name': True,
'hidden_by': None, 'hidden_by': None,
'icon': None, 'icon': None,
@ -26,7 +26,7 @@
}), }),
'original_device_class': <SensorDeviceClass.POWER: 'power'>, 'original_device_class': <SensorDeviceClass.POWER: 'power'>,
'original_icon': None, 'original_icon': None,
'original_name': 'Meter power demand', 'original_name': 'Power demand',
'platform': 'rainforest_raven', 'platform': 'rainforest_raven',
'previous_unique_id': None, 'previous_unique_id': None,
'supported_features': 0, 'supported_features': 0,
@ -35,23 +35,23 @@
'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>, 'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
}) })
# --- # ---
# name: test_sensors[sensor.raven_device_meter_power_demand-state] # name: test_sensors[sensor.raven_device_power_demand-state]
StateSnapshot({ StateSnapshot({
'attributes': ReadOnlyDict({ 'attributes': ReadOnlyDict({
'device_class': 'power', 'device_class': 'power',
'friendly_name': 'RAVEn Device Meter power demand', 'friendly_name': 'RAVEn Device Power demand',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>, 'unit_of_measurement': <UnitOfPower.KILO_WATT: 'kW'>,
}), }),
'context': <ANY>, 'context': <ANY>,
'entity_id': 'sensor.raven_device_meter_power_demand', 'entity_id': 'sensor.raven_device_power_demand',
'last_changed': <ANY>, 'last_changed': <ANY>,
'last_reported': <ANY>, 'last_reported': <ANY>,
'last_updated': <ANY>, 'last_updated': <ANY>,
'state': '1.2345', 'state': '1.2345',
}) })
# --- # ---
# name: test_sensors[sensor.raven_device_meter_price-entry] # name: test_sensors[sensor.raven_device_energy_price-entry]
EntityRegistryEntrySnapshot({ EntityRegistryEntrySnapshot({
'aliases': set({ 'aliases': set({
}), }),
@ -66,7 +66,7 @@
'disabled_by': None, 'disabled_by': None,
'domain': 'sensor', 'domain': 'sensor',
'entity_category': None, 'entity_category': None,
'entity_id': 'sensor.raven_device_meter_price', 'entity_id': 'sensor.raven_device_energy_price',
'has_entity_name': True, 'has_entity_name': True,
'hidden_by': None, 'hidden_by': None,
'icon': None, 'icon': None,
@ -78,33 +78,33 @@
}), }),
'original_device_class': None, 'original_device_class': None,
'original_icon': None, 'original_icon': None,
'original_name': 'Meter price', 'original_name': 'Energy price',
'platform': 'rainforest_raven', 'platform': 'rainforest_raven',
'previous_unique_id': None, 'previous_unique_id': None,
'supported_features': 0, 'supported_features': 0,
'translation_key': 'meter_price', 'translation_key': 'energy_price',
'unique_id': '1234567890abcdef.PriceCluster.price', 'unique_id': '1234567890abcdef.PriceCluster.price',
'unit_of_measurement': 'USD/kWh', 'unit_of_measurement': 'USD/kWh',
}) })
# --- # ---
# name: test_sensors[sensor.raven_device_meter_price-state] # name: test_sensors[sensor.raven_device_energy_price-state]
StateSnapshot({ StateSnapshot({
'attributes': ReadOnlyDict({ 'attributes': ReadOnlyDict({
'friendly_name': 'RAVEn Device Meter price', 'friendly_name': 'RAVEn Device Energy price',
'rate_label': 'Set by user', 'rate_label': 'Set by user',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'tier': 3, 'tier': 3,
'unit_of_measurement': 'USD/kWh', 'unit_of_measurement': 'USD/kWh',
}), }),
'context': <ANY>, 'context': <ANY>,
'entity_id': 'sensor.raven_device_meter_price', 'entity_id': 'sensor.raven_device_energy_price',
'last_changed': <ANY>, 'last_changed': <ANY>,
'last_reported': <ANY>, 'last_reported': <ANY>,
'last_updated': <ANY>, 'last_updated': <ANY>,
'state': '0.10', 'state': '0.10',
}) })
# --- # ---
# name: test_sensors[sensor.raven_device_meter_signal_strength-entry] # name: test_sensors[sensor.raven_device_signal_strength-entry]
EntityRegistryEntrySnapshot({ EntityRegistryEntrySnapshot({
'aliases': set({ 'aliases': set({
}), }),
@ -119,7 +119,7 @@
'disabled_by': None, 'disabled_by': None,
'domain': 'sensor', 'domain': 'sensor',
'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>, 'entity_category': <EntityCategory.DIAGNOSTIC: 'diagnostic'>,
'entity_id': 'sensor.raven_device_meter_signal_strength', 'entity_id': 'sensor.raven_device_signal_strength',
'has_entity_name': True, 'has_entity_name': True,
'hidden_by': None, 'hidden_by': None,
'icon': None, 'icon': None,
@ -131,7 +131,7 @@
}), }),
'original_device_class': None, 'original_device_class': None,
'original_icon': None, 'original_icon': None,
'original_name': 'Meter signal strength', 'original_name': 'Signal strength',
'platform': 'rainforest_raven', 'platform': 'rainforest_raven',
'previous_unique_id': None, 'previous_unique_id': None,
'supported_features': 0, 'supported_features': 0,
@ -140,23 +140,23 @@
'unit_of_measurement': '%', 'unit_of_measurement': '%',
}) })
# --- # ---
# name: test_sensors[sensor.raven_device_meter_signal_strength-state] # name: test_sensors[sensor.raven_device_signal_strength-state]
StateSnapshot({ StateSnapshot({
'attributes': ReadOnlyDict({ 'attributes': ReadOnlyDict({
'channel': 13, 'channel': 13,
'friendly_name': 'RAVEn Device Meter signal strength', 'friendly_name': 'RAVEn Device Signal strength',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>, 'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'unit_of_measurement': '%', 'unit_of_measurement': '%',
}), }),
'context': <ANY>, 'context': <ANY>,
'entity_id': 'sensor.raven_device_meter_signal_strength', 'entity_id': 'sensor.raven_device_signal_strength',
'last_changed': <ANY>, 'last_changed': <ANY>,
'last_reported': <ANY>, 'last_reported': <ANY>,
'last_updated': <ANY>, 'last_updated': <ANY>,
'state': '100', 'state': '100',
}) })
# --- # ---
# name: test_sensors[sensor.raven_device_total_meter_energy_delivered-entry] # name: test_sensors[sensor.raven_device_total_energy_delivered-entry]
EntityRegistryEntrySnapshot({ EntityRegistryEntrySnapshot({
'aliases': set({ 'aliases': set({
}), }),
@ -171,7 +171,7 @@
'disabled_by': None, 'disabled_by': None,
'domain': 'sensor', 'domain': 'sensor',
'entity_category': None, 'entity_category': None,
'entity_id': 'sensor.raven_device_total_meter_energy_delivered', 'entity_id': 'sensor.raven_device_total_energy_delivered',
'has_entity_name': True, 'has_entity_name': True,
'hidden_by': None, 'hidden_by': None,
'icon': None, 'icon': None,
@ -183,7 +183,7 @@
}), }),
'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>, 'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
'original_icon': None, 'original_icon': None,
'original_name': 'Total meter energy delivered', 'original_name': 'Total energy delivered',
'platform': 'rainforest_raven', 'platform': 'rainforest_raven',
'previous_unique_id': None, 'previous_unique_id': None,
'supported_features': 0, 'supported_features': 0,
@ -192,23 +192,23 @@
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>, 'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
}) })
# --- # ---
# name: test_sensors[sensor.raven_device_total_meter_energy_delivered-state] # name: test_sensors[sensor.raven_device_total_energy_delivered-state]
StateSnapshot({ StateSnapshot({
'attributes': ReadOnlyDict({ 'attributes': ReadOnlyDict({
'device_class': 'energy', 'device_class': 'energy',
'friendly_name': 'RAVEn Device Total meter energy delivered', 'friendly_name': 'RAVEn Device Total energy delivered',
'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>, 'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>, 'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
}), }),
'context': <ANY>, 'context': <ANY>,
'entity_id': 'sensor.raven_device_total_meter_energy_delivered', 'entity_id': 'sensor.raven_device_total_energy_delivered',
'last_changed': <ANY>, 'last_changed': <ANY>,
'last_reported': <ANY>, 'last_reported': <ANY>,
'last_updated': <ANY>, 'last_updated': <ANY>,
'state': '23456.7890', 'state': '23456.7890',
}) })
# --- # ---
# name: test_sensors[sensor.raven_device_total_meter_energy_received-entry] # name: test_sensors[sensor.raven_device_total_energy_received-entry]
EntityRegistryEntrySnapshot({ EntityRegistryEntrySnapshot({
'aliases': set({ 'aliases': set({
}), }),
@ -223,7 +223,7 @@
'disabled_by': None, 'disabled_by': None,
'domain': 'sensor', 'domain': 'sensor',
'entity_category': None, 'entity_category': None,
'entity_id': 'sensor.raven_device_total_meter_energy_received', 'entity_id': 'sensor.raven_device_total_energy_received',
'has_entity_name': True, 'has_entity_name': True,
'hidden_by': None, 'hidden_by': None,
'icon': None, 'icon': None,
@ -235,7 +235,7 @@
}), }),
'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>, 'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
'original_icon': None, 'original_icon': None,
'original_name': 'Total meter energy received', 'original_name': 'Total energy received',
'platform': 'rainforest_raven', 'platform': 'rainforest_raven',
'previous_unique_id': None, 'previous_unique_id': None,
'supported_features': 0, 'supported_features': 0,
@ -244,16 +244,16 @@
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>, 'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
}) })
# --- # ---
# name: test_sensors[sensor.raven_device_total_meter_energy_received-state] # name: test_sensors[sensor.raven_device_total_energy_received-state]
StateSnapshot({ StateSnapshot({
'attributes': ReadOnlyDict({ 'attributes': ReadOnlyDict({
'device_class': 'energy', 'device_class': 'energy',
'friendly_name': 'RAVEn Device Total meter energy received', 'friendly_name': 'RAVEn Device Total energy received',
'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>, 'state_class': <SensorStateClass.TOTAL_INCREASING: 'total_increasing'>,
'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>, 'unit_of_measurement': <UnitOfEnergy.KILO_WATT_HOUR: 'kWh'>,
}), }),
'context': <ANY>, 'context': <ANY>,
'entity_id': 'sensor.raven_device_total_meter_energy_received', 'entity_id': 'sensor.raven_device_total_energy_received',
'last_changed': <ANY>, 'last_changed': <ANY>,
'last_reported': <ANY>, 'last_reported': <ANY>,
'last_updated': <ANY>, 'last_updated': <ANY>,