diff --git a/selfdrive/car/gm/carstate.py b/selfdrive/car/gm/carstate.py index b89ab3155c..44bf1b7236 100644 --- a/selfdrive/car/gm/carstate.py +++ b/selfdrive/car/gm/carstate.py @@ -114,8 +114,8 @@ class CarState(CarStateBase): ret.cruiseState.nonAdaptive = cam_cp.vl["ASCMActiveCruiseControlStatus"]["ACCCruiseState"] not in (2, 3) if self.CP.enableBsm: - ret.leftBlindspot = pt_cp.vl["BCMBSM"]["Left_BSM"] == 1 - ret.rightBlindspot = pt_cp.vl["BCMBSM"]["Right_BSM"] == 1 + ret.leftBlindspot = pt_cp.vl["BCMBlindSpotMonitors"]["LeftBSM"] == 1 + ret.rightBlindspot = pt_cp.vl["BCMBlindSpotMonitors"]["RightBSM"] == 1 return ret @@ -151,7 +151,7 @@ class CarState(CarStateBase): ] if CP.enableBsm: - messages.append(("BCMBSM", 10)) + messages.append(("BCMBlindSpotMonitors", 10)) # Used to read back last counter sent to PT by camera if CP.networkLocation == NetworkLocation.fwdCamera: diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py index 3a22a4f545..a0e93c4a5b 100755 --- a/selfdrive/car/gm/interface.py +++ b/selfdrive/car/gm/interface.py @@ -18,7 +18,6 @@ NetworkLocation = car.CarParams.NetworkLocation BUTTONS_DICT = {CruiseButtons.RES_ACCEL: ButtonType.accelCruise, CruiseButtons.DECEL_SET: ButtonType.decelCruise, CruiseButtons.MAIN: ButtonType.altButton3, CruiseButtons.CANCEL: ButtonType.cancel} -BSM_MSG = 0x142 NON_LINEAR_TORQUE_PARAMS = { CAR.BOLT_EUV: [2.6531724862969748, 1.0, 0.1919764879840985, 0.009054123646805178],