Merge pull request commaai#83 from BogGyver/bugfix/merge-fix

0.6.3 PCC merge fix
SippieCup · Aug 15, 2019 · d5a5499 · d5a5499
2 parents d0d9e36 + 241dd8b
commit d5a5499
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/selfdrive/car/tesla/PCC_module.py b/selfdrive/car/tesla/PCC_module.py
@@ -615,7 +615,6 @@ def _safe_distance_m(v_ego_ms, CS):
   return max(CS.apFollowTimeInS * (v_ego_ms+1), MIN_SAFE_DIST_M)
 
 def _max_safe_speed_kph(lead,CS):
-  return 150.
   if _is_present(lead):
     return (CS.v_ego + lead.vRel + (lead.dRel - _safe_distance_m(CS.v_ego,CS))/CS.apFollowTimeInS) * CV.MS_TO_KPH
   else: