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

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

@@ -1,125 +1,135 @@
-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.schalter.data.Status import Status
-from pyhausbus.de.hausbus.homeassistant.proxy.schalter.params.EState import EState
-from pyhausbus.de.hausbus.homeassistant.proxy.schalter.params.EErrorCode import EErrorCode
-from pyhausbus.de.hausbus.homeassistant.proxy.schalter.params.MOptions import MOptions
-from pyhausbus.de.hausbus.homeassistant.proxy.schalter.data.Configuration import Configuration
-
-class Schalter(ABusFeature):
-  CLASS_ID:int = 19
-
-  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.schalter.data.Status import Status
+from pyhausbus.de.hausbus.homeassistant.proxy.schalter.params.EState import EState
+from pyhausbus.de.hausbus.homeassistant.proxy.schalter.params.EErrorCode import EErrorCode
+from pyhausbus.de.hausbus.homeassistant.proxy.schalter.params.MOptions import MOptions
+from pyhausbus.de.hausbus.homeassistant.proxy.schalter.data.Configuration import Configuration
+
+class Schalter(ABusFeature):
+  CLASS_ID:int = 19
+
+  def __init__ (self,objectId:int):
+    super().__init__(objectId)
+
   @staticmethod
   def create(deviceId:int, instanceId:int):
-    return Schalter(HausBusUtils.getObjectId(deviceId, 19, instanceId))
-
+    return Schalter(HausBusUtils.getObjectId(deviceId, 19, instanceId))
+
   """
   @param offTime Ausschaltdauer: \r\nWert * Zeitbasis [ms].
   @param onTime Einschaltdauer: \r\nWert * Zeitbasis [ms].
   @param quantity Anzahl der Zustandswechsel.
   """
-  def toggle(self, offTime:int, onTime:int, quantity:int):
-    LOGGER.debug("toggle"+" offTime = "+str(offTime)+" onTime = "+str(onTime)+" quantity = "+str(quantity))
-    hbCommand = HausBusCommand(self.objectId, 4, "toggle")
+  def toggle(self, offTime:int, onTime:int, quantity:int):
+    logging.info("toggle"+" offTime = "+str(offTime)+" onTime = "+str(onTime)+" quantity = "+str(quantity))
+    hbCommand = HausBusCommand(self.objectId, 4, "toggle")
     hbCommand.addByte(offTime)
     hbCommand.addByte(onTime)
     hbCommand.addByte(quantity)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param duration Einschaltdauer: \r\nWert * Zeitbasis [ms]\r\n0=nicht mehr ausschalten.
   @param onDelay Einschaltverzoegerung: Wert * Zeitbasis [ms]\r\n0=Keine.
   """
-  def on(self, duration:int, onDelay:int):
-    LOGGER.debug("on"+" duration = "+str(duration)+" onDelay = "+str(onDelay))
-    hbCommand = HausBusCommand(self.objectId, 3, "on")
+  def on(self, duration:int, onDelay:int):
+    logging.info("on"+" duration = "+str(duration)+" onDelay = "+str(onDelay))
+    hbCommand = HausBusCommand(self.objectId, 3, "on")
     hbCommand.addWord(duration)
     hbCommand.addWord(onDelay)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param offDelay Ausschaltverzoegerung: Wert * Zeitbasis [ms]\r\n0=Keine.
   """
-  def off(self, offDelay:int):
-    LOGGER.debug("off"+" offDelay = "+str(offDelay))
-    hbCommand = HausBusCommand(self.objectId, 2, "off")
+  def off(self, offDelay:int):
+    logging.info("off"+" offDelay = "+str(offDelay))
+    hbCommand = HausBusCommand(self.objectId, 2, "off")
     hbCommand.addWord(offDelay)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param duration Dauer.
   """
-  def evOn(self, duration:int):
-    LOGGER.debug("evOn"+" duration = "+str(duration))
-    hbCommand = HausBusCommand(self.objectId, 201, "evOn")
+  def evOn(self, duration:int):
+    logging.info("evOn"+" duration = "+str(duration))
+    hbCommand = HausBusCommand(self.objectId, 201, "evOn")
     hbCommand.addWord(duration)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   """
