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

pyhausbus/ABusFeature.py

@@ -1,22 +1,22 @@
-from pyhausbus.HausBusUtils import LOGGER
-from pyhausbus.ObjectId import ObjectId
-
-class ABusFeature:
-
-  def __init__(self, objectId:int):
-    self.objectId = objectId
-    self.name:str=""
-
-  def getObjectId(self) -> int:
-    return self.objectId
-
-  def getName(self) -> str:
-    return self.name
-
-  def setName(self, name:str):
-      self.name = name
-
-  def __str__(self):
-    dummy, classType = str(type(self)).rsplit(".", 1)
-    classType = classType[:-2]
-    return f"ABusFeature(type={classType}, name={self.name}, objectId={ObjectId(self.objectId)}"
+from pyhausbus.HausBusUtils import LOGGER
+from pyhausbus.ObjectId import ObjectId
+
+class ABusFeature:
+
+  def __init__(self, objectId:int):
+    self.objectId = objectId
+    self.name:str=""
+
+  def getObjectId(self) -> int:
+    return self.objectId
+
+  def getName(self) -> str:
+    return self.name
+
+  def setName(self, name:str):
+      self.name = name
+
+  def __str__(self):
+    dummy, classType = str(type(self)).rsplit(".", 1)
+    classType = classType[:-2]
+    return f"ABusFeature(type={classType}, name={self.name}, objectId={ObjectId(self.objectId)}"

pyhausbus/BusDataMessage.py

@@ -1,23 +1,23 @@
-import pyhausbus.HausBusUtils as HausBusUtils
-
-
-class BusDataMessage:
-
-  def __init__(self, senderObjectId, receiverObjectId, data):
-    self.senderObjectId = senderObjectId
-    self.receiverObjectId = receiverObjectId
-    self.data = data
-    self.time = HausBusUtils.getClockIndependMillis()
-
-  def getSenderObjectId(self):
-    return self.senderObjectId
-
-  def getReceiverObjectId(self):
-    return self.receiverObjectId
-
-  def getData(self):
-    return self.data
-
-  def __str__(self):
-    return f"BusMessage(senderObjectId={self.senderObjectId}, receiverObjectId={self.receiverObjectId}, data={self.data})"
-
+import pyhausbus.HausBusUtils as HausBusUtils
+
+
+class BusDataMessage:
+
+  def __init__(self, senderObjectId, receiverObjectId, data):
+    self.senderObjectId = senderObjectId
+    self.receiverObjectId = receiverObjectId
+    self.data = data
+    self.time = HausBusUtils.getClockIndependMillis()
+
+  def getSenderObjectId(self):
+    return self.senderObjectId
+
+  def getReceiverObjectId(self):
+    return self.receiverObjectId
+
+  def getData(self):
+    return self.data
+
+  def __str__(self):
+    return f"BusMessage(senderObjectId={self.senderObjectId}, receiverObjectId={self.receiverObjectId}, data={self.data})"
+

pyhausbus/BusHandler.py

