pyhausbus 1.0.5__py2.py3-none-any.whl → 1.0.7__py2.py3-none-any.whl

pyhausbus/Templates.py

@@ -2,6 +2,7 @@ import os
 from collections import defaultdict
 from typing import List, Dict, Optional
 from pyhausbus.de.hausbus.homeassistant.proxy.controller.params.EFirmwareId import EFirmwareId
+from pyhausbus.HausBusUtils import LOGGER
 
 def load_file(path: str) -> list[str]:
     try:
@@ -15,7 +16,8 @@ def load_file(path: str) -> list[str]:
         return []
 
 class Templates:
-    template_root_dir = "pyhausbus/templates/"
+    template_root_dir = os.path.join(os.path.dirname(__file__), "templates")
+    LOGGER.debug(f"templateRootDir = {self.template_root_dir}")
     filter_non_existing = True
     _instance = None
     class_mappings: Dict[str, str] = {}
@@ -25,7 +27,7 @@ class Templates:
         self.feature_names: Dict['ModuleType', List['FeatureEntry']] = {}
 
         try:
-            lines = load_file(self.template_root_dir + "deviceTypes.def")
+            lines = load_file(os.path.join(self.template_root_dir, "deviceTypes.def"))
             for line in lines:
                 tokens = line.split(",")
                 firmware_id = EFirmwareId.value_of(tokens[0])
