|
@@ -1382,10 +1382,10 @@ iv::decition::Decition iv::decition::DecideGps00::getDecideFromGPS(GPS_INS now_g
|
|
|
if((gpsMapLine[PathPoint]->speed)>0.001)
|
|
|
{
|
|
|
dSpeed = min((gpsMapLine[PathPoint]->speed*3.6),dSpeed);
|
|
|
- if((gpsMapLine[PathPoint]->speed)>4.5)
|
|
|
- {
|
|
|
- dSpeed =gpsMapLine[PathPoint]->speed*3.6;
|
|
|
- }
|
|
|
+// if((gpsMapLine[PathPoint]->speed)>4.5)
|
|
|
+// {
|
|
|
+// dSpeed =gpsMapLine[PathPoint]->speed*3.6;
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
|
|
@@ -3833,7 +3833,7 @@ void iv::decition::DecideGps00::transferGpsMode2( const std::vector<GPSData> gps
|
|
|
}else if(gpsMapLine[PathPoint]->mode2==3002){
|
|
|
obstacle_disable=0;
|
|
|
}else if(gpsMapLine[PathPoint]->mode2==4000){
|
|
|
- ServiceCarStatus.msysparam.vehWidth=5.6;
|
|
|
+ //ServiceCarStatus.msysparam.vehWidth=5.6;
|
|
|
}else if(cross==true){
|
|
|
speed_slowdown_flag=1;
|
|
|
lock_flag=false;
|