Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
4e3b2300d1
@ -494,7 +494,7 @@ message ButtonState {
|
||||
uint32 id = 1;
|
||||
bool down = 2;
|
||||
bool active = 3; // 带灯的按钮
|
||||
bool bypass = 4; //摁钮,钥匙 是否旁路
|
||||
// bool bypass = 4; //摁钮,钥匙 是否旁路
|
||||
}
|
||||
|
||||
// 警铃状态
|
||||
@ -531,7 +531,7 @@ message AsdState {
|
||||
message KeyState {
|
||||
uint32 id = 1;
|
||||
int32 gear = 2;
|
||||
bool bypass = 3; //摁钮,钥匙 是否旁路
|
||||
// bool bypass = 3; //摁钮,钥匙 是否旁路
|
||||
}
|
||||
|
||||
// 战场图门控箱继电器状态
|
||||
|
@ -2,6 +2,7 @@ syntax = "proto3";
|
||||
|
||||
package request;
|
||||
option go_package = "joylink.club/bj-rtsts-server/dto/request_proto";
|
||||
/*
|
||||
message BypassOperationReq{
|
||||
enum Operation{
|
||||
bypass = 0; //旁路
|
||||
@ -22,6 +23,7 @@ message BypassOperationReq{
|
||||
BypassOperationReq.Operation operation = 8;
|
||||
BypassOperationReq.BtnType btnType = 9;
|
||||
}
|
||||
*/
|
||||
|
||||
// 继电器
|
||||
message Relay {
|
||||
|
@ -527,7 +527,7 @@ message EsbButton {
|
||||
// int32 refStand = 5; // 关联站台索引
|
||||
string oldrefStand = 6; // 关联站台
|
||||
uint32 refStand = 7; // 关联站台
|
||||
string refEsbButtonMapCode = 8; // 关联紧急关闭按钮地图Code--关联PSL地图
|
||||
//string refEsbButtonMapCode = 8; // 关联紧急关闭按钮地图Code--关联PSL地图
|
||||
}
|
||||
|
||||
message GatedBox {
|
||||
|
Loading…
Reference in New Issue
Block a user