From 2919e6dcef9df5745216c84e117fe41df49a30f5 Mon Sep 17 00:00:00 2001 From: Illia Piskurov Date: Fri, 17 Jan 2025 13:38:38 +0000 Subject: [PATCH 1/7] Added separate scale for current temp for climates --- homeassistant/components/modbus/__init__.py | 2 ++ homeassistant/components/modbus/climate.py | 7 +++++-- homeassistant/components/modbus/const.py | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/modbus/__init__.py b/homeassistant/components/modbus/__init__.py index a7b32119917474..dc60a3bcfab3e5 100644 --- a/homeassistant/components/modbus/__init__.py +++ b/homeassistant/components/modbus/__init__.py @@ -65,6 +65,7 @@ CONF_BAUDRATE, CONF_BYTESIZE, CONF_CLIMATES, + CONF_CURRENT_TEMP_SCALE, CONF_DATA_TYPE, CONF_DEVICE_ADDRESS, CONF_FAN_MODE_AUTO, @@ -199,6 +200,7 @@ ), vol.Optional(CONF_STRUCTURE): cv.string, vol.Optional(CONF_SCALE, default=1): vol.Coerce(float), + vol.Optional(CONF_CURRENT_TEMP_SCALE, default=1): vol.Coerce(float), vol.Optional(CONF_OFFSET, default=0): vol.Coerce(float), vol.Optional(CONF_PRECISION): cv.positive_int, vol.Optional( diff --git a/homeassistant/components/modbus/climate.py b/homeassistant/components/modbus/climate.py index ba09bd08377f6c..be8398e02c82b8 100644 --- a/homeassistant/components/modbus/climate.py +++ b/homeassistant/components/modbus/climate.py @@ -48,6 +48,7 @@ CALL_TYPE_WRITE_REGISTER, CALL_TYPE_WRITE_REGISTERS, CONF_CLIMATES, + CONF_CURRENT_TEMP_SCALE, CONF_FAN_MODE_AUTO, CONF_FAN_MODE_DIFFUSE, CONF_FAN_MODE_FOCUS, @@ -147,6 +148,7 @@ def __init__( ] self._unit = config[CONF_TEMPERATURE_UNIT] self._attr_current_temperature = None + self._current_temperature_scale = config[CONF_CURRENT_TEMP_SCALE] self._attr_target_temperature = None self._attr_temperature_unit = ( UnitOfTemperature.FAHRENHEIT @@ -427,8 +429,9 @@ async def async_update(self, now: datetime | None = None) -> None: ], ) - self._attr_current_temperature = await self._async_read_register( - self._input_type, self._address + self._attr_current_temperature = int( + await self._async_read_register(self._input_type, self._address) + * self._current_temperature_scale ) # Read the HVAC mode register if defined if self._hvac_mode_register is not None: diff --git a/homeassistant/components/modbus/const.py b/homeassistant/components/modbus/const.py index e11e15fff20f19..ade928cee7bbce 100644 --- a/homeassistant/components/modbus/const.py +++ b/homeassistant/components/modbus/const.py @@ -29,6 +29,7 @@ CONF_PARITY = "parity" CONF_PRECISION = "precision" CONF_SCALE = "scale" +CONF_CURRENT_TEMP_SCALE = "current_temp_scale" CONF_SLAVE_COUNT = "slave_count" CONF_STATE_CLOSED = "state_closed" CONF_STATE_CLOSING = "state_closing" From 63f9762ee0135439b68c761dd70967d76a8aeeb4 Mon Sep 17 00:00:00 2001 From: Illia Piskurov Date: Wed, 22 Jan 2025 06:26:42 +0000 Subject: [PATCH 2/7] Fix bug --- homeassistant/components/modbus/climate.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/modbus/climate.py b/homeassistant/components/modbus/climate.py index be8398e02c82b8..daa5ff6f1edebd 100644 --- a/homeassistant/components/modbus/climate.py +++ b/homeassistant/components/modbus/climate.py @@ -429,9 +429,13 @@ async def async_update(self, now: datetime | None = None) -> None: ], ) - self._attr_current_temperature = int( - await self._async_read_register(self._input_type, self._address) - * self._current_temperature_scale + register_value = await self._async_read_register( + self._input_type, self._address + ) + self._attr_current_temperature = ( + int(register_value * self._current_temperature_scale) + if register_value + else None ) # Read the HVAC mode register if defined if self._hvac_mode_register is not None: From f382c6878281d54df1b48d5abf01b8e49ead6a18 Mon Sep 17 00:00:00 2001 From: Illia Piskurov Date: Fri, 31 Jan 2025 14:21:19 +0000 Subject: [PATCH 3/7] Added test for scale of current_temp attr --- tests/components/modbus/test_climate.py | 72 +++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/tests/components/modbus/test_climate.py b/tests/components/modbus/test_climate.py index 1520e4478c659f..98f86c0ce2d746 100644 --- a/tests/components/modbus/test_climate.py +++ b/tests/components/modbus/test_climate.py @@ -36,6 +36,7 @@ from homeassistant.components.homeassistant import SERVICE_UPDATE_ENTITY from homeassistant.components.modbus.const import ( CONF_CLIMATES, + CONF_CURRENT_TEMP_SCALE, CONF_DATA_TYPE, CONF_DEVICE_ADDRESS, CONF_FAN_MODE_AUTO, @@ -562,6 +563,77 @@ async def test_service_climate_update( assert hass.states.get(ENTITY_ID).state == result +@pytest.mark.parametrize( + ("do_config", "result", "register_words"), + [ + ( + { + CONF_CLIMATES: [ + { + CONF_NAME: TEST_ENTITY_NAME, + CONF_TARGET_TEMP: 120, + CONF_ADDRESS: 117, + CONF_SLAVE: 10, + CONF_SCAN_INTERVAL: 0, + CONF_DATA_TYPE: DataType.INT32, + }, + ] + }, + 17, + [0, 17], + ), + ( + { + CONF_CLIMATES: [ + { + CONF_NAME: TEST_ENTITY_NAME, + CONF_TARGET_TEMP: 120, + CONF_ADDRESS: 117, + CONF_SLAVE: 10, + CONF_SCAN_INTERVAL: 0, + CONF_CURRENT_TEMP_SCALE: 0.1, + }, + ] + }, + 25, + [250], + ), + ( + { + CONF_CLIMATES: [ + { + CONF_NAME: TEST_ENTITY_NAME, + CONF_TARGET_TEMP: 120, + CONF_ADDRESS: 117, + CONF_SLAVE: 10, + CONF_SCAN_INTERVAL: 0, + CONF_CURRENT_TEMP_SCALE: 0.01, + }, + ] + }, + 19, + [1900], + ), + ], +) +async def test_hvac_onoff_coil_update( + hass: HomeAssistant, mock_modbus_ha, result, register_words +) -> None: + """Test climate update based on On/Off coil values.""" + mock_modbus_ha.read_holding_registers.return_value = ReadResult(register_words) + + await hass.services.async_call( + HOMEASSISTANT_DOMAIN, + SERVICE_UPDATE_ENTITY, + {ATTR_ENTITY_ID: ENTITY_ID}, + blocking=True, + ) + await hass.async_block_till_done() + + state = hass.states.get(ENTITY_ID) + assert state.attributes.get("current_temperature") == result + + @pytest.mark.parametrize( ("do_config", "result", "register_words"), [ From e27fef2addeba98b7d3e3dd95535d9814dc18746 Mon Sep 17 00:00:00 2001 From: Illia Piskurov Date: Thu, 6 Feb 2025 11:00:31 +0000 Subject: [PATCH 4/7] fix bug with scale --- homeassistant/components/modbus/climate.py | 5 ++++- tests/components/modbus/test_climate.py | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/homeassistant/components/modbus/climate.py b/homeassistant/components/modbus/climate.py index daa5ff6f1edebd..ab9da0f5a4aa29 100644 --- a/homeassistant/components/modbus/climate.py +++ b/homeassistant/components/modbus/climate.py @@ -433,7 +433,10 @@ async def async_update(self, now: datetime | None = None) -> None: self._input_type, self._address ) self._attr_current_temperature = ( - int(register_value * self._current_temperature_scale) + int( + register_value * self._current_temperature_scale / self._scale + - self._offset + ) if register_value else None ) diff --git a/tests/components/modbus/test_climate.py b/tests/components/modbus/test_climate.py index 98f86c0ce2d746..d96b55e605ea92 100644 --- a/tests/components/modbus/test_climate.py +++ b/tests/components/modbus/test_climate.py @@ -62,6 +62,7 @@ CONF_HVAC_ONOFF_REGISTER, CONF_MAX_TEMP, CONF_MIN_TEMP, + CONF_SCALE, CONF_SWING_MODE_REGISTER, CONF_SWING_MODE_SWING_BOTH, CONF_SWING_MODE_SWING_HORIZ, @@ -592,6 +593,7 @@ async def test_service_climate_update( CONF_SLAVE: 10, CONF_SCAN_INTERVAL: 0, CONF_CURRENT_TEMP_SCALE: 0.1, + CONF_SCALE: 10, }, ] }, From 5e0edf59d21e86b1ac5b0e67a05992351c3a41b2 Mon Sep 17 00:00:00 2001 From: Illia Piskurov Date: Fri, 7 Feb 2025 14:35:11 +0000 Subject: [PATCH 5/7] fix offseting --- homeassistant/components/modbus/climate.py | 5 +++-- tests/components/modbus/test_climate.py | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/modbus/climate.py b/homeassistant/components/modbus/climate.py index ab9da0f5a4aa29..d32be9aeed9f64 100644 --- a/homeassistant/components/modbus/climate.py +++ b/homeassistant/components/modbus/climate.py @@ -434,8 +434,9 @@ async def async_update(self, now: datetime | None = None) -> None: ) self._attr_current_temperature = ( int( - register_value * self._current_temperature_scale / self._scale - - self._offset + (register_value - self._offset) + / self._scale + * self._current_temperature_scale ) if register_value else None diff --git a/tests/components/modbus/test_climate.py b/tests/components/modbus/test_climate.py index d96b55e605ea92..8cd07c05aafd3a 100644 --- a/tests/components/modbus/test_climate.py +++ b/tests/components/modbus/test_climate.py @@ -81,6 +81,7 @@ ATTR_TEMPERATURE, CONF_ADDRESS, CONF_NAME, + CONF_OFFSET, CONF_PLATFORM, CONF_SCAN_INTERVAL, CONF_SLAVE, @@ -592,13 +593,14 @@ async def test_service_climate_update( CONF_ADDRESS: 117, CONF_SLAVE: 10, CONF_SCAN_INTERVAL: 0, - CONF_CURRENT_TEMP_SCALE: 0.1, + CONF_CURRENT_TEMP_SCALE: 0.01, CONF_SCALE: 10, + CONF_OFFSET: 20, }, ] }, 25, - [250], + [2520], ), ( { @@ -610,6 +612,7 @@ async def test_service_climate_update( CONF_SLAVE: 10, CONF_SCAN_INTERVAL: 0, CONF_CURRENT_TEMP_SCALE: 0.01, + CONF_SCALE: 10, }, ] }, From 93c63f6072ba815f3f2deb9cdf4414bbea3b24e1 Mon Sep 17 00:00:00 2001 From: Illia Piskurov Date: Mon, 10 Feb 2025 06:29:54 +0000 Subject: [PATCH 6/7] Replace multiline ternary with if-else for better readability --- homeassistant/components/modbus/climate.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/modbus/climate.py b/homeassistant/components/modbus/climate.py index d32be9aeed9f64..b3708a9357bb95 100644 --- a/homeassistant/components/modbus/climate.py +++ b/homeassistant/components/modbus/climate.py @@ -432,15 +432,15 @@ async def async_update(self, now: datetime | None = None) -> None: register_value = await self._async_read_register( self._input_type, self._address ) - self._attr_current_temperature = ( - int( + if register_value: + self._attr_current_temperature = int( (register_value - self._offset) / self._scale * self._current_temperature_scale ) - if register_value - else None - ) + else: + self._attr_current_temperature = None + # Read the HVAC mode register if defined if self._hvac_mode_register is not None: hvac_mode = await self._async_read_register( From bcad74727fbe8c492106112a91f684086418009e Mon Sep 17 00:00:00 2001 From: Illia Piskurov Date: Mon, 10 Feb 2025 11:59:58 +0000 Subject: [PATCH 7/7] Refactor test name --- tests/components/modbus/test_climate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/components/modbus/test_climate.py b/tests/components/modbus/test_climate.py index bbed24fd9f0fe4..6eaa79afb54392 100644 --- a/tests/components/modbus/test_climate.py +++ b/tests/components/modbus/test_climate.py @@ -804,10 +804,10 @@ async def test_hvac_onoff_coil_update( ), ], ) -async def test_hvac_onoff_coil_update( +async def test_config_current_temp_scale( hass: HomeAssistant, mock_modbus_ha, result, register_words ) -> None: - """Test climate update based on On/Off coil values.""" + """Test behavior with different configurations for temperature scaling.""" mock_modbus_ha.read_holding_registers.return_value = ReadResult(register_words) await hass.services.async_call(