Revert "common PlatformFlags base class + test for < 32 bits" (#31793)

Revert "common PlatformFlags base class + test for < 32 bits (#31779)"

This reverts commit 7e75a99b03be1289aa515894e81caa1138374a38.
old-commit-hash: 99610c8819
pull/32199/head
Shane Smiskol 1 year ago committed by GitHub
parent 0e437cce25
commit b286b84044
  1. 5
      selfdrive/car/__init__.py
  2. 5
      selfdrive/car/chrysler/values.py
  3. 6
      selfdrive/car/ford/values.py
  4. 6
      selfdrive/car/honda/values.py
  5. 6
      selfdrive/car/hyundai/values.py
  6. 5
      selfdrive/car/mazda/values.py
  7. 6
      selfdrive/car/subaru/values.py
  8. 6
      selfdrive/car/toyota/values.py
  9. 6
      selfdrive/car/volkswagen/values.py

@ -318,8 +318,3 @@ class Platforms(str, ReprEnum):
for flag, platforms in platforms_with_flag.items():
print(f"{flag:32s}: {', '.join(p.name for p in platforms)}")
class PlatformFlags(IntFlag):
def __init__(self, value: int):
assert value < 2**32, "undefined behaviour with >32 bit flags"

@ -1,15 +1,16 @@
from enum import IntFlag
from dataclasses import dataclass, field
from cereal import car
from panda.python import uds
from openpilot.selfdrive.car import CarSpecs, DbcDict, PlatformConfig, PlatformFlags, Platforms, dbc_dict
from openpilot.selfdrive.car import CarSpecs, DbcDict, PlatformConfig, Platforms, dbc_dict
from openpilot.selfdrive.car.docs_definitions import CarHarness, CarInfo, CarParts
from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, p16
Ecu = car.CarParams.Ecu
class ChryslerFlags(PlatformFlags):
class ChryslerFlags(IntFlag):
# Detected flags
HIGHER_MIN_STEERING_SPEED = 1

@ -1,9 +1,9 @@
from dataclasses import dataclass, field
from enum import Enum
from enum import Enum, IntFlag
import panda.python.uds as uds
from cereal import car
from openpilot.selfdrive.car import AngleRateLimit, CarSpecs, PlatformFlags, dbc_dict, DbcDict, PlatformConfig, Platforms
from openpilot.selfdrive.car import AngleRateLimit, CarSpecs, dbc_dict, DbcDict, PlatformConfig, Platforms
from openpilot.selfdrive.car.docs_definitions import CarFootnote, CarHarness, CarInfo, CarParts, Column, \
Device
from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries, p16
@ -39,7 +39,7 @@ class CarControllerParams:
pass
class FordFlags(PlatformFlags):
class FordFlags(IntFlag):
# Static flags
CANFD = 1

@ -1,10 +1,10 @@
from dataclasses import dataclass
from enum import Enum
from enum import Enum, IntFlag
from cereal import car
from openpilot.common.conversions import Conversions as CV
from panda.python import uds
from openpilot.selfdrive.car import CarSpecs, PlatformConfig, PlatformFlags, Platforms, dbc_dict
from openpilot.selfdrive.car import CarSpecs, PlatformConfig, Platforms, dbc_dict
from openpilot.selfdrive.car.docs_definitions import CarFootnote, CarHarness, CarInfo, CarParts, Column
from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries, p16
@ -45,7 +45,7 @@ class CarControllerParams:
self.STEER_LOOKUP_V = [v * -1 for v in CP.lateralParams.torqueV][1:][::-1] + list(CP.lateralParams.torqueV)
class HondaFlags(PlatformFlags):
class HondaFlags(IntFlag):
# Detected flags
# Bosch models with alternate set of LKAS_HUD messages
BOSCH_EXT_HUD = 1

@ -1,11 +1,11 @@
import re
from dataclasses import dataclass, field
from enum import Enum
from enum import Enum, IntFlag
from cereal import car
from panda.python import uds
from openpilot.common.conversions import Conversions as CV
from openpilot.selfdrive.car import CarSpecs, DbcDict, PlatformConfig, PlatformFlags, Platforms, dbc_dict
from openpilot.selfdrive.car import CarSpecs, DbcDict, PlatformConfig, Platforms, dbc_dict
from openpilot.selfdrive.car.docs_definitions import CarFootnote, CarHarness, CarInfo, CarParts, Column
from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, p16
@ -51,7 +51,7 @@ class CarControllerParams:
self.STEER_MAX = 384
class HyundaiFlags(PlatformFlags):
class HyundaiFlags(IntFlag):
# Dynamic Flags
CANFD_HDA2 = 1
CANFD_ALT_BUTTONS = 2

@ -1,8 +1,9 @@
from dataclasses import dataclass, field
from enum import IntFlag
from cereal import car
from openpilot.common.conversions import Conversions as CV
from openpilot.selfdrive.car import CarSpecs, DbcDict, PlatformConfig, PlatformFlags, Platforms, dbc_dict
from openpilot.selfdrive.car import CarSpecs, DbcDict, PlatformConfig, Platforms, dbc_dict
from openpilot.selfdrive.car.docs_definitions import CarHarness, CarInfo, CarParts
from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries
@ -36,7 +37,7 @@ class MazdaCarSpecs(CarSpecs):
tireStiffnessFactor: float = 0.7 # not optimized yet
class MazdaFlags(PlatformFlags):
class MazdaFlags(IntFlag):
# Static flags
# Gen 1 hardware: same CAN messages and same camera
GEN1 = 1

@ -1,9 +1,9 @@
from dataclasses import dataclass, field
from enum import Enum
from enum import Enum, IntFlag
from cereal import car
from panda.python import uds
from openpilot.selfdrive.car import CarSpecs, DbcDict, PlatformConfig, Platforms, PlatformFlags, dbc_dict
from openpilot.selfdrive.car import CarSpecs, DbcDict, PlatformConfig, Platforms, dbc_dict
from openpilot.selfdrive.car.docs_definitions import CarFootnote, CarHarness, CarInfo, CarParts, Tool, Column
from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries, p16
@ -52,7 +52,7 @@ class CarControllerParams:
BRAKE_LOOKUP_V = [BRAKE_MAX, BRAKE_MIN]
class SubaruFlags(PlatformFlags):
class SubaruFlags(IntFlag):
# Detected flags
SEND_INFOTAINMENT = 1
DISABLE_EYESIGHT = 2

@ -1,11 +1,11 @@
import re
from collections import defaultdict
from dataclasses import dataclass, field
from enum import Enum
from enum import Enum, IntFlag
from cereal import car
from openpilot.common.conversions import Conversions as CV
from openpilot.selfdrive.car import CarSpecs, PlatformConfig, PlatformFlags, Platforms
from openpilot.selfdrive.car import CarSpecs, PlatformConfig, Platforms
from openpilot.selfdrive.car import AngleRateLimit, dbc_dict
from openpilot.selfdrive.car.docs_definitions import CarFootnote, CarInfo, Column, CarParts, CarHarness
from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries
@ -41,7 +41,7 @@ class CarControllerParams:
self.STEER_DELTA_DOWN = 25 # always lower than 45 otherwise the Rav4 faults (Prius seems ok with 50)
class ToyotaFlags(PlatformFlags):
class ToyotaFlags(IntFlag):
# Detected flags
HYBRID = 1
SMART_DSU = 2

@ -1,12 +1,12 @@
from collections import namedtuple
from dataclasses import dataclass, field
from enum import Enum
from enum import Enum, IntFlag
from cereal import car
from panda.python import uds
from opendbc.can.can_define import CANDefine
from openpilot.common.conversions import Conversions as CV
from openpilot.selfdrive.car import PlatformFlags, dbc_dict, CarSpecs, DbcDict, PlatformConfig, Platforms
from openpilot.selfdrive.car import dbc_dict, CarSpecs, DbcDict, PlatformConfig, Platforms
from openpilot.selfdrive.car.docs_definitions import CarFootnote, CarHarness, CarInfo, CarParts, Column, \
Device
from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, p16
@ -109,7 +109,7 @@ class CANBUS:
cam = 2
class VolkswagenFlags(PlatformFlags):
class VolkswagenFlags(IntFlag):
# Detected flags
STOCK_HCA_PRESENT = 1

Loading…
Cancel
Save