Merge branch 'kegman-unstable-merge' of https://github.com/jamezz-com…

…ma/openpilot into kegman-unstable-merge
jnlflr · Apr 5, 2019 · 022d863 · 022d863
2 parents 84d48de + e189c36
commit 022d863
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,6 +31,7 @@ selfdrive/proclogd/proclogd
 selfdrive/ui/ui
 selfdrive/test/tests/plant/out
 selfdrive/visiond/visiond
+selfdrive/locationd/kalman/loc_local.cpp
 /src/
 
 one
diff --git a/selfdrive/assets/img_spinner_comma.png b/selfdrive/assets/img_spinner_comma.png
diff --git a/selfdrive/assets/img_spinner_track.png b/selfdrive/assets/img_spinner_track.png
diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py
@@ -14,7 +14,7 @@
 except ImportError:
   CarController = None
 
-A_ACC_MAX = max(_A_CRUISE_MAX_V_FOLLOWING)
+A_ACC_MAX = min(_A_CRUISE_MAX_V_FOLLOWING)
 
 class CanBus(object):
   def __init__(self):
@@ -61,7 +61,7 @@ def calc_accel_override(a_ego, a_target, v_ego, v_target):
 
     # normalized max accel. Allowing max accel at low speed causes speed overshoots
     max_accel_bp = [10, 20]    # m/s
-    max_accel_v = [0.714, 1.0] # unit of max accel
+    max_accel_v = [0.85, 1.0] # unit of max accel
     max_accel = interp(v_ego, max_accel_bp, max_accel_v)
 
     # limit the pcm accel cmd if: