diff --git a/system/hardware/base.py b/system/hardware/base.py index 90b42b2f1f..77369124c9 100644 --- a/system/hardware/base.py +++ b/system/hardware/base.py @@ -1,10 +1,23 @@ import os from abc import abstractmethod, ABC from dataclasses import dataclass, fields - -from cereal import log - -NetworkType = log.DeviceState.NetworkType +from enum import IntEnum + +class NetworkType(IntEnum): + none = 0 + wifi = 1 + cell2G = 2 + cell3G = 3 + cell4G = 4 + cell5G = 5 + ethernet = 6 + +class NetworkStrength(IntEnum): + unknown = 0 + poor = 1 + moderate = 2 + good = 3 + great = 4 @dataclass class ThermalZone: diff --git a/system/hardware/pc/hardware.py b/system/hardware/pc/hardware.py index 017a449c90..b287dc58aa 100644 --- a/system/hardware/pc/hardware.py +++ b/system/hardware/pc/hardware.py @@ -1,10 +1,6 @@ import random -from cereal import log -from openpilot.system.hardware.base import HardwareBase - -NetworkType = log.DeviceState.NetworkType -NetworkStrength = log.DeviceState.NetworkStrength +from openpilot.system.hardware.base import HardwareBase, NetworkStrength, NetworkType class Pc(HardwareBase): diff --git a/system/hardware/tici/hardware.py b/system/hardware/tici/hardware.py index 5a8e41b51f..cc82ab4123 100644 --- a/system/hardware/tici/hardware.py +++ b/system/hardware/tici/hardware.py @@ -8,9 +8,8 @@ from enum import IntEnum from functools import cached_property, lru_cache from pathlib import Path -from cereal import log from openpilot.common.gpio import gpio_set, gpio_init, get_irqs_for_action -from openpilot.system.hardware.base import HardwareBase, ThermalConfig, ThermalZone +from openpilot.system.hardware.base import HardwareBase, NetworkStrength, NetworkType, ThermalConfig, ThermalZone from openpilot.system.hardware.tici import iwlist from openpilot.system.hardware.tici.pins import GPIO from openpilot.system.hardware.tici.amplifier import Amplifier @@ -53,9 +52,6 @@ class NMMetered(IntEnum): TIMEOUT = 0.1 REFRESH_RATE_MS = 1000 -NetworkType = log.DeviceState.NetworkType -NetworkStrength = log.DeviceState.NetworkStrength - # https://developer.gnome.org/ModemManager/unstable/ModemManager-Flags-and-Enumerations.html#MMModemAccessTechnology MM_MODEM_ACCESS_TECHNOLOGY_UMTS = 1 << 5 MM_MODEM_ACCESS_TECHNOLOGY_LTE = 1 << 14