yuchuli 4 жил өмнө
parent
commit
ff84745d8c

+ 5 - 0
src/controller/controller_vv7/main.cpp

@@ -108,7 +108,12 @@ void ListenRemotectrl(const char * strdata,const unsigned int nSize,const unsign
     else
     {
         gbAutoDriving = false;
+
         xdecition.set_accelerator(xrc.acc()*0.01);
+        if(xrc.brake()>0)
+        {
+            xdecition.set_accelerator(xrc.brake()*(-0.05));
+        }
         xdecition.set_brake(xrc.brake());
         xdecition.set_wheelangle(xrc.wheel()*5.5f);
         xdecition.set_gear(1);

+ 1 - 1
src/decition/decition_brain/decition/adc_controller/pid_controller.cpp

@@ -64,7 +64,7 @@ float iv::decition::PIDController::getPidAngle(float realSpeed, std::vector<Poin
 
     double PreviewDistance;//预瞄距离
 
-    if(ServiceCarStatus.msysparam.mvehtype=="ge3"){
+    if(ServiceCarStatus.msysparam.mvehtype=="ge3" || ServiceCarStatus.msysparam.mvehtype=="vv7"){
         realSpeed > 40 ? PreviewDistance = max(6.0, realSpeed *0.6) : PreviewDistance = max(4.0, realSpeed *0.3);
     }else if(ServiceCarStatus.msysparam.mvehtype=="hapo"){
         if(turning){

+ 1 - 1
src/decition/decition_brain_sf/decition/adc_controller/pid_controller.cpp

@@ -68,7 +68,7 @@ float iv::decition::PIDController::getPidAngle(float realSpeed, std::vector<Poin
 
     double PreviewDistance;//预瞄距离
 
-    if(ServiceCarStatus.msysparam.mvehtype=="ge3"){
+    if(ServiceCarStatus.msysparam.mvehtype=="ge3" || ServiceCarStatus.msysparam.mvehtype=="vv7"){
         realSpeed > 40 ? PreviewDistance = max(6.0, realSpeed *0.6) : PreviewDistance = max(4.0, realSpeed *0.3);
     }else{
         realSpeed > 40 ? PreviewDistance = max(6.0, realSpeed *0.6) : PreviewDistance = max(6.0, realSpeed *0.5);