From a0cf17c845950169e6089ae2430c9b1c52bbea80 Mon Sep 17 00:00:00 2001 From: tiger_zhou Date: Thu, 4 Jul 2024 17:26:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=BD=A6=E6=8E=A7=E5=88=B6=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dto/data_proto/tccGraphics.pb.go | 304 +++++++++--- dto/state_proto/device_state.pb.go | 444 +++++++++++++----- message_server/train_control_ms.go | 4 +- mqtt/client.go | 2 +- .../wayside/memory/train_tcc_graphic.go | 1 + 5 files changed, 574 insertions(+), 181 deletions(-) diff --git a/dto/data_proto/tccGraphics.pb.go b/dto/data_proto/tccGraphics.pb.go index 9b25b9f..2c41a22 100644 --- a/dto/data_proto/tccGraphics.pb.go +++ b/dto/data_proto/tccGraphics.pb.go @@ -20,6 +20,55 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) +type TccElementColor int32 + +const ( + TccElementColor_green TccElementColor = 0 + TccElementColor_red TccElementColor = 1 + TccElementColor_blue TccElementColor = 2 +) + +// Enum value maps for TccElementColor. +var ( + TccElementColor_name = map[int32]string{ + 0: "green", + 1: "red", + 2: "blue", + } + TccElementColor_value = map[string]int32{ + "green": 0, + "red": 1, + "blue": 2, + } +) + +func (x TccElementColor) Enum() *TccElementColor { + p := new(TccElementColor) + *p = x + return p +} + +func (x TccElementColor) String() string { + return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) +} + +func (TccElementColor) Descriptor() protoreflect.EnumDescriptor { + return file_tccGraphics_proto_enumTypes[0].Descriptor() +} + +func (TccElementColor) Type() protoreflect.EnumType { + return &file_tccGraphics_proto_enumTypes[0] +} + +func (x TccElementColor) Number() protoreflect.EnumNumber { + return protoreflect.EnumNumber(x) +} + +// Deprecated: Use TccElementColor.Descriptor instead. +func (TccElementColor) EnumDescriptor() ([]byte, []int) { + return file_tccGraphics_proto_rawDescGZIP(), []int{0} +} + type TccKey_TccKeyType int32 const ( @@ -50,11 +99,11 @@ func (x TccKey_TccKeyType) String() string { } func (TccKey_TccKeyType) Descriptor() protoreflect.EnumDescriptor { - return file_tccGraphics_proto_enumTypes[0].Descriptor() + return file_tccGraphics_proto_enumTypes[1].Descriptor() } func (TccKey_TccKeyType) Type() protoreflect.EnumType { - return &file_tccGraphics_proto_enumTypes[0] + return &file_tccGraphics_proto_enumTypes[1] } func (x TccKey_TccKeyType) Number() protoreflect.EnumNumber { @@ -76,6 +125,7 @@ type TccGraphicStorage struct { TccTexts []*TccText `protobuf:"bytes,3,rep,name=tccTexts,proto3" json:"tccTexts,omitempty"` TccKeys []*TccKey `protobuf:"bytes,4,rep,name=tccKeys,proto3" json:"tccKeys,omitempty"` TccHandles []*TccHandle `protobuf:"bytes,5,rep,name=tccHandles,proto3" json:"tccHandles,omitempty"` + TccLights []*TccLight `protobuf:"bytes,6,rep,name=tccLights,proto3" json:"tccLights,omitempty"` } func (x *TccGraphicStorage) Reset() { @@ -145,6 +195,13 @@ func (x *TccGraphicStorage) GetTccHandles() []*TccHandle { return nil } +func (x *TccGraphicStorage) GetTccLights() []*TccLight { + if x != nil { + return x.TccLights + } + return nil +} + // * TCC按钮 type TccButton struct { state protoimpl.MessageState @@ -409,6 +466,78 @@ func (x *TccHandle) GetCode() string { return "" } +// * TCC灯 +type TccLight struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Common *CommonInfo `protobuf:"bytes,1,opt,name=common,proto3" json:"common,omitempty"` + Code string `protobuf:"bytes,2,opt,name=code,proto3" json:"code,omitempty"` + LightColor TccElementColor `protobuf:"varint,3,opt,name=lightColor,proto3,enum=tccGraphicData.TccElementColor" json:"lightColor,omitempty"` + ActiveLevel bool `protobuf:"varint,4,opt,name=activeLevel,proto3" json:"activeLevel,omitempty"` +} + +func (x *TccLight) Reset() { + *x = TccLight{} + if protoimpl.UnsafeEnabled { + mi := &file_tccGraphics_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TccLight) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TccLight) ProtoMessage() {} + +func (x *TccLight) ProtoReflect() protoreflect.Message { + mi := &file_tccGraphics_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TccLight.ProtoReflect.Descriptor instead. +func (*TccLight) Descriptor() ([]byte, []int) { + return file_tccGraphics_proto_rawDescGZIP(), []int{5} +} + +func (x *TccLight) GetCommon() *CommonInfo { + if x != nil { + return x.Common + } + return nil +} + +func (x *TccLight) GetCode() string { + if x != nil { + return x.Code + } + return "" +} + +func (x *TccLight) GetLightColor() TccElementColor { + if x != nil { + return x.LightColor + } + return TccElementColor_green +} + +func (x *TccLight) GetActiveLevel() bool { + if x != nil { + return x.ActiveLevel + } + return false +} + var File_tccGraphics_proto protoreflect.FileDescriptor var file_tccGraphics_proto_rawDesc = []byte{ @@ -416,7 +545,7 @@ var file_tccGraphics_proto_rawDesc = []byte{ 0x6f, 0x74, 0x6f, 0x12, 0x0e, 0x74, 0x63, 0x63, 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x1a, 0x1b, 0x73, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x61, 0x79, 0x6f, 0x75, 0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0x9d, 0x02, 0x0a, 0x11, 0x54, 0x63, 0x63, 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x53, + 0x22, 0xd5, 0x02, 0x0a, 0x11, 0x54, 0x63, 0x63, 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12, 0x2b, 0x0a, 0x06, 0x63, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x61, 0x6e, 0x76, 0x61, 0x73, 0x52, 0x06, 0x63, 0x61, 0x6e, @@ -434,46 +563,64 @@ var file_tccGraphics_proto_rawDesc = []byte{ 0x6c, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x74, 0x63, 0x63, 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x63, 0x63, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x0a, 0x74, 0x63, 0x63, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x73, - 0x22, 0x72, 0x0a, 0x09, 0x54, 0x63, 0x63, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, - 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, - 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, - 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x12, - 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, - 0x64, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x73, 0x53, 0x65, 0x6c, 0x66, 0x52, 0x65, 0x73, 0x65, - 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x53, 0x65, 0x6c, 0x66, 0x52, - 0x65, 0x73, 0x65, 0x74, 0x22, 0x9a, 0x01, 0x0a, 0x07, 0x54, 0x63, 0x63, 0x54, 0x65, 0x78, 0x74, - 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, - 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, - 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, - 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x6f, 0x6e, 0x74, 0x53, 0x69, 0x7a, - 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x6f, 0x6e, 0x74, 0x53, 0x69, 0x7a, - 0x65, 0x22, 0xdb, 0x01, 0x0a, 0x06, 0x54, 0x63, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x2f, 0x0a, 0x06, - 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, - 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, - 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x12, 0x0a, - 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, - 0x65, 0x12, 0x35, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x21, 0x2e, 0x74, 0x63, 0x63, 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, - 0x2e, 0x54, 0x63, 0x63, 0x4b, 0x65, 0x79, 0x2e, 0x54, 0x63, 0x63, 0x4b, 0x65, 0x79, 0x54, 0x79, - 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x55, 0x0a, 0x0a, 0x54, 0x63, 0x63, 0x4b, - 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x1f, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, - 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x69, 0x6e, 0x74, 0x10, 0x00, 0x12, 0x22, 0x0a, 0x1e, 0x66, - 0x72, 0x6f, 0x6e, 0x74, 0x41, 0x6e, 0x64, 0x52, 0x65, 0x61, 0x72, 0x44, 0x69, 0x72, 0x65, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x01, 0x22, - 0x50, 0x0a, 0x09, 0x54, 0x63, 0x63, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x2f, 0x0a, 0x06, - 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, - 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, - 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x12, 0x0a, - 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, - 0x65, 0x42, 0x2d, 0x5a, 0x2b, 0x6a, 0x6f, 0x79, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x63, 0x6c, 0x75, - 0x62, 0x2f, 0x62, 0x6a, 0x2d, 0x72, 0x74, 0x73, 0x74, 0x73, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x65, - 0x72, 0x2f, 0x64, 0x74, 0x6f, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x12, 0x36, 0x0a, 0x09, 0x74, 0x63, 0x63, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x73, 0x18, 0x06, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x74, 0x63, 0x63, 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, + 0x44, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x63, 0x63, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x52, 0x09, 0x74, + 0x63, 0x63, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x73, 0x22, 0x72, 0x0a, 0x09, 0x54, 0x63, 0x63, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, + 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, + 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x73, + 0x53, 0x65, 0x6c, 0x66, 0x52, 0x65, 0x73, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x0b, 0x69, 0x73, 0x53, 0x65, 0x6c, 0x66, 0x52, 0x65, 0x73, 0x65, 0x74, 0x22, 0x9a, 0x01, 0x0a, + 0x07, 0x54, 0x63, 0x63, 0x54, 0x65, 0x78, 0x74, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, + 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, + 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66, + 0x6f, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, + 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x12, 0x1a, 0x0a, + 0x08, 0x66, 0x6f, 0x6e, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x08, 0x66, 0x6f, 0x6e, 0x74, 0x53, 0x69, 0x7a, 0x65, 0x22, 0xdb, 0x01, 0x0a, 0x06, 0x54, 0x63, + 0x63, 0x4b, 0x65, 0x79, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, + 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x35, 0x0a, 0x04, 0x74, 0x79, 0x70, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x74, 0x63, 0x63, 0x47, 0x72, 0x61, + 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x63, 0x63, 0x4b, 0x65, 0x79, 0x2e, + 0x54, 0x63, 0x63, 0x4b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, + 0x22, 0x55, 0x0a, 0x0a, 0x54, 0x63, 0x63, 0x4b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, + 0x0a, 0x1f, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, + 0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6c, 0x69, 0x6e, + 0x74, 0x10, 0x00, 0x12, 0x22, 0x0a, 0x1e, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x41, 0x6e, 0x64, 0x52, + 0x65, 0x61, 0x72, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x43, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x01, 0x22, 0x50, 0x0a, 0x09, 0x54, 0x63, 0x63, 0x48, 0x61, + 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, + 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0xb2, 0x01, 0x0a, 0x08, 0x54, 0x63, + 0x63, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x12, 0x2f, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, + 0x44, 0x61, 0x74, 0x61, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, + 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x3f, 0x0a, 0x0a, 0x6c, + 0x69, 0x67, 0x68, 0x74, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x1f, 0x2e, 0x74, 0x63, 0x63, 0x47, 0x72, 0x61, 0x70, 0x68, 0x69, 0x63, 0x44, 0x61, 0x74, 0x61, + 0x2e, 0x54, 0x63, 0x63, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6c, 0x6f, 0x72, + 0x52, 0x0a, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x12, 0x20, 0x0a, 0x0b, + 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x0b, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x2a, 0x2f, + 0x0a, 0x0f, 0x54, 0x63, 0x63, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6c, 0x6f, + 0x72, 0x12, 0x09, 0x0a, 0x05, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, + 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x10, 0x02, 0x42, + 0x2d, 0x5a, 0x2b, 0x6a, 0x6f, 0x79, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x63, 0x6c, 0x75, 0x62, 0x2f, + 0x62, 0x6a, 0x2d, 0x72, 0x74, 0x73, 0x74, 0x73, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, + 0x64, 0x74, 0x6f, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -488,34 +635,39 @@ func file_tccGraphics_proto_rawDescGZIP() []byte { return file_tccGraphics_proto_rawDescData } -var file_tccGraphics_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_tccGraphics_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_tccGraphics_proto_enumTypes = make([]protoimpl.EnumInfo, 2) +var file_tccGraphics_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_tccGraphics_proto_goTypes = []interface{}{ - (TccKey_TccKeyType)(0), // 0: tccGraphicData.TccKey.TccKeyType - (*TccGraphicStorage)(nil), // 1: tccGraphicData.TccGraphicStorage - (*TccButton)(nil), // 2: tccGraphicData.TccButton - (*TccText)(nil), // 3: tccGraphicData.TccText - (*TccKey)(nil), // 4: tccGraphicData.TccKey - (*TccHandle)(nil), // 5: tccGraphicData.TccHandle - (*Canvas)(nil), // 6: graphicData.Canvas - (*CommonInfo)(nil), // 7: graphicData.CommonInfo + (TccElementColor)(0), // 0: tccGraphicData.TccElementColor + (TccKey_TccKeyType)(0), // 1: tccGraphicData.TccKey.TccKeyType + (*TccGraphicStorage)(nil), // 2: tccGraphicData.TccGraphicStorage + (*TccButton)(nil), // 3: tccGraphicData.TccButton + (*TccText)(nil), // 4: tccGraphicData.TccText + (*TccKey)(nil), // 5: tccGraphicData.TccKey + (*TccHandle)(nil), // 6: tccGraphicData.TccHandle + (*TccLight)(nil), // 7: tccGraphicData.TccLight + (*Canvas)(nil), // 8: graphicData.Canvas + (*CommonInfo)(nil), // 9: graphicData.CommonInfo } var file_tccGraphics_proto_depIdxs = []int32{ - 6, // 0: tccGraphicData.TccGraphicStorage.canvas:type_name -> graphicData.Canvas - 2, // 1: tccGraphicData.TccGraphicStorage.tccButtons:type_name -> tccGraphicData.TccButton - 3, // 2: tccGraphicData.TccGraphicStorage.tccTexts:type_name -> tccGraphicData.TccText - 4, // 3: tccGraphicData.TccGraphicStorage.tccKeys:type_name -> tccGraphicData.TccKey - 5, // 4: tccGraphicData.TccGraphicStorage.tccHandles:type_name -> tccGraphicData.TccHandle - 7, // 5: tccGraphicData.TccButton.common:type_name -> graphicData.CommonInfo - 7, // 6: tccGraphicData.TccText.common:type_name -> graphicData.CommonInfo - 7, // 7: tccGraphicData.TccKey.common:type_name -> graphicData.CommonInfo - 0, // 8: tccGraphicData.TccKey.type:type_name -> tccGraphicData.TccKey.TccKeyType - 7, // 9: tccGraphicData.TccHandle.common:type_name -> graphicData.CommonInfo - 10, // [10:10] is the sub-list for method output_type - 10, // [10:10] is the sub-list for method input_type - 10, // [10:10] is the sub-list for extension type_name - 10, // [10:10] is the sub-list for extension extendee - 0, // [0:10] is the sub-list for field type_name + 8, // 0: tccGraphicData.TccGraphicStorage.canvas:type_name -> graphicData.Canvas + 3, // 1: tccGraphicData.TccGraphicStorage.tccButtons:type_name -> tccGraphicData.TccButton + 4, // 2: tccGraphicData.TccGraphicStorage.tccTexts:type_name -> tccGraphicData.TccText + 5, // 3: tccGraphicData.TccGraphicStorage.tccKeys:type_name -> tccGraphicData.TccKey + 6, // 4: tccGraphicData.TccGraphicStorage.tccHandles:type_name -> tccGraphicData.TccHandle + 7, // 5: tccGraphicData.TccGraphicStorage.tccLights:type_name -> tccGraphicData.TccLight + 9, // 6: tccGraphicData.TccButton.common:type_name -> graphicData.CommonInfo + 9, // 7: tccGraphicData.TccText.common:type_name -> graphicData.CommonInfo + 9, // 8: tccGraphicData.TccKey.common:type_name -> graphicData.CommonInfo + 1, // 9: tccGraphicData.TccKey.type:type_name -> tccGraphicData.TccKey.TccKeyType + 9, // 10: tccGraphicData.TccHandle.common:type_name -> graphicData.CommonInfo + 9, // 11: tccGraphicData.TccLight.common:type_name -> graphicData.CommonInfo + 0, // 12: tccGraphicData.TccLight.lightColor:type_name -> tccGraphicData.TccElementColor + 13, // [13:13] is the sub-list for method output_type + 13, // [13:13] is the sub-list for method input_type + 13, // [13:13] is the sub-list for extension type_name + 13, // [13:13] is the sub-list for extension extendee + 0, // [0:13] is the sub-list for field type_name } func init() { file_tccGraphics_proto_init() } @@ -585,14 +737,26 @@ func file_tccGraphics_proto_init() { return nil } } + file_tccGraphics_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TccLight); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_tccGraphics_proto_rawDesc, - NumEnums: 1, - NumMessages: 5, + NumEnums: 2, + NumMessages: 6, NumExtensions: 0, NumServices: 0, }, diff --git a/dto/state_proto/device_state.pb.go b/dto/state_proto/device_state.pb.go index 22b7815..c00fe3d 100644 --- a/dto/state_proto/device_state.pb.go +++ b/dto/state_proto/device_state.pb.go @@ -4813,10 +4813,12 @@ type TrainControlState struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Buttons []*TrainControlState_ControlButton `protobuf:"bytes,1,rep,name=buttons,proto3" json:"buttons,omitempty"` - DriverKey []*TrainControlState_DriverKeySwitch `protobuf:"bytes,2,rep,name=driverKey,proto3" json:"driverKey,omitempty"` //驾驶端激活 - DirKey *TrainControlState_DirectionKeySwitch `protobuf:"bytes,3,opt,name=dirKey,proto3" json:"dirKey,omitempty"` //接车运行方向 - PushHandler *TrainControlState_PushHandler `protobuf:"bytes,4,opt,name=pushHandler,proto3" json:"pushHandler,omitempty"` //牵引制动手柄 + Buttons []*TrainControlState_ControlButton `protobuf:"bytes,1,rep,name=buttons,proto3" json:"buttons,omitempty"` + DriverKey []*TrainControlState_DriverKeySwitch `protobuf:"bytes,2,rep,name=driverKey,proto3" json:"driverKey,omitempty"` //驾驶端激活 + DirKey *TrainControlState_DirectionKeySwitch `protobuf:"bytes,3,opt,name=dirKey,proto3" json:"dirKey,omitempty"` //接车运行方向 + PushHandler *TrainControlState_PushHandler `protobuf:"bytes,4,opt,name=pushHandler,proto3" json:"pushHandler,omitempty"` //牵引制动手柄 + Lights []*TrainControlState_ControlLight `protobuf:"bytes,5,rep,name=lights,proto3" json:"lights,omitempty"` + LightMaps map[string]*TrainControlState_ControlLight `protobuf:"bytes,6,rep,name=lightMaps,proto3" json:"lightMaps,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *TrainControlState) Reset() { @@ -4879,6 +4881,99 @@ func (x *TrainControlState) GetPushHandler() *TrainControlState_PushHandler { return nil } +func (x *TrainControlState) GetLights() []*TrainControlState_ControlLight { + if x != nil { + return x.Lights + } + return nil +} + +func (x *TrainControlState) GetLightMaps() map[string]*TrainControlState_ControlLight { + if x != nil { + return x.LightMaps + } + return nil +} + +type TrainControlStateMsg struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Buttons []*TrainControlState_ControlButton `protobuf:"bytes,1,rep,name=buttons,proto3" json:"buttons,omitempty"` + DriverKey []*TrainControlState_DriverKeySwitch `protobuf:"bytes,2,rep,name=driverKey,proto3" json:"driverKey,omitempty"` //驾驶端激活 + DirKey *TrainControlState_DirectionKeySwitch `protobuf:"bytes,3,opt,name=dirKey,proto3" json:"dirKey,omitempty"` //接车运行方向 + PushHandler *TrainControlState_PushHandler `protobuf:"bytes,4,opt,name=pushHandler,proto3" json:"pushHandler,omitempty"` //牵引制动手柄 + Lights []*TrainControlState_ControlLight `protobuf:"bytes,5,rep,name=lights,proto3" json:"lights,omitempty"` +} + +func (x *TrainControlStateMsg) Reset() { + *x = TrainControlStateMsg{} + if protoimpl.UnsafeEnabled { + mi := &file_device_state_proto_msgTypes[36] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TrainControlStateMsg) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TrainControlStateMsg) ProtoMessage() {} + +func (x *TrainControlStateMsg) ProtoReflect() protoreflect.Message { + mi := &file_device_state_proto_msgTypes[36] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TrainControlStateMsg.ProtoReflect.Descriptor instead. +func (*TrainControlStateMsg) Descriptor() ([]byte, []int) { + return file_device_state_proto_rawDescGZIP(), []int{36} +} + +func (x *TrainControlStateMsg) GetButtons() []*TrainControlState_ControlButton { + if x != nil { + return x.Buttons + } + return nil +} + +func (x *TrainControlStateMsg) GetDriverKey() []*TrainControlState_DriverKeySwitch { + if x != nil { + return x.DriverKey + } + return nil +} + +func (x *TrainControlStateMsg) GetDirKey() *TrainControlState_DirectionKeySwitch { + if x != nil { + return x.DirKey + } + return nil +} + +func (x *TrainControlStateMsg) GetPushHandler() *TrainControlState_PushHandler { + if x != nil { + return x.PushHandler + } + return nil +} + +func (x *TrainControlStateMsg) GetLights() []*TrainControlState_ControlLight { + if x != nil { + return x.Lights + } + return nil +} + type VobcBtmState_TelegramState struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -4900,7 +4995,7 @@ type VobcBtmState_TelegramState struct { func (x *VobcBtmState_TelegramState) Reset() { *x = VobcBtmState_TelegramState{} if protoimpl.UnsafeEnabled { - mi := &file_device_state_proto_msgTypes[38] + mi := &file_device_state_proto_msgTypes[39] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4913,7 +5008,7 @@ func (x *VobcBtmState_TelegramState) String() string { func (*VobcBtmState_TelegramState) ProtoMessage() {} func (x *VobcBtmState_TelegramState) ProtoReflect() protoreflect.Message { - mi := &file_device_state_proto_msgTypes[38] + mi := &file_device_state_proto_msgTypes[39] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -4978,7 +5073,7 @@ type VobcBtmState_VobcBtmHistoryState struct { func (x *VobcBtmState_VobcBtmHistoryState) Reset() { *x = VobcBtmState_VobcBtmHistoryState{} if protoimpl.UnsafeEnabled { - mi := &file_device_state_proto_msgTypes[39] + mi := &file_device_state_proto_msgTypes[40] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -4991,7 +5086,7 @@ func (x *VobcBtmState_VobcBtmHistoryState) String() string { func (*VobcBtmState_VobcBtmHistoryState) ProtoMessage() {} func (x *VobcBtmState_VobcBtmHistoryState) ProtoReflect() protoreflect.Message { - mi := &file_device_state_proto_msgTypes[39] + mi := &file_device_state_proto_msgTypes[40] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5062,7 +5157,7 @@ type StationQc_State struct { func (x *StationQc_State) Reset() { *x = StationQc_State{} if protoimpl.UnsafeEnabled { - mi := &file_device_state_proto_msgTypes[40] + mi := &file_device_state_proto_msgTypes[41] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5075,7 +5170,7 @@ func (x *StationQc_State) String() string { func (*StationQc_State) ProtoMessage() {} func (x *StationQc_State) ProtoReflect() protoreflect.Message { - mi := &file_device_state_proto_msgTypes[40] + mi := &file_device_state_proto_msgTypes[41] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5124,7 +5219,7 @@ type TrainControlState_ControlButton struct { func (x *TrainControlState_ControlButton) Reset() { *x = TrainControlState_ControlButton{} if protoimpl.UnsafeEnabled { - mi := &file_device_state_proto_msgTypes[41] + mi := &file_device_state_proto_msgTypes[43] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5137,7 +5232,7 @@ func (x *TrainControlState_ControlButton) String() string { func (*TrainControlState_ControlButton) ProtoMessage() {} func (x *TrainControlState_ControlButton) ProtoReflect() protoreflect.Message { - mi := &file_device_state_proto_msgTypes[41] + mi := &file_device_state_proto_msgTypes[43] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5150,7 +5245,7 @@ func (x *TrainControlState_ControlButton) ProtoReflect() protoreflect.Message { // Deprecated: Use TrainControlState_ControlButton.ProtoReflect.Descriptor instead. func (*TrainControlState_ControlButton) Descriptor() ([]byte, []int) { - return file_device_state_proto_rawDescGZIP(), []int{35, 0} + return file_device_state_proto_rawDescGZIP(), []int{35, 1} } func (x *TrainControlState_ControlButton) GetId() uint32 { @@ -5179,7 +5274,7 @@ type TrainControlState_DriverKeySwitch struct { func (x *TrainControlState_DriverKeySwitch) Reset() { *x = TrainControlState_DriverKeySwitch{} if protoimpl.UnsafeEnabled { - mi := &file_device_state_proto_msgTypes[42] + mi := &file_device_state_proto_msgTypes[44] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5192,7 +5287,7 @@ func (x *TrainControlState_DriverKeySwitch) String() string { func (*TrainControlState_DriverKeySwitch) ProtoMessage() {} func (x *TrainControlState_DriverKeySwitch) ProtoReflect() protoreflect.Message { - mi := &file_device_state_proto_msgTypes[42] + mi := &file_device_state_proto_msgTypes[44] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5205,7 +5300,7 @@ func (x *TrainControlState_DriverKeySwitch) ProtoReflect() protoreflect.Message // Deprecated: Use TrainControlState_DriverKeySwitch.ProtoReflect.Descriptor instead. func (*TrainControlState_DriverKeySwitch) Descriptor() ([]byte, []int) { - return file_device_state_proto_rawDescGZIP(), []int{35, 1} + return file_device_state_proto_rawDescGZIP(), []int{35, 2} } func (x *TrainControlState_DriverKeySwitch) GetId() uint32 { @@ -5234,7 +5329,7 @@ type TrainControlState_DirectionKeySwitch struct { func (x *TrainControlState_DirectionKeySwitch) Reset() { *x = TrainControlState_DirectionKeySwitch{} if protoimpl.UnsafeEnabled { - mi := &file_device_state_proto_msgTypes[43] + mi := &file_device_state_proto_msgTypes[45] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5247,7 +5342,7 @@ func (x *TrainControlState_DirectionKeySwitch) String() string { func (*TrainControlState_DirectionKeySwitch) ProtoMessage() {} func (x *TrainControlState_DirectionKeySwitch) ProtoReflect() protoreflect.Message { - mi := &file_device_state_proto_msgTypes[43] + mi := &file_device_state_proto_msgTypes[45] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5260,7 +5355,7 @@ func (x *TrainControlState_DirectionKeySwitch) ProtoReflect() protoreflect.Messa // Deprecated: Use TrainControlState_DirectionKeySwitch.ProtoReflect.Descriptor instead. func (*TrainControlState_DirectionKeySwitch) Descriptor() ([]byte, []int) { - return file_device_state_proto_rawDescGZIP(), []int{35, 2} + return file_device_state_proto_rawDescGZIP(), []int{35, 3} } func (x *TrainControlState_DirectionKeySwitch) GetId() uint32 { @@ -5290,7 +5385,7 @@ type TrainControlState_PushHandler struct { func (x *TrainControlState_PushHandler) Reset() { *x = TrainControlState_PushHandler{} if protoimpl.UnsafeEnabled { - mi := &file_device_state_proto_msgTypes[44] + mi := &file_device_state_proto_msgTypes[46] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -5303,7 +5398,7 @@ func (x *TrainControlState_PushHandler) String() string { func (*TrainControlState_PushHandler) ProtoMessage() {} func (x *TrainControlState_PushHandler) ProtoReflect() protoreflect.Message { - mi := &file_device_state_proto_msgTypes[44] + mi := &file_device_state_proto_msgTypes[46] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -5316,7 +5411,7 @@ func (x *TrainControlState_PushHandler) ProtoReflect() protoreflect.Message { // Deprecated: Use TrainControlState_PushHandler.ProtoReflect.Descriptor instead. func (*TrainControlState_PushHandler) Descriptor() ([]byte, []int) { - return file_device_state_proto_rawDescGZIP(), []int{35, 3} + return file_device_state_proto_rawDescGZIP(), []int{35, 4} } func (x *TrainControlState_PushHandler) GetId() uint32 { @@ -5333,6 +5428,61 @@ func (x *TrainControlState_PushHandler) GetVal() int32 { return 0 } +type TrainControlState_ControlLight struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id uint32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Val bool `protobuf:"varint,2,opt,name=val,proto3" json:"val,omitempty"` +} + +func (x *TrainControlState_ControlLight) Reset() { + *x = TrainControlState_ControlLight{} + if protoimpl.UnsafeEnabled { + mi := &file_device_state_proto_msgTypes[47] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *TrainControlState_ControlLight) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*TrainControlState_ControlLight) ProtoMessage() {} + +func (x *TrainControlState_ControlLight) ProtoReflect() protoreflect.Message { + mi := &file_device_state_proto_msgTypes[47] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use TrainControlState_ControlLight.ProtoReflect.Descriptor instead. +func (*TrainControlState_ControlLight) Descriptor() ([]byte, []int) { + return file_device_state_proto_rawDescGZIP(), []int{35, 5} +} + +func (x *TrainControlState_ControlLight) GetId() uint32 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *TrainControlState_ControlLight) GetVal() bool { + if x != nil { + return x.Val + } + return false +} + var File_device_state_proto protoreflect.FileDescriptor var file_device_state_proto_rawDesc = []byte{ @@ -6246,7 +6396,7 @@ var file_device_state_proto_rawDesc = []byte{ 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x61, 0x72, 0x74, 0x79, 0x41, 0x70, 0x69, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x74, - 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x81, 0x04, 0x0a, 0x11, 0x54, + 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x9e, 0x06, 0x0a, 0x11, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x40, 0x0a, 0x07, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, @@ -6265,31 +6415,72 @@ var file_device_state_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x75, 0x73, 0x68, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x52, 0x0b, 0x70, 0x75, 0x73, 0x68, - 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x1a, 0x37, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x73, 0x73, - 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x70, 0x61, 0x73, 0x73, 0x65, 0x64, - 0x1a, 0x33, 0x0a, 0x0f, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x53, 0x77, 0x69, - 0x74, 0x63, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, - 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x03, 0x76, 0x61, 0x6c, 0x1a, 0x36, 0x0a, 0x12, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x76, - 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x1a, 0x2f, 0x0a, - 0x0b, 0x50, 0x75, 0x73, 0x68, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, - 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x2a, 0x37, - 0x0a, 0x0b, 0x53, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, - 0x03, 0x41, 0x6e, 0x79, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x41, 0x78, 0x6c, 0x65, 0x10, 0x01, - 0x12, 0x09, 0x0a, 0x05, 0x4c, 0x6f, 0x67, 0x69, 0x63, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x50, - 0x68, 0x79, 0x73, 0x69, 0x63, 0x10, 0x03, 0x42, 0x67, 0x0a, 0x25, 0x63, 0x6c, 0x75, 0x62, 0x2e, - 0x6a, 0x6f, 0x79, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x62, 0x6a, 0x72, 0x74, 0x73, 0x73, 0x2e, 0x61, - 0x74, 0x73, 0x2e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, - 0x42, 0x10, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x5a, 0x2c, 0x6a, 0x6f, 0x79, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x63, 0x6c, 0x75, 0x62, - 0x2f, 0x62, 0x6a, 0x2d, 0x72, 0x74, 0x73, 0x74, 0x73, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, - 0x2f, 0x64, 0x74, 0x6f, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x12, 0x3d, 0x0a, 0x06, 0x6c, 0x69, 0x67, 0x68, 0x74, + 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, + 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x61, 0x74, + 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x52, 0x06, + 0x6c, 0x69, 0x67, 0x68, 0x74, 0x73, 0x12, 0x45, 0x0a, 0x09, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x4d, + 0x61, 0x70, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x73, 0x74, 0x61, 0x74, + 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x2e, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x4d, 0x61, 0x70, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x09, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x4d, 0x61, 0x70, 0x73, 0x1a, 0x63, 0x0a, + 0x0e, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x4d, 0x61, 0x70, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x3b, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x25, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, + 0x6f, 0x6c, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x42, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x73, 0x73, 0x65, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x06, 0x70, 0x61, 0x73, 0x73, 0x65, 0x64, 0x1a, 0x33, 0x0a, 0x0f, 0x44, + 0x72, 0x69, 0x76, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, + 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x76, 0x61, 0x6c, + 0x1a, 0x36, 0x0a, 0x12, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, + 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x1a, 0x2f, 0x0a, 0x0b, 0x50, 0x75, 0x73, 0x68, + 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x1a, 0x30, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, + 0x74, 0x72, 0x6f, 0x6c, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61, 0x6c, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x22, 0xec, 0x02, 0x0a, 0x14, + 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x61, 0x74, + 0x65, 0x4d, 0x73, 0x67, 0x12, 0x40, 0x0a, 0x07, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x73, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, + 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, + 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x52, 0x07, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x73, 0x12, 0x46, 0x0a, 0x09, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, + 0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x73, 0x74, 0x61, 0x74, + 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x2e, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x53, 0x77, 0x69, + 0x74, 0x63, 0x68, 0x52, 0x09, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x4b, 0x65, 0x79, 0x12, 0x43, + 0x0a, 0x06, 0x64, 0x69, 0x72, 0x4b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, + 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x52, 0x06, 0x64, 0x69, 0x72, + 0x4b, 0x65, 0x79, 0x12, 0x46, 0x0a, 0x0b, 0x70, 0x75, 0x73, 0x68, 0x48, 0x61, 0x6e, 0x64, 0x6c, + 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, + 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x53, 0x74, 0x61, + 0x74, 0x65, 0x2e, 0x50, 0x75, 0x73, 0x68, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x52, 0x0b, + 0x70, 0x75, 0x73, 0x68, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x12, 0x3d, 0x0a, 0x06, 0x6c, + 0x69, 0x67, 0x68, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x73, 0x74, + 0x61, 0x74, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x4c, 0x69, 0x67, + 0x68, 0x74, 0x52, 0x06, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x73, 0x2a, 0x37, 0x0a, 0x0b, 0x53, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x6e, 0x79, + 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x41, 0x78, 0x6c, 0x65, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, + 0x4c, 0x6f, 0x67, 0x69, 0x63, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x68, 0x79, 0x73, 0x69, + 0x63, 0x10, 0x03, 0x42, 0x67, 0x0a, 0x25, 0x63, 0x6c, 0x75, 0x62, 0x2e, 0x6a, 0x6f, 0x79, 0x6c, + 0x69, 0x6e, 0x6b, 0x2e, 0x62, 0x6a, 0x72, 0x74, 0x73, 0x73, 0x2e, 0x61, 0x74, 0x73, 0x2e, 0x76, + 0x65, 0x72, 0x69, 0x66, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x42, 0x10, 0x44, 0x65, + 0x76, 0x69, 0x63, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x5a, 0x2c, + 0x6a, 0x6f, 0x79, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x63, 0x6c, 0x75, 0x62, 0x2f, 0x62, 0x6a, 0x2d, + 0x72, 0x74, 0x73, 0x74, 0x73, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x64, 0x74, 0x6f, + 0x2f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -6305,7 +6496,7 @@ func file_device_state_proto_rawDescGZIP() []byte { } var file_device_state_proto_enumTypes = make([]protoimpl.EnumInfo, 6) -var file_device_state_proto_msgTypes = make([]protoimpl.MessageInfo, 45) +var file_device_state_proto_msgTypes = make([]protoimpl.MessageInfo, 48) var file_device_state_proto_goTypes = []interface{}{ (SectionType)(0), // 0: state.SectionType (Signal_Aspect)(0), // 1: state.Signal.Aspect @@ -6349,57 +6540,60 @@ var file_device_state_proto_goTypes = []interface{}{ (*SimulationThirdPartyApiService)(nil), // 39: state.SimulationThirdPartyApiService (*SimulationThirdPartyApiServiceState)(nil), // 40: state.SimulationThirdPartyApiServiceState (*TrainControlState)(nil), // 41: state.TrainControlState - nil, // 42: state.SignalState.RelayStateMapEntry - nil, // 43: state.VobcBtmState.HistoryEntry - (*VobcBtmState_TelegramState)(nil), // 44: state.VobcBtmState.TelegramState - (*VobcBtmState_VobcBtmHistoryState)(nil), // 45: state.VobcBtmState.VobcBtmHistoryState - (*StationQc_State)(nil), // 46: state.StationQc.State - (*TrainControlState_ControlButton)(nil), // 47: state.TrainControlState.ControlButton - (*TrainControlState_DriverKeySwitch)(nil), // 48: state.TrainControlState.DriverKeySwitch - (*TrainControlState_DirectionKeySwitch)(nil), // 49: state.TrainControlState.DirectionKeySwitch - (*TrainControlState_PushHandler)(nil), // 50: state.TrainControlState.PushHandler - (*request_proto.PointsParam)(nil), // 51: request.PointsParam - (*request_proto.SignalParam)(nil), // 52: request.SignalParam - (*common_proto.TrainDynamicConfig)(nil), // 53: common.TrainDynamicConfig - (*common_proto.TrainEndsState)(nil), // 54: common.TrainEndsState - (*request_proto.PsdParam)(nil), // 55: request.PsdParam - (*data_proto.KilometerSystem)(nil), // 56: graphicData.KilometerSystem - (*request_proto.CkmParam)(nil), // 57: request.CkmParam - (*request_proto.XcjParam)(nil), // 58: request.XcjParam + (*TrainControlStateMsg)(nil), // 42: state.TrainControlStateMsg + nil, // 43: state.SignalState.RelayStateMapEntry + nil, // 44: state.VobcBtmState.HistoryEntry + (*VobcBtmState_TelegramState)(nil), // 45: state.VobcBtmState.TelegramState + (*VobcBtmState_VobcBtmHistoryState)(nil), // 46: state.VobcBtmState.VobcBtmHistoryState + (*StationQc_State)(nil), // 47: state.StationQc.State + nil, // 48: state.TrainControlState.LightMapsEntry + (*TrainControlState_ControlButton)(nil), // 49: state.TrainControlState.ControlButton + (*TrainControlState_DriverKeySwitch)(nil), // 50: state.TrainControlState.DriverKeySwitch + (*TrainControlState_DirectionKeySwitch)(nil), // 51: state.TrainControlState.DirectionKeySwitch + (*TrainControlState_PushHandler)(nil), // 52: state.TrainControlState.PushHandler + (*TrainControlState_ControlLight)(nil), // 53: state.TrainControlState.ControlLight + (*request_proto.PointsParam)(nil), // 54: request.PointsParam + (*request_proto.SignalParam)(nil), // 55: request.SignalParam + (*common_proto.TrainDynamicConfig)(nil), // 56: common.TrainDynamicConfig + (*common_proto.TrainEndsState)(nil), // 57: common.TrainEndsState + (*request_proto.PsdParam)(nil), // 58: request.PsdParam + (*data_proto.KilometerSystem)(nil), // 59: graphicData.KilometerSystem + (*request_proto.CkmParam)(nil), // 60: request.CkmParam + (*request_proto.XcjParam)(nil), // 61: request.XcjParam } var file_device_state_proto_depIdxs = []int32{ - 51, // 0: state.SwitchState.param:type_name -> request.PointsParam + 54, // 0: state.SwitchState.param:type_name -> request.PointsParam 1, // 1: state.SignalState.aspect:type_name -> state.Signal.Aspect - 52, // 2: state.SignalState.param:type_name -> request.SignalParam - 42, // 3: state.SignalState.relayStateMap:type_name -> state.SignalState.RelayStateMapEntry + 55, // 2: state.SignalState.param:type_name -> request.SignalParam + 43, // 3: state.SignalState.relayStateMap:type_name -> state.SignalState.RelayStateMapEntry 23, // 4: state.PlatformState.spksState:type_name -> state.ReplyState 30, // 5: state.PlatformState.mkxJState:type_name -> state.MkxJState 2, // 6: state.TrainConnState.connType:type_name -> state.TrainConnState.TrainConnType 17, // 7: state.TrainState.dynamicState:type_name -> state.TrainDynamicState 18, // 8: state.TrainState.vobcState:type_name -> state.TrainVobcState - 53, // 9: state.TrainState.trainDynamicConfig:type_name -> common.TrainDynamicConfig - 54, // 10: state.TrainState.trainEndsA:type_name -> common.TrainEndsState - 54, // 11: state.TrainState.trainEndsB:type_name -> common.TrainEndsState + 56, // 9: state.TrainState.trainDynamicConfig:type_name -> common.TrainDynamicConfig + 57, // 10: state.TrainState.trainEndsA:type_name -> common.TrainEndsState + 57, // 11: state.TrainState.trainEndsB:type_name -> common.TrainEndsState 20, // 12: state.TrainState.btmState:type_name -> state.BTMState 41, // 13: state.TrainState.tcc:type_name -> state.TrainControlState 13, // 14: state.TrainState.connState:type_name -> state.TrainConnState 16, // 15: state.TrainState.pluseCount:type_name -> state.SensorSpeedPulseCount 15, // 16: state.TrainState.vobcBtm:type_name -> state.VobcBtmState - 44, // 17: state.VobcBtmState.telegramState:type_name -> state.VobcBtmState.TelegramState - 43, // 18: state.VobcBtmState.history:type_name -> state.VobcBtmState.HistoryEntry + 45, // 17: state.VobcBtmState.telegramState:type_name -> state.VobcBtmState.TelegramState + 44, // 18: state.VobcBtmState.history:type_name -> state.VobcBtmState.HistoryEntry 21, // 19: state.TrainMapState.trainDynamicConfig:type_name -> state.TrainDynamicConfigMqtt 22, // 20: state.TrainMapState.trainEndsA:type_name -> state.TrainEndsStateMqtt 22, // 21: state.TrainMapState.trainEndsB:type_name -> state.TrainEndsStateMqtt 20, // 22: state.TrainMapState.btmState:type_name -> state.BTMState 13, // 23: state.TrainMapState.connState:type_name -> state.TrainConnState 28, // 24: state.PsdState.asdStates:type_name -> state.AsdState - 55, // 25: state.PsdState.param:type_name -> request.PsdParam + 58, // 25: state.PsdState.param:type_name -> request.PsdParam 23, // 26: state.MkxJState.replyState:type_name -> state.ReplyState - 56, // 27: state.BaliseState.km:type_name -> graphicData.KilometerSystem - 46, // 28: state.StationQc.qdStates:type_name -> state.StationQc.State - 46, // 29: state.StationQc.cjStates:type_name -> state.StationQc.State - 57, // 30: state.CkmState.param:type_name -> request.CkmParam - 58, // 31: state.XcjState.param:type_name -> request.XcjParam + 59, // 27: state.BaliseState.km:type_name -> graphicData.KilometerSystem + 47, // 28: state.StationQc.qdStates:type_name -> state.StationQc.State + 47, // 29: state.StationQc.cjStates:type_name -> state.StationQc.State + 60, // 30: state.CkmState.param:type_name -> request.CkmParam + 61, // 31: state.XcjState.param:type_name -> request.XcjParam 19, // 32: state.VariationStatus.updatedTrain:type_name -> state.TrainMapState 8, // 33: state.VariationStatus.updatedSwitch:type_name -> state.SwitchState 7, // 34: state.VariationStatus.updatedSection:type_name -> state.SectionState @@ -6426,16 +6620,24 @@ var file_device_state_proto_depIdxs = []int32{ 40, // 55: state.SimulationThirdPartyApiService.states:type_name -> state.SimulationThirdPartyApiServiceState 4, // 56: state.SimulationThirdPartyApiServiceState.type:type_name -> state.SimulationThirdPartyApiService.Type 5, // 57: state.SimulationThirdPartyApiServiceState.state:type_name -> state.SimulationThirdPartyApiService.State - 47, // 58: state.TrainControlState.buttons:type_name -> state.TrainControlState.ControlButton - 48, // 59: state.TrainControlState.driverKey:type_name -> state.TrainControlState.DriverKeySwitch - 49, // 60: state.TrainControlState.dirKey:type_name -> state.TrainControlState.DirectionKeySwitch - 50, // 61: state.TrainControlState.pushHandler:type_name -> state.TrainControlState.PushHandler - 45, // 62: state.VobcBtmState.HistoryEntry.value:type_name -> state.VobcBtmState.VobcBtmHistoryState - 63, // [63:63] is the sub-list for method output_type - 63, // [63:63] is the sub-list for method input_type - 63, // [63:63] is the sub-list for extension type_name - 63, // [63:63] is the sub-list for extension extendee - 0, // [0:63] is the sub-list for field type_name + 49, // 58: state.TrainControlState.buttons:type_name -> state.TrainControlState.ControlButton + 50, // 59: state.TrainControlState.driverKey:type_name -> state.TrainControlState.DriverKeySwitch + 51, // 60: state.TrainControlState.dirKey:type_name -> state.TrainControlState.DirectionKeySwitch + 52, // 61: state.TrainControlState.pushHandler:type_name -> state.TrainControlState.PushHandler + 53, // 62: state.TrainControlState.lights:type_name -> state.TrainControlState.ControlLight + 48, // 63: state.TrainControlState.lightMaps:type_name -> state.TrainControlState.LightMapsEntry + 49, // 64: state.TrainControlStateMsg.buttons:type_name -> state.TrainControlState.ControlButton + 50, // 65: state.TrainControlStateMsg.driverKey:type_name -> state.TrainControlState.DriverKeySwitch + 51, // 66: state.TrainControlStateMsg.dirKey:type_name -> state.TrainControlState.DirectionKeySwitch + 52, // 67: state.TrainControlStateMsg.pushHandler:type_name -> state.TrainControlState.PushHandler + 53, // 68: state.TrainControlStateMsg.lights:type_name -> state.TrainControlState.ControlLight + 46, // 69: state.VobcBtmState.HistoryEntry.value:type_name -> state.VobcBtmState.VobcBtmHistoryState + 53, // 70: state.TrainControlState.LightMapsEntry.value:type_name -> state.TrainControlState.ControlLight + 71, // [71:71] is the sub-list for method output_type + 71, // [71:71] is the sub-list for method input_type + 71, // [71:71] is the sub-list for extension type_name + 71, // [71:71] is the sub-list for extension extendee + 0, // [0:71] is the sub-list for field type_name } func init() { file_device_state_proto_init() } @@ -6876,8 +7078,8 @@ func file_device_state_proto_init() { return nil } } - file_device_state_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VobcBtmState_TelegramState); i { + file_device_state_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TrainControlStateMsg); i { case 0: return &v.state case 1: @@ -6889,7 +7091,7 @@ func file_device_state_proto_init() { } } file_device_state_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VobcBtmState_VobcBtmHistoryState); i { + switch v := v.(*VobcBtmState_TelegramState); i { case 0: return &v.state case 1: @@ -6901,7 +7103,7 @@ func file_device_state_proto_init() { } } file_device_state_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*StationQc_State); i { + switch v := v.(*VobcBtmState_VobcBtmHistoryState); i { case 0: return &v.state case 1: @@ -6913,19 +7115,7 @@ func file_device_state_proto_init() { } } file_device_state_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TrainControlState_ControlButton); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_device_state_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TrainControlState_DriverKeySwitch); i { + switch v := v.(*StationQc_State); i { case 0: return &v.state case 1: @@ -6937,7 +7127,7 @@ func file_device_state_proto_init() { } } file_device_state_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*TrainControlState_DirectionKeySwitch); i { + switch v := v.(*TrainControlState_ControlButton); i { case 0: return &v.state case 1: @@ -6949,6 +7139,30 @@ func file_device_state_proto_init() { } } file_device_state_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TrainControlState_DriverKeySwitch); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_device_state_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TrainControlState_DirectionKeySwitch); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_device_state_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TrainControlState_PushHandler); i { case 0: return &v.state @@ -6960,6 +7174,18 @@ func file_device_state_proto_init() { return nil } } + file_device_state_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*TrainControlState_ControlLight); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -6967,7 +7193,7 @@ func file_device_state_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_device_state_proto_rawDesc, NumEnums: 6, - NumMessages: 45, + NumMessages: 48, NumExtensions: 0, NumServices: 0, }, diff --git a/message_server/train_control_ms.go b/message_server/train_control_ms.go index 08e556d..8799976 100644 --- a/message_server/train_control_ms.go +++ b/message_server/train_control_ms.go @@ -17,7 +17,9 @@ func NewTrainControlMs(vs *memory.VerifySimulation, mapId int32) ms_api.MsgTask allTrainMap.Range(func(key, value any) bool { trainId := fmt.Sprintf("%v", key) ts := value.(*state_proto.TrainState) - err := mqtt.GetMsgClient().PubTrainControlState(vs.SimulationId, trainId, ts.Tcc) + ttcc := ts.Tcc + tcc := &state_proto.TrainControlStateMsg{Buttons: ttcc.Buttons, DriverKey: ttcc.DriverKey, DirKey: ttcc.DirKey, PushHandler: ttcc.PushHandler} + err := mqtt.GetMsgClient().PubTrainControlState(vs.SimulationId, trainId, tcc) if err != nil { slog.Error("发送列车控制mqtt失败", err) } diff --git a/mqtt/client.go b/mqtt/client.go index 72ae5b6..ed83f22 100644 --- a/mqtt/client.go +++ b/mqtt/client.go @@ -139,6 +139,6 @@ func (client *MqttClient) PubSfpState(simulationId string, mapId int32, msg *sta } // 发送列车控制状态 -func (client *MqttClient) PubTrainControlState(simulationId string, trainId string, msg *state_proto.TrainControlState) error { +func (client *MqttClient) PubTrainControlState(simulationId string, trainId string, msg *state_proto.TrainControlStateMsg) error { return client.pub(GetTrainControlTopic(simulationId, trainId), msg) } diff --git a/ts/simulation/wayside/memory/train_tcc_graphic.go b/ts/simulation/wayside/memory/train_tcc_graphic.go index b4528a2..35e32bf 100644 --- a/ts/simulation/wayside/memory/train_tcc_graphic.go +++ b/ts/simulation/wayside/memory/train_tcc_graphic.go @@ -101,6 +101,7 @@ func initTrainTcc(vs *VerifySimulation, runDir bool, breaking int32) *state_prot } btns = append(btns, btn) } + tcc.Buttons = btns for _, b := range tccGI.TccHandles { if b.Code == QYSB {