pyhausbus 1.0.1__py2.py3-none-any.whl → 1.0.3__py2.py3-none-any.whl

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

@@ -1,123 +1,123 @@
-from pyhausbus.HausBusUtils import LOGGER
-from pyhausbus.HausBusCommand import HausBusCommand
-from pyhausbus.ABusFeature import *
-from pyhausbus.ResultWorker import ResultWorker
-import pyhausbus.HausBusUtils as HausBusUtils
-from pyhausbus.de.hausbus.homeassistant.proxy.counter.data.Configuration import Configuration
-from pyhausbus.de.hausbus.homeassistant.proxy.counter.params.MMode import MMode
-from pyhausbus.de.hausbus.homeassistant.proxy.counter.data.Status import Status
-from pyhausbus.de.hausbus.homeassistant.proxy.counter.params.EErrorCode import EErrorCode
-
-class Counter(ABusFeature):
-  CLASS_ID:int = 35
-
-  def __init__ (self,objectId:int):
-    super().__init__(objectId)
+import logging
+from pyhausbus.HausBusCommand import HausBusCommand
+from pyhausbus.ABusFeature import *
+from pyhausbus.ResultWorker import ResultWorker
+import pyhausbus.HausBusUtils as HausBusUtils
+from pyhausbus.de.hausbus.homeassistant.proxy.counter.data.Configuration import Configuration
+from pyhausbus.de.hausbus.homeassistant.proxy.counter.params.MMode import MMode
+from pyhausbus.de.hausbus.homeassistant.proxy.counter.data.Status import Status
+from pyhausbus.de.hausbus.homeassistant.proxy.counter.params.EErrorCode import EErrorCode
 
+class Counter(ABusFeature):
+  CLASS_ID:int = 35
+
+  def __init__ (self,objectId:int):
+    super().__init__(objectId)
+
   @staticmethod
   def create(deviceId:int, instanceId:int):
-    return Counter(HausBusUtils.getObjectId(deviceId, 35, instanceId))
-
+    return Counter(HausBusUtils.getObjectId(deviceId, 35, instanceId))
+
   """
   """
