Jason Wen 31c56ca708 Merge branch 'master' into dev-priv/master ...

# Conflicts:
#	panda
#	selfdrive/car/hyundai/carstate.py
#	selfdrive/car/hyundai/hyundaican.py
#	selfdrive/controls/controlsd.py
#	selfdrive/manager/custom_dep.py

2023-09-23 00:06:34 -04:00

..

lateral_mpc_lib

mpc_lib: fix dependencies (#29621)

2023-08-25 16:51:57 -07:00

longitudinal_mpc_lib

Gap Adjust Cruise: Merge with Driving Personality (#263)

2023-09-14 03:15:43 -04:00

tests

add missing openpilot prefix to imports

2023-08-24 15:46:56 +01:00

__init__.py

selfdrive/controls

2020-01-17 12:48:30 -08:00

alertmanager.py

add openpilot prefix to imports (#29498)

2023-08-20 20:49:55 -07:00

alerts_offroad.json

thermald: show temp value in offroad alert (#28664)

2023-06-23 17:12:01 -07:00

desire_helper.py

Merge branch 'master' into dev-priv/master-test

2023-09-05 20:17:19 -04:00

drive_helpers.py

Merge branch 'master' into dev-priv/master-test

2023-09-05 20:17:19 -04:00

events.py

Merge branch 'master' into dev-priv/master

2023-09-23 00:06:34 -04:00

lane_planner.py

fix upstream conflict

2023-06-22 20:43:01 -04:00

latcontrol_angle.py

add openpilot prefix to imports (#29498)

2023-08-20 20:49:55 -07:00

latcontrol_pid.py

add openpilot prefix to imports (#29498)

2023-08-20 20:49:55 -07:00

latcontrol_torque.py

Merge branch 'master' into dev-priv/master-test

2023-09-05 20:17:19 -04:00

latcontrol.py

add openpilot prefix to imports (#29498)

2023-08-20 20:49:55 -07:00

lateral_planner.py

Merge branch 'master' into dev-priv/master-test

2023-09-05 20:17:19 -04:00

longcontrol.py

add openpilot prefix to imports (#29498)

2023-08-20 20:49:55 -07:00

longitudinal_planner.py

Gap Adjust Cruise: Merge with Driving Personality (#263)

2023-09-14 03:15:43 -04:00

pid.py

add openpilot prefix to imports (#29498)

2023-08-20 20:49:55 -07:00

speed_limit_controller.py

Upstream merge fixes

2023-09-06 01:05:01 -04:00

turn_speed_controller.py

Upstream merge fixes

2023-09-06 01:05:01 -04:00

vehicle_model.py

Revert "Ram HD: locked Steering Ratio (#156)" (#161)

2023-06-15 11:20:18 -04:00

vision_turn_controller.py

Upstream merge fixes

2023-09-06 01:05:01 -04:00