Browse Source

Merge branch 'master' of http://10.16.0.29:3000/ADPilot/modularization

yuchuli 2 years ago
parent
commit
0af562f23b

+ 3 - 2
src/decition/decition_brain_sf_changan_shenlan/decition/decide_gps_00.cpp

@@ -2207,7 +2207,8 @@ if((traffic_type==0x01)||(traffic_type==0x02)||(traffic_type==0x03)||(traffic_ty
     {
        if((distance_to_center>=radiation_distance)&&(distance_to_center<=radiation_distance+10))
        {
-          dSpeed = min(1.0,realspeed-0.2);
+          //dSpeed = min(1.0,realspeed-0.2);
+          dSpeed = max(1.0,realspeed-2);  //乘用车不同于底盘,速度是不稳定的,如果取最小一会就减成0了
           ServiceCarStatus.vehicle_state_1x = 1;
           ServiceCarStatus.target_spd_1x = 1.0;
        }
@@ -2380,7 +2381,7 @@ else
     {
         if(dSpeed>10.0)
         {
-            dSpeed=10.0;
+            dSpeed=10.0;   //shenlan bisai xiansu 10
         }
     }