-  def evOff(self):
-    LOGGER.debug("evOff")
-    hbCommand = HausBusCommand(self.objectId, 200, "evOff")
+  def evOff(self):
+    logging.info("evOff")
+    hbCommand = HausBusCommand(self.objectId, 200, "evOff")
     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, 5, "getStatus")
+  def getStatus(self):
+    logging.info("getStatus")
+    hbCommand = HausBusCommand(self.objectId, 5, "getStatus")
     ResultWorker()._setResultInfo(Status,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param state .
-  @param duration Einschaltdauer: Wert * Zeitbasis [ms]\r\n0=Endlos.
+  @param duration Einschaltdauer: Wert * Zeitbasis [ms]\r\n0=Endlos\r\nWenn state TOGGLE.
+  @param offTime Dauer der Aus-Phase beim Togglen: \r\nWert * Zeitbasis [ms].
+  @param onTime Dauer der An-Phase beim Togglen: \r\nWert * Zeitbasis [ms].
   """
-  def Status(self, state:EState, duration:int):
-    LOGGER.debug("Status"+" state = "+str(state)+" duration = "+str(duration))
-    hbCommand = HausBusCommand(self.objectId, 129, "Status")
+  def Status(self, state:EState, duration:int, offTime:int, onTime:int):
+    logging.info("Status"+" state = "+str(state)+" duration = "+str(duration)+" offTime = "+str(offTime)+" onTime = "+str(onTime))
+    hbCommand = HausBusCommand(self.objectId, 129, "Status")
     hbCommand.addByte(state.value)
     hbCommand.addWord(duration)
+    hbCommand.addByte(offTime)
+    hbCommand.addByte(onTime)
     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 offTime Dauer der Aus-Phase beim Togglen: \r\nWert * Zeitbasis [ms].
+  @param onTime Dauer der An-Phase beim Togglen: \r\nWert * Zeitbasis [ms].
+  @param quantity Anzahl der Schaltvorgaenge.
   """
-  def evToggle(self):
-    LOGGER.debug("evToggle")
-    hbCommand = HausBusCommand(self.objectId, 202, "evToggle")
+  def evToggle(self, offTime:int, onTime:int, quantity:int):
+    logging.info("evToggle"+" offTime = "+str(offTime)+" onTime = "+str(onTime)+" quantity = "+str(quantity))
+    hbCommand = HausBusCommand(self.objectId, 202, "evToggle")
+    hbCommand.addByte(offTime)
+    hbCommand.addByte(onTime)
+    hbCommand.addByte(quantity)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param maxOnTime Maximale Zeit.
   @param offDelayTime Verzoegerungszeit nach einem Off-Kommando.
@@ -127,27 +137,27 @@ class Schalter(ABusFeature):
   @param options Reservierte Bits muessen immer deaktiviert sein. Das Aktivieren eines reservierten Bits fuehrt nach dem Neustart des Controllers zu den Standart-Einstellungen..
   @param disableBitIndex Bit Index0-31 Systemvariable.
   """
-  def Configuration(self, maxOnTime:int, offDelayTime:int, timeBase:int, options:MOptions, disableBitIndex:int):
-    LOGGER.debug("Configuration"+" maxOnTime = "+str(maxOnTime)+" offDelayTime = "+str(offDelayTime)+" timeBase = "+str(timeBase)+" options = "+str(options)+" disableBitIndex = "+str(disableBitIndex))
-    hbCommand = HausBusCommand(self.objectId, 128, "Configuration")
+  def Configuration(self, maxOnTime:int, offDelayTime:int, timeBase:int, options:MOptions, disableBitIndex:int):
+    logging.info("Configuration"+" maxOnTime = "+str(maxOnTime)+" offDelayTime = "+str(offDelayTime)+" timeBase = "+str(timeBase)+" options = "+str(options)+" disableBitIndex = "+str(disableBitIndex))
+    hbCommand = HausBusCommand(self.objectId, 128, "Configuration")
     hbCommand.addByte(maxOnTime)
     hbCommand.addByte(offDelayTime)
     hbCommand.addWord(timeBase)
     hbCommand.addByte(options.getValue())
     hbCommand.addByte(disableBitIndex)
     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, 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 maxOnTime Maximale Zeit.
   @param offDelayTime Verzoegerungszeit nach einem Off-Kommando.
@@ -155,36 +165,49 @@ class Schalter(ABusFeature):
   @param options Reservierte Bits muessen immer deaktiviert sein. Das Aktivieren eines reservierten Bits fuehrt nach dem Neustart des Controllers zu den Standart-Einstellungen..
   @param disableBitIndex Bit Index0-31 Systemvariable.
   """
-  def setConfiguration(self, maxOnTime:int, offDelayTime:int, timeBase:int, options:MOptions, disableBitIndex:int):
-    LOGGER.debug("setConfiguration"+" maxOnTime = "+str(maxOnTime)+" offDelayTime = "+str(offDelayTime)+" timeBase = "+str(timeBase)+" options = "+str(options)+" disableBitIndex = "+str(disableBitIndex))
-    hbCommand = HausBusCommand(self.objectId, 1, "setConfiguration")
+  def setConfiguration(self, maxOnTime:int, offDelayTime:int, timeBase:int, options:MOptions, disableBitIndex:int):
+    logging.info("setConfiguration"+" maxOnTime = "+str(maxOnTime)+" offDelayTime = "+str(offDelayTime)+" timeBase = "+str(timeBase)+" options = "+str(options)+" disableBitIndex = "+str(disableBitIndex))
+    hbCommand = HausBusCommand(self.objectId, 1, "setConfiguration")
     hbCommand.addByte(maxOnTime)
     hbCommand.addByte(offDelayTime)
     hbCommand.addWord(timeBase)
     hbCommand.addByte(options.getValue())
     hbCommand.addByte(disableBitIndex)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param cmdDelay Dauer Wert * Zeitbasis [ms].
   """
-  def evCmdDelay(self, cmdDelay:int):
-    LOGGER.debug("evCmdDelay"+" cmdDelay = "+str(cmdDelay))
-    hbCommand = HausBusCommand(self.objectId, 203, "evCmdDelay")
+  def evCmdDelay(self, cmdDelay:int):
+    logging.info("evCmdDelay"+" cmdDelay = "+str(cmdDelay))
+    hbCommand = HausBusCommand(self.objectId, 203, "evCmdDelay")
     hbCommand.addWord(cmdDelay)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   """
-  def evDisabled(self):
-    LOGGER.debug("evDisabled")
-    hbCommand = HausBusCommand(self.objectId, 204, "evDisabled")
+  def evDisabled(self):
+    logging.info("evDisabled")
+    hbCommand = HausBusCommand(self.objectId, 204, "evDisabled")
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
+  """
+  @param duty 0-100% Pulsverh?ltnis.
+  @param quantity Anzahl der Zustandswechsel.
+  """
+  def toggleByDuty(self, duty:int, quantity:int):
+    logging.info("toggleByDuty"+" duty = "+str(duty)+" quantity = "+str(quantity))
+    hbCommand = HausBusCommand(self.objectId, 6, "toggleByDuty")
+    hbCommand.addByte(duty)
+    hbCommand.addByte(quantity)
+    ResultWorker()._setResultInfo(None,self.getObjectId())
+    hbCommand.send()
+    logging.info("returns")
+
 

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

@@ -1,17 +1,17 @@
-from pyhausbus.HausBusUtils import LOGGER
-from pyhausbus.HausBusCommand import HausBusCommand
-from pyhausbus.ABusFeature import *
-from pyhausbus.ResultWorker import ResultWorker
-import pyhausbus.HausBusUtils as HausBusUtils
-
-class SnmpAgent(ABusFeature):
-  CLASS_ID:int = 163
-
-  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
 
+class SnmpAgent(ABusFeature):
+  CLASS_ID:int = 163
+
+  def __init__ (self,objectId:int):
+    super().__init__(objectId)
+
   @staticmethod
   def create(deviceId:int, instanceId:int):
-    return SnmpAgent(HausBusUtils.getObjectId(deviceId, 163, instanceId))
-
+    return SnmpAgent(HausBusUtils.getObjectId(deviceId, 163, instanceId))
+
 

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

@@ -1,33 +1,33 @@
-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.systemTime.data.Time import Time
-from pyhausbus.de.hausbus.homeassistant.proxy.systemTime.params.EWeekDay import EWeekDay
-from pyhausbus.de.hausbus.homeassistant.proxy.systemTime.params.EDate import EDate
-from pyhausbus.de.hausbus.homeassistant.proxy.systemTime.params.EMonth import EMonth
-from pyhausbus.de.hausbus.homeassistant.proxy.systemTime.params.EErrorCode import EErrorCode
-
-class SystemTime(ABusFeature):
-  CLASS_ID:int = 3
-
-  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.systemTime.data.Time import Time
+from pyhausbus.de.hausbus.homeassistant.proxy.systemTime.params.EWeekDay import EWeekDay
+from pyhausbus.de.hausbus.homeassistant.proxy.systemTime.params.EDate import EDate
+from pyhausbus.de.hausbus.homeassistant.proxy.systemTime.params.EMonth import EMonth
+from pyhausbus.de.hausbus.homeassistant.proxy.systemTime.params.EErrorCode import EErrorCode
 
+class SystemTime(ABusFeature):
+  CLASS_ID:int = 3
+
+  def __init__ (self,objectId:int):
+    super().__init__(objectId)
+
   @staticmethod
   def create(deviceId:int, instanceId:int):
-    return SystemTime(HausBusUtils.getObjectId(deviceId, 3, instanceId))
-
+    return SystemTime(HausBusUtils.getObjectId(deviceId, 3, instanceId))
+
   """
   """
-  def getTime(self):
-    LOGGER.debug("getTime")
-    hbCommand = HausBusCommand(self.objectId, 0, "getTime")
+  def getTime(self):
+    logging.info("getTime")
+    hbCommand = HausBusCommand(self.objectId, 0, "getTime")
     ResultWorker()._setResultInfo(Time,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param weekDay .
   @param date .
@@ -37,9 +37,9 @@ class SystemTime(ABusFeature):
   @param minutes .
   @param seconds .
   """
-  def setTime(self, weekDay:EWeekDay, date:EDate, month:EMonth, year:int, hours:int, minutes:int, seconds:int):
-    LOGGER.debug("setTime"+" weekDay = "+str(weekDay)+" date = "+str(date)+" month = "+str(month)+" year = "+str(year)+" hours = "+str(hours)+" minutes = "+str(minutes)+" seconds = "+str(seconds))
-    hbCommand = HausBusCommand(self.objectId, 1, "setTime")
+  def setTime(self, weekDay:EWeekDay, date:EDate, month:EMonth, year:int, hours:int, minutes:int, seconds:int):
+    logging.info("setTime"+" weekDay = "+str(weekDay)+" date = "+str(date)+" month = "+str(month)+" year = "+str(year)+" hours = "+str(hours)+" minutes = "+str(minutes)+" seconds = "+str(seconds))
+    hbCommand = HausBusCommand(self.objectId, 1, "setTime")
     hbCommand.addByte(weekDay.value)
     hbCommand.addByte(date.value)
     hbCommand.addByte(month.value)
@@ -48,9 +48,9 @@ class SystemTime(ABusFeature):
     hbCommand.addByte(minutes)
     hbCommand.addByte(seconds)
     ResultWorker()._setResultInfo(None,self.getObjectId())
-    hbCommand.send()
-    LOGGER.debug("returns")
-
+    hbCommand.send()
+    logging.info("returns")
+
   """
   @param weekday .
   @param date .
@@ -60,9 +60,9 @@ class SystemTime(ABusFeature):
   @param minutes .
   @param seconds .
   """
-  def Time(self, weekday:int, date:int, month:int, year:int, hours:int, minutes:int, seconds:int):
-    LOGGER.debug("Time"+" weekday = "+str(weekday)+" date = "+str(date)+" month = "+str(month)+" year = "+str(year)+" hours = "+str(hours)+" minutes = "+str(minutes)+" seconds = "+str(seconds))
-    hbCommand = HausBusCommand(self.objectId, 128, "Time")
+  def Time(self, weekday:int, date:int, month:int, year:int, hours:int, minutes:int, seconds:int):
+    logging.info("Time"+" weekday = "+str(weekday)+" date = "+str(date)+" month = "+str(month)+" year = "+str(year)+" hours = "+str(hours)+" minutes = "+str(minutes)+" seconds = "+str(seconds))
+    hbCommand = HausBusCommand(self.objectId, 128, "Time")
     hbCommand.addByte(weekday)
     hbCommand.addByte(date)
     hbCommand.addByte(month)
@@ -71,18 +71,18 @@ class SystemTime(ABusFeature):
     hbCommand.addByte(minutes)
     hbCommand.addByte(seconds)
     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")
+