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

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")

pyhausbus/HausBusUtils.py

@@ -4,190 +4,200 @@ import traceback
 
 LOGGER = logging.getLogger("pyhausbus")
 
-HOMESERVER_DEVICE_ID:int = 9998
-HOMESERVER_OBJECT_ID:int = (HOMESERVER_DEVICE_ID << 16) + (0 << 8) + 1
+HOMESERVER_DEVICE_ID: int = 9998
+HOMESERVER_OBJECT_ID: int = (HOMESERVER_DEVICE_ID << 16) + (0 << 8) + 1
 
 UDP_PORT = 5855
 
-def getObjectId(deviceId:int, classId:int, instanceId:int) -> int:
-  return (deviceId << 16) + (classId << 8) + instanceId
 
-def bytesToDWord(data:bytearray, offset) -> int:
-  try:
-    result = 0
-    result += (data[offset[0]] & 0xff)
-    offset[0] += 1
+def getObjectId(deviceId: int, classId: int, instanceId: int) -> int:
+    return (deviceId << 16) + (classId << 8) + instanceId
 
-    result += (data[offset[0]] & 0xff) * 256
-    offset[0] += 1
 
-    result += (data[offset[0]] & 0xff) * 65536
-    offset[0] += 1
+def bytesToDWord(data: bytearray, offset) -> int:
+    try:
+        result = 0
+        result += data[offset[0]] & 0xFF
+        offset[0] += 1
 
-    result += (data[offset[0]] & 0xff) * 16777216
-    offset[0] += 1
+        result += (data[offset[0]] & 0xFF) * 256
+        offset[0] += 1
 
-    return result
-  except (Exception) as err:
-    LOGGER.error(err,exc_info=True,stack_info=True)
-    return 0
+        result += (data[offset[0]] & 0xFF) * 65536
+        offset[0] += 1
 
+        result += (data[offset[0]] & 0xFF) * 16777216
+        offset[0] += 1
 
-def bytesToWord(data:bytearray, offset) -> int:
-  try:
-    result = 0
-    result += (data[offset[0]] & 0xff)
-    offset[0] += 1
+        return result
+    except Exception as err:
+        LOGGER.error(err, exc_info=True, stack_info=True)
+        return 0
 
-    result += (data[offset[0]] & 0xff) * 256
-    offset[0] += 1
 
-    return result
-  except (Exception) as err:
-    LOGGER.error(err,exc_info=True,stack_info=True)
-    return 0
+def bytesToWord(data: bytearray, offset) -> int:
+    try:
+        result = 0
+        result += data[offset[0]] & 0xFF
+        offset[0] += 1
 
+        result += (data[offset[0]] & 0xFF) * 256
+        offset[0] += 1
 
-def bytesToInt(data:bytearray, offset) -> int:
-  try:
-    if (len(data)<=offset[0]):
-      return 0
-    result = data[offset[0]] & 0xff
-    offset[0] += 1
-    return result
-  except (Exception) as err:
-    LOGGER.error(err,exc_info=True,stack_info=True)
-    return 0
+        return result
+    except Exception as err:
+        LOGGER.error(err, exc_info=True, stack_info=True)
+        return 0
 
 
-def bytesToString(data:bytearray, offset) -> str:
-  try:
-    result = ""
-    for i in range(offset[0], len(data)):
-      offset[0] += 1
-      if (data[i] == 0):
-        break
+def bytesToInt(data: bytearray, offset) -> int:
+    try:
+        if len(data) <= offset[0]:
+            return 0
+        result = data[offset[0]] & 0xFF
+        offset[0] += 1
+        return result
+    except Exception as err:
+        LOGGER.error(err, exc_info=True, stack_info=True)
+        return 0
 
-      result += chr(data[i])
-    return result
-  except (Exception) as err:
-    LOGGER.error(err,exc_info=True,stack_info=True)
-    return ""
 
+def bytesToString(data: bytearray, offset) -> str:
+    try:
+        result = ""
+        for i in range(offset[0], len(data)):
+            offset[0] += 1
+            if data[i] == 0:
+                break
+
+            result += chr(data[i])
+        return result
+    except Exception as err:
+        LOGGER.error(err, exc_info=True, stack_info=True)
+        return ""
 
-def bytesToDebugString(message:bytearray) -> str:
-  result = ""
-  for byte in message:
-    if (result != ""):
-      result = result + ", "
-    result = result + hex(byte)
-  return result
+
+def bytesToDebugString(message: bytearray) -> str:
+    result = ""
+    for byte in message:
+        if result != "":
+            result = result + ", "
+        result = result + hex(byte)
+    return result
 
 
 def getInstanceId(objectId) -> int:
-  return (objectId) & 0xff
+    return (objectId) & 0xFF
 
 
 def getDeviceId(objectId) -> int:
-  return ((objectId >> 24) & 0xff) * 256 + ((objectId >> 16) & 0xff)
+    return ((objectId >> 24) & 0xFF) * 256 + ((objectId >> 16) & 0xFF)
 
 
 def getClassId(objectId) -> int:
