Merge branch 'refs/heads/master-priv' into improved-model-cabapilities-check

# Conflicts:
#	selfdrive/modeld/modeld.py
This commit is contained in:
DevTekVE
2024-05-19 21:32:20 +02:00
+1 -1
View File
@@ -161,7 +161,7 @@ void MapWindow::updateState(const UIState &s) {
const SubMaster &sm = *(s.sm);
update();
if (sm.updated("modelV2") && uiState()->scene.custom_driving_model && uiState()->scene.driving_model_gen != 4) {
if (sm.updated("modelV2") && uiState()->scene.custom_driving_model && uiState()->scene.driving_model_gen != 4 && uiState()->scene.driving_model_gen != 0) {
// set path color on change, and show map on rising edge of navigate on openpilot
auto car_control = sm["carControl"].getCarControl();
bool nav_enabled = sm["modelV2"].getModelV2().getNavEnabledDEPRECATED() &&