Revert "don't use cereal"

This reverts commit 7208524d42.
pull/35253/head
Cameron Clough 1 week ago
parent 2ba1d8ac80
commit b05003d97b
  1. 21
      system/hardware/base.py
  2. 6
      system/hardware/pc/hardware.py
  3. 6
      system/hardware/tici/hardware.py

@ -1,23 +1,10 @@
import os
from abc import abstractmethod, ABC
from dataclasses import dataclass, fields
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
from cereal import log
NetworkType = log.DeviceState.NetworkType
@dataclass
class ThermalZone:

@ -1,6 +1,10 @@
import random
from openpilot.system.hardware.base import HardwareBase, NetworkStrength, NetworkType
from cereal import log
from openpilot.system.hardware.base import HardwareBase
NetworkType = log.DeviceState.NetworkType
NetworkStrength = log.DeviceState.NetworkStrength
class Pc(HardwareBase):

@ -8,8 +8,9 @@ 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, NetworkStrength, NetworkType, ThermalConfig, ThermalZone
from openpilot.system.hardware.base import HardwareBase, 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
@ -52,6 +53,9 @@ 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

Loading…
Cancel
Save