Jelajahi Sumber

print decition output change

chenxiaowei 2 tahun lalu
induk
melakukan
ba0158647e

+ 19 - 6
src/decition/decition_brain_sf_changan_shenlan/decition/brain.cpp

@@ -836,13 +836,26 @@ void iv::decition::BrainDecition::ShareDecition(iv::decition::Decition decition)
     xdecition.set_angle_mode(decition->angle_mode);
     xdecition.set_angle_active(decition->angle_active);
     xdecition.set_auto_mode(decition->auto_mode);
+    if(ServiceCarStatus.msysparam.mvehtype=="shenlan")
+    {
+        std::cout<<"===================shareDecition========================"<<std::endl;
+        std::cout<<"  torque_st:"<<ServiceCarStatus.torque_st
+                <<"  decideTorque:"<<decition->torque <<"  decideBrake:"<<decition->brake
+                <<"  decideAngActive:"<<decition->angle_active
+                <<"  decideAutoMode:"<<decition->auto_mode
+              <<std::endl;
+        std::cout<<"========================================="<<std::endl;
+    }
+    else
+    {
 
-    std::cout<<"===================shareDecition========================"<<std::endl;
-    std::cout<<"  torque_st:"<<ServiceCarStatus.torque_st
-            <<"  decideTorque:"<<decition->torque <<"  decideBrake:"<<decition->brake
-           <<"  decition mode:"<<decition->mode
-          <<std::endl;
-    std::cout<<"========================================="<<std::endl;
+        std::cout<<"===================shareDecition========================"<<std::endl;
+        std::cout<<"  torque_st:"<<ServiceCarStatus.torque_st
+                <<"  decideTorque:"<<decition->torque <<"  decideBrake:"<<decition->brake
+               <<"  decition mode:"<<decition->mode
+              <<std::endl;
+        std::cout<<"========================================="<<std::endl;
+    }
 
     static qint64 oldtime;
 

+ 4 - 2
src/decition/decition_brain_sf_changan_shenlan/decition/decition_type.h

@@ -55,9 +55,11 @@ struct DecitionBasic {
     bool acc_active;  //ACC扭矩请求激活(为1激活,为0不激活),不激活后不执行扭矩请求
     bool brake_active; //ACC减速激活(为1制动激活,为0制动不激活)
     bool brake_type;  //ADC请求类型(制动时为1,其余情况为0)
-    unsigned char angle_mode;  //横向控制激活模式
+//    unsigned char angle_mode;  //横向控制激活模式
+     int  angle_mode;  //横向控制激活模式
     bool angle_active; //横向控制激活,和上一条同时满足才执行横向请求角度
-    unsigned char auto_mode; //3为自动控制模式
+//    unsigned char auto_mode; //3为自动控制模式
+    int  auto_mode; //3为自动控制模式 ,否则打印输出有问题
 
 };
 typedef boost::shared_ptr<DecitionBasic> Decition;	//决策