|
@@ -167,7 +167,7 @@ iv::decition::BrainDecition::BrainDecition()
|
|
|
|
|
|
mpUltraArea = iv::modulecomm::RegisterRecv("ultra_area",iv::decition::ListenUltraArea);
|
|
|
|
|
|
- mpFSMSkipCmd = iv::modulecomm::RegisterRecv("FSMSkipCmmand",iv::decition::ListenFSMSkipCmd);
|
|
|
+ mpFSMSkipCmd = iv::modulecomm::RegisterRecv("FSMSkipCommand",iv::decition::ListenFSMSkipCmd);
|
|
|
|
|
|
|
|
|
mTime.start();
|
|
@@ -512,7 +512,7 @@ void iv::decition::BrainDecition::run() {
|
|
|
{
|
|
|
ServiceCarStatus.mbRunPause=true;
|
|
|
//待命停车
|
|
|
- if(ServiceCarStatus.mbOvertimeCnt<=100)//待命计时
|
|
|
+ if(ServiceCarStatus.mbOvertimeCnt<=1000)//待命计时
|
|
|
{
|
|
|
ServiceCarStatus.mbOvertimeCnt++;
|
|
|
}
|
|
@@ -615,8 +615,7 @@ void iv::decition::BrainDecition::run() {
|
|
|
ServiceCarStatus.mbFSM_State = 4;
|
|
|
ServiceCarStatus.mbLastFSM_State=2;
|
|
|
}
|
|
|
- if((ServiceCarStatus.mbTakeOverEn == 0) && (ServiceCarStatus.mbLastFSM_State == 0)
|
|
|
- &&(ServiceCarStatus.mbCloseToPath == 0))//退出接管 && 远离路线
|
|
|
+ if((ServiceCarStatus.mbTakeOverEn == 0) && (ServiceCarStatus.mbLastFSM_State == 0))//退出接管 && 远离路线
|
|
|
{
|
|
|
ServiceCarStatus.mbRunPause=true;
|
|
|
ServiceCarStatus.mbFSM_State = 0;
|