@@ -1,110 +1,110 @@
-import threading
-from pyhausbus.de.hausbus.homeassistant.proxy import ProxyFactory
-from pyhausbus.HausBusUtils import *
-from pyhausbus.BusDataMessage import BusDataMessage
-from pyhausbus.IBusDataListener import IBusDataListener
-import time
-import importlib
-from pyhausbus.UdpReceiveWorker import UdpReceiveWorker
-import socket
-import pyhausbus.HausBusUtils as HausBusUtils
-import traceback
-
-RS485_GATEWAY = "#RS485#"
-EVENTS_START = 200
-RESULT_START = 128
-
-class BusHandler:
-
-  _singleInstance = None
-  sock:None
-  broadcastIp = "192.168.178.255"
-  listeners = []
-
-  @staticmethod
-  def getInstance():
-    if BusHandler._singleInstance is None:
-      BusHandler._singleInstance = BusHandler()
-    return BusHandler._singleInstance
-
-  def __init__(self):
-    if BusHandler._singleInstance is None:
-      self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-      self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
-      x = UdpReceiveWorker(self.busDataReceived)
-      x.startWorker()
-      self._getBroadcastIp()
-
-  def _getBroadcastIp(self):
-    temp_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    try:
-        temp_socket.connect(("8.8.8.8", 80))
-        own_ip = temp_socket.getsockname()[0].split('.')
-        self.broadcastIp = own_ip[0] + "." + own_ip[1] + "." + own_ip[2] + ".255"
-    finally:
-        temp_socket.close()
-
-  def busDataReceived(self, senderObjectId, receiverObjectId, functionId, functionData, gateway, corrupted:bool):
-    # Es kann entweder eine Antwort oder Event des Senders sein oder ein Aufruf auf dem Empfänger
-    featureClassId = 0
-    identifierId = 0
-    if (functionId < RESULT_START):
-      featureClassId = getClassId(receiverObjectId)
-      identifierId = receiverObjectId
-    else:
-      featureClassId = getClassId(senderObjectId)
-      identifierId = senderObjectId
-
-    LOGGER.debug("classId = " + str(featureClassId) + ", functionId = " + str(functionId))
-    className = ProxyFactory.getBusClassNameFor(featureClassId, functionId)
-    if (className=="de.hausbus.proxy.LogicalButton"):
-      LOGGER.debug("test")
-
-    try:
-      module_name, class_name = className.rsplit(".", 1)
-      module = importlib.import_module(className)
-      cls = getattr(module, class_name)
-      method = getattr(cls, "_fromBytes")
-      offset = [0]
-      newObject = method(functionData, offset)
-
-      add = ""
-      if (corrupted):
-        add = " (corrupted) "
-
-      message = gateway + " COMMAND IN " + add + " from " + str(getDeviceId(senderObjectId)) + " to " + str(getDeviceId(receiverObjectId)) + ": " + str(newObject) + ", Sender: " + formatObjectId(senderObjectId) + ", Receiver: " + str(formatObjectId(receiverObjectId))
-      LOGGER.debug(message)
-
-      if (not corrupted):
-        newMessage = BusDataMessage(senderObjectId, receiverObjectId, newObject)
-        LOGGER.debug("got: " + str(newObject) + " from " + str(senderObjectId) + " to " + str(receiverObjectId))
-        for actListener in self.listeners:
-          actListener.busDataReceived(newMessage)
-    except (Exception, RuntimeError, TypeError, NameError, OSError) as err:
-        LOGGER.error(err,exc_info=True,stack_info=True)
-
-  def sendData(self, data:bytearray, debug:str):
-
-    udpData:bytearray = self.prepareForUDP(data)
-
-    LOGGER.debug(UdpReceiveWorker.UDP_GATEWAY + " COMMAND OUT " + debug)
-    LOGGER.debug(UdpReceiveWorker.UDP_GATEWAY + " DATA OUT " + HausBusUtils.formatBytes(udpData))
-
-    try:
-      self.sock.sendto(udpData, (self.broadcastIp, UDP_PORT))
-    except socket.error as e:
-      LOGGER.error(e,exc_info=True,stack_info=True)
-
-  def prepareForUDP(self, data:bytearray) -> bytearray:
-    result = bytearray(len(data) + 2)
-    result[0] = 0xef
-    result[1] = 0xef
-    result[2:] = data[:]
-    return result
-
-  def addBusEventListener(self, listener:IBusDataListener):
-    if not listener in self.listeners:
-      self.listeners.append(listener)
-
-  def removeBusEventListener(self, listener:IBusDataListener):
-    self.listeners.remove(listener)
+import threading
+from pyhausbus.de.hausbus.homeassistant.proxy import ProxyFactory
+from pyhausbus.HausBusUtils import *
+from pyhausbus.BusDataMessage import BusDataMessage
+from pyhausbus.IBusDataListener import IBusDataListener
+import time
+import importlib
+from pyhausbus.UdpReceiveWorker import UdpReceiveWorker
+import socket
+import pyhausbus.HausBusUtils as HausBusUtils
+import traceback
+
+RS485_GATEWAY = "#RS485#"
+EVENTS_START = 200
+RESULT_START = 128
+
+class BusHandler:
+
+  _singleInstance = None
+  sock:None
+  broadcastIp = "192.168.178.255"
+  listeners = []
+
+  @staticmethod
+  def getInstance():
+    if BusHandler._singleInstance is None:
+      BusHandler._singleInstance = BusHandler()
+    return BusHandler._singleInstance
+
+  def __init__(self):
+    if BusHandler._singleInstance is None:
+      self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+      self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
+      x = UdpReceiveWorker(self.busDataReceived)
+      x.startWorker()
+      self._getBroadcastIp()
+
+  def _getBroadcastIp(self):
+    temp_socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    try:
+        temp_socket.connect(("8.8.8.8", 80))
+        own_ip = temp_socket.getsockname()[0].split('.')
+        self.broadcastIp = own_ip[0] + "." + own_ip[1] + "." + own_ip[2] + ".255"
+    finally:
+        temp_socket.close()
+
+  def busDataReceived(self, senderObjectId, receiverObjectId, functionId, functionData, gateway, corrupted:bool):
+    # Es kann entweder eine Antwort oder Event des Senders sein oder ein Aufruf auf dem Empfänger
+    featureClassId = 0
+    identifierId = 0
+    if (functionId < RESULT_START):
+      featureClassId = getClassId(receiverObjectId)
+      identifierId = receiverObjectId
+    else:
+      featureClassId = getClassId(senderObjectId)
+      identifierId = senderObjectId
+
+    LOGGER.debug("classId = " + str(featureClassId) + ", functionId = " + str(functionId))
+    className = ProxyFactory.getBusClassNameFor(featureClassId, functionId)
+    if (className=="de.hausbus.proxy.LogicalButton"):
+      LOGGER.debug("test")
+
+    try:
+      module_name, class_name = className.rsplit(".", 1)
+      module = importlib.import_module(className)
+      cls = getattr(module, class_name)
+      method = getattr(cls, "_fromBytes")
+      offset = [0]
+      newObject = method(functionData, offset)
+
+      add = ""
+      if (corrupted):
+        add = " (corrupted) "
+
+      message = gateway + " COMMAND IN " + add + " from " + str(getDeviceId(senderObjectId)) + " to " + str(getDeviceId(receiverObjectId)) + ": " + str(newObject) + ", Sender: " + formatObjectId(senderObjectId) + ", Receiver: " + str(formatObjectId(receiverObjectId))
+      LOGGER.debug(message)
+
+      if (not corrupted):
+        newMessage = BusDataMessage(senderObjectId, receiverObjectId, newObject)
+        LOGGER.debug("got: " + str(newObject) + " from " + str(senderObjectId) + " to " + str(receiverObjectId))
+        for actListener in self.listeners:
+          actListener.busDataReceived(newMessage)
+    except (Exception, RuntimeError, TypeError, NameError, OSError) as err:
+        LOGGER.error(err,exc_info=True,stack_info=True)
+
+  def sendData(self, data:bytearray, debug:str):
+
+    udpData:bytearray = self.prepareForUDP(data)
+
+    LOGGER.debug(UdpReceiveWorker.UDP_GATEWAY + " COMMAND OUT " + debug)
+    LOGGER.debug(UdpReceiveWorker.UDP_GATEWAY + " DATA OUT " + HausBusUtils.formatBytes(udpData))
+
+    try:
+      self.sock.sendto(udpData, (self.broadcastIp, UDP_PORT))
+    except socket.error as e:
+      LOGGER.error(e,exc_info=True,stack_info=True)
+
+  def prepareForUDP(self, data:bytearray) -> bytearray:
+    result = bytearray(len(data) + 2)
+    result[0] = 0xef
+    result[1] = 0xef
+    result[2:] = data[:]
+    return result
+
+  def addBusEventListener(self, listener:IBusDataListener):
+    if not listener in self.listeners:
+      self.listeners.append(listener)
+
+  def removeBusEventListener(self, listener:IBusDataListener):
+    self.listeners.remove(listener)

