- clean up code

- fix some bugs
r7sa · Oct 14, 2018 · a829abd · a829abd
1 parent 08a1351
commit a829abd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/megad/megad.py b/megad/megad.py
@@ -420,10 +420,10 @@ async def pool(self, device_id=None):
             for megad_id, dev in self.devices.items():
                 if device_id is None or dev.device_id == device_id:
                     updated = await dev.pool()
-                    for up in updated:
+                    for port_id in updated:
                         if self.platform.on_state_changed:
-                            await self.platform.on_state_changed(dev.device_id, up, dev.ports[up]['value'])
-                        result.add((dev.device_id, up))
+                            await self.platform.on_state_changed(dev.device_id, port_id, dev.ports[port_id]['value'])
+                        result.add((dev.device_id, port_id))
         except Exception as e:
             self.platform.logger.exception(f'Exception on HTTP MegaD message processing. Exception type: {type(e)} message: {e}')
         return result

diff --git a/megad/mqtt.py b/megad/mqtt.py
@@ -202,7 +202,7 @@ async def stop(self):
 
     async def on_mqtt_connect(self):
         for dev_id, dev in self.devices.items():
-            await self.publish_device(dev, None)
+            await self.publish_device(dev_id, None)
 
     async def on_mqtt_message(self, topic, payload):
         try: