mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-08-31 21:23:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "f"

Browse Source 
This reverts commit b4364a8272.
This commit is contained in:
firestar5683
2025-12-20 23:56:09 -06:00
parent fb1639f538
commit f2d055ca44
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opendbc_repo/opendbc/car/gm/carcontroller.py
+2 -1
View File
@@ -6,6 +6,7 @@ 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
@@ -19,7 +20,7 @@ CAMERA_CANCEL_DELAY_FRAMES = 10
MIN_STEER_MSG_INTERVAL_MS = 15
class CarController(CarControllerBase, IntelligentCruiseButtonManagementInterface):
class CarController(CarControllerBase, GasInterceptorCarController, IntelligentCruiseButtonManagementInterface):
def __init__(self, dbc_names, CP, CP_SP):
super().__init__(dbc_names, CP, CP_SP)
self.start_time = 0.
opendbc_repo/opendbc/car/gm/interface.py
+5
View File
@@ -14,6 +14,8 @@ 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,
@@ -111,6 +113,9 @@ 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