merge

1 files changed, 12 insertions, 11 deletions

diff --git a/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto b/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto
index 51fd85311..1dbd9515d 100644
--- a/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto
+++ b/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto
@@ -9,14 +9,15 @@ import "EventType.proto";
 
 message AlarmHandlingItem
 {
-    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;
-}
+	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;
+    }