-  return (objectId >> 8) & 0xff
+    return (objectId >> 8) & 0xFF
 
 
 def formatObjectId(objectId) -> str:
-  result = "[DeviceId: " + str(getDeviceId(objectId))
-  result += ", ClassId: " + str(getClassId(objectId))
-  result += ", Instance: " + str(getInstanceId(objectId)) + "]"
-  return result
+    result = "[DeviceId: " + str(getDeviceId(objectId))
+    result += ", ClassId: " + str(getClassId(objectId))
+    result += ", Instance: " + str(getInstanceId(objectId)) + "]"
+    return result
 
 
 def getClockIndependMillis():
-  return time.perf_counter() * 1000
+    return time.perf_counter() * 1000
 
 
 def setBit(is_set: bool, bit: int, value: int) -> int:
     if is_set:
-        value |= (1 << bit)
+        value |= 1 << bit
     else:
         value &= ~(1 << bit)
     return value
 
 
-def isBitSet(bit:int, value:int) -> bool:
-  return ((value >> bit) & 1) > 0
+def isBitSet(bit: int, value: int) -> bool:
+    return ((value >> bit) & 1) > 0
 
 
-def bytesToBlob(data:bytearray, offset) -> bytearray:
-  try:
-    result = bytearray(len(data) - offset[0])
-    result[:] = data[offset[0]:]
-    offset[0]=offset[0]+len(data)
-    return result
-  except (Exception) as err:
-    LOGGER.error(err,exc_info=True,stack_info=True)
-    return 0
+def bytesToBlob(data: bytearray, offset) -> bytearray:
+    try:
+        result = bytearray(len(data) - offset[0])
+        result[:] = data[offset[0] :]
+        offset[0] = offset[0] + len(data)
+        return result
+    except Exception as err:
+        LOGGER.error(err, exc_info=True, stack_info=True)
+        return 0
+
 
 def dWordToBytes(value: int) -> bytearray:
-  result = bytearray(4)
-  result[0] = value & 0xff
-  result[1] = (value >> 8) & 0xff
-  result[2] = (value >> 16) & 0xff
-  result[3] = (value >> 24) & 0xff
-  return result
+    result = bytearray(4)
+    result[0] = value & 0xFF
+    result[1] = (value >> 8) & 0xFF
+    result[2] = (value >> 16) & 0xFF
+    result[3] = (value >> 24) & 0xFF
+    return result
 
 
 def addWord(value: int, inOutList):
-  inOutList.append(value & 0xff)
-  inOutList.append((value >> 8) & 0xff)
+    inOutList.append(value & 0xFF)
+    inOutList.append((value >> 8) & 0xFF)
+
 
 def addDword(value: int, inOutList):
-  inOutList.append(value & 0xff)
-  inOutList.append((value >> 8) & 0xff)
-  inOutList.append((value >> 16) & 0xff)
-  inOutList.append((value >> 24) & 0xff)
+    inOutList.append(value & 0xFF)
+    inOutList.append((value >> 8) & 0xFF)
+    inOutList.append((value >> 16) & 0xFF)
+    inOutList.append((value >> 24) & 0xFF)
+
 
 def wordToBytes(value: int) -> bytearray:
-  result = bytearray(2)
-  result[0] = value & 0xff
-  result[1] = (value >> 8) & 0xff
-  return result
-
-def bytesToSInt(data:bytearray, offset) -> int:
-  result = data[offset[0]] & 0xff
-  offset[0]+=1
-  if (result > 127):
-    result -= 256
-  return result
-
-def formatBytes(data:bytearray, offset:int=0, length:int=-1, asHex:bool=True) -> str:
-  if (length==-1):
-    length=len(data)
-
-    if (data == None):
-      return "NULL"
-
-    result=""
-
-    for i in range (offset,length):
-      if (asHex):
-        result+="0x"+hex(data[i])
-      else:
-        result+=data[i] & 0xff
+    result = bytearray(2)
+    result[0] = value & 0xFF
+    result[1] = (value >> 8) & 0xFF
     return result
 
-def bytesToList(data:bytearray, offset):
-  try:
-    result = bytearray()
-    offsetStart = offset[0]
-    for i in range (offsetStart,len(data),2):
-      key = data[i] & 0xff
-      value = data[i + 1] & 0xff
-      result.append(key)
-      result.append(value)
-      offset[0]+=2
+
+def bytesToSInt(data: bytearray, offset) -> int:
+    result = data[offset[0]] & 0xFF
+    offset[0] += 1
+    if result > 127:
+        result -= 256
     return result
