Add separate scale and offset for current temperature for modbus climates

homeassistant/components/modbus/__init__.py

@@ -66,6 +66,8 @@
     CONF_BYTESIZE,
     CONF_CLIMATES,
     CONF_COLOR_TEMP_REGISTER,
+    CONF_CURRENT_TEMP_OFFSET,
+    CONF_CURRENT_TEMP_SCALE,
     CONF_DATA_TYPE,
     CONF_DEVICE_ADDRESS,
     CONF_FAN_MODE_AUTO,
@@ -212,6 +214,8 @@
         vol.Optional(CONF_STRUCTURE): cv.string,
         vol.Optional(CONF_SCALE, default=1): vol.Coerce(float),
         vol.Optional(CONF_OFFSET, default=0): vol.Coerce(float),
+        vol.Inclusive(CONF_CURRENT_TEMP_SCALE, "current_temp"): vol.Coerce(float),
+        vol.Inclusive(CONF_CURRENT_TEMP_OFFSET, "current_temp"): vol.Coerce(float),
         vol.Optional(CONF_PRECISION): cv.positive_int,
         vol.Optional(
             CONF_SWAP,

homeassistant/components/modbus/climate.py

@@ -50,6 +50,8 @@
     CALL_TYPE_WRITE_REGISTER,
     CALL_TYPE_WRITE_REGISTERS,
     CONF_CLIMATES,
+    CONF_CURRENT_TEMP_OFFSET,
+    CONF_CURRENT_TEMP_SCALE,
     CONF_FAN_MODE_AUTO,
     CONF_FAN_MODE_DIFFUSE,
     CONF_FAN_MODE_FOCUS,
@@ -301,6 +303,13 @@ def __init__(
         else:
             self._hvac_onoff_coil = None
 
+        if CONF_CURRENT_TEMP_SCALE in config:
+            self._current_temp_scale = config[CONF_CURRENT_TEMP_SCALE]
+            self._current_temp_offset = config[CONF_CURRENT_TEMP_OFFSET]
+        else:
+            self._current_temp_scale = None
+            self._current_temp_offset = None
+
     async def async_added_to_hass(self) -> None:
         """Handle entity which will be added."""
         await self.async_base_added_to_hass()
@@ -474,9 +483,17 @@ async def _async_update(self) -> None:
             ],
         )
 
-        self._attr_current_temperature = await self._async_read_register(
+        current_temp_register_value = await self._async_read_register(
             self._input_type, self._address
         )
+        if self._current_temp_scale is None:
+            self._attr_current_temperature = current_temp_register_value
+        else:
+            # Undo global scale/offset
+            raw_value = (current_temp_register_value - self._offset) / self._scale
+            new_value = raw_value * self._current_temp_scale + self._current_temp_offset
+            self._attr_current_temperature = new_value
+
         # Read the HVAC mode register if defined
         if self._hvac_mode_register is not None:
             hvac_mode = await self._async_read_register(

homeassistant/components/modbus/const.py

@@ -19,6 +19,8 @@
 CONF_CLIMATES = "climates"
 CONF_BRIGHTNESS_REGISTER = "brightness_address"
 CONF_COLOR_TEMP_REGISTER = "color_temp_address"
+CONF_CURRENT_TEMP_SCALE = "current_temp_scale"
+CONF_CURRENT_TEMP_OFFSET = "current_temp_offset"
 CONF_DATA_TYPE = "data_type"
 CONF_DEVICE_ADDRESS = "device_address"
 CONF_FANS = "fans"

tests/components/modbus/test_climate.py

@@ -38,6 +38,8 @@
 from homeassistant.components.homeassistant import SERVICE_UPDATE_ENTITY
 from homeassistant.components.modbus.const import (
     CONF_CLIMATES,
+    CONF_CURRENT_TEMP_OFFSET,
+    CONF_CURRENT_TEMP_SCALE,
     CONF_DATA_TYPE,
     CONF_DEVICE_ADDRESS,
     CONF_FAN_MODE_AUTO,
@@ -74,6 +76,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,
@@ -92,6 +95,7 @@
     ATTR_TEMPERATURE,
     CONF_ADDRESS,
     CONF_NAME,
+    CONF_OFFSET,
     CONF_PLATFORM,
     CONF_SCAN_INTERVAL,
     CONF_SLAVE,
@@ -928,6 +932,83 @@ async def test_hvac_onoff_register_transition_update(
     assert state.state == result_after
 
 
+@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.01,
+                        CONF_CURRENT_TEMP_OFFSET: 10,
+                        CONF_SCALE: 10,
+                        CONF_OFFSET: 20,
+                    },
+                ]
+            },
+            35,
+            [2500],
+        ),
+        (
+            {
+                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,
+                        CONF_CURRENT_TEMP_OFFSET: 10,
+                        CONF_SCALE: 10,
+                        CONF_OFFSET: -20,
+                    },
+                ]
+            },
+            29,
+            [1900],
+        ),
+    ],
+)
+async def test_config_current_temp_scale_and_offset(
+    hass: HomeAssistant, mock_modbus_ha, result, register_words
+) -> None:
+    """Test behavior with different configurations for temperature scaling."""
+    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"),
     [