jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-22 20:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct modbus commit validation, too strict on integers (#109338)

Browse Source
This commit is contained in:
jan iversen 2024-02-02 09:46:53 +01:00 committed by GitHub
parent 025fe51322
commit 543870d5f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
homeassistant/components/modbus/base_platform.py
View File

@ -182,7 +182,6 @@ class BaseStructPlatform(BasePlatform, RestoreEntity):
self._data_type = config[CONF_DATA_TYPE] self._data_type = config[CONF_DATA_TYPE]
self._structure: str = config[CONF_STRUCTURE] self._structure: str = config[CONF_STRUCTURE]
self._scale = config[CONF_SCALE] self._scale = config[CONF_SCALE]
self._precision = config.get(CONF_PRECISION, 2)
self._offset = config[CONF_OFFSET] self._offset = config[CONF_OFFSET]
self._slave_count = config.get(CONF_SLAVE_COUNT, None) or config.get( self._slave_count = config.get(CONF_SLAVE_COUNT, None) or config.get(
CONF_VIRTUAL_COUNT, 0 CONF_VIRTUAL_COUNT, 0
@ -196,11 +195,10 @@ class BaseStructPlatform(BasePlatform, RestoreEntity):
DataType.UINT32, DataType.UINT32,
DataType.UINT64, DataType.UINT64,
) )
if self._value_is_int: if not self._value_is_int:
if self._min_value: self._precision = config.get(CONF_PRECISION, 2)
self._min_value = round(self._min_value) else:
if self._max_value: self._precision = config.get(CONF_PRECISION, 0)
self._max_value = round(self._max_value)
def _swap_registers(self, registers: list[int], slave_count: int) -> list[int]: def _swap_registers(self, registers: list[int], slave_count: int) -> list[int]:
"""Do swap as needed.""" """Do swap as needed."""
@ -235,13 +233,13 @@ class BaseStructPlatform(BasePlatform, RestoreEntity):
return None return None
val: float | int = self._scale * entry + self._offset val: float | int = self._scale * entry + self._offset
if self._min_value is not None and val < self._min_value: if self._min_value is not None and val < self._min_value:
return str(self._min_value) val = self._min_value
if self._max_value is not None and val > self._max_value: if self._max_value is not None and val > self._max_value:
return str(self._max_value) val = self._max_value
if self._zero_suppress is not None and abs(val) <= self._zero_suppress: if self._zero_suppress is not None and abs(val) <= self._zero_suppress:
return "0" return "0"
if self._precision == 0 or self._value_is_int: if self._precision == 0:
return str(int(round(val, 0))) return str(round(val))
return f"{float(val):.{self._precision}f}" return f"{float(val):.{self._precision}f}"
def unpack_structure_result(self, registers: list[int]) -> str | None: def unpack_structure_result(self, registers: list[int]) -> str | None:

10
tests/components/modbus/test_sensor.py
View File

@ -357,7 +357,7 @@ async def test_config_wrong_struct_sensor(
}, },
[7], [7],
False, False,
"34", "34.0000",
), ),
( (
{ {
@ -379,7 +379,7 @@ async def test_config_wrong_struct_sensor(
}, },
[9], [9],
False, False,
"18", "18.5",
), ),
( (
{ {
@ -390,7 +390,7 @@ async def test_config_wrong_struct_sensor(
}, },
[1], [1],
False, False,
"2", "2.40",
), ),
( (
{ {
@ -401,7 +401,7 @@ async def test_config_wrong_struct_sensor(
}, },
[2], [2],
False, False,
"-8", "-8.3",
), ),
( (
{ {
@ -676,7 +676,7 @@ async def test_config_wrong_struct_sensor(
}, },
[0x00AB, 0xCDEF], [0x00AB, 0xCDEF],
False, False,
"112594", "112593.75",
), ),
( (
{ {