diff --git a/homeassistant/components/fronius/coordinator.py b/homeassistant/components/fronius/coordinator.py index 73bded645f36..f8a46fc73dfd 100644 --- a/homeassistant/components/fronius/coordinator.py +++ b/homeassistant/components/fronius/coordinator.py @@ -269,7 +269,7 @@ class FroniusModbusInverterUpdateCoordinator(FroniusModbusCoordinatorBase): values[f"mppt_{number}_current_dc"] = module.current values[f"mppt_{number}_voltage_dc"] = module.voltage values[f"mppt_{number}_power_dc"] = module.power - values[f"mppt_{number}_energy_dc"] = module.energy + values[f"mppt_{number}_energy"] = module.energy return self._as_device_data(values) diff --git a/homeassistant/components/fronius/sensor.py b/homeassistant/components/fronius/sensor.py index cb245f9d7194..ad3831f36914 100644 --- a/homeassistant/components/fronius/sensor.py +++ b/homeassistant/components/fronius/sensor.py @@ -324,12 +324,12 @@ def _modbus_mppt_descriptions( translation_placeholders={"mppt_no": str(mppt_no)}, ), FroniusSensorEntityDescription( - key=f"mppt_{mppt_no}_energy_dc", + key=f"mppt_{mppt_no}_energy", native_unit_of_measurement=UnitOfEnergy.WATT_HOUR, device_class=SensorDeviceClass.ENERGY, state_class=SensorStateClass.TOTAL_INCREASING, invalid_when_falsy=True, - translation_key="modbus_mppt_energy_dc", + translation_key="modbus_mppt_energy", translation_placeholders={"mppt_no": str(mppt_no)}, ), ] diff --git a/homeassistant/components/fronius/strings.json b/homeassistant/components/fronius/strings.json index 93659cfcfd65..f2ff3db4400b 100644 --- a/homeassistant/components/fronius/strings.json +++ b/homeassistant/components/fronius/strings.json @@ -264,8 +264,8 @@ "modbus_mppt_current_dc": { "name": "MPPT {mppt_no} DC current" }, - "modbus_mppt_energy_dc": { - "name": "MPPT {mppt_no} DC energy" + "modbus_mppt_energy": { + "name": "MPPT {mppt_no} energy" }, "modbus_mppt_power_dc": { "name": "MPPT {mppt_no} DC power" diff --git a/tests/components/fronius/snapshots/test_diagnostics.ambr b/tests/components/fronius/snapshots/test_diagnostics.ambr index 04651d1234d6..adbd60c1f000 100644 --- a/tests/components/fronius/snapshots/test_diagnostics.ambr +++ b/tests/components/fronius/snapshots/test_diagnostics.ambr @@ -741,7 +741,7 @@ 'mppt_1_current_dc': dict({ 'value': 8.2, }), - 'mppt_1_energy_dc': dict({ + 'mppt_1_energy': dict({ 'value': 1000000, }), 'mppt_1_power_dc': dict({ diff --git a/tests/components/fronius/test_modbus.py b/tests/components/fronius/test_modbus.py index 5305a540d8a2..9806d2101281 100644 --- a/tests/components/fronius/test_modbus.py +++ b/tests/components/fronius/test_modbus.py @@ -74,7 +74,7 @@ async def test_gen24_storage_mppt( assert_state(hass, "sensor.gen24_storage_mppt_1_dc_current", 8.2) assert_state(hass, "sensor.gen24_storage_mppt_1_dc_voltage", 402.1) assert_state(hass, "sensor.gen24_storage_mppt_1_dc_power", 3300) - assert_state(hass, "sensor.gen24_storage_mppt_1_dc_energy", 1000000) + assert_state(hass, "sensor.gen24_storage_mppt_1_energy", 1000000) assert_state(hass, "sensor.gen24_storage_mppt_2_dc_power", 1650) assert_state(hass, "sensor.gen24_storage_mppt_3_dc_power", 0) assert_state(hass, "sensor.gen24_storage_mppt_4_dc_power", 480) @@ -301,7 +301,7 @@ async def test_not_implemented_values( assert_state(hass, "sensor.inverter_name_mppt_1_dc_power", 3300) assert hass.states.get("sensor.inverter_name_mppt_2_dc_power") is None - assert hass.states.get("sensor.inverter_name_mppt_2_dc_energy") is None + assert hass.states.get("sensor.inverter_name_mppt_2_energy") is None # PV total unknown when a PV module doesn't report energy assert hass.states.get("sensor.inverter_name_pv_energy_total") is None @@ -312,7 +312,7 @@ async def test_not_implemented_values( freezer.tick(FroniusModbusInverterUpdateCoordinator.default_interval) async_fire_time_changed(hass) await hass.async_block_till_done() - assert_state(hass, "sensor.inverter_name_mppt_1_dc_energy", "unknown") + assert_state(hass, "sensor.inverter_name_mppt_1_energy", "unknown") @pytest.mark.usefixtures("entity_registry_enabled_by_default")