@@ -58,16 +60,17 @@ class Templates:
               
             quit()'''
 
-            lines = load_file(self.template_root_dir + "classMapping.def")
+            lines = load_file(os.path.join(self.template_root_dir, "classMapping.def"))
             if lines:
                 for line in lines:
                     tokens = line.split(",")
                     orig_name = tokens[0]
                     mapped_name = tokens[1]
                     Templates.class_mappings[orig_name] = mapped_name
-
+            LOGGER.debug(f"module types = {len(self.module_types)}")
+            LOGGER.debug(f"feature names = {len(self.feature_names)}")
         except Exception as e:
-            print(f"Fehler beim Initialisieren der Templates: {e}")
+            LOGGER.error(f"Fehler beim Initialisieren der Templates: {e}")
 
     @classmethod
     def get_instance(cls):

pyhausbus/de/hausbus/homeassistant/proxy/AnalogEingang.py

@@ -1,4 +1,3 @@
-import logging
 from pyhausbus.HausBusCommand import HausBusCommand
 from pyhausbus.ABusFeature import *
 from pyhausbus.ResultWorker import ResultWorker
@@ -20,51 +19,51 @@ class AnalogEingang(ABusFeature):
   """
   """
   def evLow(self):
-    logging.info("evLow")
+    LOGGER.debug("evLow")
     hbCommand = HausBusCommand(self.objectId, 200, "evLow")
     ResultWorker()._setResultInfo(None,self.getObjectId())
     hbCommand.send()
-    logging.info("returns")
+    LOGGER.debug("returns")
 
   """
   """
   def evInRange(self):
-    logging.info("evInRange")
+    LOGGER.debug("evInRange")
     hbCommand = HausBusCommand(self.objectId, 201, "evInRange")
     ResultWorker()._setResultInfo(None,self.getObjectId())
     hbCommand.send()
-    logging.info("returns")
+    LOGGER.debug("returns")
 
   """
   """
   def evHigh(self):
-    logging.info("evHigh")
+    LOGGER.debug("evHigh")
     hbCommand = HausBusCommand(self.objectId, 202, "evHigh")
     ResultWorker()._setResultInfo(None,self.getObjectId())
     hbCommand.send()
-    logging.info("returns")
+    LOGGER.debug("returns")
 
   """
   @param value .
   @param lastEvent .
   """
   def evStatus(self, value:int, lastEvent:ELastEvent):
-    logging.info("evStatus"+" value = "+str(value)+" lastEvent = "+str(lastEvent))
+    LOGGER.debug("evStatus"+" value = "+str(value)+" lastEvent = "+str(lastEvent))
     hbCommand = HausBusCommand(self.objectId, 203, "evStatus")
     hbCommand.addWord(value)
     hbCommand.addByte(lastEvent.value)
     ResultWorker()._setResultInfo(None,self.getObjectId())
     hbCommand.send()
-    logging.info("returns")
+    LOGGER.debug("returns")
 
   """
   """
   def getConfiguration(self):
-    logging.info("getConfiguration")
+    LOGGER.debug("getConfiguration")
     hbCommand = HausBusCommand(self.objectId, 0, "getConfiguration")
     ResultWorker()._setResultInfo(Configuration,self.getObjectId())
     hbCommand.send()
-    logging.info("returns")
+    LOGGER.debug("returns")
 
   """
   @param lowerThreshold untere Schwelle.
@@ -77,7 +76,7 @@ class AnalogEingang(ABusFeature):
   @param deltaSensorID Die InstanceID des Sensors auf diesem Controller.
   """
   def setConfiguration(self, lowerThreshold:int, upperThreshold:int, reportTimeBase:int, minReportTime:int, maxReportTime:int, hysteresis:int, calibration:int, deltaSensorID:int):
-    logging.info("setConfiguration"+" lowerThreshold = "+str(lowerThreshold)+" upperThreshold = "+str(upperThreshold)+" reportTimeBase = "+str(reportTimeBase)+" minReportTime = "+str(minReportTime)+" maxReportTime = "+str(maxReportTime)+" hysteresis = "+str(hysteresis)+" calibration = "+str(calibration)+" deltaSensorID = "+str(deltaSensorID))
+    LOGGER.debug("setConfiguration"+" lowerThreshold = "+str(lowerThreshold)+" upperThreshold = "+str(upperThreshold)+" reportTimeBase = "+str(reportTimeBase)+" minReportTime = "+str(minReportTime)+" maxReportTime = "+str(maxReportTime)+" hysteresis = "+str(hysteresis)+" calibration = "+str(calibration)+" deltaSensorID = "+str(deltaSensorID))
     hbCommand = HausBusCommand(self.objectId, 1, "setConfiguration")
     hbCommand.addWord(lowerThreshold)
     hbCommand.addWord(upperThreshold)
@@ -89,16 +88,16 @@ class AnalogEingang(ABusFeature):
     hbCommand.addByte(deltaSensorID)
     ResultWorker()._setResultInfo(None,self.getObjectId())
     hbCommand.send()
-    logging.info("returns")
+    LOGGER.debug("returns")
 
   """
   """
   def getStatus(self):
-    logging.info("getStatus")
+    LOGGER.debug("getStatus")
     hbCommand = HausBusCommand(self.objectId, 2, "getStatus")
     ResultWorker()._setResultInfo(Status,self.getObjectId())
     hbCommand.send()
-    logging.info("returns")
+    LOGGER.debug("returns")
 
   """
   @param lowerThreshold untere Schwelle.
@@ -111,7 +110,7 @@ class AnalogEingang(ABusFeature):
   @param deltaSensorID Die InstanceID des Sensors auf diesem Controller.
   """
   def Configuration(self, lowerThreshold:int, upperThreshold:int, reportTimeBase:int, minReportTime:int, maxReportTime:int, hysteresis:int, calibration:int, deltaSensorID:int):
-    logging.info("Configuration"+" lowerThreshold = "+str(lowerThreshold)+" upperThreshold = "+str(upperThreshold)+" reportTimeBase = "+str(reportTimeBase)+" minReportTime = "+str(minReportTime)+" maxReportTime = "+str(maxReportTime)+" hysteresis = "+str(hysteresis)+" calibration = "+str(calibration)+" deltaSensorID = "+str(deltaSensorID))
+    LOGGER.debug("Configuration"+" lowerThreshold = "+str(lowerThreshold)+" upperThreshold = "+str(upperThreshold)+" reportTimeBase = "+str(reportTimeBase)+" minReportTime = "+str(minReportTime)+" maxReportTime = "+str(maxReportTime)+" hysteresis = "+str(hysteresis)+" calibration = "+str(calibration)+" deltaSensorID = "+str(deltaSensorID))
     hbCommand = HausBusCommand(self.objectId, 128, "Configuration")
     hbCommand.addWord(lowerThreshold)
     hbCommand.addWord(upperThreshold)
@@ -123,17 +122,17 @@ class AnalogEingang(ABusFeature):
     hbCommand.addByte(deltaSensorID)
     ResultWorker()._setResultInfo(None,self.getObjectId())
     hbCommand.send()
-    logging.info("returns")
+    LOGGER.debug("returns")
 
   """
   @param value .
   """
   def Status(self, value:int):
-    logging.info("Status"+" value = "+str(value))
+    LOGGER.debug("Status"+" value = "+str(value))
     hbCommand = HausBusCommand(self.objectId, 129, "Status")
     hbCommand.addWord(value)
     ResultWorker()._setResultInfo(None,self.getObjectId())
     hbCommand.send()
-    logging.info("returns")
+    LOGGER.debug("returns")