Update values for v6 generic and XM specific

Author: CoMPaTech

CHANGELOG.md

@@ -7,6 +7,8 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 - Support for v6 firmware XM models using a different login path (XW already was successful)
+- Calculated cpuload on v6 if values available (to prevent reporting close to 100%)
+- Fix frequency on v6 firmware (if value is cast as a string ending in MHz)
 
 ## [0.5.6] - 2025-10-11
 

airos/data.py

@@ -246,11 +246,20 @@ class Host6(AirOSDataClass):
     totalram: int
     freeram: int
     cpuload: float | int | None
+    cputotal: float | int | None  # Reported on XM firmware
+    cpubusy: float | int | None  # Reported on XM firmware
 
     @classmethod
     def __pre_deserialize__(cls, d: dict[str, Any]) -> dict[str, Any]:
         """Pre-deserialize hook for Host."""
         _check_and_log_unknown_enum_value(d, "netrole", NetRole, "Host", "netrole")
+
+        # Calculate cpufloat from actuals instead on relying on near 100% value
+        if (
+            all(isinstance(d.get(k), (int, float)) for k in ("cpubusy", "cputotal"))
+            and d["cputotal"] > 0
+        ):
+            d["cpuload"] = round((d["cpubusy"] / d["cputotal"]) * 100, 2)
         return d
 
 
@@ -562,7 +571,7 @@ class Wireless6(AirOSDataClass):
     apmac: str
     countrycode: int
     channel: int
-    frequency: str
+    frequency: int
     dfs: int
     opmode: str
     antenna: str
@@ -593,6 +602,11 @@ def __pre_deserialize__(cls, d: dict[str, Any]) -> dict[str, Any]:
         _check_and_log_unknown_enum_value(
             d, "security", Security, "Wireless", "security"
         )
+
+        freq = d.get("frequency")
+        if isinstance(freq, str) and "MHz" in freq:
+            d["frequency"] = int(freq.split()[0])
+
         return d
 
 

fixtures/airos_NanoStation_M5_sta_v6.3.16.json

@@ -21,7 +21,9 @@
   },
   "genuine": "/images/genuine.png",
   "host": {
-    "cpuload": 24.0,
+    "cpubusy": 3786414,
+    "cpuload": 25.51,
+    "cputotal": 14845531,
     "devmodel": "NanoStation M5 ",
     "freeram": 42516480,
     "fwprefix": "XW",
@@ -140,7 +142,7 @@
     "dfs": 0,
     "distance": 750,
     "essid": "Nano",
-    "frequency": "5180 MHz",
+    "frequency": 5180,
     "hide_essid": 0,
     "mode": "sta",
     "noisef": -99,

fixtures/airos_NanoStation_loco_M5_v6.3.16_XM_ap.json

@@ -21,7 +21,9 @@
   },
   "genuine": "/images/genuine.png",
   "host": {
-    "cpuload": 100.0,
+    "cpubusy": 11092563,
+    "cpuload": 5.68,
+    "cputotal": 195292633,
     "devmodel": "NanoStation loco M5 ",
     "freeram": 8429568,
     "fwprefix": "XM",
@@ -126,7 +128,7 @@
     "dfs": 1,
     "distance": 600,
     "essid": "SOMETHING",
-    "frequency": "5700 MHz",
+    "frequency": 5700,
     "hide_essid": 1,
     "mode": "ap",
     "noisef": -91,

fixtures/airos_NanoStation_loco_M5_v6.3.16_XM_sta.json

@@ -21,7 +21,9 @@
   },
   "genuine": "/images/genuine.png",
   "host": {
-    "cpuload": 100.0,
+    "cpubusy": 11150046,
+    "cpuload": 5.65,
+    "cputotal": 197455604,
     "devmodel": "NanoStation loco M5 ",
     "freeram": 8753152,
     "fwprefix": "XM",
@@ -126,7 +128,7 @@
     "dfs": 0,
     "distance": 600,
     "essid": "SOMETHING",
-    "frequency": "5700 MHz",
+    "frequency": 5700,
     "hide_essid": 0,
     "mode": "sta",
     "noisef": -89,

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "airos"
-version         = "0.5.7a9"
+version         = "0.5.7a10"
 license         = "MIT"
 description     = "Ubiquiti airOS module(s) for Python 3."
 readme          = "README.md"