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

pyhausbus/HausBusUtils.py

@@ -1,203 +1,203 @@
-import logging
-import time
-import traceback
-
-LOGGER = logging.getLogger("pyhausbus")
-
-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
-
-        result += (data[offset[0]] & 0xFF) * 256
-        offset[0] += 1
-
-        result += (data[offset[0]] & 0xFF) * 65536
-        offset[0] += 1
-
-        result += (data[offset[0]] & 0xFF) * 16777216
-        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
-
-        return result
-    except Exception as err:
-        LOGGER.error(err, exc_info=True, stack_info=True)
-        return 0
-
-
-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
-
-
-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 getInstanceId(objectId) -> int:
-    return (objectId) & 0xFF
-
-
-def getDeviceId(objectId) -> int:
-    return ((objectId >> 24) & 0xFF) * 256 + ((objectId >> 16) & 0xFF)
-
-
-def getClassId(objectId) -> int:
-    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
-
-
-def getClockIndependMillis():
-    return time.perf_counter() * 1000
-
-
-def setBit(is_set: bool, bit: int, value: int) -> int:
-    if is_set:
-        value |= 1 << bit
-    else:
-        value &= ~(1 << bit)
-    return value
-
-
-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 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
-
-
-def addWord(value: int, inOutList):
-    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)
-
-
-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
-        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()
+import logging
+import time
+import traceback
+
+LOGGER = logging.getLogger("pyhausbus")
+
+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
+
+        result += (data[offset[0]] & 0xFF) * 256
+        offset[0] += 1
+
+        result += (data[offset[0]] & 0xFF) * 65536
+        offset[0] += 1
+
+        result += (data[offset[0]] & 0xFF) * 16777216
+        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
+
+        return result
+    except Exception as err:
+        LOGGER.error(err, exc_info=True, stack_info=True)
+        return 0
+
+
+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
+
+
+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 getInstanceId(objectId) -> int:
+    return (objectId) & 0xFF
+
+
+def getDeviceId(objectId) -> int:
+    return ((objectId >> 24) & 0xFF) * 256 + ((objectId >> 16) & 0xFF)
+
+
+def getClassId(objectId) -> int:
+    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
+
+
+def getClockIndependMillis():
+    return time.perf_counter() * 1000
+
+
+def setBit(is_set: bool, bit: int, value: int) -> int:
+    if is_set:
+        value |= 1 << bit
+    else:
+        value &= ~(1 << bit)
+    return value
+
+
+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 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
+
+
+def addWord(value: int, inOutList):
+    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)
+
+
+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
+        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/HomeServer.py

