diff --git a/third_party/can_btm/balise_btm.go b/third_party/can_btm/balise_btm.go index aea2f9b..e069a47 100644 --- a/third_party/can_btm/balise_btm.go +++ b/third_party/can_btm/balise_btm.go @@ -6,6 +6,7 @@ import ( "joylink.club/bj-rtsts-server/third_party/message" "joylink.club/bj-rtsts-server/third_party/udp" "joylink.club/bj-rtsts-server/ts/simulation/wayside/memory" + "joylink.club/rtsssimulation/component" "joylink.club/rtsssimulation/fi" "log/slog" "sort" @@ -209,9 +210,13 @@ func (s *btmCanetClient) rspToAtp(isResendRequest bool) { statusF.Dsn = s.dsn s.dsnAdd1() // - baliseTelegram, btSendErr := fi.BaliseTelegramForSend(s.bcm.EvnWorld()) + balises, btSendErr := fi.GetScannedBaliseTelegram(s.bcm.EvnWorld()) + var baliseTelegram *component.TrainBaliseTelegram if btSendErr != nil { //slog.Debug(btSendErr.Error()) + } else { + baliseTelegram = <-balises + slog.Debug(fmt.Sprintf("发送应答器报文,应答器:[%s]", baliseTelegram.BaliseId)) } //true-收到应答器报文 isRcvTelegram := baliseTelegram != nil