diff --git a/selfdrive/car/chrysler/carstate.py b/selfdrive/car/chrysler/carstate.py index f7ebf82f1..6d76ddd8e 100644 --- a/selfdrive/car/chrysler/carstate.py +++ b/selfdrive/car/chrysler/carstate.py @@ -2,7 +2,7 @@ from opendbc.can.parser import CANParser from opendbc.can.can_define import CANDefine from openpilot.selfdrive.car import create_button_events, structs from openpilot.selfdrive.car.chrysler.values import DBC, STEER_THRESHOLD, RAM_CARS -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.interfaces import CarStateBase ButtonType = structs.CarState.ButtonEvent.Type diff --git a/selfdrive/car/conversions.py b/selfdrive/car/common/conversions.py similarity index 100% rename from selfdrive/car/conversions.py rename to selfdrive/car/common/conversions.py diff --git a/selfdrive/car/docs_definitions.py b/selfdrive/car/docs_definitions.py index 6df109fac..cf047445b 100644 --- a/selfdrive/car/docs_definitions.py +++ b/selfdrive/car/docs_definitions.py @@ -4,7 +4,7 @@ import copy from dataclasses import dataclass, field from enum import Enum -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.structs import CarParams GOOD_TORQUE_THRESHOLD = 1.0 # m/s^2 diff --git a/selfdrive/car/ford/carstate.py b/selfdrive/car/ford/carstate.py index 813af7694..4e06b6561 100644 --- a/selfdrive/car/ford/carstate.py +++ b/selfdrive/car/ford/carstate.py @@ -1,7 +1,7 @@ from opendbc.can.can_define import CANDefine from opendbc.can.parser import CANParser from openpilot.selfdrive.car import create_button_events, structs -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.ford.fordcan import CanBus from openpilot.selfdrive.car.ford.values import DBC, CarControllerParams, FordFlags from openpilot.selfdrive.car.interfaces import CarStateBase diff --git a/selfdrive/car/ford/interface.py b/selfdrive/car/ford/interface.py index 17f136b1b..8f644b65a 100644 --- a/selfdrive/car/ford/interface.py +++ b/selfdrive/car/ford/interface.py @@ -1,6 +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.common.conversions import Conversions as CV from openpilot.selfdrive.car.ford.fordcan import CanBus from openpilot.selfdrive.car.ford.values import Ecu, FordFlags from openpilot.selfdrive.car.interfaces import CarInterfaceBase diff --git a/selfdrive/car/ford/radar_interface.py b/selfdrive/car/ford/radar_interface.py index a4e80380e..55cd2bd8d 100644 --- a/selfdrive/car/ford/radar_interface.py +++ b/selfdrive/car/ford/radar_interface.py @@ -1,7 +1,7 @@ from math import cos, sin from opendbc.can.parser import CANParser from openpilot.selfdrive.car import structs -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.ford.fordcan import CanBus from openpilot.selfdrive.car.ford.values import DBC, RADAR from openpilot.selfdrive.car.interfaces import RadarInterfaceBase diff --git a/selfdrive/car/gm/carcontroller.py b/selfdrive/car/gm/carcontroller.py index e562ef6e8..ab9db94ba 100644 --- a/selfdrive/car/gm/carcontroller.py +++ b/selfdrive/car/gm/carcontroller.py @@ -2,7 +2,7 @@ import copy from opendbc.can.packer import CANPacker from openpilot.selfdrive.car import DT_CTRL, apply_driver_steer_torque_limits, structs from openpilot.selfdrive.car.gm import gmcan -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.gm.values import DBC, CanBus, CarControllerParams, CruiseButtons from openpilot.selfdrive.car.common.numpy_fast import interp from openpilot.selfdrive.car.interfaces import CarControllerBase diff --git a/selfdrive/car/gm/carstate.py b/selfdrive/car/gm/carstate.py index 99823c9e7..ba44910d3 100644 --- a/selfdrive/car/gm/carstate.py +++ b/selfdrive/car/gm/carstate.py @@ -2,7 +2,7 @@ import copy from opendbc.can.can_define import CANDefine from opendbc.can.parser import CANParser from openpilot.selfdrive.car import create_button_events, structs -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.common.numpy_fast import mean from openpilot.selfdrive.car.interfaces import CarStateBase from openpilot.selfdrive.car.gm.values import DBC, AccState, CanBus, CruiseButtons, STEER_THRESHOLD diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py index 4f47dbde2..902ffe5e7 100755 --- a/selfdrive/car/gm/interface.py +++ b/selfdrive/car/gm/interface.py @@ -5,7 +5,7 @@ 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.common.conversions import Conversions as CV 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 diff --git a/selfdrive/car/gm/radar_interface.py b/selfdrive/car/gm/radar_interface.py index 919e2940f..9831e692c 100755 --- a/selfdrive/car/gm/radar_interface.py +++ b/selfdrive/car/gm/radar_interface.py @@ -2,7 +2,7 @@ import math from opendbc.can.parser import CANParser from openpilot.selfdrive.car import structs -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.gm.values import DBC, CanBus from openpilot.selfdrive.car.interfaces import RadarInterfaceBase diff --git a/selfdrive/car/honda/carstate.py b/selfdrive/car/honda/carstate.py index 7558562d0..7452630eb 100644 --- a/selfdrive/car/honda/carstate.py +++ b/selfdrive/car/honda/carstate.py @@ -3,7 +3,7 @@ from collections import defaultdict from opendbc.can.can_define import CANDefine from opendbc.can.parser import CANParser from openpilot.selfdrive.car import create_button_events, structs -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.common.numpy_fast import interp from openpilot.selfdrive.car.honda.hondacan import CanBus, get_cruise_speed_conversion from openpilot.selfdrive.car.honda.values import CAR, DBC, STEER_THRESHOLD, HONDA_BOSCH, \ diff --git a/selfdrive/car/honda/hondacan.py b/selfdrive/car/honda/hondacan.py index b35045501..63ca8b43d 100644 --- a/selfdrive/car/honda/hondacan.py +++ b/selfdrive/car/honda/hondacan.py @@ -1,5 +1,5 @@ from openpilot.selfdrive.car import CanBusBase -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.honda.values import HondaFlags, HONDA_BOSCH, HONDA_BOSCH_RADARLESS, CAR, CarControllerParams # CAN bus layout with relay diff --git a/selfdrive/car/honda/interface.py b/selfdrive/car/honda/interface.py index 54df6c257..61443b8ad 100755 --- a/selfdrive/car/honda/interface.py +++ b/selfdrive/car/honda/interface.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 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.conversions import Conversions as CV from openpilot.selfdrive.car.common.numpy_fast import interp from openpilot.selfdrive.car.honda.hondacan import CanBus from openpilot.selfdrive.car.honda.values import CarControllerParams, HondaFlags, CAR, HONDA_BOSCH, \ diff --git a/selfdrive/car/honda/values.py b/selfdrive/car/honda/values.py index 499cbbc0e..f6357f6cb 100644 --- a/selfdrive/car/honda/values.py +++ b/selfdrive/car/honda/values.py @@ -3,7 +3,7 @@ from enum import Enum, IntFlag from panda.python import uds from openpilot.selfdrive.car import CarSpecs, PlatformConfig, Platforms, dbc_dict, structs -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.docs_definitions import CarFootnote, CarHarness, CarDocs, CarParts, Column from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries, p16 diff --git a/selfdrive/car/hyundai/carcontroller.py b/selfdrive/car/hyundai/carcontroller.py index f9f260305..059c7dd84 100644 --- a/selfdrive/car/hyundai/carcontroller.py +++ b/selfdrive/car/hyundai/carcontroller.py @@ -1,7 +1,7 @@ import copy from opendbc.can.packer import CANPacker from openpilot.selfdrive.car import DT_CTRL, apply_driver_steer_torque_limits, common_fault_avoidance, make_tester_present_msg, structs -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.common.numpy_fast import clip from openpilot.selfdrive.car.hyundai import hyundaicanfd, hyundaican from openpilot.selfdrive.car.hyundai.carstate import CarState diff --git a/selfdrive/car/hyundai/carstate.py b/selfdrive/car/hyundai/carstate.py index 2aa8e453c..4d716aac8 100644 --- a/selfdrive/car/hyundai/carstate.py +++ b/selfdrive/car/hyundai/carstate.py @@ -5,7 +5,7 @@ import math from opendbc.can.parser import CANParser from opendbc.can.can_define import CANDefine from openpilot.selfdrive.car import create_button_events, structs -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.hyundai.hyundaicanfd import CanBus from openpilot.selfdrive.car.hyundai.values import HyundaiFlags, CAR, DBC, CAN_GEARS, CAMERA_SCC_CAR, \ CANFD_CAR, Buttons, CarControllerParams diff --git a/selfdrive/car/hyundai/values.py b/selfdrive/car/hyundai/values.py index 6937b719c..25267d7e9 100644 --- a/selfdrive/car/hyundai/values.py +++ b/selfdrive/car/hyundai/values.py @@ -4,7 +4,7 @@ from enum import Enum, IntFlag from panda.python import uds from openpilot.selfdrive.car import CarSpecs, DbcDict, PlatformConfig, Platforms, dbc_dict -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.structs import CarParams from openpilot.selfdrive.car.docs_definitions import CarFootnote, CarHarness, CarDocs, CarParts, Column from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, p16 diff --git a/selfdrive/car/interfaces.py b/selfdrive/car/interfaces.py index e89b63eb1..b918302a4 100644 --- a/selfdrive/car/interfaces.py +++ b/selfdrive/car/interfaces.py @@ -12,7 +12,7 @@ from openpilot.selfdrive.car import DT_CTRL, apply_hysteresis, gen_empty_fingerp from openpilot.selfdrive.car import structs from openpilot.selfdrive.car.can_definitions import CanData, CanRecvCallable, CanSendCallable from openpilot.selfdrive.car.common.basedir import BASEDIR -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.common.simple_kalman import KF1D, get_kalman_gain from openpilot.selfdrive.car.common.numpy_fast import clip from openpilot.selfdrive.car.values import PLATFORMS diff --git a/selfdrive/car/mazda/carstate.py b/selfdrive/car/mazda/carstate.py index d48d07824..c3b339473 100644 --- a/selfdrive/car/mazda/carstate.py +++ b/selfdrive/car/mazda/carstate.py @@ -1,7 +1,7 @@ from opendbc.can.can_define import CANDefine from opendbc.can.parser import CANParser from openpilot.selfdrive.car import create_button_events, structs -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.interfaces import CarStateBase from openpilot.selfdrive.car.mazda.values import DBC, LKAS_LIMITS, MazdaFlags diff --git a/selfdrive/car/mazda/interface.py b/selfdrive/car/mazda/interface.py index 3c868745f..3da5e8e1b 100755 --- a/selfdrive/car/mazda/interface.py +++ b/selfdrive/car/mazda/interface.py @@ -1,6 +1,6 @@ #!/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.common.conversions import Conversions as CV from openpilot.selfdrive.car.mazda.values import CAR, LKAS_LIMITS from openpilot.selfdrive.car.interfaces import CarInterfaceBase diff --git a/selfdrive/car/mazda/values.py b/selfdrive/car/mazda/values.py index ea49eeaec..3f71a4db3 100644 --- a/selfdrive/car/mazda/values.py +++ b/selfdrive/car/mazda/values.py @@ -2,7 +2,7 @@ from dataclasses import dataclass, field from enum import IntFlag from openpilot.selfdrive.car import CarSpecs, DbcDict, PlatformConfig, Platforms, dbc_dict -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.structs import CarParams from openpilot.selfdrive.car.docs_definitions import CarHarness, CarDocs, CarParts from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries diff --git a/selfdrive/car/nissan/carstate.py b/selfdrive/car/nissan/carstate.py index 78d57b7e2..129831594 100644 --- a/selfdrive/car/nissan/carstate.py +++ b/selfdrive/car/nissan/carstate.py @@ -3,7 +3,7 @@ from collections import deque from opendbc.can.can_define import CANDefine from opendbc.can.parser import CANParser from openpilot.selfdrive.car import create_button_events, structs -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.interfaces import CarStateBase from openpilot.selfdrive.car.nissan.values import CAR, DBC, CarControllerParams diff --git a/selfdrive/car/subaru/carstate.py b/selfdrive/car/subaru/carstate.py index 5ae7416c9..cabf2c5c5 100644 --- a/selfdrive/car/subaru/carstate.py +++ b/selfdrive/car/subaru/carstate.py @@ -2,7 +2,7 @@ import copy from opendbc.can.can_define import CANDefine from opendbc.can.parser import CANParser from openpilot.selfdrive.car import structs -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.interfaces import CarStateBase from openpilot.selfdrive.car.subaru.values import DBC, CanBus, SubaruFlags from openpilot.selfdrive.car import CanSignalRateCalculator diff --git a/selfdrive/car/toyota/carstate.py b/selfdrive/car/toyota/carstate.py index 2970d8c34..924388eab 100644 --- a/selfdrive/car/toyota/carstate.py +++ b/selfdrive/car/toyota/carstate.py @@ -3,7 +3,7 @@ import copy from opendbc.can.can_define import CANDefine from opendbc.can.parser import CANParser from openpilot.selfdrive.car import DT_CTRL, create_button_events, structs -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.common.filter_simple import FirstOrderFilter from openpilot.selfdrive.car.common.numpy_fast import mean from openpilot.selfdrive.car.interfaces import CarStateBase diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py index e10eba13b..45b6f7a03 100644 --- a/selfdrive/car/toyota/values.py +++ b/selfdrive/car/toyota/values.py @@ -4,7 +4,7 @@ from dataclasses import dataclass, field from enum import Enum, IntFlag from openpilot.selfdrive.car import CarSpecs, PlatformConfig, Platforms, AngleRateLimit, dbc_dict -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.structs import CarParams from openpilot.selfdrive.car.docs_definitions import CarFootnote, CarDocs, Column, CarParts, CarHarness from openpilot.selfdrive.car.fw_query_definitions import FwQueryConfig, Request, StdQueries diff --git a/selfdrive/car/volkswagen/carcontroller.py b/selfdrive/car/volkswagen/carcontroller.py index 72168f6e4..1f46520cb 100644 --- a/selfdrive/car/volkswagen/carcontroller.py +++ b/selfdrive/car/volkswagen/carcontroller.py @@ -1,7 +1,7 @@ import copy from opendbc.can.packer import CANPacker from openpilot.selfdrive.car import DT_CTRL, apply_driver_steer_torque_limits, structs -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.common.numpy_fast import clip from openpilot.selfdrive.car.interfaces import CarControllerBase from openpilot.selfdrive.car.volkswagen import mqbcan, pqcan diff --git a/selfdrive/car/volkswagen/carstate.py b/selfdrive/car/volkswagen/carstate.py index 8feb0642b..b441c73f3 100644 --- a/selfdrive/car/volkswagen/carstate.py +++ b/selfdrive/car/volkswagen/carstate.py @@ -2,7 +2,7 @@ import numpy as np from opendbc.can.parser import CANParser from openpilot.selfdrive.car import structs from openpilot.selfdrive.car.interfaces import CarStateBase -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car.volkswagen.values import DBC, CANBUS, NetworkLocation, TransmissionType, GearShifter, \ CarControllerParams, VolkswagenFlags diff --git a/selfdrive/car/volkswagen/values.py b/selfdrive/car/volkswagen/values.py index f4562f3c0..53161e98a 100644 --- a/selfdrive/car/volkswagen/values.py +++ b/selfdrive/car/volkswagen/values.py @@ -5,7 +5,7 @@ from enum import Enum, IntFlag, StrEnum from panda.python import uds from opendbc.can.can_define import CANDefine from openpilot.selfdrive.car import dbc_dict, CarSpecs, DbcDict, PlatformConfig, Platforms -from openpilot.selfdrive.car.conversions import Conversions as CV +from openpilot.selfdrive.car.common.conversions import Conversions as CV from openpilot.selfdrive.car import structs from openpilot.selfdrive.car.docs_definitions import CarFootnote, CarHarness, CarDocs, CarParts, Column, \ Device