diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-11-07 22:54:09 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-11-07 22:54:09 +0200 |
| commit | 5257bfef6cf9fc4896fe417233e7535401c4e5e1 (patch) | |
| tree | 7b64247434a55ad07b79c9efb521f76b576f59eb /Software | |
| parent | 42370757e73c70495384922615279817e1592e39 (diff) | |
| parent | 9f81ed49d313941207169fb99eff07452e143e28 (diff) | |
| download | Tango-5257bfef6cf9fc4896fe417233e7535401c4e5e1.tar.gz Tango-5257bfef6cf9fc4896fe417233e7535401c4e5e1.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software')
| -rw-r--r-- | Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto | 22 | ||||
| -rw-r--r-- | Software/Stubs Collection/alarm generator/alarm_gen.exe | bin | 0 -> 3760128 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/Utilities/Tango.AlarmParametersGenerator/Program.cs | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto b/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto index 0dbc0a114..862b4dabe 100644 --- a/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto +++ b/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto @@ -10,15 +10,15 @@ 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; + //uint32 Frequency = 2; //1/10/100/1000 + uint32 DeviceId = 2; + uint32 ModuleDeviceId = 3; + uint32 AlarmValue = 4; + bool AlarmDirection = 5; + Debugging.DebugLogCategory Severity = 6; + //uint32 Predecessor = 7; + uint32 DebounceValue = 7; + Diagnostics.EventType EventType = 8; + string EventName = 9; + bool IsPersistent = 10; } diff --git a/Software/Stubs Collection/alarm generator/alarm_gen.exe b/Software/Stubs Collection/alarm generator/alarm_gen.exe Binary files differnew file mode 100644 index 000000000..6044e0ef0 --- /dev/null +++ b/Software/Stubs Collection/alarm generator/alarm_gen.exe diff --git a/Software/Visual_Studio/Utilities/Tango.AlarmParametersGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.AlarmParametersGenerator/Program.cs index a18befe34..2972b4892 100644 --- a/Software/Visual_Studio/Utilities/Tango.AlarmParametersGenerator/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.AlarmParametersGenerator/Program.cs @@ -94,13 +94,13 @@ namespace Tango.AlarmParametersGenerator AlarmHandlingItem alarm = new AlarmHandlingItem(); alarm.AlarmSource = item.Source.ToEnum<AlarmSourceType>(); - alarm.Frequency = item.Frequency.ToUint(); + //alarm.Frequency = item.Frequency.ToUint(); alarm.DeviceId = item.DeviceId.ToUint(); alarm.ModuleDeviceId = item.ApplicationDeviceID.ToUint(); alarm.AlarmValue = item.Criteria.ToUint(); alarm.AlarmDirection = item.Direction.ToBoolean(); alarm.Severity = item.Severity.ToEnum<DebugLogCategory>(); - alarm.Predecessor = item.Predeccesor.ToUint(); + //alarm.Predecessor = item.Predeccesor.ToUint(); alarm.DebounceValue = item.DebounceValue.ToUint(); alarm.EventType = (EventType)item.Code.ToUint(); alarm.IsPersistent = item.Persistent.ToBooleanYesNo(); |