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

列车操控调整

This commit is contained in:
tiger_zhou 2024-08-16 15:33:30 +08:00
parent 15c015a9a5
commit 0de305b397
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
third_party/can_btm/balise_detection.go vendored
View File

@ -32,7 +32,7 @@ type BtmAntennaRunningInfo struct {
const (
//BtmAntennaOffsetHead = int64(1000) //车载BTM天线距车头端点的距离，mm
BtmAntennaOffsetHead = int64(0) //车载BTM天线距车头端点的距离，mm
BtmAntennaOffsetHead = int64(-1000) //车载BTM天线距车头端点的距离，mm
)
// TrainHeadPositionInfo 列车车头运行位置信息
@ -87,10 +87,12 @@ func (t *BaliseDetector) newDetect(wd *component.WorldData, repo *repository.Rep
var startBalises []*repository.Transponder
//startBalises = t.searchBalisesFromBetweenLinkPosition(repo, th.Up, curAntennaRi2.LinkId, th2.LinkOffset, th.LinkOffset)
startBalises = t.searchBalisesFromBetweenLinkPosition(repo, th2.Up, curAntennaRi2.LinkId, curAntennaRi2.LinkOffset, curAntennaRi.LinkOffset)
startBalises = t.searchBalisesFromBetweenLinkPosition(repo, th.Up, curAntennaRi.LinkId, curAntennaRi2.LinkOffset, curAntennaRi.LinkOffset)
balises := make([]*repository.Transponder, 0)
for _, balise := range startBalises {
//slog.Info(fmt.Sprintf("id:%v , %v,linkeId:%v ,headoffset:%v,tailOffset:%v", balise.Id(), th.Up, curAntennaRi.LinkId, curAntennaRi.LinkOffset, curAntennaRi2.LinkOffset))
find := false
for _, transponder := range balises {
if transponder.Id() == balise.Id() {

3
third_party/train_pc_sim/train_pc_sim.go vendored
View File

@ -411,8 +411,7 @@ func (d *trainPcSimService) SendDriverActive(train *state_proto.TrainState) {
vobc := train.VobcState
defulatBuf := make([]byte, 0)
msg := &message.TrainPcSimBaseMessage{Data: defulatBuf}
msg := &message.TrainPcSimBaseMessage{}
if train.TrainRunUp {
if vobc.Tc1Active {
msg.Type = message.SENDER_TRAIN_TC_ACTIVE

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

@ -541,6 +541,11 @@ func (s *VerifySimulation) reportTrainMockInitMsg(train *state_proto.TrainState,
// 4.4.1. 车载输出数字量信息报文内容
func (s *VerifySimulation) TrainPcSimDigitalOutInfoHandle(train *state_proto.TrainState, data []byte) {
/* slog.Info("开始接受atp输出模拟量==============")
for i, d := range data {
slog.Info(fmt.Sprintf("接受atp模拟量id:%v,data:%b", i, d))
}
slog.Info("结束接受atp输出模拟量eeeeeeeeeeeeeeeeee")*/
s.reportTrainMockInitMsg(train, data[4], data[1])
vobc := train.VobcState
trainPcSimDigitalOutInfoHandleCode7_0(data[4], vobc)