فهرست منبع

fix(grpc_BS):fix signal-slot error in main func

孙嘉城 3 سال پیش
والد
کامیت
3ac0ee79b3

+ 0 - 1
src/driver/driver_cloud_grpc_client_BS/main.cpp

@@ -208,7 +208,6 @@ int main(int argc, char *argv[])
     VehicleControlClient *vehiclecontrol = new VehicleControlClient(grpc::CreateChannel(control_str, grpc::InsecureChannelCredentials()));
     qRegisterMetaType<org::jeecg::defsControl::grpc::CtrlMode>("org::jeecg::defsControl::grpc::CtrlMode"); ///< to solve the problem of signal and slot being in different threads
     QObject::connect(vehiclechangectrlmode,&VehicleChangeCtrlModeClient::ctrlMode_Changed,vehiclecontrol,&VehicleControlClient::ctrlMode_Changed_Slot);
-//    QObject::connect(vehiclechangectrlmode,&VehicleChangeCtrlModeClient::ctrlMode_Changed,vehicleuploaddata,&DataExchangeClient::ctrlMode_Changed_Slot);
     vehiclechangectrlmode->start();
     vehiclecontrol->start();
 

+ 11 - 0
src/driver/driver_cloud_grpc_client_BS/vehicle_control.cpp

@@ -107,6 +107,10 @@ void VehicleControlClient::updateControlData(void)
     std::cout<<"throttle:"<<throttleCMD<<std::endl;
     std::cout<<"brake:"<<brakeCMD<<std::endl;
 #endif
+    std::cout<<"\n"<<"shift:"<<shiftCMD<<std::endl;
+    std::cout<<"steeringWheelAngle:"<<steeringWheelAngleCMD<<std::endl;
+    std::cout<<"throttle:"<<throttleCMD<<std::endl;
+    std::cout<<"brake:"<<brakeCMD<<"\n"<<std::endl;
     iv::remotectrl xmsg;
     if(modeCMD == CtrlMode::CMD_REMOTE || modeCMD == CtrlMode::CMD_CLOUD_PLATFORM)
         xmsg.set_ntype(iv::remotectrl::CtrlType::remotectrl_CtrlType_REMOTE);
@@ -128,6 +132,13 @@ void VehicleControlClient::updateControlData(void)
         else
             xmsg.set_shift(0);
     }
+    else if(modeCMD == CtrlMode::CMD_AUTO)
+    {
+        xmsg.set_acc(0.0);
+        xmsg.set_brake(0.0);
+        xmsg.set_wheel(0.0);
+        xmsg.set_shift(0);
+    }
     else
     {
         xmsg.set_acc(0.0);

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

@@ -182,7 +182,7 @@ void DataExchangeClient::updateData(void)
 {
     id = gstrid;
     timeStamp = QDateTime::currentMSecsSinceEpoch();
-    SOC = 86.5;
+    SOC = 87.5;
     statusFeedback = VehicleStatus::STATUS_REMOTE;
     mileage = 123.45; // kilometer
     speed = 0.1; // m/s