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

merge

Browse Source
This commit is contained in:
Yuan 2023-08-04 17:29:07 +08:00
parent 9581fc07dd
commit 86bf1f0c76
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
protos/stationLayoutGraphics.proto
View File

@ -27,9 +27,10 @@ message RtssGraphicStorage {
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信息
repeated SlopeKiloMarker slopeKiloMarker = 25; //坡度公里标
} }
message Canvas { message Canvas {
@ -133,20 +134,12 @@ message TrainWindow {
message AxleCounting { message AxleCounting {
CommonInfo common = 1; CommonInfo common = 1;
<<<<<<< HEAD
string code = 2; // 名称
KilometerSystem kilometerSystem = 3; //公里标
repeated RelatedRef axleCountingRef =
4; // 计轴关联的非岔区物理区段和道岔，设备id和端口
int32 index = 5; //计轴的索引编号
=======
string code = 2; // 名称 string code = 2; // 名称
KilometerSystem kilometerSystem = 3; //公里标 KilometerSystem kilometerSystem = 3; //公里标
repeated RelatedRef axleCountingRef = repeated RelatedRef axleCountingRef =
4; // 计轴关联的非岔区物理区段和道岔，设备id和端口 4; // 计轴关联的非岔区物理区段和道岔，设备id和端口
int32 index = 5; //计轴的索引编号 int32 index = 5; //计轴的索引编号
bool invent = 6; //是否虚拟计轴--一般是最末端 bool invent = 6; //是否虚拟计轴--一般是最末端
>>>>>>> e44a7efaa57d4923f00deec4716380897047b243
} }
// message Train { // message Train {