Fix issues with latest firmware

Andre0512 · May 21, 2023 · 89d31a0 · 89d31a0
1 parent 984d731
commit 89d31a0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 venv/
 __pycache__/
 dist/
-src/*.egg-info/
+src/*.egg-info/
+test*
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setup(
     name="speedport-api",
-    version="0.4.4",
+    version="0.4.5",
     author="Andre Basche",
     description="Control Telekom Speedport routers with Python",
     long_description=long_description,

diff --git a/src/speedport/device.py b/src/speedport/device.py
@@ -64,7 +64,7 @@ def slave(self):
 
     @property
     def type(self):
-        return ["lan", "wlan", "wlan5"][int(self._data.get("mdevice_type"))]
+        return ["lan", "wlan", "wlan5"][int(self._data.get("mdevice_type", "0")) % 3]
 
     @property
     def ula_ipv6(self):

diff --git a/src/speedport/speedport.py b/src/speedport/speedport.py
@@ -109,7 +109,8 @@ async def status(self):
     @property
     async def devices(self):
         data = await self.get("data/DeviceList.json")
-        devices = data.get("addmlandevice", []) + data.get("addmwlan5device", []) + data.get("addmwlandevice", [])
+        devices = data.get("addmlandevice", []) + data.get("addmwlan5device", [])
+        devices += data.get("addmwlandevice", []) + data.get("addmdevice", [])
         devices = sorted(devices, key=lambda d: int(d["mdevice_ipv4"].split(".")[-1]))
         return [WlanDevice(device) for device in devices]