Skip to content

[pull] dev from home-assistant:dev #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 19, 2025
Merged

[pull] dev from home-assistant:dev #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86e3eca
Bump pyswitchbot to 0.68.4 (#150871)
zerzhang Aug 19, 2025
0c0e54b
Bump aiorussound to 4.8.1 (#150858)
noahhusby Aug 19, 2025
fc5e720
Use correct unit and class for the Imeon inverter sensors (#150847)
Imeon-Energy Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions homeassistant/components/imeon_inverter/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
EntityCategory,
UnitOfElectricCurrent,
UnitOfElectricPotential,
UnitOfEnergy,
UnitOfFrequency,
UnitOfPower,
UnitOfTemperature,
Expand Down Expand Up @@ -50,8 +49,8 @@
SensorEntityDescription(
key="battery_stored",
translation_key="battery_stored",
native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
device_class=SensorDeviceClass.ENERGY_STORAGE,
native_unit_of_measurement=UnitOfPower.WATT,
device_class=SensorDeviceClass.POWER,
state_class=SensorStateClass.MEASUREMENT,
),
# Grid
Expand Down Expand Up @@ -238,16 +237,16 @@
SensorEntityDescription(
key="pv_consumed",
translation_key="pv_consumed",
native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
device_class=SensorDeviceClass.ENERGY,
state_class=SensorStateClass.TOTAL,
native_unit_of_measurement=UnitOfPower.WATT,
device_class=SensorDeviceClass.POWER,
state_class=SensorStateClass.MEASUREMENT,
),
SensorEntityDescription(
key="pv_injected",
translation_key="pv_injected",
native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
device_class=SensorDeviceClass.ENERGY,
state_class=SensorStateClass.TOTAL,
native_unit_of_measurement=UnitOfPower.WATT,
device_class=SensorDeviceClass.POWER,
state_class=SensorStateClass.MEASUREMENT,
),
SensorEntityDescription(
key="pv_power_1",
Expand Down Expand Up @@ -290,14 +289,14 @@
key="monitoring_self_consumption",
translation_key="monitoring_self_consumption",
native_unit_of_measurement=PERCENTAGE,
state_class=SensorStateClass.MEASUREMENT,
state_class=SensorStateClass.TOTAL,
suggested_display_precision=2,
),
SensorEntityDescription(
key="monitoring_self_sufficiency",
translation_key="monitoring_self_sufficiency",
native_unit_of_measurement=PERCENTAGE,
state_class=SensorStateClass.MEASUREMENT,
state_class=SensorStateClass.TOTAL,
suggested_display_precision=2,
),
# Monitoring (instant minute data)
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/russound_rio/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"iot_class": "local_push",
"loggers": ["aiorussound"],
"quality_scale": "silver",
"requirements": ["aiorussound==4.8.0"],
"requirements": ["aiorussound==4.8.1"],
"zeroconf": ["_rio._tcp.local."]
}
2 changes: 1 addition & 1 deletion homeassistant/components/switchbot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@
"iot_class": "local_push",
"loggers": ["switchbot"],
"quality_scale": "gold",
"requirements": ["PySwitchbot==0.68.3"]
"requirements": ["PySwitchbot==0.68.4"]
}
4 changes: 2 additions & 2 deletions requirements_all.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions requirements_test_all.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 20 additions & 20 deletions tests/components/imeon_inverter/snapshots/test_sensor.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@
'suggested_display_precision': 0,
}),
}),
'original_device_class': <SensorDeviceClass.ENERGY_STORAGE: 'energy_storage'>,
'original_device_class': <SensorDeviceClass.POWER: 'power'>,
'original_icon': None,
'original_name': 'Battery stored',
'platform': 'imeon_inverter',
Expand All @@ -201,16 +201,16 @@
'supported_features': 0,
'translation_key': 'battery_stored',
'unique_id': '111111111111111_battery_stored',
'unit_of_measurement': <UnitOfEnergy.WATT_HOUR: 'Wh'>,
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
})
# ---
# name: test_sensors[sensor.imeon_inverter_battery_stored-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'energy_storage',
'device_class': 'power',
'friendly_name': 'Imeon inverter Battery stored',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'unit_of_measurement': <UnitOfEnergy.WATT_HOUR: 'Wh'>,
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
}),
'context': <ANY>,
'entity_id': 'sensor.imeon_inverter_battery_stored',
Expand Down Expand Up @@ -1290,7 +1290,7 @@
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'state_class': <SensorStateClass.TOTAL: 'total'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
Expand Down Expand Up @@ -1328,7 +1328,7 @@
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Imeon inverter Monitoring self-consumption',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'state_class': <SensorStateClass.TOTAL: 'total'>,
'unit_of_measurement': '%',
}),
'context': <ANY>,
Expand All @@ -1345,7 +1345,7 @@
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'state_class': <SensorStateClass.TOTAL: 'total'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
Expand Down Expand Up @@ -1383,7 +1383,7 @@
StateSnapshot({
'attributes': ReadOnlyDict({
'friendly_name': 'Imeon inverter Monitoring self-sufficiency',
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'state_class': <SensorStateClass.TOTAL: 'total'>,
'unit_of_measurement': '%',
}),
'context': <ANY>,
Expand Down Expand Up @@ -2072,7 +2072,7 @@
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.TOTAL: 'total'>,
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
Expand All @@ -2094,7 +2094,7 @@
'suggested_display_precision': 0,
}),
}),
'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
'original_device_class': <SensorDeviceClass.POWER: 'power'>,
'original_icon': None,
'original_name': 'PV consumed',
'platform': 'imeon_inverter',
Expand All @@ -2103,16 +2103,16 @@
'supported_features': 0,
'translation_key': 'pv_consumed',
'unique_id': '111111111111111_pv_consumed',
'unit_of_measurement': <UnitOfEnergy.WATT_HOUR: 'Wh'>,
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
})
# ---
# name: test_sensors[sensor.imeon_inverter_pv_consumed-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'energy',
'device_class': 'power',
'friendly_name': 'Imeon inverter PV consumed',
'state_class': <SensorStateClass.TOTAL: 'total'>,
'unit_of_measurement': <UnitOfEnergy.WATT_HOUR: 'Wh'>,
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
}),
'context': <ANY>,
'entity_id': 'sensor.imeon_inverter_pv_consumed',
Expand All @@ -2128,7 +2128,7 @@
}),
'area_id': None,
'capabilities': dict({
'state_class': <SensorStateClass.TOTAL: 'total'>,
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
}),
'config_entry_id': <ANY>,
'config_subentry_id': <ANY>,
Expand All @@ -2150,7 +2150,7 @@
'suggested_display_precision': 0,
}),
}),
'original_device_class': <SensorDeviceClass.ENERGY: 'energy'>,
'original_device_class': <SensorDeviceClass.POWER: 'power'>,
'original_icon': None,
'original_name': 'PV injected',
'platform': 'imeon_inverter',
Expand All @@ -2159,16 +2159,16 @@
'supported_features': 0,
'translation_key': 'pv_injected',
'unique_id': '111111111111111_pv_injected',
'unit_of_measurement': <UnitOfEnergy.WATT_HOUR: 'Wh'>,
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
})
# ---
# name: test_sensors[sensor.imeon_inverter_pv_injected-state]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'energy',
'device_class': 'power',
'friendly_name': 'Imeon inverter PV injected',
'state_class': <SensorStateClass.TOTAL: 'total'>,
'unit_of_measurement': <UnitOfEnergy.WATT_HOUR: 'Wh'>,
'state_class': <SensorStateClass.MEASUREMENT: 'measurement'>,
'unit_of_measurement': <UnitOfPower.WATT: 'W'>,
}),
'context': <ANY>,
'entity_id': 'sensor.imeon_inverter_pv_injected',
Expand Down
Loading