From 55caeb729d9d27553c74bd10693b5f73afb140ff Mon Sep 17 00:00:00 2001 From: luckylz2git <8618993@qq.com> Date: Thu, 26 Sep 2024 18:19:38 +0800 Subject: [PATCH] CT6 TESTING --- selfdrive/car/gm/carstate.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/selfdrive/car/gm/carstate.py b/selfdrive/car/gm/carstate.py index 43162c098..3c6fec12d 100644 --- a/selfdrive/car/gm/carstate.py +++ b/selfdrive/car/gm/carstate.py @@ -179,11 +179,12 @@ class CarState(CarStateBase): if self.CP.networkLocation == NetworkLocation.fwdCamera and not self.CP.flags & GMFlags.NO_CAMERA.value: if self.CP.carFingerprint not in CC_ONLY_CAR: ret.cruiseState.speed = cam_cp.vl["ASCMActiveCruiseControlStatus"]["ACCSpeedSetpoint"] * CV.KPH_TO_MS - if self.CP.carFingerprint not in SDGM_CAR: - ret.stockAeb = cam_cp.vl["AEBCmd"]["AEBCmdActive"] != 0 - else: - ret.stockAeb = False - # openpilot controls nonAdaptive when not pcmCruise + ##### CT6 TESTING + ##### if self.CP.carFingerprint not in SDGM_CAR: + ##### ret.stockAeb = cam_cp.vl["AEBCmd"]["AEBCmdActive"] != 0 + ##### else: + ##### ret.stockAeb = False + ##### openpilot controls nonAdaptive when not pcmCruise if self.CP.pcmCruise: ret.cruiseState.nonAdaptive = cam_cp.vl["ASCMActiveCruiseControlStatus"]["ACCCruiseState"] not in (2, 3) if self.CP.carFingerprint in CC_ONLY_CAR: @@ -302,11 +303,12 @@ class CarState(CarStateBase): if CP.enableBsm: messages.append(("BCMBlindSpotMonitor", 10)) - else: - messages += [ - ("AEBCmd", 10), - # ("ECMPRDNL2", 10), #10Hz # ONSTAR_GPS_TEST - ] + ##### CT6 TESTING + ##### else: + ##### messages += [ + ##### ("AEBCmd", 10), + ##### # ("ECMPRDNL2", 10), #10Hz # ONSTAR_GPS_TEST + ##### ] if CP.carFingerprint not in CC_ONLY_CAR: messages += [ ("ASCMActiveCruiseControlStatus", 25),