|
@@ -2780,14 +2780,6 @@ else
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(ServiceCarStatus.msysparam.mvehtype=="shenlan")
|
|
|
- {
|
|
|
- if(dSpeed>20.0)
|
|
|
- {
|
|
|
- dSpeed=20.0; //shenlan bisai xiansu 10
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
if(ServiceCarStatus.msysparam.mvehtype=="hunter")
|
|
|
{
|
|
|
if(dSpeed>5.0)
|
|
@@ -2822,6 +2814,14 @@ else
|
|
|
dSpeed=min(dSpeed,ServiceCarStatus.iTrafficsignSpeed);
|
|
|
//20230814,交通标志识别添加 end
|
|
|
|
|
|
+ if(ServiceCarStatus.msysparam.mvehtype=="shenlan")//fangzhe juece zuihou,xianzhi sudu
|
|
|
+ {
|
|
|
+ if(dSpeed>20.0)
|
|
|
+ {
|
|
|
+ dSpeed=20.0; //shenlan bisai xiansu 10
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
phaseSpeedDecition(gps_decition, secSpeed, obsDistance, obsSpeed,now_gps_ins);
|
|
|
|
|
|
Point2D now_s_d=iv::decition::cartesian_to_frenet1D(gpsMapLine,now_gps_ins.gps_x,now_gps_ins.gps_y);
|