Merge remote-tracking branch 'upstream/master' into toyota-fuzzy-v2

2 years ago · 2214f0a808
parent a45836f18b 045ed8a91e
commit 2214f0a808
4 changed files with 3 additions and 2 deletions
--- a/selfdrive/boardd/tests/test_boardd
+++ b/selfdrive/boardd/tests/test_boardd
--- a/selfdrive/debug/cycle_alerts.py
+++ b/selfdrive/debug/cycle_alerts.py
@ -25,7 +25,8 @@ def cycle_alerts(duration=200, is_metric=False):
    (EventName.buttonCancel, ET.USER_DISABLE),
    (EventName.wrongGear, ET.NO_ENTRY),
-    (EventName.vehicleModelInvalid, ET.SOFT_DISABLE),
+    (EventName.locationdTemporaryError, ET.SOFT_DISABLE),
    (EventName.paramsdTemporaryError, ET.SOFT_DISABLE),
    (EventName.accFaulted, ET.IMMEDIATE_DISABLE),
    # DM sequence
--- a/tools/joystick/README.md
+++ b/tools/joystick/README.md
@ -61,4 +61,4 @@ Now start your car and openpilot should go into joystick mode with an alert on s
 Make sure the conditions are met in the panda to allow controls (e.g. cruise control engaged). You can also make a modification to the panda code to always allow controls.
-![](steer.gif)
+![](https://github.com/commaai/openpilot/assets/8762862/e640cbca-cb7a-4dcb-abce-b23b036ad8e7)
--- a/tools/joystick/steer.gif
+++ b/tools/joystick/steer.gif
`@ -61,4 +61,4 @@ Now start your car and openpilot should go into joystick mode with an alert on s`

	`Make sure the conditions are met in the panda to allow controls (e.g. cruise control engaged). You can also make a modification to the panda code to always allow controls.`	`Make sure the conditions are met in the panda to allow controls (e.g. cruise control engaged). You can also make a modification to the panda code to always allow controls.`

	`![](steer.gif)`	`![](https://github.com/commaai/openpilot/assets/8762862/e640cbca-cb7a-4dcb-abce-b23b036ad8e7)`