Browse Source

jiaotong biaozhi finish

Your Name 1 year ago
parent
commit
5d2218fa43

+ 1 - 1
src/decition/decition_brain_sf_changan_shenlan/decition/brain.cpp

@@ -1261,7 +1261,7 @@ void iv::decition::BrainDecition::UpdateTrafficSign(std::shared_ptr<iv::vision::
     int objectID=0;
     float objectCon=ServiceCarStatus.objectCon;  //W>30
     float objectW=ServiceCarStatus.objectWidth;  //W>0.85
-    for(int i =0;mvision_obs_->obj_size();i++)//{"Speed10","Speed5","Left","Right","Nopassing","Park"}共六类
+    for(int i =0;i<mvision_obs_->obj_size();i++)//{"Speed10","Speed5","Left","Right","Nopassing","Park"}共六类
     {
         if(mvision_obs_->obj(i).con()>=objectCon)
         {

+ 8 - 8
src/decition/decition_brain_sf_changan_shenlan/decition/decide_gps_00.cpp

@@ -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);