longitudinal personality: display in Toyota instrument cluster

selfdrive/car/toyota/carcontroller.py

@@ -141,9 +141,9 @@ def update(self, CC, CS, now_nanos):
       lead = hud_control.leadVisible or CS.out.vEgo < 12.  # at low speed we always assume the lead is present so ACC can be engaged
 
       # Press distance button until we are at the correct bar length. Only change while enabled to avoid skipping startup popup
-      if self.frame % 6 == 0:
-        if CS.pcm_follow_distance_values.get(CS.pcm_follow_distance, "UNKNOWN") != "FAR" and CS.out.cruiseState.enabled and \
-          self.CP.carFingerprint not in UNSUPPORTED_DSU_CAR:
+      if self.frame % 6 == 0 and self.CP.openpilotLongitudinalControl:
+        desired_distance = 4 - hud_control.leadDistanceBars
+        if CS.out.cruiseState.enabled and CS.pcm_follow_distance != desired_distance:
           self.distance_button = not self.distance_button
         else:
           self.distance_button = 0

selfdrive/car/toyota/carstate.py

@@ -44,7 +44,6 @@ def __init__(self, CP):
     self.distance_button = 0
 
     self.pcm_follow_distance = 0
-    self.pcm_follow_distance_values = can_define.dv['PCM_CRUISE_2']['PCM_FOLLOW_DISTANCE']
 
     self.low_speed_lockout = False
     self.acc_type = 1

selfdrive/controls/controlsd.py

@@ -680,6 +680,7 @@ def publish_logs(self, CS, start_time, CC, lac_log):
     hudControl.speedVisible = self.enabled
     hudControl.lanesVisible = self.enabled
     hudControl.leadVisible = self.sm['longitudinalPlan'].hasLead
+    hudControl.leadDistanceBars = self.sm['longitudinalPlan'].personality.raw + 1
 
     hudControl.rightLaneVisible = True
     hudControl.leftLaneVisible = True

selfdrive/test/process_replay/ref_commit

@@ -1 +1 @@
-d53d44c21a89d7925d5ad16938e14794907f28b1
+653f68e6be4689dc9dce1a93cb726d37b9c588d3