From 1a1ab96c21e019e1f8544323a3c637ef3c5e4692 Mon Sep 17 00:00:00 2001 From: actuallylemoncurd Date: Fri, 30 Aug 2024 19:51:27 -0400 Subject: [PATCH] VWPQ SP: golf varient haxs --- opendbc_repo | 2 +- selfdrive/car/volkswagen/interface.py | 7 ++----- selfdrive/car/volkswagen/pqcan.py | 2 +- selfdrive/car/volkswagen/values.py | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/opendbc_repo b/opendbc_repo index 529474a50e235d..652a3bc98045a2 160000 --- a/opendbc_repo +++ b/opendbc_repo @@ -1 +1 @@ -Subproject commit 529474a50e235db51085d8255b24092009107ccb +Subproject commit 652a3bc98045a2bc7bffea15e071ebf5d81e108a diff --git a/selfdrive/car/volkswagen/interface.py b/selfdrive/car/volkswagen/interface.py index 42b4e966021609..0552e430b8a84a 100644 --- a/selfdrive/car/volkswagen/interface.py +++ b/selfdrive/car/volkswagen/interface.py @@ -36,10 +36,7 @@ def _get_params(ret, candidate: CAR, fingerprint, car_fw, experimental_long, doc else: ret.transmissionType = TransmissionType.manual - if any(msg in fingerprint[1] for msg in (0x1A0, 0xC2)): # Bremse_1, Lenkwinkel_1 - ret.networkLocation = NetworkLocation.gateway - else: - ret.networkLocation = NetworkLocation.fwdCamera + ret.networkLocation = NetworkLocation.gateway # The PQ port is in dashcam-only mode due to a fixed six-minute maximum timer on HCA steering. An unsupported # EPS flash update to work around this timer, and enable steering down to zero, is available from: @@ -47,7 +44,7 @@ def _get_params(ret, candidate: CAR, fingerprint, car_fw, experimental_long, doc # It is documented in a four-part blog series: # https://blog.willemmelching.nl/carhacking/2022/01/02/vw-part1/ # Panda ALLOW_DEBUG firmware required. - ret.dashcamOnly = True + #ret.dashcamOnly = True else: # Set global MQB parameters diff --git a/selfdrive/car/volkswagen/pqcan.py b/selfdrive/car/volkswagen/pqcan.py index 14c49db7c55594..52f22745473bf9 100644 --- a/selfdrive/car/volkswagen/pqcan.py +++ b/selfdrive/car/volkswagen/pqcan.py @@ -2,7 +2,7 @@ def create_steering_control(packer, bus, apply_steer, lkas_enabled): values = { "LM_Offset": abs(apply_steer), "LM_OffSign": 1 if apply_steer < 0 else 0, - "HCA_Status": 5 if (lkas_enabled and apply_steer != 0) else 3, + "HCA_Status": 7 if (lkas_enabled and apply_steer != 0) else 3, "Vib_Freq": 16, } diff --git a/selfdrive/car/volkswagen/values.py b/selfdrive/car/volkswagen/values.py index c29798ca3cd886..76a71ebe702335 100644 --- a/selfdrive/car/volkswagen/values.py +++ b/selfdrive/car/volkswagen/values.py @@ -278,7 +278,7 @@ class CAR(Platforms): ) VOLKSWAGEN_JETTA_MK6 = VolkswagenPQPlatformConfig( [VWCarDocs("Volkswagen Jetta 2015-2018")], - VolkswagenCarSpecs(mass=1518, wheelbase=2.65, minSteerSpeed=50 * CV.KPH_TO_MS, minEnableSpeed=20 * CV.KPH_TO_MS), + VolkswagenCarSpecs(mass=1518, wheelbase=2.62), chassis_codes={"5K", "AJ"}, wmis={WMI.VOLKSWAGEN_MEXICO_CAR}, )