|
@@ -1755,7 +1755,7 @@ static int file_num;
|
|
|
// gps_decition->rightlamp = false;
|
|
|
// }
|
|
|
|
|
|
- dSpeed = min(6.0,dSpeed);
|
|
|
+ dSpeed = min(5.0,dSpeed);
|
|
|
if (turnLampFlag>0)
|
|
|
{
|
|
|
gps_decition->leftlamp = false;
|
|
@@ -1961,7 +1961,7 @@ static int file_num;
|
|
|
if (vehState == avoidObs || vehState==waitAvoid ) {
|
|
|
if (obsDistance <ServiceCarStatus.aocfDis && obsDistance >0)
|
|
|
{
|
|
|
- dSpeed = min(6.0,dSpeed);
|
|
|
+ dSpeed = min(5.0,dSpeed);
|
|
|
avoidTimes++;
|
|
|
// if (avoidTimes>=6)
|
|
|
if (avoidTimes>=ServiceCarStatus.aocfTimes)
|
|
@@ -2509,7 +2509,7 @@ static int file_num;
|
|
|
(ServiceCarStatus.mbUltraDis[3]>=0.0&&ServiceCarStatus.mbUltraDis[3]<1.0))
|
|
|
{
|
|
|
// minDecelerate=min(-0.5f,minDecelerate);
|
|
|
- dSpeed=min(dSpeed,5.0);
|
|
|
+ dSpeed=min(dSpeed,3.0);
|
|
|
std::cout<<" ====================================12================================"<<std::endl;
|
|
|
}
|
|
|
|
|
@@ -2886,12 +2886,12 @@ std::vector<iv::Point2D> iv::decition::DecideGps00::getGpsTrace(iv::GPS_INS now_
|
|
|
traceOriLeft.clear();
|
|
|
traceOriRight.clear();
|
|
|
|
|
|
- if (gpsMapLine.size() > 800 && PathPoint >= 0) {
|
|
|
+ if (gpsMapLine.size() > 700 && PathPoint >= 0) {
|
|
|
int aimIndex;
|
|
|
if(circleMode){
|
|
|
- aimIndex=PathPoint+800;
|
|
|
+ aimIndex=PathPoint+700;
|
|
|
}else{
|
|
|
- aimIndex=min((PathPoint+800),(int)gpsMapLine.size());
|
|
|
+ aimIndex=min((PathPoint+700),(int)gpsMapLine.size());
|
|
|
}
|
|
|
|
|
|
for (int i = PathPoint; i < aimIndex; i++)
|