pyhausbus 1.0.3__py2.py3-none-any.whl → 1.0.4__py2.py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- pyhausbus/HomeServer.py +0 -8
- {pyhausbus-1.0.3.dist-info → pyhausbus-1.0.4.dist-info}/METADATA +1 -1
- {pyhausbus-1.0.3.dist-info → pyhausbus-1.0.4.dist-info}/RECORD +5 -5
- {pyhausbus-1.0.3.dist-info → pyhausbus-1.0.4.dist-info}/LICENSE +0 -0
- {pyhausbus-1.0.3.dist-info → pyhausbus-1.0.4.dist-info}/WHEEL +0 -0
pyhausbus/HomeServer.py
CHANGED
@@ -21,8 +21,6 @@ from pyhausbus.ResultWorker import ResultWorker
|
|
21
21
|
class HomeServer(IBusDataListener):
|
22
22
|
_instance = None
|
23
23
|
bushandler = None
|
24
|
-
modulesIds = {}
|
25
|
-
configurations = {}
|
26
24
|
|
27
25
|
def __new__(cls, *args, **kwargs):
|
28
26
|
if not cls._instance:
|
@@ -48,7 +46,6 @@ class HomeServer(IBusDataListener):
|
|
48
46
|
def getDeviceInstances(self, senderObjectId: int, remoteObjects: RemoteObjects):
|
49
47
|
deviceId = HausBusUtils.getDeviceId(senderObjectId)
|
50
48
|
objectList = remoteObjects.getObjectList()
|
51
|
-
moduleId = self.modulesIds[deviceId];
|
52
49
|
configuration = self.configurations[deviceId];
|
53
50
|
|
54
51
|
result = []
|
@@ -57,15 +54,12 @@ class HomeServer(IBusDataListener):
|
|
57
54
|
classId = objectList[i + 1]
|
58
55
|
className = ProxyFactory.getBusClassNameForClass(classId)
|
59
56
|
objectId = HausBusUtils.getObjectId(deviceId, classId, instanceId)
|
60
|
-
featureName = Templates.get_instance().get_feature_name_from_template(moduleId.getFirmwareId(), configuration.getFCKE(), classId, instanceId);
|
61
57
|
|
62
58
|
try:
|
63
59
|
module_name, class_name = className.rsplit(".", 1)
|
64
60
|
module = importlib.import_module(className)
|
65
61
|
cls = getattr(module, class_name)
|
66
62
|
obj = cls(objectId)
|
67
|
-
if featureName!=None:
|
68
|
-
obj.setName(featureName)
|
69
63
|
result.append(obj)
|
70
64
|
except Exception as err:
|
71
65
|
LOGGER.error(err,exc_info=True, stack_info=True)
|
@@ -74,11 +68,9 @@ class HomeServer(IBusDataListener):
|
|
74
68
|
def busDataReceived(self, busDataMessage):
|
75
69
|
"""if a device restarts during runtime, we automatically read moduleId"""
|
76
70
|
if isinstance(busDataMessage.getData(), ModuleId):
|
77
|
-
self.modulesIds[HausBusUtils.getDeviceId(busDataMessage.getSenderObjectId())]=busDataMessage.getData();
|
78
71
|
Controller(busDataMessage.getSenderObjectId()).getConfiguration()
|
79
72
|
|
80
73
|
if isinstance(busDataMessage.getData(), Configuration):
|
81
|
-
self.configurations[HausBusUtils.getDeviceId(busDataMessage.getSenderObjectId())]=busDataMessage.getData();
|
82
74
|
Controller(busDataMessage.getSenderObjectId()).getRemoteObjects()
|
83
75
|
|
84
76
|
""" if a device restarts during runtime, we automatically read moduleId"""
|
@@ -574,7 +574,7 @@ pyhausbus/de/hausbus/homeassistant/proxy/wiFi/params/EErrorCode.py,sha256=lUH1Yz
|
|
574
574
|
pyhausbus/de/hausbus/homeassistant/proxy/WiFi.py,sha256=WqTClRdTCmVf8na4U5XjEu6ZlSW9NfjtNsnu3HTqM7o,5611
|
575
575
|
pyhausbus/HausBusCommand.py,sha256=VivsMd-m05qErdHTzO_I7_1mE3c44ydETu6G1hJg1Wg,2469
|
576
576
|
pyhausbus/HausBusUtils.py,sha256=UHzb4z5CjUrG1yoTJqvwIL1G_f_TFWV8Zx0xPtSxShg,5112
|
577
|
-
pyhausbus/HomeServer.py,sha256=
|
577
|
+
pyhausbus/HomeServer.py,sha256=Jqj0EHMypj66r6kaLqLjvc_-41L9YY-tmMLQoUYHdxA,3449
|
578
578
|
pyhausbus/IBusDataListener.py,sha256=brgsrtXHUyUg3RdWLTxOInrNdU30wEcunhOCUPGClyY,151
|
579
579
|
pyhausbus/Main.py,sha256=EckTLyt0sVZlqTQuRm5M7P1oMMwJMlXXkI-JBdVCbEI,4433
|
580
580
|
pyhausbus/ObjectId.py,sha256=V05TWtWqgbksOpxvXonMg9UIUa2cqyZnrMzmhWzRne8,657
|
@@ -633,7 +633,7 @@ pyhausbus/templates/SD6_1E_Multitaster.tpl,sha256=cneNlLhmyE0RSh1BQK5p8Gz2cRbDOF
|
|
633
633
|
pyhausbus/Templates.py,sha256=Fo-xYyKUeEgcOo5hYIUUH3vx5DRnDY9jLnykk16hJQg,5333
|
634
634
|
pyhausbus/UdpReceiveWorker.py,sha256=lQD2O2Rqk3Xvy6Glrlbn1p2n4ZTWW80yxJp3-OsQTcc,2678
|
635
635
|
pyhausbus/WeekTime.py,sha256=o30XyAOEYAQhcWdE2hEX685RNJmo-VCQNPEx1xAFwzk,1287
|
636
|
-
pyhausbus-1.0.
|
637
|
-
pyhausbus-1.0.
|
638
|
-
pyhausbus-1.0.
|
639
|
-
pyhausbus-1.0.
|
636
|
+
pyhausbus-1.0.4.dist-info/LICENSE,sha256=LrguBvqK4LI4RXcja3oOYNPAIB5x5HPUXHRlkTkP5Sg,1094
|
637
|
+
pyhausbus-1.0.4.dist-info/METADATA,sha256=XOaeWcX8-NO3kQttyvk4-Mx7hoZuy0E6JJSfqz18yrA,1324
|
638
|
+
pyhausbus-1.0.4.dist-info/WHEEL,sha256=iAMR_6Qh95yyjYIwRxyjpiFq4FhDPemrEV-SyWIQB3U,92
|
639
|
+
pyhausbus-1.0.4.dist-info/RECORD,,
|
File without changes
|
File without changes
|