列车机器人驾驶需使用驾驶命令后才会自动解除EB

This commit is contained in:
joylink_zhangsai 2023-11-22 16:16:21 +08:00
parent aec1a01f96
commit 4becfd48cb
2 changed files with 12 additions and 11 deletions

View File

@ -491,10 +491,10 @@ public class VirtualRealityTrain extends VirtualRealityDevice {
}
public void setCommunication(boolean communication) {
if ((Fault.COMMUNICATION_ABNORMAL.equals(this.fault) || !atpOn || this.noCommunicateDevice)
&& communication) {
return;
}
if ((Fault.COMMUNICATION_ABNORMAL.equals(this.fault) || !atpOn || this.noCommunicateDevice)
&& communication) {
return;
}
this.communication = communication;
}
@ -752,9 +752,9 @@ public class VirtualRealityTrain extends VirtualRealityDevice {
}
public void updateTBForce(float fk, float fb) {
if (isEB()) {
return;
}
if (isEB()) {
return;
}
if (Fault.DRIVE_FAULT.equals(fault) && fk > 0) {
return;
}
@ -1064,9 +1064,9 @@ public class VirtualRealityTrain extends VirtualRealityDevice {
}
public boolean isInTheStandArea() {
if (this.getHeadPosition() == null) {
return false;
}
if (this.getHeadPosition() == null) {
return false;
}
return this.getHeadPosition().getSection().isNormalStandTrack()
|| this.calculateTailPosition().getSection().isNormalStandTrack();
}
@ -1356,6 +1356,7 @@ public class VirtualRealityTrain extends VirtualRealityDevice {
public void updateDriveParam(DriveParamVO paramVO) {
paramVO.setDefaultStop(this.robotDriveParam.isDefaultStop());
paramVO.setReleaseEB(true);
this.robotDriveParam = paramVO;
}

View File

@ -84,7 +84,7 @@ public class DriveParamVO {
* 解除EB目的是在且仅在每次进行驾驶操作后自动缓解当时存在的EB
*/
@JsonIgnore
private boolean releaseEB = true;
private boolean releaseEB;
public void setSpeedLimit(Float speedLimit) {
this.speedLimit = speedLimit;