Index: leahi_dialin/fp/modules/alarms.py
===================================================================
diff -u -rb4df138485c0c52360b6f43d7bd9e92e1c15969a -rd5d173f098022abd74435f48a30961c7be89d184
--- leahi_dialin/fp/modules/alarms.py	(.../alarms.py)	(revision b4df138485c0c52360b6f43d7bd9e92e1c15969a)
+++ leahi_dialin/fp/modules/alarms.py	(.../alarms.py)	(revision d5d173f098022abd74435f48a30961c7be89d184)
@@ -80,7 +80,7 @@
             elif 'F32' in event_data_type:
                 struct_unpack_type = 'f'
 
-        self.alarm_data_type[event_data_type] = struct_unpack_type
+            self.alarm_data_type[event_data_type] = struct_unpack_type
 
     @publish(["fp_alarm_triggered_timestamp", "alarm_states", "alarm_conditions", "alarm_data",
               "alarm_priorities", "alarm_ranks", "alarm_clear_top_only_flags"])
@@ -117,7 +117,7 @@
         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]]
-        self.last_alarm_triggered = alarm_id
+        self.last_alarm_triggered = alarm_id[0]
         self.last_alarm_data_1 = data_1[0]
         self.last_alarm_data_2 = data_2[0]
         self.fp_alarm_triggered_timestamp = timestamp