pyhausbus/HausBusCommand.py

@@ -1,84 +1,84 @@
-from pyhausbus.BusHandler import BusHandler
-import pyhausbus.HausBusUtils as HausBusUtils
-from pyhausbus.HausBusUtils import LOGGER
-from pyhausbus.ObjectId import ObjectId
-
-class HausBusCommand:
-
-  def __init__ (self, receiverObjectId:int, functionId:int, debug:str):
-    self.commandCounter:int = 0
-    self.receiverObjectId = receiverObjectId
-    self.debug = debug
-    self.busHandler = BusHandler.getInstance()
-    self.data:bytearray=bytearray()
-    self.params:bytearray=bytearray()
-    self.bytes:bytearray=None
-
-    # Kontroll-Byte
-    self.data.append(0)
-
-    # Nachrichtenzaehler
-    self.data.append(0)
-
-    # Sender-ID
-    for act in HausBusUtils.dWordToBytes(HausBusUtils.HOMESERVER_OBJECT_ID):
-      self.data.append(act)
-
-    # Empfaenger-ID
-    for act in HausBusUtils.dWordToBytes(receiverObjectId):
-      self.data.append(act)
-
-    self.params.append(functionId)
-
-  def addByte(self, byteParam:int):
-    self.params.append(byteParam)
-
-  def addSByte(self, sByteParam:int):
-    if (sByteParam < 0):
-      self.params.append((256 + sByteParam))
-    else:
-      self.params.append(sByteParam)
-
-  def addBlob(self, blob:bytearray):
-    for act in blob:
-      self.params.append(act)
-
-  def addString(self, value:str):
-    for i in range(len(value)):
-      self.params.append(value[i])
-    self.params.append(0)
-
-  def addMap(self, inMap):
-    for key, value in inMap.items():
-      self.addByte(key)
-      self.addByte(value)
-
-  def addWord(self, wordParam:int):
-    HausBusUtils.addWord(wordParam, self.params)
-
-  def addDWord(self, dWordParam:int):
-    HausBusUtils.addDword(dWordParam, self.params)
-
-  def _createBytes(self):
-
-    # Datenlaenge
-    for act in HausBusUtils.wordToBytes(len(self.params)):
-      self.data.append(act)
-
-    # Daten
-    for act in self.params:
-      self.data.append(act)
-
-    self.bytes = bytearray(len(self.data))
-    for i in range (len(self.data)):
-      self.bytes[i] = self.data[i]
-
-  def send(self):
-    LOGGER.debug("Sende " + self.debug + " an " + str(ObjectId(self.receiverObjectId)))
-    if (self.bytes == None):
-      self._createBytes()
-
-    return self.busHandler.sendData(self.bytes, self.debug + " to " + str(HausBusUtils.getDeviceId(self.receiverObjectId)))
-
-  def __str__(self):
+from pyhausbus.BusHandler import BusHandler
+import pyhausbus.HausBusUtils as HausBusUtils
+from pyhausbus.HausBusUtils import LOGGER
+from pyhausbus.ObjectId import ObjectId
+
+class HausBusCommand:
+
+  def __init__ (self, receiverObjectId:int, functionId:int, debug:str):
+    self.commandCounter:int = 0
+    self.receiverObjectId = receiverObjectId
+    self.debug = debug
+    self.busHandler = BusHandler.getInstance()
+    self.data:bytearray=bytearray()
+    self.params:bytearray=bytearray()
+    self.bytes:bytearray=None
+
+    # Kontroll-Byte
+    self.data.append(0)
+
+    # Nachrichtenzaehler
+    self.data.append(0)
+
+    # Sender-ID
+    for act in HausBusUtils.dWordToBytes(HausBusUtils.HOMESERVER_OBJECT_ID):
+      self.data.append(act)
+
+    # Empfaenger-ID
+    for act in HausBusUtils.dWordToBytes(receiverObjectId):
+      self.data.append(act)
+
+    self.params.append(functionId)
+
+  def addByte(self, byteParam:int):
+    self.params.append(byteParam)
+
+  def addSByte(self, sByteParam:int):
+    if (sByteParam < 0):
+      self.params.append((256 + sByteParam))
+    else:
+      self.params.append(sByteParam)
+
+  def addBlob(self, blob:bytearray):
+    for act in blob:
+      self.params.append(act)
+
+  def addString(self, value:str):
+    for i in range(len(value)):
+      self.params.append(value[i])
+    self.params.append(0)
+
+  def addMap(self, inMap):
+    for key, value in inMap.items():
+      self.addByte(key)
+      self.addByte(value)
+
+  def addWord(self, wordParam:int):
+    HausBusUtils.addWord(wordParam, self.params)
+
+  def addDWord(self, dWordParam:int):
+    HausBusUtils.addDword(dWordParam, self.params)
+
+  def _createBytes(self):
+
+    # Datenlaenge
+    for act in HausBusUtils.wordToBytes(len(self.params)):
+      self.data.append(act)
+
+    # Daten
+    for act in self.params:
+      self.data.append(act)
+
+    self.bytes = bytearray(len(self.data))
+    for i in range (len(self.data)):
+      self.bytes[i] = self.data[i]
+
+  def send(self):
+    LOGGER.debug("Sende " + self.debug + " an " + str(ObjectId(self.receiverObjectId)))
+    if (self.bytes == None):
+      self._createBytes()
+
+    return self.busHandler.sendData(self.bytes, self.debug + " to " + str(HausBusUtils.getDeviceId(self.receiverObjectId)))
+
+  def __str__(self):
     return f"HausBusCommand(debug={self.debug} to {HausBusUtils.formatObjectId(self.receiverObjectId)}, params={self.params}, data={self.data}"

