|
@@ -1582,14 +1582,14 @@ static int file_num;
|
|
|
|
|
|
}
|
|
|
#ifdef AVOID_NEW
|
|
|
- if((vehState==avoiding)||(vehState==preAvoid))
|
|
|
- {
|
|
|
- //dSpeed = min(8.0,dSpeed);
|
|
|
- dSpeed = min(4.0,dSpeed);
|
|
|
- }else if((vehState==backOri)||(avoidXNew!=0)){
|
|
|
- //dSpeed = min(12.0,dSpeed);
|
|
|
- dSpeed = min(5.0,dSpeed);
|
|
|
- }
|
|
|
+// if((vehState==avoiding)||(vehState==preAvoid))
|
|
|
+// {
|
|
|
+// //dSpeed = min(8.0,dSpeed);
|
|
|
+// dSpeed = min(5.0,dSpeed);
|
|
|
+// }else if((vehState==backOri)||(avoidXNew!=0)){
|
|
|
+// //dSpeed = min(12.0,dSpeed);
|
|
|
+// dSpeed = min(5.0,dSpeed);
|
|
|
+// }
|
|
|
#else
|
|
|
if((vehState==avoiding)||(vehState==backOri)||(roadNow != roadOri)||(vehState==preAvoid))
|
|
|
{
|
|
@@ -1963,7 +1963,7 @@ static int file_num;
|
|
|
if (vehState == avoidObs || vehState==waitAvoid ) {
|
|
|
if (obsDistance <ServiceCarStatus.aocfDis && obsDistance >0)
|
|
|
{
|
|
|
- dSpeed = min(4.0,dSpeed);
|
|
|
+// dSpeed = min(4.0,dSpeed);
|
|
|
avoidTimes++;
|
|
|
// if (avoidTimes>=6)
|
|
|
if (avoidTimes>=ServiceCarStatus.aocfTimes)
|