From 67c8dc043c5ee39b1d0765e1499934d9f098eef0 Mon Sep 17 00:00:00 2001 From: Shea_D Date: Wed, 28 Feb 2024 19:07:06 -0600 Subject: [PATCH] Ford - Add OBDC Cable Length to CarPartList (#31608) * Update comma cable requirement for Ford CANFD * Adding Long_Cable to part list * Moving cable info into doc_definitions under CarHarness * Updating parts for ford_q4 * Updating Q3 info * Updated MachE with USBC coupler * fix typo * updating docs/cars.md * Add 3X angled no cable * Adding in nocable device package * Add missing ) Co-authored-by: Cameron Clough * Generating new Docs.MD * Added threex_nocable for MachE * Swap MachE to regular mount no cable * confirmed with Comma Operations all boxes include 1.5ft cable regardless of 9.5ft selection * Updating CarInfo * Update USB_Coupler for Q4 Harness * Remove cable from import * removed ] * Disagree with the inconsistency but OK Co-authored-by: Shane Smiskol * Update selfdrive/car/ford/values.py --------- Co-authored-by: sheaduncan Co-authored-by: Cameron Clough Co-authored-by: Shane Smiskol old-commit-hash: 4cec88c02902ff15eafbb497e779c5ca2dc13d8b --- selfdrive/car/docs_definitions.py | 3 ++- selfdrive/car/ford/values.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/selfdrive/car/docs_definitions.py b/selfdrive/car/docs_definitions.py index 841cc3af2f..1adf78b1c8 100644 --- a/selfdrive/car/docs_definitions.py +++ b/selfdrive/car/docs_definitions.py @@ -118,7 +118,8 @@ class CarHarness(EnumBase): nissan_b = BaseCarHarness("Nissan B connector", parts=[Accessory.harness_box, Cable.rj45_cable_7ft, Cable.long_obdc_cable, Cable.usbc_coupler]) mazda = BaseCarHarness("Mazda connector") ford_q3 = BaseCarHarness("Ford Q3 connector") - ford_q4 = BaseCarHarness("Ford Q4 connector") + ford_q4 = BaseCarHarness("Ford Q4 connector", parts=[Accessory.harness_box, Accessory.comma_power_v2, Cable.rj45_cable_7ft, Cable.long_obdc_cable, + Cable.usbc_coupler]) class Device(EnumBase): diff --git a/selfdrive/car/ford/values.py b/selfdrive/car/ford/values.py index 1008d68b98..f969d395d2 100644 --- a/selfdrive/car/ford/values.py +++ b/selfdrive/car/ford/values.py @@ -58,7 +58,7 @@ class FordCarInfo(CarInfo): def init_make(self, CP: car.CarParams): harness = CarHarness.ford_q4 if CP.carFingerprint in CANFD_CAR else CarHarness.ford_q3 - if CP.carFingerprint in (CAR.BRONCO_SPORT_MK1, CAR.MAVERICK_MK1, CAR.F_150_MK14): + if CP.carFingerprint in (CAR.BRONCO_SPORT_MK1, CAR.MAVERICK_MK1, CAR.F_150_MK14, CAR.F_150_LIGHTNING_MK1): self.car_parts = CarParts([Device.threex_angled_mount, harness]) else: self.car_parts = CarParts([Device.threex, harness])