Merge pull request #491 from onboard-data/boolean_enum_history

462- Do not coerce binary/enum Points to values if None when trending

BAC0/core/devices/Points.py

@@ -258,7 +258,7 @@ async def priority(self, priority=None):
                 return None
             return val
 
-    def _trend(self, res: t.Union[float, int, str]) -> None:
+    def _trend(self, res: t.Optional[t.Union[float, int, str]]) -> None:
         now = datetime.now().astimezone()
         self._history.timestamp.append(now)
         self._history.value.append(res)
@@ -851,7 +851,8 @@ def __init__(
         self.properties.units_state = tuple(str(x) for x in units_state)
 
     def _trend(self, res):
-        res = "1: active" if res == BinaryPV.active else "0: inactive"
+        if res is not None:
+            res = "1: active" if res == BinaryPV.active else "0: inactive"
         super()._trend(res)
 
     @property
@@ -979,7 +980,8 @@ def __init__(
         )
 
     def _trend(self, res):
-        res = f"{res}: {self.get_state(res)}"
+        if res is not None:
+            res = f"{res}: {self.get_state(res)}"
         super()._trend(res)
 
     @property

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "BAC0"
-version = "2024.09.20dev"
+version = "2024.09.20"
 description = "BACnet Scripting Framework for testing DDC Controls"
 authors = [{name = "Christian Tremblay", email = "[email protected]"}]
 readme = "README.md"
@@ -40,4 +40,4 @@ include = [
 namespaces = false
 
 [tool.pytest.ini_options]
-asyncio_default_fixture_loop_scope = "session"
+asyncio_default_fixture_loop_scope = "session"