Skip to content

Commit

Permalink
GM: remove basedir import (commaai#33312)
Browse files Browse the repository at this point in the history
* remove these exceptions

* whoop

* ahhh
  • Loading branch information
sshane authored Aug 15, 2024
1 parent 3e9b91a commit d43bf89
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 0 additions & 4 deletions .importlinter
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ forbidden_modules =
openpilot.teleoprtc
openpilot.tinygrad
ignore_imports =
# remove these
openpilot.selfdrive.car.gm.interface -> openpilot.common.basedir
openpilot.selfdrive.car.interfaces -> openpilot.common.basedir

# these are okay
openpilot.selfdrive.car.card -> openpilot.common.swaglog
openpilot.selfdrive.car.card -> openpilot.common.realtime
Expand Down
4 changes: 4 additions & 0 deletions selfdrive/car/common/basedir.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import os


BASEDIR = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../"))
4 changes: 2 additions & 2 deletions selfdrive/car/gm/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from math import fabs, exp
from panda import Panda

from openpilot.common.basedir import BASEDIR
from openpilot.selfdrive.car import get_safety_config, get_friction
from openpilot.selfdrive.car.common.basedir import BASEDIR
from openpilot.selfdrive.car.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
Expand All @@ -20,7 +20,7 @@
CAR.CHEVROLET_SILVERADO: [3.29974374, 1.0, 0.25571356, 0.0465122]
}

NEURAL_PARAMS_PATH = os.path.join(BASEDIR, 'selfdrive/car/torque_data/neural_ff_weights.json')
NEURAL_PARAMS_PATH = os.path.join(BASEDIR, 'torque_data/neural_ff_weights.json')


class CarInterface(CarInterfaceBase):
Expand Down
10 changes: 5 additions & 5 deletions selfdrive/car/interfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
from functools import cache

from cereal import car
from openpilot.common.basedir import BASEDIR
from openpilot.selfdrive.car import DT_CTRL, apply_hysteresis, gen_empty_fingerprint, scale_rot_inertia, scale_tire_stiffness, get_friction, STD_CARGO_KG
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.simple_kalman import KF1D, get_kalman_gain
from openpilot.selfdrive.car.common.numpy_fast import clip
Expand All @@ -25,9 +25,9 @@
ACCEL_MIN = -3.5
FRICTION_THRESHOLD = 0.3

TORQUE_PARAMS_PATH = os.path.join(BASEDIR, 'selfdrive/car/torque_data/params.toml')
TORQUE_OVERRIDE_PATH = os.path.join(BASEDIR, 'selfdrive/car/torque_data/override.toml')
TORQUE_SUBSTITUTE_PATH = os.path.join(BASEDIR, 'selfdrive/car/torque_data/substitute.toml')
TORQUE_PARAMS_PATH = os.path.join(BASEDIR, 'torque_data/params.toml')
TORQUE_OVERRIDE_PATH = os.path.join(BASEDIR, 'torque_data/override.toml')
TORQUE_SUBSTITUTE_PATH = os.path.join(BASEDIR, 'torque_data/substitute.toml')

GEAR_SHIFTER_MAP: dict[str, car.CarState.GearShifter] = {
'P': GearShifter.park, 'PARK': GearShifter.park,
Expand Down Expand Up @@ -397,7 +397,7 @@ def get_interface_attr(attr: str, combine_brands: bool = False, ignore_none: boo
# - keys are all the car models or brand names
# - values are attr values from all car folders
result = {}
for car_folder in sorted([x[0] for x in os.walk(BASEDIR + '/selfdrive/car')]):
for car_folder in sorted([x[0] for x in os.walk(BASEDIR)]):
try:
brand_name = car_folder.split('/')[-1]
brand_values = __import__(f'openpilot.selfdrive.car.{brand_name}.{INTERFACE_ATTR_FILE.get(attr, "values")}', fromlist=[attr])
Expand Down

0 comments on commit d43bf89

Please sign in to comment.