diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-11-18 16:53:27 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-11-18 16:53:27 +0200 |
| commit | d490924ad53668da9cfac498a925def0ff616b6d (patch) | |
| tree | 4211d0c2379b08b0afb1c862530f40e2d17f0cc8 /Software/PMR | |
| parent | e766a7f3799444e93a5dc9547c4121c4aa3b14fb (diff) | |
| parent | a9d18c495bfb4232b61bf4b45f1ba3c626cdb61b (diff) | |
| download | Tango-d490924ad53668da9cfac498a925def0ff616b6d.tar.gz Tango-d490924ad53668da9cfac498a925def0ff616b6d.zip | |
MERGED.
Diffstat (limited to 'Software/PMR')
4 files changed, 41 insertions, 12 deletions
diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto index 2dca4ee09..152408996 100644 --- a/Software/PMR/Messages/Common/MessageType.proto +++ b/Software/PMR/Messages/Common/MessageType.proto @@ -125,6 +125,10 @@ enum MessageType StubMainCardEEpromWriteResponse = 112; StubHeadEEpromRequest = 113; StubHeadEEpromResponse = 114; + ProcedureRequest = 115; + ProcedureResponse = 116; + StubAllHardwareRequest = 117; + StubAllHardwareResponse = 118; //------------------------------------ diff --git a/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto b/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto index 0dbc0a114..51fd85311 100644 --- a/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto +++ b/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto @@ -9,16 +9,14 @@ import "EventType.proto"; message AlarmHandlingItem { - AlarmSourceType AlarmSource = 1; - uint32 Frequency = 2; //1/10/100/1000 - uint32 DeviceId = 3; - uint32 ModuleDeviceId = 4; - uint32 AlarmValue = 5; - bool AlarmDirection = 6; - Debugging.DebugLogCategory Severity = 7; - uint32 Predecessor = 8; - uint32 DebounceValue = 9; - Diagnostics.EventType EventType = 10; - string EventName = 11; - bool IsPersistent = 12; + AlarmSourceType AlarmSource = 1; + uint32 DeviceId = 2; + uint32 ModuleDeviceId = 3; + uint32 AlarmValue = 4; + bool AlarmDirection = 5; + Debugging.DebugLogCategory Severity = 6; + uint32 DebounceValue = 7; + Diagnostics.EventType EventType = 8; + string EventName = 9; + bool IsPersistent = 10; } diff --git a/Software/PMR/Messages/Stubs/ProcedureRequest.proto b/Software/PMR/Messages/Stubs/ProcedureRequest.proto new file mode 100644 index 000000000..2c65a2910 --- /dev/null +++ b/Software/PMR/Messages/Stubs/ProcedureRequest.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +package Tango.PMR.Stubs; +option java_package = "com.twine.tango.pmr.stubs"; + +message ProcedureRequest +{ + int32 Type = 1; + int32 Timeout = 2; + float Param1 = 3; + float Param2 = 4; + float Param3 = 5; + float Param4 = 6; +}
\ No newline at end of file diff --git a/Software/PMR/Messages/Stubs/ProcedureResponse.proto b/Software/PMR/Messages/Stubs/ProcedureResponse.proto new file mode 100644 index 000000000..840ba054b --- /dev/null +++ b/Software/PMR/Messages/Stubs/ProcedureResponse.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +package Tango.PMR.Stubs; +option java_package = "com.twine.tango.pmr.stubs"; + +message ProcedureResponse +{ + int32 Type = 1; + int32 Time = 2; + float ReplyValue1 = 3; + float ReplyValue2 = 4; + float ReplyValue3 = 5; +}
\ No newline at end of file |