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

pyhausbus/Templates.py

@@ -76,8 +76,7 @@ class Templates:
         return cls._instance
 
     def get_feature_name_from_template(self, firmware_id, fcke, class_id, instance_id) -> Optional[str]:
-        if fcke != -1 & (firmware_id == EFirmwareId.ESP):
-        
+        if fcke != -1:
             ''' print("get_feature_name_from_template firmware_id = ",firmware_id," fcke = ",fcke," class_id = ",class_id," instance_id = ",instance_id)'''
             features = self.get_features(firmware_id, fcke)
 
@@ -87,6 +86,12 @@ class Templates:
                         return entry.name
         return None
 
+    def getModuleName(self, firmwareId: EFirmwareId, fcke: int):
+        for entry in self.module_types:
+          if entry.suits(firmwareId, fcke):
+            return entry.name
+        return None
+    
     def get_features(self, firmware_id, fcke) -> Optional[List['FeatureEntry']]:
         for module_type, features in self.feature_names.items():
             if module_type.suits(firmware_id, fcke):

{pyhausbus-1.0.2.dist-info → pyhausbus-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyhausbus
-Version: 1.0.2
+Version: 1.0.3
 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

{pyhausbus-1.0.2.dist-info → pyhausbus-1.0.3.dist-info}/RECORD

@@ -573,7 +573,6 @@ pyhausbus/de/hausbus/homeassistant/proxy/wiFi/params/_init_.py,sha256=AbpHGcgLb-
 pyhausbus/de/hausbus/homeassistant/proxy/wiFi/params/EErrorCode.py,sha256=lUH1Yz7wAP0iq96faOMe4JDW0gRPNiPiy4QyjP0Ii_0,595
 pyhausbus/de/hausbus/homeassistant/proxy/WiFi.py,sha256=WqTClRdTCmVf8na4U5XjEu6ZlSW9NfjtNsnu3HTqM7o,5611
 pyhausbus/HausBusCommand.py,sha256=VivsMd-m05qErdHTzO_I7_1mE3c44ydETu6G1hJg1Wg,2469
-pyhausbus/HausBusDevice.py,sha256=lVHv2YwZUnEi2r6zKbOlX6gCqIQLT5bojtHIB9pTHkk,2511
 pyhausbus/HausBusUtils.py,sha256=UHzb4z5CjUrG1yoTJqvwIL1G_f_TFWV8Zx0xPtSxShg,5112
 pyhausbus/HomeServer.py,sha256=JxhBn4I8OMhlp7PZ6ox4HmG9kxfDM9uxydwnLtle7OI,4019
 pyhausbus/IBusDataListener.py,sha256=brgsrtXHUyUg3RdWLTxOInrNdU30wEcunhOCUPGClyY,151
@@ -631,10 +630,10 @@ pyhausbus/templates/SD485_2E_6-fach-Taster.tpl,sha256=d8ALY9k1pcNSQUGSqSUsIpiRva
 pyhausbus/templates/SD485_2F_6-fach-Taster.tpl,sha256=d8ALY9k1pcNSQUGSqSUsIpiRvaR0bqoy4onhpfF7bzA,533
 pyhausbus/templates/SD6_14_Multitaster.tpl,sha256=cneNlLhmyE0RSh1BQK5p8Gz2cRbDOFztfc1_XWy3fAY,451
 pyhausbus/templates/SD6_1E_Multitaster.tpl,sha256=cneNlLhmyE0RSh1BQK5p8Gz2cRbDOFztfc1_XWy3fAY,451
-pyhausbus/Templates.py,sha256=Uf4Np9Sg-48rD-eRXXd5WXcZAyhrZPW0yWyzmlJWgk8,5168
+pyhausbus/Templates.py,sha256=Fo-xYyKUeEgcOo5hYIUUH3vx5DRnDY9jLnykk16hJQg,5333
 pyhausbus/UdpReceiveWorker.py,sha256=lQD2O2Rqk3Xvy6Glrlbn1p2n4ZTWW80yxJp3-OsQTcc,2678
 pyhausbus/WeekTime.py,sha256=o30XyAOEYAQhcWdE2hEX685RNJmo-VCQNPEx1xAFwzk,1287
-pyhausbus-1.0.2.dist-info/LICENSE,sha256=LrguBvqK4LI4RXcja3oOYNPAIB5x5HPUXHRlkTkP5Sg,1094
-pyhausbus-1.0.2.dist-info/METADATA,sha256=2R76nqfRV5QzaRj5xRutgubPR1M7O0clXwVU6Ih1Ikk,1324
-pyhausbus-1.0.2.dist-info/WHEEL,sha256=iAMR_6Qh95yyjYIwRxyjpiFq4FhDPemrEV-SyWIQB3U,92
-pyhausbus-1.0.2.dist-info/RECORD,,
+pyhausbus-1.0.3.dist-info/LICENSE,sha256=LrguBvqK4LI4RXcja3oOYNPAIB5x5HPUXHRlkTkP5Sg,1094
+pyhausbus-1.0.3.dist-info/METADATA,sha256=g4cMmX4-vwVNIr8epBHV5uYci__hFB5qEfaoUhEDvLc,1324
+pyhausbus-1.0.3.dist-info/WHEEL,sha256=iAMR_6Qh95yyjYIwRxyjpiFq4FhDPemrEV-SyWIQB3U,92
+pyhausbus-1.0.3.dist-info/RECORD,,

pyhausbus/HausBusDevice.py

@@ -1,70 +0,0 @@
-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")