Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
ff0352b2f8
@ -489,7 +489,7 @@ message MkxJState {
|
||||
message BaliseState {
|
||||
uint32 id = 1;
|
||||
graphicData.KilometerSystem km = 2; //当前公里标
|
||||
bytes telegram = 3; //当前报文
|
||||
string telegram = 3; //当前报文(16进制字符串)
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -196,7 +196,7 @@ message Station {
|
||||
// int32 index = 7;
|
||||
string refIbpMapCode = 8; // 关联IBP地图Code
|
||||
string stationName = 9; //车站名
|
||||
//string stationNameAcronym = 10; // 车站名缩写
|
||||
string stationNameAcronym = 10; // 车站名拼音简写
|
||||
bool depots = 11; //是否车辆段
|
||||
repeated string oldmanageStations = 12; // 如果是集中站——管理的车站-id
|
||||
repeated uint32 manageStations = 13; // 如果是集中站——管理的车站-id
|
||||
@ -411,9 +411,11 @@ message Transponder { // 应答器
|
||||
KilometerSystem kilometerSystem = 5; //公里标
|
||||
RelatedRef TransponderRef = 6; //关联关系
|
||||
repeated string oldcentralizedStations = 7; // 集中站Id列表
|
||||
bytes fixedTelegram = 8;//无源应答器固定报文
|
||||
// bytes fixedTelegram = 8;//无源应答器固定报文
|
||||
TransponderTypeEnum type = 9;//应答器类型
|
||||
repeated uint32 centralizedStations = 10; // 集中站Id列表
|
||||
string fixedTelegram = 11; //应答器固定报文
|
||||
string userTelegram = 12; //应答器用户报文
|
||||
}
|
||||
|
||||
message SimpleRef {
|
||||
|
Loading…
Reference in New Issue
Block a user