Merge pull request commaai#136 from arne182/0512

0512
rav4kumar · May 27, 2019 · 4c18ae3 · 4c18ae3
2 parents e5f91ba + 6c361a5
commit 4c18ae3
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 1 deletion.
diff --git a/openpilot b/openpilot
@@ -0,0 +1 @@
+/data/openpilot
diff --git a/selfdrive/controls/lib/long_mpc.py b/selfdrive/controls/lib/long_mpc.py
@@ -85,7 +85,7 @@ def get_TR(self):
       return 2.7  # 30m at 40km/hr
 
   def update(self, CS, lead, v_cruise_setpoint):
-    self.car_state = CS
+    self.car_state = CS.carState
     self.v_ego = CS.carState.vEgo
 
     # Setup current mpc state

diff --git a/selfdrive/controls/lib/longitudinal_mpc/lib_mpc_export/acado_solver.o b/selfdrive/controls/lib/longitudinal_mpc/lib_mpc_export/acado_solver.o
diff --git a/selfdrive/controls/lib/longitudinal_mpc/libmpc1.so b/selfdrive/controls/lib/longitudinal_mpc/libmpc1.so
diff --git a/selfdrive/controls/lib/longitudinal_mpc/longitudinal_mpc.o b/selfdrive/controls/lib/longitudinal_mpc/longitudinal_mpc.o