Version 1.5.1(4)

3 files changed, 62 insertions, 32 deletions

diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.c
index 7f25525ff..2ed0ef818 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.c
@@ -52,7 +52,7 @@ void   alarm_handling_item__free_unpacked
   assert(message->base.descriptor == &alarm_handling_item__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[10] =
+static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[12] =
 {
   {
     "",
@@ -71,6 +71,18 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[10]
     2,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
+    offsetof(AlarmHandlingItem, has_frequency),
+    offsetof(AlarmHandlingItem, frequency),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
     offsetof(AlarmHandlingItem, has_deviceid),
     offsetof(AlarmHandlingItem, deviceid),
     NULL,
@@ -80,7 +92,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[10]
   },
   {
     "",
-    3,
+    4,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
     offsetof(AlarmHandlingItem, has_moduledeviceid),
@@ -92,7 +104,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[10]
   },
   {
     "",
-    4,
+    5,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
     offsetof(AlarmHandlingItem, has_alarmvalue),
@@ -104,7 +116,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[10]
   },
   {
     "",
-    5,
+    6,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BOOL,
     offsetof(AlarmHandlingItem, has_alarmdirection),
@@ -116,7 +128,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[10]
   },
   {
     "",
-    6,
+    7,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_ENUM,
     offsetof(AlarmHandlingItem, has_severity),
@@ -128,7 +140,19 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[10]
   },
   {
     "",
-    7,
+    8,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(AlarmHandlingItem, has_predecessor),
+    offsetof(AlarmHandlingItem, predecessor),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    9,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
     offsetof(AlarmHandlingItem, has_debouncevalue),
@@ -140,7 +164,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[10]
   },
   {
     "",
-    8,
+    10,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_ENUM,
     offsetof(AlarmHandlingItem, has_eventtype),
@@ -152,7 +176,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[10]
   },
   {
     "",
-    9,
+    11,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
@@ -164,7 +188,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[10]
   },
   {
     "",
-    10,
+    12,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BOOL,
     offsetof(AlarmHandlingItem, has_ispersistent),
@@ -176,21 +200,23 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[10]
   },
 };
 static const unsigned alarm_handling_item__field_indices_by_name[] = {
-  4,   /* field[4] = AlarmDirection */
+  5,   /* field[5] = AlarmDirection */
   0,   /* field[0] = AlarmSource */
-  3,   /* field[3] = AlarmValue */
-  6,   /* field[6] = DebounceValue */
-  1,   /* field[1] = DeviceId */
-  8,   /* field[8] = EventName */
-  7,   /* field[7] = EventType */
-  9,   /* field[9] = IsPersistent */
-  2,   /* field[2] = ModuleDeviceId */
-  5,   /* field[5] = Severity */
+  4,   /* field[4] = AlarmValue */
+  8,   /* field[8] = DebounceValue */
+  2,   /* field[2] = DeviceId */
+  10,   /* field[10] = EventName */
+  9,   /* field[9] = EventType */
+  1,   /* field[1] = Frequency */
+  11,   /* field[11] = IsPersistent */
+  3,   /* field[3] = ModuleDeviceId */
+  7,   /* field[7] = Predecessor */
+  6,   /* field[6] = Severity */
 };
 static const ProtobufCIntRange alarm_handling_item__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 10 }
+  { 0, 12 }
 };
 const ProtobufCMessageDescriptor alarm_handling_item__descriptor =
 {
@@ -200,7 +226,7 @@ const ProtobufCMessageDescriptor alarm_handling_item__descriptor =
   "",
   "",
   sizeof(AlarmHandlingItem),
-  10,
+  12,
   alarm_handling_item__field_descriptors,
   alarm_handling_item__field_indices_by_name,
   1,  alarm_handling_item__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.h
index 635c38544..f69c7b96d 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.h
@@ -31,6 +31,8 @@ struct  _AlarmHandlingItem
   ProtobufCMessage base;
   protobuf_c_boolean has_alarmsource;
   AlarmSourceType alarmsource;
+  protobuf_c_boolean has_frequency;
+  uint32_t frequency;
   protobuf_c_boolean has_deviceid;
   uint32_t deviceid;
   protobuf_c_boolean has_moduledeviceid;
@@ -41,6 +43,8 @@ struct  _AlarmHandlingItem
   protobuf_c_boolean alarmdirection;
   protobuf_c_boolean has_severity;
   DebugLogCategory severity;
+  protobuf_c_boolean has_predecessor;
+  uint32_t predecessor;
   protobuf_c_boolean has_debouncevalue;
   uint32_t debouncevalue;
   protobuf_c_boolean has_eventtype;
@@ -51,7 +55,7 @@ struct  _AlarmHandlingItem
 };
 #define ALARM_HANDLING_ITEM__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&alarm_handling_item__descriptor) \
-    , 0, ALARM_SOURCE_TYPE__TemperatureAlarm, 0, 0, 0, 0, 0, 0, 0, 0, 0, DEBUG_LOG_CATEGORY__Info, 0, 0, 0, EVENT_TYPE__None, NULL, 0, 0 }
+    , 0, ALARM_SOURCE_TYPE__TemperatureAlarm, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, DEBUG_LOG_CATEGORY__Info, 0, 0, 0, 0, 0, EVENT_TYPE__None, NULL, 0, 0 }
 
 
 /* AlarmHandlingItem methods */
diff --git a/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto b/Software/PMR/Messages/EmbeddedParameters/AlarmHandlingItem.proto
index 862b4dabe..0dbc0a114 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 = 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;
+    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;
 }