joylink/rts-sim-testing-service
6
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: joylink:3bf98d1ddf4a917965ba4653faafe97b28a3aad9
Branches Tags
joylink:master
joylink:develop
joylink:local-test
..
compare: joylink:d24717c13ade2440a3195e0ece544a37e948a0c4
Branches Tags
joylink:develop
joylink:local-test
joylink:master

2 Commits
3bf98d1ddf ... d24717c13a

Author SHA1 Message Date
tiger_zhou
d24717c13a Merge branch 'develop' into local-test
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m51s
Details
2024-05-10 08:24:05 +08:00
tiger_zhou
a6119b890f 列车控制调整 2024-05-10 08:23:50 +08:00
2 changed files with 4 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
rts-sim-testing-message

@ -1 +1 @@
Subproject commit 121134778a38df672562fd8d1acb1482a327702f Subproject commit e4c55ea4b6f9f5f875d59fc5bba51fc21bc8ef97

3
ts/simulation/wayside/memory/wayside_simulation_train_pc.go
View File

@ -59,6 +59,9 @@ func ControlTrainUpdate(s *VerifySimulation, ct *request_proto.TrainControl) {
vobc.TractionStatus = false vobc.TractionStatus = false
vobc.TractionForce = 0 vobc.TractionForce = 0
} }
if vobc.EmergencyBrakingStatus {
vobc.TractionForce = 0
}
if sta.ConnState.Conn && sta.ConnState.ConnType == state_proto.TrainConnState_PC_SIM && tce != nil { if sta.ConnState.Conn && sta.ConnState.ConnType == state_proto.TrainConnState_PC_SIM && tce != nil {
train_pc_sim.Default().PublishTrainControlEvent(tce) train_pc_sim.Default().PublishTrainControlEvent(tce)
} }