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 2022-06-13 16:58:46 +08:00
parent 90a6f2c916
commit ebfb324072
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/club/joylink/rtss/simulation/cbtc/device/real/modbustcp/xty/XtyPsdServiceImpl.java
View File

@ -61,12 +61,26 @@ public class XtyPsdServiceImpl implements RealDeviceService {
int wvgm = configVO.getWvgm();// 关门控制值
if (vrPsd.isTurning()) { // 屏蔽门设置中且为信号系统可操作状态
if (autoMode && vrPsd.isCommandOpen() && (cv & wvkm) != wvkm) { // 开门
if (autoMode && vrPsd.isCommandOpen() /*&& (cv & wvkm) != wvkm*/) { // 开门
if ((cv & wvkm) != wvkm) {
this.plcGatewayService.checkEqualAndWriteSingleRegister(plcGateway.getConfig().getAddr(),
configVO.getWbi(), cv, wvkm, plcGateway.getChannel());
} else if(autoMode && !vrPsd.isCommandOpen() && (cv & wvgm) != wvgm){ // 关门
} else if (vrPsd.isLockAndClose()) {
this.plcGatewayService.checkEqualAndWriteSingleRegister(plcGateway.getConfig().getAddr(),
configVO.getWbi(), cv, wvgm, plcGateway.getChannel());
this.plcGatewayService.checkEqualAndWriteSingleRegister(plcGateway.getConfig().getAddr(),
configVO.getWbi(), cv, wvkm, plcGateway.getChannel());
}
} else if(autoMode && !vrPsd.isCommandOpen() && (cv & wvgm) != wvgm){ // 关门
if ((cv & wvgm) != wvgm) {
this.plcGatewayService.checkEqualAndWriteSingleRegister(plcGateway.getConfig().getAddr(),
configVO.getWbi(), cv, wvgm, plcGateway.getChannel());
} else if (vrPsd.isOpen2End()) {
this.plcGatewayService.checkEqualAndWriteSingleRegister(plcGateway.getConfig().getAddr(),
configVO.getWbi(), cv, wvkm, plcGateway.getChannel());
this.plcGatewayService.checkEqualAndWriteSingleRegister(plcGateway.getConfig().getAddr(),
configVO.getWbi(), cv, wvgm, plcGateway.getChannel());
}
}
}
if (rbkmdw && rbgmdw) { // 开关门进行中