瀏覽代碼

fix(grpc_BS):fix default ctrlmode from emergencyStop to auto.

fujiankuan 3 年之前
父節點
當前提交
b25c2fd21a

+ 2 - 2
src/driver/driver_cloud_grpc_client_BS/vehicle_control.cpp

@@ -207,7 +207,7 @@ void VehicleControlClient::run()
         if(abs(xTime.elapsed() - lastTime)>=interval)
         {
             std::string reply = vehicleControl();
-            std::cout<< reply <<std::endl;
+//            std::cout<< reply <<std::endl;
             updateControlData();
             lastTime = xTime.elapsed();
         }
@@ -378,7 +378,7 @@ void VehicleUploadMapClient::run()
             if(isNeedMap == false)
             {
                 std::string reply = uploadMap();
-                std::cout<< reply <<std::endl;
+//                std::cout<< reply <<std::endl;
                 if(isNeedMap == true)
                 {
                     updateMapPOIData();

+ 1 - 1
src/driver/driver_cloud_grpc_client_BS/vehicle_control.h

@@ -72,7 +72,7 @@ private:
     double throttleCMD = 0;
     double brakeCMD = 0;
 
-    org::jeecg::defsControl::grpc::CtrlMode modeCMD = org::jeecg::defsControl::grpc::CtrlMode::CMD_EMERGENCY_STOP; ///< update by slot function
+    org::jeecg::defsControl::grpc::CtrlMode modeCMD = org::jeecg::defsControl::grpc::CtrlMode::CMD_AUTO; ///< update by slot function
 
 public slots:
     void ctrlMode_Changed_Slot(org::jeecg::defsControl::grpc::CtrlMode ctrlMode);

+ 1 - 1
src/driver/driver_cloud_grpc_client_BS/vehicle_upload.cpp

@@ -642,7 +642,7 @@ void DataExchangeClient::run()
     {
         if(abs(xTime.elapsed() - lastTime)>=interval)
         {
-            int realInterval = abs(xTime.elapsed() - realLastTime);
+            uint64_t realInterval = abs(xTime.elapsed() - realLastTime);
             realLastTime = xTime.elapsed();
             updateData(realInterval);
             std::string reply = uploadVehicleInfo();