Bladeren bron

modify zhaji pro

zhangjia 3 jaren geleden
bovenliggende
commit
ad3050e592
1 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 4 4
      src/decition/decition_brain_sf/decition/decide_gps_00.cpp

+ 4 - 4
src/decition/decition_brain_sf/decition/decide_gps_00.cpp

@@ -3727,15 +3727,15 @@ void iv::decition::DecideGps00::transferGpsMode2( const std::vector<GPSData> gps
     if(  gpsMapLine[PathPoint]->mode2==3000){
     if(  gpsMapLine[PathPoint]->mode2==3000){
         if(obsDistance>7){       //7   zj-5
         if(obsDistance>7){       //7   zj-5
             obsDistance=200;
             obsDistance=200;
+        }else{
+            lock_flag=false;
         }
         }
-        if(realspeed>5){
+        if((realspeed>5)&&(lock_flag==false)){
             minDecelerate=-0.5;
             minDecelerate=-0.5;
         }else{
         }else{
         dSpeed=min(dSpeed,5.0);
         dSpeed=min(dSpeed,5.0);
+        lock_flag=true;
         }
         }
-//        givlog->debug("brain_decition","mode2: %d",
-//                      gpsMapLine[PathPoint]->mode2);
-
     }
     }
     else if(gpsMapLine[PathPoint]->mode2==3001){
     else if(gpsMapLine[PathPoint]->mode2==3001){
              obstacle_disable=1;
              obstacle_disable=1;