Merge remote-tracking branch 'refs/remotes/openpilot/master' into small-sync

# Conflicts:
#	cereal
#	opendbc
#	panda
#	selfdrive/car/__init__.py
#	selfdrive/monitoring/dmonitoringd.py
This commit is contained in:
Miguel Fernandez
2024-05-09 15:13:00 +02:00
88 changed files with 1032 additions and 1551 deletions
-1
View File
@@ -172,7 +172,6 @@ std::unordered_map<std::string, uint32_t> keys = {
{"Offroad_CarUnrecognized", CLEAR_ON_MANAGER_START | CLEAR_ON_ONROAD_TRANSITION},
{"Offroad_ConnectivityNeeded", CLEAR_ON_MANAGER_START},
{"Offroad_ConnectivityNeededPrompt", CLEAR_ON_MANAGER_START},
{"Offroad_InvalidTime", CLEAR_ON_MANAGER_START},
{"Offroad_IsTakingSnapshot", CLEAR_ON_MANAGER_START},
{"Offroad_NeosUpdate", CLEAR_ON_MANAGER_START},
{"Offroad_NoFirmware", CLEAR_ON_MANAGER_START | CLEAR_ON_ONROAD_TRANSITION},