Merge branch 'develop' into local-test
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m51s
All checks were successful
local-test分支打包构建docker并发布运行 / Docker-Build (push) Successful in 1m51s
This commit is contained in:
commit
d24717c13a
@ -1 +1 @@
|
||||
Subproject commit 121134778a38df672562fd8d1acb1482a327702f
|
||||
Subproject commit e4c55ea4b6f9f5f875d59fc5bba51fc21bc8ef97
|
@ -59,6 +59,9 @@ func ControlTrainUpdate(s *VerifySimulation, ct *request_proto.TrainControl) {
|
||||
vobc.TractionStatus = false
|
||||
vobc.TractionForce = 0
|
||||
}
|
||||
if vobc.EmergencyBrakingStatus {
|
||||
vobc.TractionForce = 0
|
||||
}
|
||||
if sta.ConnState.Conn && sta.ConnState.ConnType == state_proto.TrainConnState_PC_SIM && tce != nil {
|
||||
train_pc_sim.Default().PublishTrainControlEvent(tce)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user