pyhausbus/HausBusDevice.py

@@ -0,0 +1,70 @@
+import logging
+
+from pyhausbus.de.hausbus.homeassistant.proxy.controller.params.EFirmwareId import (
+    EFirmwareId,
+)
+
+LOGGER = logging.getLogger("pyhausbus")
+
+device_type_map = {
+    EFirmwareId.ESP32: {
+        int("0x65", 16): "LAN-RS485 Brückenmodul",
+        int("0x18", 16): "6-fach Taster",
+        int("0x19", 16): "4-fach Taster",
+        int("0x1A", 16): "2-fach Taster",
+        int("0x1B", 16): "1-fach Taster",
+        int("0x1C", 16): "6-fach Taster Gira",
+        int("0x20", 16): "32-fach IO",
+        int("0x0C", 16): "16-fach Relais",
+        int("0x08", 16): "8-fach Relais",
+        int("0x10", 16): "22-fach UP-IO",
+        int("0x28", 16): "8-fach Dimmer",
+        int("0x30", 16): "2-fach RGB Dimmer",
+        int("0x00", 16): "4-fach 0-10V Dimmer",
+        int("0x01", 16): "4-fach 1-10V Dimmer",
+    },
+    EFirmwareId.HBC: {
+        int("0x18", 16): "6-fach Taster",
+        int("0x19", 16): "4-fach Taster",
+        int("0x1A", 16): "2-fach Taster",
+        int("0x1B", 16): "1-fach Taster",
+        int("0x1C", 16): "6-fach Taster Gira",
+        int("0x20", 16): "32-fach IO",
+        int("0x0C", 16): "16-fach Relais",
+        int("0x08", 16): "8-fach Relais",
+        int("0x10", 16): "24-fach UP-IO",
+        int("0x28", 16): "8-fach Dimmer",
+        int("0x29", 16): "8-fach Dimmer",
+        int("0x30", 16): "2-fach RGB Dimmer",
+        int("0x00", 16): "4-fach 0-10V Dimmer",
+        int("0x01", 16): "4-fach 1-10V Dimmer",
+    },
+    EFirmwareId.SD485: {
+        int("0x28", 16): "24-fach UP-IO",
+        int("0x1E", 16): "6-fach Taster",
+        int("0x2E", 16): "6-fach Taster",
+        int("0x2F", 16): "6-fach Taster",
+        int("0x2B", 16): "4-fach 0-10V Dimmer",
+        int("0x2C", 16): "4-fach Taster",
+        int("0x2D", 16): "4-fach 1-10V Dimmer",
+        int("0x2A", 16): "2-fach Taster",
+        int("0x29", 16): "1-fach Taster",
+    },
+    EFirmwareId.AR8: {
+        int("0x28", 16): "LAN Brückenmodul",
+        int("0x30", 16): "8-fach Relais",
+    },
+    EFirmwareId.SD6: {
+        int("0x14", 16): "Multitaster",
+        int("0x1E", 16): "Multitaster",
+    },
+}
+
+
+def get_device_type(firmware_id: EFirmwareId, type_id: int) -> str:
+    """Get device type from firmware ID and type ID."""
+    firmware_model_id = device_type_map.get(firmware_id, {})
+    if len(firmware_model_id) == 0:
+        return "Controller"
+    else:
+        return firmware_model_id.get(type_id, "Controller")