Merge remote-tracking branch 'origin/master'
# Conflicts: # protos/stationLayoutGraphics.proto
This commit is contained in:
commit
55e58e0d18
@ -26,9 +26,9 @@ message RtssGraphicStorage {
|
|||||||
repeated AxleCountingSection axleCountingSections = 16;
|
repeated AxleCountingSection axleCountingSections = 16;
|
||||||
repeated LogicSection logicSections = 17;
|
repeated LogicSection logicSections = 17;
|
||||||
repeated StopPosition stopPositions = 18;
|
repeated StopPosition stopPositions = 18;
|
||||||
// repeated SpksSwitch spksSwitchs = 19;
|
repeated SpksSwitch spksSwitchs = 19;
|
||||||
// repeated EsbButton esbButtons = 20; // 紧急关闭按钮
|
repeated EsbButton esbButtons = 20; // 紧急关闭按钮
|
||||||
// repeated GatedBox gateBoxs = 21; // 站台开门/关门/发车按钮整合控制箱
|
repeated GatedBox gateBoxs = 21; // 站台开门/关门/发车按钮整合控制箱
|
||||||
repeated Transponder transponders = 22; // 应答器
|
repeated Transponder transponders = 22; // 应答器
|
||||||
repeated Slope slopes = 23; // 坡度
|
repeated Slope slopes = 23; // 坡度
|
||||||
// repeated CalculateLink CalculateLink = 24; // 计算link信息
|
// repeated CalculateLink CalculateLink = 24; // 计算link信息
|
||||||
@ -207,7 +207,7 @@ message Station {
|
|||||||
// string kilometerCode = 5; //公里标
|
// string kilometerCode = 5; //公里标
|
||||||
KilometerSystem kilometerSystem = 6; //公里标
|
KilometerSystem kilometerSystem = 6; //公里标
|
||||||
// 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; //是否车辆段
|
||||||
|
Loading…
Reference in New Issue
Block a user