Fixes from code review

This commit is contained in:
Robert Dunmire III 2023-12-16 12:57:01 -05:00
parent 1bbedfaa8b
commit e828e0bf0a

View file

@ -284,13 +284,11 @@ class MikrotikCoordinator(DataUpdateCoordinator[None]):
self.host_tracking_initialized = False self.host_tracking_initialized = False
self.support_capsman = False self.support_capsman = False
self.support_wifi = False
self.support_wireless = False self.support_wireless = False
self.support_wifiwave2 = False
self.support_ppp = False self.support_ppp = False
self.support_ups = False self.support_ups = False
self.support_gps = False self.support_gps = False
self._wifimodule = None self._wifimodule = "wireless"
self.major_fw_version = 0 self.major_fw_version = 0
self.minor_fw_version = 0 self.minor_fw_version = 0
@ -519,32 +517,22 @@ class MikrotikCoordinator(DataUpdateCoordinator[None]):
self.support_ppp = True self.support_ppp = True
self.support_wireless = True self.support_wireless = True
if "wifiwave2" in packages and packages["wifiwave2"]["enabled"]: if "wifiwave2" in packages and packages["wifiwave2"]["enabled"]:
self.support_wifiwave2 = True
self.support_wifi = False
self.support_capsman = False self.support_capsman = False
self._wifimodule = "wifiwave2" self._wifimodule = "wifiwave2"
elif "wifi" in packages and packages["wifi"]["enabled"]: elif "wifi" in packages and packages["wifi"]["enabled"]:
self.support_wifiwave2 = False
self.support_wifi = True
self.support_capsman = False self.support_capsman = False
self._wifimodule = "wifi" self._wifimodule = "wifi"
elif "wifi-qcom" in packages and packages["wifi-qcom"]["enabled"]: elif "wifi-qcom" in packages and packages["wifi-qcom"]["enabled"]:
self.support_wifiwave2 = False
self.support_wifi = True
self.support_capsman = False self.support_capsman = False
self._wifimodule = "wifi" self._wifimodule = "wifi"
elif "wifi-qcom-ac" in packages and packages["wifi-qcom-ac"]["enabled"]: elif "wifi-qcom-ac" in packages and packages["wifi-qcom-ac"]["enabled"]:
self.support_wifiwave2 = False
self.support_wifi = True
self.support_capsman = False self.support_capsman = False
self._wifimodule = "wifi" self._wifimodule = "wifi"
else: else:
self.support_wifiwave2 = False
self.support_wifi = False
self.support_capsman = True self.support_capsman = True
_LOGGER.debug("Mikrotik %s wifi module=%s", _LOGGER.debug("Mikrotik %s wifi module=%s",
@ -1994,11 +1982,9 @@ class MikrotikCoordinator(DataUpdateCoordinator[None]):
if self.major_fw_version >= 7 and self.minor_fw_version > 12: if self.major_fw_version >= 7 and self.minor_fw_version > 12:
registration_path = "/interface/wifi/registration-table" registration_path = "/interface/wifi/registration-table"
self._wifimodule = "wifi"
else: else:
registration_path= "/caps-man/registration-table" registration_path= "/caps-man/registration-table"
self._wifimodule = "wireless"
self.ds["capsman_hosts"] = parse_api( self.ds["capsman_hosts"] = parse_api(
data={}, data={},