From 8e3b18c3a01a261243b710cf4fb6df2ca3456dd8 Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Tue, 2 Jul 2024 22:22:56 -0700
Subject: [PATCH] Ford: use more reliable gear message (#32886)

* todo

* nope

* not this one

* yep

* passes

* clean up

* not used!

* oop

* update refs
old-commit-hash: 7de2aac3c93caa20213894e574f06bd45f789335
---
 selfdrive/car/ford/carstate.py           | 6 +++---
 selfdrive/test/process_replay/ref_commit | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/selfdrive/car/ford/carstate.py b/selfdrive/car/ford/carstate.py
index 78f48ec5c4..d7130681d4 100644
--- a/selfdrive/car/ford/carstate.py
+++ b/selfdrive/car/ford/carstate.py
@@ -15,7 +15,7 @@ class CarState(CarStateBase):
     super().__init__(CP)
     can_define = CANDefine(DBC[CP.carFingerprint]["pt"])
     if CP.transmissionType == TransmissionType.automatic:
-      self.shifter_values = can_define.dv["Gear_Shift_by_Wire_FD1"]["TrnRng_D_RqGsm"]
+      self.shifter_values = can_define.dv["PowertrainData_10"]["TrnRng_D_Rq"]
 
     self.vehicle_sensors_valid = False
 
@@ -69,7 +69,7 @@ class CarState(CarStateBase):
 
     # gear
     if self.CP.transmissionType == TransmissionType.automatic:
-      gear = self.shifter_values.get(cp.vl["Gear_Shift_by_Wire_FD1"]["TrnRng_D_RqGsm"])
+      gear = self.shifter_values.get(cp.vl["PowertrainData_10"]["TrnRng_D_Rq"])
       ret.gearShifter = self.parse_gear_shifter(gear)
     elif self.CP.transmissionType == TransmissionType.manual:
       ret.clutchPressed = cp.vl["Engine_Clutch_Data"]["CluPdlPos_Pc_Meas"] > 0
@@ -139,7 +139,7 @@ class CarState(CarStateBase):
 
     if CP.transmissionType == TransmissionType.automatic:
       messages += [
-        ("Gear_Shift_by_Wire_FD1", 10),
+        ("PowertrainData_10", 10),
       ]
     elif CP.transmissionType == TransmissionType.manual:
       messages += [
diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit
index 96161a42de..1635012f3e 100644
--- a/selfdrive/test/process_replay/ref_commit
+++ b/selfdrive/test/process_replay/ref_commit
@@ -1 +1 @@
-8737e368e17f859291164286feb4246e00c0b4a5
+f6ff3601bd0496e78d8bc3b019d58bb7739f096b
\ No newline at end of file