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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
thesai 2024-02-06 15:37:48 +08:00
commit 4e3b2300d1
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
protos/device_state.proto
View File

@ -494,7 +494,7 @@ message ButtonState {
uint32 id = 1; uint32 id = 1;
bool down = 2; bool down = 2;
bool active = 3; // 带灯的按钮 bool active = 3; // 带灯的按钮
bool bypass = 4; //摁钮，钥匙 是否旁路 // bool bypass = 4; //摁钮，钥匙 是否旁路
} }
// 警铃状态 // 警铃状态
@ -531,7 +531,7 @@ message AsdState {
message KeyState { message KeyState {
uint32 id = 1; uint32 id = 1;
int32 gear = 2; int32 gear = 2;
bool bypass = 3; //摁钮，钥匙 是否旁路 // bool bypass = 3; //摁钮，钥匙 是否旁路
} }
// 战场图门控箱继电器状态 // 战场图门控箱继电器状态

2
protos/request.proto
View File

@ -2,6 +2,7 @@ syntax = "proto3";
package request; package request;
option go_package = "joylink.club/bj-rtsts-server/dto/request_proto"; option go_package = "joylink.club/bj-rtsts-server/dto/request_proto";
/*
message BypassOperationReq{ message BypassOperationReq{
enum Operation{ enum Operation{
bypass = 0; //旁路 bypass = 0; //旁路
@ -22,6 +23,7 @@ message BypassOperationReq{
BypassOperationReq.Operation operation = 8; BypassOperationReq.Operation operation = 8;
BypassOperationReq.BtnType btnType = 9; BypassOperationReq.BtnType btnType = 9;
} }
*/
// 继电器 // 继电器
message Relay { message Relay {

2
protos/stationLayoutGraphics.proto
View File

@ -527,7 +527,7 @@ message EsbButton {
// int32 refStand = 5; // 关联站台索引 // int32 refStand = 5; // 关联站台索引
string oldrefStand = 6; // 关联站台 string oldrefStand = 6; // 关联站台
uint32 refStand = 7; // 关联站台 uint32 refStand = 7; // 关联站台
string refEsbButtonMapCode = 8; // 关联紧急关闭按钮地图Code--关联PSL地图 //string refEsbButtonMapCode = 8; // 关联紧急关闭按钮地图Code--关联PSL地图
} }
message GatedBox { message GatedBox {