Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion homeassistant/components/hydrawise/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"documentation": "https://www.home-assistant.io/integrations/hydrawise",
"iot_class": "cloud_polling",
"loggers": ["pydrawise"],
"requirements": ["pydrawise==2025.7.0"]
"requirements": ["pydrawise==2025.9.0"]
}
4 changes: 2 additions & 2 deletions homeassistant/components/modbus/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,8 @@
{
vol.Required(CONF_TARGET_TEMP): hvac_fixedsize_reglist_validator,
vol.Optional(CONF_TARGET_TEMP_WRITE_REGISTERS, default=False): cv.boolean,
vol.Optional(CONF_MAX_TEMP, default=35): vol.Coerce(float),
vol.Optional(CONF_MIN_TEMP, default=5): vol.Coerce(float),
vol.Optional(CONF_MAX_TEMP, default=35): vol.Coerce(int),
vol.Optional(CONF_MIN_TEMP, default=5): vol.Coerce(int),
vol.Optional(CONF_STEP, default=0.5): vol.Coerce(float),
vol.Optional(CONF_TEMPERATURE_UNIT, default=DEFAULT_TEMP_UNIT): cv.string,
vol.Exclusive(CONF_HVAC_ONOFF_COIL, "hvac_onoff_type"): cv.positive_int,
Expand Down
15 changes: 3 additions & 12 deletions homeassistant/components/modbus/entity.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,10 @@ def __init__(
self._attr_name = entry[CONF_NAME]
self._attr_device_class = entry.get(CONF_DEVICE_CLASS)

def get_optional_numeric_config(config_name: str) -> int | float | None:
if (val := entry.get(config_name)) is None:
return None
assert isinstance(val, (float, int)), (
f"Expected float or int but {config_name} was {type(val)}"
)
return val

self._min_value = get_optional_numeric_config(CONF_MIN_VALUE)
self._max_value = get_optional_numeric_config(CONF_MAX_VALUE)
self._min_value = entry.get(CONF_MIN_VALUE)
self._max_value = entry.get(CONF_MAX_VALUE)
self._nan_value = entry.get(CONF_NAN_VALUE)
self._zero_suppress = get_optional_numeric_config(CONF_ZERO_SUPPRESS)
self._zero_suppress = entry.get(CONF_ZERO_SUPPRESS)

@abstractmethod
async def _async_update(self) -> None:
Expand Down Expand Up @@ -345,7 +337,6 @@ async def async_turn(self, command: int) -> None:
return

if self._verify_delay:
assert self._verify_delay == 1
if self._cancel_call:
self._cancel_call()
self._cancel_call = None
Expand Down
9 changes: 2 additions & 7 deletions homeassistant/components/modbus/light.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ def __init__(
self._attr_color_mode = self._detect_color_mode(config)
self._attr_supported_color_modes = {self._attr_color_mode}

# Set min/max kelvin values if the mode is COLOR_TEMP
self._attr_min_color_temp_kelvin: int = LIGHT_DEFAULT_MIN_KELVIN
self._attr_max_color_temp_kelvin: int = LIGHT_DEFAULT_MAX_KELVIN
if self._attr_color_mode == ColorMode.COLOR_TEMP:
self._attr_min_color_temp_kelvin = config.get(
CONF_MIN_TEMP, LIGHT_DEFAULT_MIN_KELVIN
Expand Down Expand Up @@ -193,9 +194,6 @@ def _convert_modbus_percent_to_brightness(percent: int) -> int:

def _convert_modbus_percent_to_temperature(self, percent: int) -> int:
"""Convert Modbus scale (0-100) to the color temperature in Kelvin (2000-7000 К)."""
assert isinstance(self._attr_min_color_temp_kelvin, int) and isinstance(
self._attr_max_color_temp_kelvin, int
)
return round(
self._attr_min_color_temp_kelvin
+ (
Expand All @@ -216,9 +214,6 @@ def _convert_brightness_to_modbus(brightness: int) -> int:

def _convert_color_temp_to_modbus(self, kelvin: int) -> int:
"""Convert color temperature from Kelvin to the Modbus scale (0-100)."""
assert isinstance(self._attr_min_color_temp_kelvin, int) and isinstance(
self._attr_max_color_temp_kelvin, int
)
return round(
LIGHT_MODBUS_SCALE_MIN
+ (kelvin - self._attr_min_color_temp_kelvin)
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/nut/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
"ups_realpower": { "name": "Real power" },
"ups_realpower_nominal": { "name": "Nominal real power" },
"ups_shutdown": { "name": "Shutdown ability" },
"ups_start_auto": { "name": "Start on ac" },
"ups_start_auto": { "name": "Start on AC" },
"ups_start_battery": { "name": "Start on battery" },
"ups_start_reboot": { "name": "Reboot on battery" },
"ups_status": { "name": "Status data" },
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/overkiz/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
},
"cloud": {
"description": "Enter your application credentials.",
"description": "Enter your credentials.",
"data": {
"username": "[%key:common::config_flow::data::username%]",
"password": "[%key:common::config_flow::data::password%]"
Expand Down
4 changes: 2 additions & 2 deletions homeassistant/components/tesla_fleet/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
"name": "Odometer"
},
"island_status": {
"name": "Grid Status",
"name": "Grid status",
"state": {
"island_status_unknown": "Unknown",
"on_grid": "[%key:common::state::connected%]",
Expand All @@ -452,7 +452,7 @@
}
},
"storm_mode_active": {
"name": "Storm Watch active"
"name": "Storm watch active"
},
"vehicle_state_tpms_pressure_fl": {
"name": "Tire pressure front left"
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"email": "Email",
"host": "Host",
"ip": "IP address",
"implementation": "Application Credentials",
"implementation": "Application credentials",
"language": "Language",
"latitude": "Latitude",
"llm_hass_api": "Control Home Assistant",
Expand Down
2 changes: 1 addition & 1 deletion requirements_all.txt

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

2 changes: 1 addition & 1 deletion requirements_test_all.txt

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

6 changes: 3 additions & 3 deletions tests/components/tesla_fleet/snapshots/test_sensor.ambr
Original file line number Diff line number Diff line change
Expand Up @@ -1757,7 +1757,7 @@
}),
'original_device_class': <SensorDeviceClass.ENUM: 'enum'>,
'original_icon': None,
'original_name': 'Grid Status',
'original_name': 'Grid status',
'platform': 'tesla_fleet',
'previous_unique_id': None,
'suggested_object_id': None,
Expand All @@ -1771,7 +1771,7 @@
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'enum',
'friendly_name': 'Energy Site Grid Status',
'friendly_name': 'Energy Site Grid status',
'options': list([
'island_status_unknown',
'on_grid',
Expand All @@ -1792,7 +1792,7 @@
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'enum',
'friendly_name': 'Energy Site Grid Status',
'friendly_name': 'Energy Site Grid status',
'options': list([
'island_status_unknown',
'on_grid',
Expand Down
Loading