Merge remote-tracking branch 'origin/master'

This commit is contained in:
tiger_zhou 2024-01-16 16:33:14 +08:00
commit ff0352b2f8
2 changed files with 5 additions and 3 deletions

View File

@ -489,7 +489,7 @@ message MkxJState {
message BaliseState { message BaliseState {
uint32 id = 1; uint32 id = 1;
graphicData.KilometerSystem km = 2; // graphicData.KilometerSystem km = 2; //
bytes telegram = 3; // string telegram = 3; //16
} }
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////

View File

@ -196,7 +196,7 @@ message Station {
// int32 index = 7; // int32 index = 7;
string refIbpMapCode = 8; // IBP地图Code string refIbpMapCode = 8; // IBP地图Code
string stationName = 9; // string stationName = 9; //
//string stationNameAcronym = 10; // string stationNameAcronym = 10; //
bool depots = 11; // bool depots = 11; //
repeated string oldmanageStations = 12; // -id repeated string oldmanageStations = 12; // -id
repeated uint32 manageStations = 13; // -id repeated uint32 manageStations = 13; // -id
@ -411,9 +411,11 @@ message Transponder { // 应答器
KilometerSystem kilometerSystem = 5; // KilometerSystem kilometerSystem = 5; //
RelatedRef TransponderRef = 6; // RelatedRef TransponderRef = 6; //
repeated string oldcentralizedStations = 7; // Id列表 repeated string oldcentralizedStations = 7; // Id列表
bytes fixedTelegram = 8;// // bytes fixedTelegram = 8;//
TransponderTypeEnum type = 9;// TransponderTypeEnum type = 9;//
repeated uint32 centralizedStations = 10; // Id列表 repeated uint32 centralizedStations = 10; // Id列表
string fixedTelegram = 11; //
string userTelegram = 12; //
} }
message SimpleRef { message SimpleRef {