From d6590aa6763a8d6bedbe1e24f6a90177892ee362 Mon Sep 17 00:00:00 2001 From: Jason Young Date: Sun, 6 Feb 2022 12:18:17 -0500 Subject: [PATCH] remove ACC_13 with matching panda bump --- panda | 2 +- selfdrive/car/volkswagen/carcontroller.py | 2 -- selfdrive/car/volkswagen/carstate.py | 4 ---- selfdrive/car/volkswagen/volkswagencan.py | 10 ---------- 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/panda b/panda index b4558221d..03769d49f 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit b4558221dfdef7298e3bbc441b29e1128f774179 +Subproject commit 03769d49f7efa75f1ed1fd55cd44ccf7f0f2f6da diff --git a/selfdrive/car/volkswagen/carcontroller.py b/selfdrive/car/volkswagen/carcontroller.py index b4fe01cd4..59fd31d78 100644 --- a/selfdrive/car/volkswagen/carcontroller.py +++ b/selfdrive/car/volkswagen/carcontroller.py @@ -82,8 +82,6 @@ class CarController(): idx)) can_sends.append(volkswagencan.create_mqb_acc_04_control(self.packer_pt, CANBUS.pt, CS.acc_04_stock_values, idx)) - can_sends.append(volkswagencan.create_mqb_acc_13_control(self.packer_pt, CANBUS.pt, enabled, - CS.acc_13_stock_values)) # **** Steering Controls ************************************************ # diff --git a/selfdrive/car/volkswagen/carstate.py b/selfdrive/car/volkswagen/carstate.py index 898ab194e..b31015750 100644 --- a/selfdrive/car/volkswagen/carstate.py +++ b/selfdrive/car/volkswagen/carstate.py @@ -98,7 +98,6 @@ class CarState(CarStateBase): # Update ACC radar status. self.acc_04_stock_values = ext_cp.vl["ACC_04"] - self.acc_13_stock_values = ext_cp.vl["ACC_13"] self.acc_type = ext_cp.vl["ACC_06"]["ACC_Typ"] self.tsk_status = pt_cp.vl["TSK_06"]["TSK_Status"] if self.tsk_status == 2: @@ -274,15 +273,12 @@ class MqbExtraSignals: ("AWV2_Freigabe", "ACC_10"), # FCW brake jerk release ("ANB_Teilbremsung_Freigabe", "ACC_10"), # AEB partial braking release ("ANB_Zielbremsung_Freigabe", "ACC_10"), # AEB target braking release - ("Unknown_Osc_1", "ACC_13"), # Unknown oscillating value (checksum/xor?) - ("Unknown_Osc_2", "ACC_13"), # Unknown oscillating value (checksum/xor?) ] fwd_radar_checks = [ ("ACC_06", 50), # From J428 ACC radar control module ("ACC_10", 50), # From J428 ACC radar control module ("ACC_02", 17), # From J428 ACC radar control module ("ACC_04", 17), # From J428 ACC radar control module - ("ACC_13", 17), # From J428 ACC radar control module ] bsm_radar_signals = [ ("SWA_Infostufe_SWA_li", "SWA_01"), # Blind spot object info, left diff --git a/selfdrive/car/volkswagen/volkswagencan.py b/selfdrive/car/volkswagen/volkswagencan.py index 2062d03e5..ea7847488 100644 --- a/selfdrive/car/volkswagen/volkswagencan.py +++ b/selfdrive/car/volkswagen/volkswagencan.py @@ -98,13 +98,3 @@ def create_mqb_acc_07_control(packer, bus, enabled, accel, acc_hold_request, acc } return packer.make_can_msg("ACC_07", bus, values, idx) - -def create_mqb_acc_13_control(packer, bus, enabled, acc_13_stock_values): - values = acc_13_stock_values.copy() - - values.update({ - "Unknown_Status": 15, - "ACC_Engaged": enabled, - }) - - return packer.make_can_msg("ACC_13", bus, values)