-  def getConfiguration(self):
-    LOGGER.debug("getConfiguration")
-    hbCommand = HausBusCommand(self.objectId, 0, "getConfiguration")
+  def getConfiguration(self):
+    logging.info("getConfiguration")
+    hbCommand = HausBusCommand(self.objectId, 0, "getConfiguration")
     ResultWorker()._setResultInfo(Configuration,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param mode increment: 1 = Zaehler inkrementieren.
   @param debounceTime 0 - 255[ms].
   @param reportTime Zeitintervall in Minuten nach dem der Zaehler den aktuellen Stand meldet.
   @param scaleFaktor Anzahl Impulse pro Einheit z.B. pro kWh.
   """
-  def setConfiguration(self, mode:MMode, debounceTime:int, reportTime:int, scaleFaktor:int):
-    LOGGER.debug("setConfiguration"+" mode = "+str(mode)+" debounceTime = "+str(debounceTime)+" reportTime = "+str(reportTime)+" scaleFaktor = "+str(scaleFaktor))
-    hbCommand = HausBusCommand(self.objectId, 1, "setConfiguration")
+  def setConfiguration(self, mode:MMode, debounceTime:int, reportTime:int, scaleFaktor:int):
+    logging.info("setConfiguration"+" mode = "+str(mode)+" debounceTime = "+str(debounceTime)+" reportTime = "+str(reportTime)+" scaleFaktor = "+str(scaleFaktor))
+    hbCommand = HausBusCommand(self.objectId, 1, "setConfiguration")
     hbCommand.addByte(mode.getValue())
     hbCommand.addByte(debounceTime)
     hbCommand.addWord(reportTime)
     hbCommand.addWord(scaleFaktor)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   """
-  def getStatus(self):
-    LOGGER.debug("getStatus")
-    hbCommand = HausBusCommand(self.objectId, 2, "getStatus")
+  def getStatus(self):
+    logging.info("getStatus")
+    hbCommand = HausBusCommand(self.objectId, 2, "getStatus")
     ResultWorker()._setResultInfo(Status,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param counter Zaehler ganze Einheiten.
   @param fraction Bruchteil 0-scaleFactor.
   """
-  def setCount(self, counter:int, fraction:int):
-    LOGGER.debug("setCount"+" counter = "+str(counter)+" fraction = "+str(fraction))
-    hbCommand = HausBusCommand(self.objectId, 3, "setCount")
+  def setCount(self, counter:int, fraction:int):
+    logging.info("setCount"+" counter = "+str(counter)+" fraction = "+str(fraction))
+    hbCommand = HausBusCommand(self.objectId, 3, "setCount")
     hbCommand.addDWord(counter)
     hbCommand.addWord(fraction)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param mode increment: 1 = Zaehler inkrementieren.
   @param debounceTime 0 - 255[ms].
   @param reportTime Zeitintervall in Minuten nach dem der Zaehler den aktuellen Stand meldet.
   @param scaleFaktor Anzahl Impulse pro Einheit z.B. pro kWh.
   """
-  def Configuration(self, mode:MMode, debounceTime:int, reportTime:int, scaleFaktor:int):
-    LOGGER.debug("Configuration"+" mode = "+str(mode)+" debounceTime = "+str(debounceTime)+" reportTime = "+str(reportTime)+" scaleFaktor = "+str(scaleFaktor))
-    hbCommand = HausBusCommand(self.objectId, 128, "Configuration")
+  def Configuration(self, mode:MMode, debounceTime:int, reportTime:int, scaleFaktor:int):
+    logging.info("Configuration"+" mode = "+str(mode)+" debounceTime = "+str(debounceTime)+" reportTime = "+str(reportTime)+" scaleFaktor = "+str(scaleFaktor))
+    hbCommand = HausBusCommand(self.objectId, 128, "Configuration")
     hbCommand.addByte(mode.getValue())
     hbCommand.addByte(debounceTime)
     hbCommand.addWord(reportTime)
     hbCommand.addWord(scaleFaktor)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param errorCode .
   """
-  def evError(self, errorCode:EErrorCode):
-    LOGGER.debug("evError"+" errorCode = "+str(errorCode))
-    hbCommand = HausBusCommand(self.objectId, 255, "evError")
+  def evError(self, errorCode:EErrorCode):
+    logging.info("evError"+" errorCode = "+str(errorCode))
+    hbCommand = HausBusCommand(self.objectId, 255, "evError")
     hbCommand.addByte(errorCode.value)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param counter Zaehler ganze Einheiten.
   @param fraction Bruchteil 0-scaleFactor.
   """
-  def Status(self, counter:int, fraction:int):
-    LOGGER.debug("Status"+" counter = "+str(counter)+" fraction = "+str(fraction))
-    hbCommand = HausBusCommand(self.objectId, 129, "Status")
+  def Status(self, counter:int, fraction:int):
+    logging.info("Status"+" counter = "+str(counter)+" fraction = "+str(fraction))
+    hbCommand = HausBusCommand(self.objectId, 129, "Status")
     hbCommand.addDWord(counter)
     hbCommand.addWord(fraction)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param counter Zaehler ganze Einheiten.
   @param fraction Bruchteil 0-scaleFactor.
   """
-  def evStatus(self, counter:int, fraction:int):
-    LOGGER.debug("evStatus"+" counter = "+str(counter)+" fraction = "+str(fraction))
-    hbCommand = HausBusCommand(self.objectId, 200, "evStatus")
+  def evStatus(self, counter:int, fraction:int):
+    logging.info("evStatus"+" counter = "+str(counter)+" fraction = "+str(fraction))
+    hbCommand = HausBusCommand(self.objectId, 200, "evStatus")
     hbCommand.addDWord(counter)
     hbCommand.addWord(fraction)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
 

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

@@ -1,217 +1,229 @@
-from pyhausbus.HausBusUtils import LOGGER
-from pyhausbus.HausBusCommand import HausBusCommand
-from pyhausbus.ABusFeature import *
-from pyhausbus.ResultWorker import ResultWorker
-import pyhausbus.HausBusUtils as HausBusUtils
-from pyhausbus.de.hausbus.homeassistant.proxy.currentReader.params.MConfig import MConfig
-from pyhausbus.de.hausbus.homeassistant.proxy.currentReader.data.Configuration import Configuration
-from pyhausbus.de.hausbus.homeassistant.proxy.currentReader.data.Current import Current
-from pyhausbus.de.hausbus.homeassistant.proxy.currentReader.data.SignalCount import SignalCount
-from pyhausbus.de.hausbus.homeassistant.proxy.currentReader.data.Power import Power
-
-class CurrentReader(ABusFeature):
-  CLASS_ID:int = 90
-
-  def __init__ (self,objectId:int):
-    super().__init__(objectId)
-
+import logging
+from pyhausbus.HausBusCommand import HausBusCommand
+from pyhausbus.ABusFeature import *
+from pyhausbus.ResultWorker import ResultWorker
+import pyhausbus.HausBusUtils as HausBusUtils
+from pyhausbus.de.hausbus.homeassistant.proxy.currentReader.params.MConfig import MConfig
+from pyhausbus.de.hausbus.homeassistant.proxy.currentReader.data.Configuration import Configuration
+from pyhausbus.de.hausbus.homeassistant.proxy.currentReader.data.Current import Current
+from pyhausbus.de.hausbus.homeassistant.proxy.currentReader.data.SignalCount import SignalCount
+from pyhausbus.de.hausbus.homeassistant.proxy.currentReader.data.Power import Power
+from pyhausbus.de.hausbus.homeassistant.proxy.currentReader.params.EErrorCode import EErrorCode
+
+class CurrentReader(ABusFeature):
+  CLASS_ID:int = 90
+
+  def __init__ (self,objectId:int):
+    super().__init__(objectId)
+
   @staticmethod
   def create(deviceId:int, instanceId:int):
-    return CurrentReader(HausBusUtils.getObjectId(deviceId, 90, instanceId))
-
+    return CurrentReader(HausBusUtils.getObjectId(deviceId, 90, instanceId))
+
   """
   @param config .
   @param impPerKwh Anzahl Signale pro kWh.
   @param startCurrent Startwert Stromverbrauch in Wattstunden.
   @param currentReportInterval Interval in Sekunden nach dem immer der aktuelle Gesamtstromverbrauch gemeldet wird.
   """
-  def setConfiguration(self, config:MConfig, impPerKwh:int, startCurrent:int, currentReportInterval:int):
-    LOGGER.debug("setConfiguration"+" config = "+str(config)+" impPerKwh = "+str(impPerKwh)+" startCurrent = "+str(startCurrent)+" currentReportInterval = "+str(currentReportInterval))
-    hbCommand = HausBusCommand(self.objectId, 3, "setConfiguration")
+  def setConfiguration(self, config:MConfig, impPerKwh:int, startCurrent:int, currentReportInterval:int):
+    logging.info("setConfiguration"+" config = "+str(config)+" impPerKwh = "+str(impPerKwh)+" startCurrent = "+str(startCurrent)+" currentReportInterval = "+str(currentReportInterval))
+    hbCommand = HausBusCommand(self.objectId, 3, "setConfiguration")
     hbCommand.addByte(config.getValue())
     hbCommand.addWord(impPerKwh)
     hbCommand.addDWord(startCurrent)
     hbCommand.addWord(currentReportInterval)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   """
-  def getConfiguration(self):
-    LOGGER.debug("getConfiguration")
-    hbCommand = HausBusCommand(self.objectId, 4, "getConfiguration")
+  def getConfiguration(self):
+    logging.info("getConfiguration")
+    hbCommand = HausBusCommand(self.objectId, 4, "getConfiguration")
     ResultWorker()._setResultInfo(Configuration,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param config .
   @param impPerKwh Anzahl Signale pro kWh.
   @param startCurrent Startwert Stromverbrauch in Wattstunden.
   @param currentReportInterval Interval in Sekunden nach dem immer der aktuelle Gesamtstromverbrauch gemeldet wird.
   """
-  def Configuration(self, config:MConfig, impPerKwh:int, startCurrent:int, currentReportInterval:int):
-    LOGGER.debug("Configuration"+" config = "+str(config)+" impPerKwh = "+str(impPerKwh)+" startCurrent = "+str(startCurrent)+" currentReportInterval = "+str(currentReportInterval))
-    hbCommand = HausBusCommand(self.objectId, 129, "Configuration")
+  def Configuration(self, config:MConfig, impPerKwh:int, startCurrent:int, currentReportInterval:int):
+    logging.info("Configuration"+" config = "+str(config)+" impPerKwh = "+str(impPerKwh)+" startCurrent = "+str(startCurrent)+" currentReportInterval = "+str(currentReportInterval))
+    hbCommand = HausBusCommand(self.objectId, 129, "Configuration")
     hbCommand.addByte(config.getValue())
     hbCommand.addWord(impPerKwh)
     hbCommand.addDWord(startCurrent)
     hbCommand.addWord(currentReportInterval)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param time Systemzeit des ESP zu Debugzwecken.
   @param signalCount Anzahl gez?hlter S0 Signale seit dem letzten Zur?cksetzen.
   @param power Aktuelle Leistung in Watt.
   @param signalDuration Dauer des gemessenen S0 Signals in ms.
   """
-  def evSignal(self, time:int, signalCount:int, power:int, signalDuration:int):
-    LOGGER.debug("evSignal"+" time = "+str(time)+" signalCount = "+str(signalCount)+" power = "+str(power)+" signalDuration = "+str(signalDuration))
-    hbCommand = HausBusCommand(self.objectId, 200, "evSignal")
+  def evSignal(self, time:int, signalCount:int, power:int, signalDuration:int):
+    logging.info("evSignal"+" time = "+str(time)+" signalCount = "+str(signalCount)+" power = "+str(power)+" signalDuration = "+str(signalDuration))
+    hbCommand = HausBusCommand(self.objectId, 200, "evSignal")
     hbCommand.addDWord(time)
     hbCommand.addDWord(signalCount)
     hbCommand.addWord(power)
     hbCommand.addDWord(signalDuration)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   """
-  def getCurrent(self):
-    LOGGER.debug("getCurrent")
-    hbCommand = HausBusCommand(self.objectId, 1, "getCurrent")
+  def getCurrent(self):
+    logging.info("getCurrent")
+    hbCommand = HausBusCommand(self.objectId, 1, "getCurrent")
     ResultWorker()._setResultInfo(Current,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param current Verbrauchter Strom in Wattstunden.
   """
-  def evCurrent(self, current:int):
-    LOGGER.debug("evCurrent"+" current = "+str(current))
-    hbCommand = HausBusCommand(self.objectId, 201, "evCurrent")
+  def evCurrent(self, current:int):
+    logging.info("evCurrent"+" current = "+str(current))
+    hbCommand = HausBusCommand(self.objectId, 201, "evCurrent")
     hbCommand.addDWord(current)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param power Aktuelle Leistung in Watt.
   """
-  def Power(self, power:int):
-    LOGGER.debug("Power"+" power = "+str(power))
-    hbCommand = HausBusCommand(self.objectId, 130, "Power")
+  def Power(self, power:int):
+    logging.info("Power"+" power = "+str(power))
+    hbCommand = HausBusCommand(self.objectId, 130, "Power")
     hbCommand.addWord(power)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param current verbrauchter Strom in Wattstunden.
   """
-  def Current(self, current:int):
-    LOGGER.debug("Current"+" current = "+str(current))
-    hbCommand = HausBusCommand(self.objectId, 128, "Current")
+  def Current(self, current:int):
+    logging.info("Current"+" current = "+str(current))
+    hbCommand = HausBusCommand(self.objectId, 128, "Current")
     hbCommand.addDWord(current)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   """
-  def getSignalCount(self):
-    LOGGER.debug("getSignalCount")
-    hbCommand = HausBusCommand(self.objectId, 6, "getSignalCount")
+  def getSignalCount(self):
+    logging.info("getSignalCount")
+    hbCommand = HausBusCommand(self.objectId, 6, "getSignalCount")
     ResultWorker()._setResultInfo(SignalCount,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param signalCount Anzahl gez?hlter S0 Signale seit dem letzten Zur?cksetzen.
   """
-  def SignalCount(self, signalCount:int):
-    LOGGER.debug("SignalCount"+" signalCount = "+str(signalCount))
-    hbCommand = HausBusCommand(self.objectId, 131, "SignalCount")
+  def SignalCount(self, signalCount:int):
+    logging.info("SignalCount"+" signalCount = "+str(signalCount))
+    hbCommand = HausBusCommand(self.objectId, 131, "SignalCount")
     hbCommand.addDWord(signalCount)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   """
-  def clearSignalCount(self):
-    LOGGER.debug("clearSignalCount")
-    hbCommand = HausBusCommand(self.objectId, 7, "clearSignalCount")
+  def clearSignalCount(self):
+    logging.info("clearSignalCount")
+    hbCommand = HausBusCommand(self.objectId, 7, "clearSignalCount")
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param signalCount .
   """
-  def setSignalCount(self, signalCount:int):
-    LOGGER.debug("setSignalCount"+" signalCount = "+str(signalCount))
-    hbCommand = HausBusCommand(self.objectId, 2, "setSignalCount")
+  def setSignalCount(self, signalCount:int):
+    logging.info("setSignalCount"+" signalCount = "+str(signalCount))
+    hbCommand = HausBusCommand(self.objectId, 2, "setSignalCount")
     hbCommand.addDWord(signalCount)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   """
-  def getPower(self):
-    LOGGER.debug("getPower")
-    hbCommand = HausBusCommand(self.objectId, 5, "getPower")
+  def getPower(self):
+    logging.info("getPower")
+    hbCommand = HausBusCommand(self.objectId, 5, "getPower")
     ResultWorker()._setResultInfo(Power,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   """
-  def incSignalCount(self):
-    LOGGER.debug("incSignalCount")
-    hbCommand = HausBusCommand(self.objectId, 9, "incSignalCount")
+  def incSignalCount(self):
+    logging.info("incSignalCount")
+    hbCommand = HausBusCommand(self.objectId, 9, "incSignalCount")
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   """
-  def decSignalCount(self):
-    LOGGER.debug("decSignalCount")
-    hbCommand = HausBusCommand(self.objectId, 10, "decSignalCount")
+  def decSignalCount(self):
+    logging.info("decSignalCount")
+    hbCommand = HausBusCommand(self.objectId, 10, "decSignalCount")
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param data .
   @param type .
   """
-  def evDebug(self, data:int, type:MConfig):
-    LOGGER.debug("evDebug"+" data = "+str(data)+" type = "+str(type))
-    hbCommand = HausBusCommand(self.objectId, 210, "evDebug")
+  def evDebug(self, data:int, type:MConfig):
+    logging.info("evDebug"+" data = "+str(data)+" type = "+str(type))
+    hbCommand = HausBusCommand(self.objectId, 210, "evDebug")
     hbCommand.addDWord(data)
     hbCommand.addByte(type.getValue())
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param value .
   @param stamp .
   """
-  def evInterrupt(self, value:int, stamp:int):
-    LOGGER.debug("evInterrupt"+" value = "+str(value)+" stamp = "+str(stamp))
-    hbCommand = HausBusCommand(self.objectId, 211, "evInterrupt")
+  def evInterrupt(self, value:int, stamp:int):
+    logging.info("evInterrupt"+" value = "+str(value)+" stamp = "+str(stamp))
+    hbCommand = HausBusCommand(self.objectId, 211, "evInterrupt")
     hbCommand.addByte(value)
     hbCommand.addDWord(stamp)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
+  """
+  @param errorCode .
+  """
+  def evError(self, errorCode:EErrorCode):
+    logging.info("evError"+" errorCode = "+str(errorCode))
+    hbCommand = HausBusCommand(self.objectId, 255, "evError")
+    hbCommand.addByte(errorCode.value)
+    ResultWorker()._setResultInfo(None,self.getObjectId())
+    hbCommand.send()
+    logging.info("returns")
+