修改屏蔽门故障操作bug
This commit is contained in:
parent
01b16f30ef
commit
3c76b468b2
|
|
@ -246,10 +246,11 @@ const (
|
|||
Psd_ForceKm4 Psd_Operation = 7 //强制四编组开门
|
||||
Psd_ForceKm8 Psd_Operation = 8 //强制八编组开门
|
||||
Psd_ForceGm Psd_Operation = 9 //强制关门
|
||||
Psd_AsdCannotOpen Psd_Operation = 10 //滑动门无法开门
|
||||
Psd_CancelAsdCannotOpen Psd_Operation = 11 //取消滑动门无法开门
|
||||
Psd_AsdCannotClose Psd_Operation = 12 //滑动门无法关闭
|
||||
Psd_CancelAsdCannotClose Psd_Operation = 13 //取消滑动门无法关闭
|
||||
Psd_CancelForce Psd_Operation = 10 //取消强制
|
||||
Psd_AsdCannotOpen Psd_Operation = 11 //滑动门无法开门
|
||||
Psd_CancelAsdCannotOpen Psd_Operation = 12 //取消滑动门无法开门
|
||||
Psd_AsdCannotClose Psd_Operation = 13 //滑动门无法关闭
|
||||
Psd_CancelAsdCannotClose Psd_Operation = 14 //取消滑动门无法关闭
|
||||
)
|
||||
|
||||
// Enum value maps for Psd_Operation.
|
||||
|
|
@ -265,10 +266,11 @@ var (
|
|||
7: "ForceKm4",
|
||||
8: "ForceKm8",
|
||||
9: "ForceGm",
|
||||
10: "AsdCannotOpen",
|
||||
11: "CancelAsdCannotOpen",
|
||||
12: "AsdCannotClose",
|
||||
13: "CancelAsdCannotClose",
|
||||
10: "CancelForce",
|
||||
11: "AsdCannotOpen",
|
||||
12: "CancelAsdCannotOpen",
|
||||
13: "AsdCannotClose",
|
||||
14: "CancelAsdCannotClose",
|
||||
}
|
||||
Psd_Operation_value = map[string]int32{
|
||||
"Undefined": 0,
|
||||
|
|
@ -281,10 +283,11 @@ var (
|
|||
"ForceKm4": 7,
|
||||
"ForceKm8": 8,
|
||||
"ForceGm": 9,
|
||||
"AsdCannotOpen": 10,
|
||||
"CancelAsdCannotOpen": 11,
|
||||
"AsdCannotClose": 12,
|
||||
"CancelAsdCannotClose": 13,
|
||||
"CancelForce": 10,
|
||||
"AsdCannotOpen": 11,
|
||||
"CancelAsdCannotOpen": 12,
|
||||
"AsdCannotClose": 13,
|
||||
"CancelAsdCannotClose": 14,
|
||||
}
|
||||
)
|
||||
|
||||
|
|
@ -672,7 +675,7 @@ var file_request_proto_rawDesc = []byte{
|
|||
0x0b, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x50, 0x64, 0x72, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0f,
|
||||
0x0a, 0x0b, 0x53, 0x65, 0x74, 0x46, 0x61, 0x75, 0x6c, 0x74, 0x4f, 0x63, 0x63, 0x10, 0x04, 0x12,
|
||||
0x12, 0x0a, 0x0e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x46, 0x61, 0x75, 0x6c, 0x74, 0x4f, 0x63,
|
||||
0x63, 0x10, 0x05, 0x22, 0xeb, 0x01, 0x0a, 0x03, 0x50, 0x73, 0x64, 0x22, 0xe3, 0x01, 0x0a, 0x09,
|
||||
0x63, 0x10, 0x05, 0x22, 0xfc, 0x01, 0x0a, 0x03, 0x50, 0x73, 0x64, 0x22, 0xf4, 0x01, 0x0a, 0x09,
|
||||
0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0d, 0x0a, 0x09, 0x55, 0x6e, 0x64,
|
||||
0x65, 0x66, 0x69, 0x6e, 0x65, 0x64, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x4b, 0x6d, 0x34, 0x10,
|
||||
0x01, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4b, 0x6d, 0x34, 0x10, 0x02,
|
||||
|
|
@ -681,26 +684,27 @@ var file_request_proto_rawDesc = []byte{
|
|||
0x12, 0x0c, 0x0a, 0x08, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x47, 0x6d, 0x10, 0x06, 0x12, 0x0c,
|
||||
0x0a, 0x08, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x4b, 0x6d, 0x34, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08,
|
||||
0x46, 0x6f, 0x72, 0x63, 0x65, 0x4b, 0x6d, 0x38, 0x10, 0x08, 0x12, 0x0b, 0x0a, 0x07, 0x46, 0x6f,
|
||||
0x72, 0x63, 0x65, 0x47, 0x6d, 0x10, 0x09, 0x12, 0x11, 0x0a, 0x0d, 0x41, 0x73, 0x64, 0x43, 0x61,
|
||||
0x6e, 0x6e, 0x6f, 0x74, 0x4f, 0x70, 0x65, 0x6e, 0x10, 0x0a, 0x12, 0x17, 0x0a, 0x13, 0x43, 0x61,
|
||||
0x6e, 0x63, 0x65, 0x6c, 0x41, 0x73, 0x64, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x4f, 0x70, 0x65,
|
||||
0x6e, 0x10, 0x0b, 0x12, 0x12, 0x0a, 0x0e, 0x41, 0x73, 0x64, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74,
|
||||
0x43, 0x6c, 0x6f, 0x73, 0x65, 0x10, 0x0c, 0x12, 0x18, 0x0a, 0x14, 0x43, 0x61, 0x6e, 0x63, 0x65,
|
||||
0x6c, 0x41, 0x73, 0x64, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x10,
|
||||
0x0d, 0x22, 0xb9, 0x01, 0x0a, 0x0f, 0x50, 0x73, 0x64, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69,
|
||||
0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74,
|
||||
0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, 0x6d,
|
||||
0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x70,
|
||||
0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x61, 0x70, 0x49, 0x64, 0x12,
|
||||
0x1a, 0x0a, 0x08, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x08, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x34, 0x0a, 0x09, 0x6f,
|
||||
0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16,
|
||||
0x2e, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x50, 0x73, 0x64, 0x2e, 0x4f, 0x70, 0x65,
|
||||
0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f,
|
||||
0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x73, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x05, 0x20,
|
||||
0x03, 0x28, 0x05, 0x52, 0x08, 0x61, 0x73, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x42, 0x15, 0x5a,
|
||||
0x13, 0x2e, 0x2f, 0x64, 0x74, 0x6f, 0x2f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x70,
|
||||
0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x72, 0x63, 0x65, 0x47, 0x6d, 0x10, 0x09, 0x12, 0x0f, 0x0a, 0x0b, 0x43, 0x61, 0x6e, 0x63, 0x65,
|
||||
0x6c, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x11, 0x0a, 0x0d, 0x41, 0x73, 0x64, 0x43,
|
||||
0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x4f, 0x70, 0x65, 0x6e, 0x10, 0x0b, 0x12, 0x17, 0x0a, 0x13, 0x43,
|
||||
0x61, 0x6e, 0x63, 0x65, 0x6c, 0x41, 0x73, 0x64, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x4f, 0x70,
|
||||
0x65, 0x6e, 0x10, 0x0c, 0x12, 0x12, 0x0a, 0x0e, 0x41, 0x73, 0x64, 0x43, 0x61, 0x6e, 0x6e, 0x6f,
|
||||
0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x10, 0x0d, 0x12, 0x18, 0x0a, 0x14, 0x43, 0x61, 0x6e, 0x63,
|
||||
0x65, 0x6c, 0x41, 0x73, 0x64, 0x43, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65,
|
||||
0x10, 0x0e, 0x22, 0xb9, 0x01, 0x0a, 0x0f, 0x50, 0x73, 0x64, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74,
|
||||
0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6d, 0x75, 0x6c, 0x61,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69,
|
||||
0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61,
|
||||
0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x61, 0x70, 0x49, 0x64,
|
||||
0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x08, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x34, 0x0a, 0x09,
|
||||
0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32,
|
||||
0x16, 0x2e, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x50, 0x73, 0x64, 0x2e, 0x4f, 0x70,
|
||||
0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69,
|
||||
0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x73, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x05,
|
||||
0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x61, 0x73, 0x64, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x42, 0x15,
|
||||
0x5a, 0x13, 0x2e, 0x2f, 0x64, 0x74, 0x6f, 0x2f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f,
|
||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ func HandlePsdOperation(simulation *VerifySimulation, req *request_proto.PsdOper
|
|||
case request_proto.Psd_ForceKm4:
|
||||
case request_proto.Psd_ForceKm8:
|
||||
case request_proto.Psd_ForceGm:
|
||||
case request_proto.Psd_CancelForce:
|
||||
case request_proto.Psd_AsdCannotClose:
|
||||
return fi.SetPsdFault(simulation.World, uid, component_proto.Psd_AsdCannotClose, req.AsdCodes)
|
||||
case request_proto.Psd_CancelAsdCannotClose:
|
||||
|
|
|
|||
Loading…
Reference in New Issue