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

Address late modbus review (#99123)

Browse Source 
Post review comments.
This commit is contained in:
jan iversen 2023-08-28 09:07:31 +02:00 committed by GitHub
parent 4b50c95d1d
commit a3b526eef6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,6 @@ from homeassistant.const import (
CONF_STRUCTURE, CONF_STRUCTURE,
CONF_UNIQUE_ID, CONF_UNIQUE_ID,
STATE_ON, STATE_ON,
STATE_UNAVAILABLE,
) )
from homeassistant.core import callback from homeassistant.core import callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect from homeassistant.helpers.dispatcher import async_dispatcher_connect
@ -188,10 +187,10 @@ class BaseStructPlatform(BasePlatform, RestoreEntity):
registers.reverse() registers.reverse()
return registers return registers
def __process_raw_value(self, entry: float | int | str) -> float | int | str: def __process_raw_value(self, entry: float | int | str) -> float | int | str | None:
"""Process value from sensor with NaN handling, scaling, offset, min/max etc.""" """Process value from sensor with NaN handling, scaling, offset, min/max etc."""
if self._nan_value and entry in (self._nan_value, -self._nan_value): if self._nan_value and entry in (self._nan_value, -self._nan_value):
return STATE_UNAVAILABLE 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 self._min_value return self._min_value
@ -231,6 +230,8 @@ class BaseStructPlatform(BasePlatform, RestoreEntity):
# the conversion only when it's absolutely necessary. # the conversion only when it's absolutely necessary.
if isinstance(v_temp, int) and self._precision == 0: if isinstance(v_temp, int) and self._precision == 0:
v_result.append(str(v_temp)) v_result.append(str(v_temp))
elif v_temp is None:
v_result.append("") # pragma: no cover
elif v_temp != v_temp: # noqa: PLR0124 elif v_temp != v_temp: # noqa: PLR0124
# NaN float detection replace with None # NaN float detection replace with None
v_result.append("nan") # pragma: no cover v_result.append("nan") # pragma: no cover
@ -245,6 +246,8 @@ class BaseStructPlatform(BasePlatform, RestoreEntity):
# we lose some precision, and unit tests will fail. Therefore, we do # we lose some precision, and unit tests will fail. Therefore, we do
# the conversion only when it's absolutely necessary. # the conversion only when it's absolutely necessary.
if val_result is None:
return None
# NaN float detection replace with None # NaN float detection replace with None
if val_result != val_result: # noqa: PLR0124 if val_result != val_result: # noqa: PLR0124
return None # pragma: no cover return None # pragma: no cover
@ -252,7 +255,7 @@ class BaseStructPlatform(BasePlatform, RestoreEntity):
return str(val_result) return str(val_result)
if isinstance(val_result, str): if isinstance(val_result, str):
if val_result == "nan": if val_result == "nan":
val_result = STATE_UNAVAILABLE # pragma: no cover val_result = None # pragma: no cover
return val_result return val_result
return f"{float(val_result):.{self._precision}f}" return f"{float(val_result):.{self._precision}f}"