zhudongjer/carrot
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix navInstruction...

Browse Source
This commit is contained in:
ajouatom 2025-02-24 10:50:20 +09:00
parent daee80b504
commit 136ef70b3b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
selfdrive/ui/carrot.cc
View File

@ -1117,11 +1117,15 @@ public:
return; return;
} }
const auto carrot_man = sm["carrotMan"].getCarrotMan(); const auto carrot_man = sm["carrotMan"].getCarrotMan();
const auto nav_inst = sm["navInstruction"].getNavInstruction(); float maneuverDistance = 0;
//const auto car_state = sm["carState"].getCarState(); if (sm.alive("navInstruction")) {
const auto nav_inst = sm["navInstruction"].getNavInstruction();
maneuverDistance = nav_inst.getManeuverDistance();
}
active_carrot = carrot_man.getActiveCarrot(); active_carrot = carrot_man.getActiveCarrot();
//printf("active_carrot: %d\n", active_carrot); //printf("active_carrot: %d\n", active_carrot);
if (active_carrot <= 1 || (carrot_man.getNGoPosDist() <= 0 && nav_inst.getManeuverDistance() > 0)) active_navi_inst = true; if (active_carrot <= 1 || (carrot_man.getNGoPosDist() <= 0 && maneuverDistance > 0)) active_navi_inst = true;
else active_navi_inst = false; else active_navi_inst = false;
if (active_carrot > 1) { if (active_carrot > 1) {
@ -1147,6 +1151,7 @@ public:
szTBTMainText = QString::fromStdString(carrot_man.getSzTBTMainText()); szTBTMainText = QString::fromStdString(carrot_man.getSzTBTMainText());
} else if(sm.alive("navInstruction") && sm.valid("navInstruction")) { } else if(sm.alive("navInstruction") && sm.valid("navInstruction")) {
const auto nav_inst = sm["navInstruction"].getNavInstruction();
xTurnInfo = 0; xTurnInfo = 0;
xDistToTurn = nav_inst.getManeuverDistance(); xDistToTurn = nav_inst.getManeuverDistance();
nRoadLimitSpeed = nav_inst.getSpeedLimit(); nRoadLimitSpeed = nav_inst.getSpeedLimit();