From b1f722775527b49b45225f811bc4efbfb5543c4c Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 16 Aug 2024 00:21:49 -0700 Subject: [PATCH] don't need to do this in this pr --- selfdrive/car/body/interface.py | 3 --- selfdrive/car/chrysler/interface.py | 3 --- selfdrive/car/ford/interface.py | 3 --- selfdrive/car/gm/interface.py | 3 --- selfdrive/car/honda/interface.py | 3 --- selfdrive/car/hyundai/interface.py | 3 --- selfdrive/car/mazda/interface.py | 3 --- selfdrive/car/nissan/interface.py | 3 --- selfdrive/car/subaru/interface.py | 3 --- selfdrive/car/toyota/interface.py | 3 --- selfdrive/car/volkswagen/interface.py | 5 ----- 11 files changed, 35 deletions(-) diff --git a/selfdrive/car/body/interface.py b/selfdrive/car/body/interface.py index 805d56a78c..6b5ff2b4a9 100644 --- a/selfdrive/car/body/interface.py +++ b/selfdrive/car/body/interface.py @@ -1,13 +1,10 @@ import math from openpilot.selfdrive.car import get_safety_config, structs from openpilot.selfdrive.car.interfaces import CarInterfaceBase -from openpilot.selfdrive.car.body.carstate import CarState from openpilot.selfdrive.car.body.values import SPEED_FROM_RPM class CarInterface(CarInterfaceBase): - CS: CarState - @staticmethod def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, experimental_long, docs): ret.notCar = True diff --git a/selfdrive/car/chrysler/interface.py b/selfdrive/car/chrysler/interface.py index ad626ccefc..e038472163 100755 --- a/selfdrive/car/chrysler/interface.py +++ b/selfdrive/car/chrysler/interface.py @@ -1,14 +1,11 @@ #!/usr/bin/env python3 from panda import Panda from openpilot.selfdrive.car import get_safety_config, structs -from openpilot.selfdrive.car.chrysler.carstate import CarState from openpilot.selfdrive.car.chrysler.values import CAR, RAM_HD, RAM_DT, RAM_CARS, ChryslerFlags from openpilot.selfdrive.car.interfaces import CarInterfaceBase class CarInterface(CarInterfaceBase): - CS: CarState - @staticmethod def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, experimental_long, docs): ret.carName = "chrysler" diff --git a/selfdrive/car/ford/interface.py b/selfdrive/car/ford/interface.py index 664ce83552..89bd25a017 100644 --- a/selfdrive/car/ford/interface.py +++ b/selfdrive/car/ford/interface.py @@ -1,7 +1,6 @@ from panda import Panda from openpilot.selfdrive.car import get_safety_config, structs from openpilot.selfdrive.car.conversions import Conversions as CV -from openpilot.selfdrive.car.ford.carstate import CarState from openpilot.selfdrive.car.ford.fordcan import CanBus from openpilot.selfdrive.car.ford.values import Ecu, FordFlags from openpilot.selfdrive.car.interfaces import CarInterfaceBase @@ -10,8 +9,6 @@ TransmissionType = structs.CarParams.TransmissionType class CarInterface(CarInterfaceBase): - CS: CarState - @staticmethod def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, experimental_long, docs): ret.carName = "ford" diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py index f19ce740ac..3220a2e1eb 100755 --- a/selfdrive/car/gm/interface.py +++ b/selfdrive/car/gm/interface.py @@ -7,7 +7,6 @@ from panda import Panda from openpilot.selfdrive.car import get_safety_config, get_friction, structs from openpilot.selfdrive.car.common.basedir import BASEDIR from openpilot.selfdrive.car.conversions import Conversions as CV -from openpilot.selfdrive.car.gm.carstate import CarState from openpilot.selfdrive.car.gm.radar_interface import RADAR_HEADER_MSG from openpilot.selfdrive.car.gm.values import CAR, CarControllerParams, EV_CAR, CAMERA_ACC_CAR, CanBus from openpilot.selfdrive.car.interfaces import CarInterfaceBase, TorqueFromLateralAccelCallbackType, FRICTION_THRESHOLD, LatControlInputs, NanoFFModel @@ -25,8 +24,6 @@ NEURAL_PARAMS_PATH = os.path.join(BASEDIR, 'torque_data/neural_ff_weights.json') class CarInterface(CarInterfaceBase): - CS: CarState - @staticmethod def get_pid_accel_limits(CP, current_speed, cruise_speed): return CarControllerParams.ACCEL_MIN, CarControllerParams.ACCEL_MAX diff --git a/selfdrive/car/honda/interface.py b/selfdrive/car/honda/interface.py index 3f0519e04a..620e41313e 100755 --- a/selfdrive/car/honda/interface.py +++ b/selfdrive/car/honda/interface.py @@ -3,7 +3,6 @@ from panda import Panda from openpilot.selfdrive.car import get_safety_config, structs from openpilot.selfdrive.car.conversions import Conversions as CV from openpilot.selfdrive.car.common.numpy_fast import interp -from openpilot.selfdrive.car.honda.carstate import CarState from openpilot.selfdrive.car.honda.hondacan import CanBus from openpilot.selfdrive.car.honda.values import CarControllerParams, HondaFlags, CAR, HONDA_BOSCH, \ HONDA_NIDEC_ALT_SCM_MESSAGES, HONDA_BOSCH_RADARLESS @@ -14,8 +13,6 @@ TransmissionType = structs.CarParams.TransmissionType class CarInterface(CarInterfaceBase): - CS: CarState - @staticmethod def get_pid_accel_limits(CP, current_speed, cruise_speed): if CP.carFingerprint in HONDA_BOSCH: diff --git a/selfdrive/car/hyundai/interface.py b/selfdrive/car/hyundai/interface.py index 3fa5d9d559..4222b82750 100644 --- a/selfdrive/car/hyundai/interface.py +++ b/selfdrive/car/hyundai/interface.py @@ -1,7 +1,6 @@ from panda import Panda from openpilot.selfdrive.car import get_safety_config, structs -from openpilot.selfdrive.car.hyundai.carstate import CarState from openpilot.selfdrive.car.hyundai.hyundaicanfd import CanBus from openpilot.selfdrive.car.hyundai.values import HyundaiFlags, CAR, DBC, CANFD_CAR, CAMERA_SCC_CAR, CANFD_RADAR_SCC_CAR, \ CANFD_UNSUPPORTED_LONGITUDINAL_CAR, EV_CAR, HYBRID_CAR, LEGACY_SAFETY_MODE_CAR, \ @@ -16,8 +15,6 @@ ENABLE_BUTTONS = (Buttons.RES_ACCEL, Buttons.SET_DECEL, Buttons.CANCEL) class CarInterface(CarInterfaceBase): - CS: CarState - @staticmethod def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, experimental_long, docs): ret.carName = "hyundai" diff --git a/selfdrive/car/mazda/interface.py b/selfdrive/car/mazda/interface.py index 530a2d0064..dcf3a05511 100755 --- a/selfdrive/car/mazda/interface.py +++ b/selfdrive/car/mazda/interface.py @@ -1,14 +1,11 @@ #!/usr/bin/env python3 from openpilot.selfdrive.car import get_safety_config, structs from openpilot.selfdrive.car.conversions import Conversions as CV -from openpilot.selfdrive.car.mazda.carstate import CarState from openpilot.selfdrive.car.mazda.values import CAR, LKAS_LIMITS from openpilot.selfdrive.car.interfaces import CarInterfaceBase class CarInterface(CarInterfaceBase): - CS: CarState - @staticmethod def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, experimental_long, docs): ret.carName = "mazda" diff --git a/selfdrive/car/nissan/interface.py b/selfdrive/car/nissan/interface.py index e9232f4e9e..fba88bb37c 100644 --- a/selfdrive/car/nissan/interface.py +++ b/selfdrive/car/nissan/interface.py @@ -1,13 +1,10 @@ from panda import Panda from openpilot.selfdrive.car import get_safety_config, structs from openpilot.selfdrive.car.interfaces import CarInterfaceBase -from openpilot.selfdrive.car.nissan.carstate import CarState from openpilot.selfdrive.car.nissan.values import CAR class CarInterface(CarInterfaceBase): - CS: CarState - @staticmethod def _get_params(ret: structs.CarParams, candidate, fingerprint, car_fw, experimental_long, docs): ret.carName = "nissan" diff --git a/selfdrive/car/subaru/interface.py b/selfdrive/car/subaru/interface.py index 0cf8a02b02..9191de99d7 100644 --- a/selfdrive/car/subaru/interface.py +++ b/selfdrive/car/subaru/interface.py @@ -2,13 +2,10 @@ from panda import Panda from openpilot.selfdrive.car import get_safety_config, structs from openpilot.selfdrive.car.disable_ecu import disable_ecu from openpilot.selfdrive.car.interfaces import CarInterfaceBase -from openpilot.selfdrive.car.subaru.carstate import CarState from openpilot.selfdrive.car.subaru.values import CAR, GLOBAL_ES_ADDR, SubaruFlags class CarInterface(CarInterfaceBase): - CS: CarState - @staticmethod def _get_params(ret: structs.CarParams, candidate: CAR, fingerprint, car_fw, experimental_long, docs): ret.carName = "subaru" diff --git a/selfdrive/car/toyota/interface.py b/selfdrive/car/toyota/interface.py index ab157f46e1..ee3f22f57c 100644 --- a/selfdrive/car/toyota/interface.py +++ b/selfdrive/car/toyota/interface.py @@ -1,7 +1,6 @@ from panda import Panda from panda.python import uds from openpilot.selfdrive.car import structs, get_safety_config -from openpilot.selfdrive.car.toyota.carstate import CarState from openpilot.selfdrive.car.toyota.values import Ecu, CAR, DBC, ToyotaFlags, CarControllerParams, TSS2_CAR, RADAR_ACC_CAR, NO_DSU_CAR, \ MIN_ACC_SPEED, EPS_SCALE, UNSUPPORTED_DSU_CAR, NO_STOP_TIMER_CAR, ANGLE_CONTROL_CAR from openpilot.selfdrive.car.disable_ecu import disable_ecu @@ -11,8 +10,6 @@ SteerControlType = structs.CarParams.SteerControlType class CarInterface(CarInterfaceBase): - CS: CarState - @staticmethod def get_pid_accel_limits(CP, current_speed, cruise_speed): return CarControllerParams.ACCEL_MIN, CarControllerParams.ACCEL_MAX diff --git a/selfdrive/car/volkswagen/interface.py b/selfdrive/car/volkswagen/interface.py index a155a4927d..0d4f1e0ee3 100644 --- a/selfdrive/car/volkswagen/interface.py +++ b/selfdrive/car/volkswagen/interface.py @@ -1,15 +1,10 @@ from panda import Panda from openpilot.selfdrive.car import get_safety_config, structs from openpilot.selfdrive.car.interfaces import CarInterfaceBase -from openpilot.selfdrive.car.volkswagen.carcontroller import CarController -from openpilot.selfdrive.car.volkswagen.carstate import CarState from openpilot.selfdrive.car.volkswagen.values import CAR, NetworkLocation, TransmissionType, VolkswagenFlags class CarInterface(CarInterfaceBase): - CS: CarState - CC: CarController - @staticmethod def _get_params(ret: structs.CarParams, candidate: CAR, fingerprint, car_fw, experimental_long, docs): ret.carName = "volkswagen"