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

取消站台轨默认限速；列车在计轴故障区域不恢复通信

Browse Source
This commit is contained in:
joylink_zhangsai 2021-08-20 16:51:50 +08:00
parent 00c12177e2
commit 1e31cd0971
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/simulation/cbtc/data/map/Section.java
View File

@ -976,8 +976,6 @@ public class Section extends MayOutOfOrderDevice {
return this.getSpeedUpLimit() / 3.6f;
} else if (this.isSwitchTrack() && this.getRelSwitch().isReversePosition()) {
return 30 / 3.6f;
} else if (this.isStandTrack()) {
return 44 / 3.6f;
}
return null;
}

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

@ -428,6 +428,10 @@ public class VirtualRealityTrain extends VirtualRealityDevice {
*/
private boolean released;
public SectionPosition getTailPosition() {
return this.tailPosition == null ? calculateTailPosition() : this.tailPosition;
}
public void setCommunication(boolean communication) {
if ((Fault.COMMUNICATION_ABNORMAL.equals(this.fault) || !atpOn || this.noCommunicateDevice) && communication)
return;

14
src/main/java/club/joylink/rtss/simulation/cbtc/onboard/ATP/ATPLogicLoop.java
View File

@ -235,8 +235,16 @@ public class ATPLogicLoop {
private void driveModeControl(Simulation simulation, VirtualRealityTrain train) {
DriveMode preDriveMode = train.getPreDriveMode();
DriveMode driveMode = train.getDriveMode();
SectionPosition headPosition = train.getHeadPosition();
SectionPosition tailPosition = train.getTailPosition();
switch (preDriveMode) {
case AM:
if (Section.AxleFault.FAULT.equals(headPosition.getSection().getFault())) {
break;
}
if (Section.AxleFault.FAULT.equals(tailPosition.getSection().getFault())) {
break;
}
train.setCommunication(true); //恢复列车通信
if (!Objects.equals(driveMode, preDriveMode)) {
if (train.isCMMode() && train.isAtoOn()) {
@ -245,6 +253,12 @@ public class ATPLogicLoop {
}
break;
case CM:
if (Section.AxleFault.FAULT.equals(headPosition.getSection().getFault())) {
break;
}
if (Section.AxleFault.FAULT.equals(tailPosition.getSection().getFault())) {
break;
}
train.setCommunication(true); //恢复列车通信
if (!Objects.equals(driveMode, preDriveMode)) {
atoService.closeATO(train);