|
@@ -97,10 +97,7 @@ bool Decision::CommandRequestService(decision::CommandModeCmd::Request &req,
|
|
{
|
|
{
|
|
if (SpeedControl(throttle_Last) == 1)
|
|
if (SpeedControl(throttle_Last) == 1)
|
|
{
|
|
{
|
|
-<<<<<<< HEAD
|
|
|
|
-=======
|
|
|
|
ros::Duration(2).sleep(); // sleep for two second
|
|
ros::Duration(2).sleep(); // sleep for two second
|
|
->>>>>>> 51b16792f0443ff81a2e13d8a533e12f91083390
|
|
|
|
LOG(INFO)<<Name()<<"CommandRequestService break control 70% excute success.";
|
|
LOG(INFO)<<Name()<<"CommandRequestService break control 70% excute success.";
|
|
if (BreakCtrControl(SFT_PSNG_LRN_REQ_FORWARD_1) == 1) // 前进挡
|
|
if (BreakCtrControl(SFT_PSNG_LRN_REQ_FORWARD_1) == 1) // 前进挡
|
|
break;
|
|
break;
|