-  except (Exception) as err:
-    LOGGER.error(err,exc_info=True,stack_info=True)
-    return bytearray()
+
+
+def formatBytes(
+    data: bytearray, offset: int = 0, length: int = -1, asHex: bool = True
+) -> str:
+    if length == -1:
+        length = len(data)
+
+        if data == None:
+            return "NULL"
+
+        result = ""
+
+        for i in range(offset, length):
+            if asHex:
+                result += "0x" + hex(data[i])
+            else:
+                result += data[i] & 0xFF
+        return result
+
+
+def bytesToList(data: bytearray, offset):
+    try:
+        result = bytearray()
+        offsetStart = offset[0]
+        for i in range(offsetStart, len(data), 2):
+            key = data[i] & 0xFF
+            value = data[i + 1] & 0xFF
+            result.append(key)
+            result.append(value)
+            offset[0] += 2
+        return result
+    except Exception as err:
+        LOGGER.error(err, exc_info=True, stack_info=True)
+        return bytearray()

{pyhausbus-1.0.0.dist-info → pyhausbus-1.0.1.dist-info}/METADATA

@@ -1,7 +1,8 @@
 Metadata-Version: 2.1
 Name: pyhausbus
-Version: 1.0.0
+Version: 1.0.1
 Summary: Python based library for accessing haus-bus.de modules. Inteded to be used in a Home Assistant integration.
+Home-page: https://haus-bus.secure-stores.de/
 Author: Hermann Hoeschen
 Author-email: info@haus-bus.de
 Classifier: License :: OSI Approved :: MIT License
@@ -18,6 +19,8 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Project-URL: Bug Tracker, https://github.com/hausbus/homeassistant/issues
+Project-URL: Repository, https://github.com/hausbus/homeassistant
 Description-Content-Type: text/markdown
 
 # pyhausbus

{pyhausbus-1.0.0.dist-info → pyhausbus-1.0.1.dist-info}/RECORD

@@ -2,7 +2,8 @@ pyhausbus/ABusFeature.py,sha256=CoXamHLNnuVt4KKOj8m7aGu60EAkapTwF7jXlOy6wdA,556
 pyhausbus/BusDataMessage.py,sha256=riHYPByCZbE2nm_Zi6Vtg0niDCMPw2j1QK4pgSdSfnU,613
 pyhausbus/BusHandler.py,sha256=eRDuZHUywIO5c419eC_QMNS-jk3kEUSyv6eTRH6VWD0,4013
 pyhausbus/HausBusCommand.py,sha256=q-0NH0exPdWWPoKeyi8rCEJsX6le7xRxUE4hOCerG1g,2386
-pyhausbus/HausBusUtils.py,sha256=c598f_M_4HRZ0wkG61BrRHK82iQTiI0uJcCy6CykYzs,4467
+pyhausbus/HausBusDevice.py,sha256=NRzaV-TZQ7P31yzL3dlY3TsB7xHxwCYcKwwNg8fFo5w,2441
+pyhausbus/HausBusUtils.py,sha256=bPi2W-iIWIpXtRaSa_qxhZbYenRuodD0-w0rUmAo9AY,4909
 pyhausbus/HomeServer.py,sha256=5V9GWY-dWL7DFwFMg3peK_h2mcEEX2gjcDX7g75FDGA,2801
 pyhausbus/IBusDataListener.py,sha256=2iakwRz-dg-wPVutAYeCm0cFykSl9bkTlxAU79GyycU,145
 pyhausbus/Main.py,sha256=tlYdZPiqodVioDHraxPype04r8McZFBMCSDMM4_6b1k,4333
@@ -519,7 +520,7 @@ pyhausbus/de/hausbus/homeassistant/proxy/wiFi/data/EvError.py,sha256=heTZfYOQ6lw
 pyhausbus/de/hausbus/homeassistant/proxy/wiFi/data/_init_.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pyhausbus/de/hausbus/homeassistant/proxy/wiFi/params/EErrorCode.py,sha256=VFr7nVTg9RiCHiE9M7Lk2vEMyj5O7whrC2bJGCKT1CA,378
 pyhausbus/de/hausbus/homeassistant/proxy/wiFi/params/_init_.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pyhausbus-1.0.0.dist-info/LICENSE,sha256=o5kWncdm1-QwSPPsPlLL8BhpXCt6u3Kj7jWPsPSDcs4,1073
-pyhausbus-1.0.0.dist-info/METADATA,sha256=jeRXf0wiN_-iRX2jukTPGGMn7dWHwJzxbEaNSG4JkdI,1087
-pyhausbus-1.0.0.dist-info/WHEEL,sha256=5cEDLREhpnNYpDlijc02-Q_4r7AkXMYW6R1JITTLLOQ,92
-pyhausbus-1.0.0.dist-info/RECORD,,
+pyhausbus-1.0.1.dist-info/LICENSE,sha256=o5kWncdm1-QwSPPsPlLL8BhpXCt6u3Kj7jWPsPSDcs4,1073
+pyhausbus-1.0.1.dist-info/METADATA,sha256=Oh2fk3AqSqTEWpeRpO0BEdOz5OTdOGoxXOqyDD11hKY,1273
+pyhausbus-1.0.1.dist-info/WHEEL,sha256=IrRNNNJ-uuL1ggO5qMvT1GGhQVdQU54d6ZpYqEZfEWo,92
+pyhausbus-1.0.1.dist-info/RECORD,,

{pyhausbus-1.0.0.dist-info → pyhausbus-1.0.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.8.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py2.py3-none-any