@@ -1,68 +1,86 @@
-from pyhausbus.BusHandler import BusHandler
-from pyhausbus.IBusDataListener import IBusDataListener
-from pyhausbus.de.hausbus.homeassistant.proxy.Controller import Controller
-from pyhausbus.de.hausbus.homeassistant.proxy.controller.params.EIndex import EIndex
-from pyhausbus.de.hausbus.homeassistant.proxy.controller.data.RemoteObjects import (
-    RemoteObjects,
-)
-from pyhausbus.HausBusUtils import LOGGER
-import pyhausbus.de.hausbus.homeassistant.proxy.ProxyFactory as ProxyFactory
-import pyhausbus.HausBusUtils as HausBusUtils
-from pyhausbus.de.hausbus.homeassistant.proxy.controller.data.ModuleId import ModuleId
-import importlib
-import traceback
-import time
-import threading
-from pyhausbus.de.hausbus.homeassistant.proxy.controller.data.EvStarted import EvStarted
-from pyhausbus.ResultWorker import ResultWorker
-
-class HomeServer(IBusDataListener):
-    _instance = None
-    bushandler = None
-
-    def __new__(cls, *args, **kwargs):
-        if not cls._instance:
-            cls._instance = super().__new__(cls, *args, **kwargs)
-        return cls._instance
-
-    def __init__(self):
-        LOGGER.debug("init homeserver")
-        self.bushandler = BusHandler.getInstance()
-        self.bushandler.addBusEventListener(ResultWorker())
-        self.bushandler.addBusEventListener(self)
-
-    def searchDevices(self):
-        controler = Controller(0)
-        controler.getModuleId(EIndex.RUNNING)
-
-    def addBusEventListener(self, listener: IBusDataListener):
-        self.bushandler.addBusEventListener(listener)
-
-    def removeBusEventListener(self, listener: IBusDataListener):
-        self.bushandler.removeBusEventListener(listener)
-
-    def getDeviceInstances(self, senderObjectId: int, remoteObjects: RemoteObjects):
-        deviceId = HausBusUtils.getDeviceId(senderObjectId)
-        objectList = remoteObjects.getObjectList()
-
-        result = []
-        for i in range(0, len(objectList), 2):
-            instanceId = objectList[i]
-            classId = objectList[i + 1]
-            className = ProxyFactory.getBusClassNameForClass(classId)
-            objectId = HausBusUtils.getObjectId(deviceId, classId, instanceId)
-
-            try:
-                module_name, class_name = className.rsplit(".", 1)
-                module = importlib.import_module(className)
-                cls = getattr(module, class_name)
-                obj = cls(objectId)
-                result.append(obj)
-            except Exception as err:
-                LOGGER.error(err,exc_info=True, stack_info=True)
-        return result
-
-    def busDataReceived(self, busDataMessage):
-        """if a device restarts during runtime, we automatically read moduleId"""
-        if isinstance(busDataMessage.getData(), EvStarted):
-            Controller(busDataMessage.getSenderObjectId()).getModuleId(EIndex.RUNNING)
+from pyhausbus.BusHandler import BusHandler
+from pyhausbus.Templates import Templates
+from pyhausbus.IBusDataListener import IBusDataListener
+from pyhausbus.de.hausbus.homeassistant.proxy.Controller import Controller
+from pyhausbus.de.hausbus.homeassistant.proxy.controller.params.EIndex import EIndex
+from pyhausbus.de.hausbus.homeassistant.proxy.controller.data.RemoteObjects import (
+    RemoteObjects,
+)
+from pyhausbus.HausBusUtils import LOGGER
+import pyhausbus.de.hausbus.homeassistant.proxy.ProxyFactory as ProxyFactory
+import pyhausbus.HausBusUtils as HausBusUtils
+from pyhausbus.de.hausbus.homeassistant.proxy.controller.data.ModuleId import ModuleId
+from pyhausbus.de.hausbus.homeassistant.proxy.controller.data.Configuration import Configuration
+import importlib
+import traceback
+import time
+import threading
+from pyhausbus.de.hausbus.homeassistant.proxy.controller.data.EvStarted import EvStarted
+from pyhausbus.ResultWorker import ResultWorker
+
+class HomeServer(IBusDataListener):
+    _instance = None
+    bushandler = None
+    modulesIds = {}
+    configurations = {}
+
+    def __new__(cls, *args, **kwargs):
+        if not cls._instance:
+            cls._instance = super().__new__(cls, *args, **kwargs)
+        return cls._instance
+
+    def __init__(self):
+        LOGGER.debug("init homeserver")
+        self.bushandler = BusHandler.getInstance()
+        self.bushandler.addBusEventListener(ResultWorker())
+        self.bushandler.addBusEventListener(self)
+
+    def searchDevices(self):
+        controler = Controller(0)
+        controler.getModuleId(EIndex.RUNNING)
+
+    def addBusEventListener(self, listener: IBusDataListener):
+        self.bushandler.addBusEventListener(listener)
+
+    def removeBusEventListener(self, listener: IBusDataListener):
+        self.bushandler.removeBusEventListener(listener)
+
+    def getDeviceInstances(self, senderObjectId: int, remoteObjects: RemoteObjects):
+        deviceId = HausBusUtils.getDeviceId(senderObjectId)
+        objectList = remoteObjects.getObjectList()
+        moduleId = self.modulesIds[deviceId];
+        configuration = self.configurations[deviceId];
+
+        result = []
+        for i in range(0, len(objectList), 2):
+            instanceId = objectList[i]
+            classId = objectList[i + 1]
+            className = ProxyFactory.getBusClassNameForClass(classId)
+            objectId = HausBusUtils.getObjectId(deviceId, classId, instanceId)
+            featureName = Templates.get_instance().get_feature_name_from_template(moduleId.getFirmwareId(), configuration.getFCKE(), classId, instanceId);
+            
+            try:
+                module_name, class_name = className.rsplit(".", 1)
+                module = importlib.import_module(className)
+                cls = getattr(module, class_name)
+                obj = cls(objectId)
+                if featureName!=None:
+                  obj.setName(featureName)
+                result.append(obj)
+            except Exception as err:
+                LOGGER.error(err,exc_info=True, stack_info=True)
+        return result
+
+    def busDataReceived(self, busDataMessage):
+        """if a device restarts during runtime, we automatically read moduleId"""
+        if isinstance(busDataMessage.getData(), ModuleId):
+            self.modulesIds[HausBusUtils.getDeviceId(busDataMessage.getSenderObjectId())]=busDataMessage.getData();
+            Controller(busDataMessage.getSenderObjectId()).getConfiguration()
+
+        if isinstance(busDataMessage.getData(), Configuration):
+            self.configurations[HausBusUtils.getDeviceId(busDataMessage.getSenderObjectId())]=busDataMessage.getData();
+            Controller(busDataMessage.getSenderObjectId()).getRemoteObjects()
+
+        """ if a device restarts during runtime, we automatically read moduleId"""
+        if isinstance(busDataMessage.getData(), EvStarted):
+            Controller(busDataMessage.getSenderObjectId()).getModuleId(EIndex.RUNNING)

pyhausbus/IBusDataListener.py

@@ -1,7 +1,7 @@
-from abc import ABC, abstractmethod
-
-class IBusDataListener(ABC):
-
-    @abstractmethod
-    def busDataReceived(self,busDataMessage):
+from abc import ABC, abstractmethod
+
+class IBusDataListener(ABC):
+
+    @abstractmethod
+    def busDataReceived(self,busDataMessage):
         pass