joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/VirtualRealityTrain.java
View File

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

2
src/main/java/club/joylink/rtss/vo/client/operation/DriveParamVO.java
View File

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