Index: dialin/dg/alarms.py =================================================================== diff -u -rb88bd81598f55b6fcfac0fd42b2da3754fbf765e -r8efb17d9278ef024010c903f7190b1b37e187890 --- dialin/dg/alarms.py (.../alarms.py) (revision b88bd81598f55b6fcfac0fd42b2da3754fbf765e) +++ dialin/dg/alarms.py (.../alarms.py) (revision 8efb17d9278ef024010c903f7190b1b37e187890) @@ -163,17 +163,13 @@ # Get the data value by unpacking the data type data_2 = struct.unpack(struct_data_type_2, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) - # Pad with space for 3 U32s - set to zero - unused for DG - priority = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) - rank = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) - clr_top_only = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) - self.alarm_states[alarm_id[0]] = True self.alarm_conditions[alarm_id[0]] = True - self.alarm_data = [data_1[0], data_2[0]] - self.alarm_priorities[alarm_id[0]] = priority[0] - self.alarm_ranks[alarm_id[0]] = rank[0] - self.alarm_clear_top_only_flags[alarm_id[0]] = clr_top_only[0] + self.alarm_data[alarm_id[0]] = [data_1[0], data_2[0]] + # Pad with space for 3 U32s - set to zero - unused for DG + self.alarm_priorities[alarm_id[0]] = 0 + self.alarm_ranks[alarm_id[0]] = 0 + self.alarm_clear_top_only_flags[alarm_id[0]] = 0 self.dg_alarm_triggered_timestamp = timestamp @publish(["dg_alarm_clrd_timestamp", "alarm_states"])