From b4364a82726fe69ed590190897112343ef1f1ca3 Mon Sep 17 00:00:00 2001 From: firestar5683 <168790843+firestar5683@users.noreply.github.com> Date: Sat, 20 Dec 2025 23:51:16 -0600 Subject: [PATCH] f --- opendbc_repo/opendbc/car/gm/carcontroller.py | 3 +-- opendbc_repo/opendbc/car/gm/interface.py | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/opendbc_repo/opendbc/car/gm/carcontroller.py b/opendbc_repo/opendbc/car/gm/carcontroller.py index ab4288706..9c5a7655f 100644 --- a/opendbc_repo/opendbc/car/gm/carcontroller.py +++ b/opendbc_repo/opendbc/car/gm/carcontroller.py @@ -6,7 +6,6 @@ from opendbc.car.gm import gmcan from opendbc.car.common.conversions import Conversions as CV from opendbc.car.gm.values import DBC, CanBus, CarControllerParams, CruiseButtons from opendbc.car.interfaces import CarControllerBase -from opendbc.sunnypilot.car.gm.carcontroller_ext import GasInterceptorCarController from opendbc.sunnypilot.car.gm.values_ext import GMFlagsSP from opendbc.sunnypilot.car.gm.icbm import IntelligentCruiseButtonManagementInterface @@ -20,7 +19,7 @@ CAMERA_CANCEL_DELAY_FRAMES = 10 MIN_STEER_MSG_INTERVAL_MS = 15 -class CarController(CarControllerBase, GasInterceptorCarController, IntelligentCruiseButtonManagementInterface): +class CarController(CarControllerBase, IntelligentCruiseButtonManagementInterface): def __init__(self, dbc_names, CP, CP_SP): super().__init__(dbc_names, CP, CP_SP) self.start_time = 0. diff --git a/opendbc_repo/opendbc/car/gm/interface.py b/opendbc_repo/opendbc/car/gm/interface.py index 527894ec2..a52b87c49 100755 --- a/opendbc_repo/opendbc/car/gm/interface.py +++ b/opendbc_repo/opendbc/car/gm/interface.py @@ -14,8 +14,6 @@ from opendbc.sunnypilot.car.gm.values_ext import GMFlagsSP, GMSafetyFlagsSP TransmissionType = structs.CarParams.TransmissionType NetworkLocation = structs.CarParams.NetworkLocation - -PEDAL_MSG = 0x201 NON_ACC_ICBM_CARS = { CAR.CHEVROLET_BOLT_NON_ACC, CAR.CHEVROLET_BOLT_NON_ACC_1ST_GEN, @@ -113,9 +111,6 @@ class CarInterface(CarInterfaceBase): ret.safetyConfigs = [get_safety_config(structs.CarParams.SafetyModel.gm)] ret.autoResumeSng = False ret.enableBsm = 0x142 in fingerprint[CanBus.POWERTRAIN] - if PEDAL_MSG in fingerprint[0]: - ret.enableGasInterceptorDEPRECATED = True - if candidate in EV_CAR: ret.transmissionType = TransmissionType.direct ret.safetyConfigs[0].safetyParam |= GMSafetyFlags.EV.value