fix register mapping

LavermanJJ · Sep 16, 2022 · 810bbc4 · 810bbc4
1 parent e73345a
commit 810bbc4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pysolarfocus"
-version = "1.2.2"
+version = "1.2.3"
 description = "Unofficial, local Solarfocus client"
 authors = ["Jeroen Laverman <jjlaverman@web.de>"]
 license = "Apache-2.0"

diff --git a/pysolarfocus/__init__.py b/pysolarfocus/__init__.py
@@ -1,5 +1,5 @@
 """Python client lib for Solarfocus"""
-__version__ = "1.2.2"
+__version__ = "1.2.3"
 
 
 from .const import (
@@ -371,11 +371,6 @@ def pb_outdoor_temperature(self) -> float:
         """Supply temperature of heating circuit 1"""
         return self._pelletsboiler_input_regs.get("OUTDOOR_TEMPERATURE")["value"]
 
-    @property
-    def pb_mode(self) -> int:
-        """Supply temperature of heating circuit 1"""
-        return self._pelletsboiler_input_regs.get("MODE_THERMINATOR")["value"]
-
     @property
     def pb_octoplus_buffer_temperature_bottom(self) -> float:
         """Supply temperature of heating circuit 1"""
@@ -386,6 +381,10 @@ def pb_octoplus_buffer_temperature_top(self) -> float:
         """Supply temperature of heating circuit 1"""
         return self._pelletsboiler_input_regs.get("OCTOPLUS_BUFFER_TEMPERATURE_TOP")["value"]
 
+    @property
+    def pb_log_wood_therminator(self) -> float:
+        """Supply temperature of heating circuit 1"""
+        return self._pelletsboiler_input_regs.get("LOG_WOOD_THERMINATOR")["value"]
 
 
     def __init__(self, conn, update_on_read=False):

diff --git a/pysolarfocus/const.py b/pysolarfocus/const.py
@@ -241,18 +241,19 @@
 }
 
 PB_START_DDR = 2400
-PB_COUNT = 11
+PB_COUNT = 13
 PB_REGMAP_INPUT = {
     "PELLETSBOILER_TEMPERATURE": {"addr": 0, "value": 0, "multiplier": 0.1, "count": 1, "type": INT},
     "STATUS": {"addr": 1, "value": 0, "multiplier": 1, "count": 1, "type": UINT},
-    "MESSAGE_NUMBER": {"addr": 2, "value": 0, "multiplier": 1, "count": 1, "type": INT},
-    "DOOR_CONTACT": {"addr": 3, "value": 0, "multiplier": 1, "count": 1, "type": INT},
-    "CLEANING": {"addr": 4, "value": 0, "multiplier": 1, "count": 1, "type": INT},
-    "ASH_CONTAINER": {"addr": 5, "value": 0, "multiplier": 1, "count": 1, "type": INT},
-    "OUTDOOR_TEMPERATURE": {"addr": 6, "value": 0, "multiplier": 0.1, "count": 1, "type": INT},
-    "MODE_THERMINATOR": {"addr": 7, "value": 0, "multiplier": 1, "count": 1, "type": INT},
-    "OCTOPLUS_BUFFER_TEMPERATURE_BOTTOM": {"addr": 8, "value": 0, "multiplier": 0.1, "count": 1, "type": INT},
-    "OCTOPLUS_BUFFER_TEMPERATURE_TOP": {"addr": 9, "value": 0, "multiplier": 0.1, "count": 1, "type": INT},
+    "MESSAGE_NUMBER": {"addr": 4, "value": 0, "multiplier": 1, "count": 1, "type": INT},
+    "DOOR_CONTACT": {"addr": 5, "value": 0, "multiplier": 1, "count": 1, "type": INT},
+    "CLEANING": {"addr": 6, "value": 0, "multiplier": 1, "count": 1, "type": INT},
+    "ASH_CONTAINER": {"addr": 7, "value": 0, "multiplier": 1, "count": 1, "type": INT},
+    "OUTDOOR_TEMPERATURE": {"addr": 8, "value": 0, "multiplier": 0.1, "count": 1, "type": INT},
+    #"MODE_THERMINATOR": {"addr": 9, "value": 0, "multiplier": 1, "count": 1, "type": INT},
+    "OCTOPLUS_BUFFER_TEMPERATURE_BOTTOM": {"addr": 9, "value": 0, "multiplier": 0.1, "count": 1, "type": INT},
+    "OCTOPLUS_BUFFER_TEMPERATURE_TOP": {"addr": 10, "value": 0, "multiplier": 0.1, "count": 1, "type": INT},
+    "LOG_WOOD_THERMINATOR": {"addr": 11, "value": 0, "multiplier": 1, "count": 1, "type": UINT},
 }