Index: Alarms/loader.py
===================================================================
diff -u -r64d8a48a84b8b1bacd24876d1e49d77f8792fb72 -r6cb400a434d041af1019837967bc14cbb8137bdd
--- Alarms/loader.py	(.../loader.py)	(revision 64d8a48a84b8b1bacd24876d1e49d77f8792fb72)
+++ Alarms/loader.py	(.../loader.py)	(revision 6cb400a434d041af1019837967bc14cbb8137bdd)
@@ -32,10 +32,9 @@
     eColTime        = 0
     eColID          = 1
     eColMute        = 2
-    eColEscalate    = 3
-    eColFlags       = 4
-    eColMessage     = 5
-    eColCount       = 6
+    eColFlags       = 3
+    eColMessage     = 4
+    eColCount       = 5
 
     eRowMute        = 9
 
@@ -44,7 +43,6 @@
         eColTime        : ( 70, 'Time'      ),
         eColID          : ( 45, 'Top ID'    ),
         eColMute        : (100, 'Mute'      ),
-        eColEscalate    : ( 45, 'Escl'      ),
         eColFlags       : (150, 'Flags'     ),
         eColMessage     : (100, 'Message'   ),
     }
@@ -78,7 +76,6 @@
         self.rdoPriorityLow         = self.find_widget(QtWidgets.QToolButton    , 'rdoPriorityLow'      )
         self.rdoPriorityMed         = self.find_widget(QtWidgets.QToolButton    , 'rdoPriorityMed'      )
         self.rdoPriorityHigh        = self.find_widget(QtWidgets.QToolButton    , 'rdoPriorityHigh'     )
-        self.spnEscalatesIn         = self.find_widget(QtWidgets.QSpinBox       , 'spnEscalatesIn'      )
         self.spnMuteTimeout         = self.find_widget(QtWidgets.QSpinBox       , 'spnMuteTimeout'      )
         self.lstFlags               = self.find_widget(QtWidgets.QListWidget    , 'lstFlags'            )
         self.tblStatusIDs           = self.find_widget(QtWidgets.QTableWidget   , 'tblStatusIDs'        )           
@@ -210,14 +207,12 @@
         :return: none
         """
         alarm_id = self.spnTopID.value()
-        escalate = self.spnEscalatesIn.value()
         mute_out = self.spnMuteTimeout.value()
         if alarm_id >= 0:
             self.set_flags()
             self.td_interface_alarms.cmd_activate_alarm_id(
                 self.priority,
                 alarm_id,
-                escalate,
                 mute_out,
                 self.flags
             )
@@ -240,7 +235,7 @@
             data_field_2 = "0"
 
         if alarm_id:
-            self.interface.alarm.cmd_set_alarm_triggered(
+            self.td_interface_alarms.cmd_set_alarm_triggered(
                 alarm_id,
                 field_descriptor_1, data_field_1,
                 field_descriptor_2, data_field_2, 101, 202, 1)
@@ -253,7 +248,7 @@
         :return: none
         """
         [alarm_id, row] = self.alarm_id()
-        self.interface.alarm.cmd_set_alarm_cleared(alarm_id)
+        self.td_interface_alarms.cmd_set_alarm_cleared(alarm_id)
         self.tblTriggeredIDs.removeRow(row)
 
     @Slot()
@@ -263,7 +258,7 @@
         :return: none
         """
         [alarm_id, row] = self.alarm_id()
-        self.interface.alarm.cmd_set_alarm_cleared_condition(alarm_id)
+        self.td_interface_alarms.cmd_set_alarm_cleared_condition(alarm_id)
         self.tblTriggeredIDs.item(row, self.eColID).setBackground(self.colors[AlarmPriority.ALARM_NONE])
         self.tblTriggeredIDs.item(row, self.eColID).setSelected(False)
 
@@ -296,7 +291,7 @@
         a7 = self.spnP7.value()
         a8 = self.spnP8.value()
         a9 = self.spnP9.value()
-        self.interface.alarm.cmd_send_active_list_response(True, 0, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)
+        self.td_interface_alarms.cmd_send_active_list_response(True, 0, a0, a1, a2, a3, a4, a5, a6, a7, a8, a9)
 
     @Slot()
     def do_active_list_reject(self):
@@ -305,7 +300,7 @@
         :return: none
         """
         reason = self.spnReason.value()
-        self.interface.alarm.cmd_send_active_list_response(False, reason)
+        self.td_interface_alarms.cmd_send_active_list_response(False, reason)
 
     @Slot()
     def on_status_ids_item_clicked(self, item: QtWidgets.QTableWidgetItem):
@@ -359,7 +354,6 @@
         model.setData(model.index(row, self.eColTime), now)
         model.setData(model.index(row, self.eColID), alarm_id)
         model.setData(model.index(row, self.eColMute), self.spnMuteTimeout.value())
-        model.setData(model.index(row, self.eColEscalate), self.spnEscalatesIn.value())
         self.tblStatusIDs.item(row, self.eColMute).setCheckState(Qt.Unchecked)
         model.setData(model.index(row, self.eColMessage), "N/A")
         model.setData(model.index(row, self.eColFlags), '{:016b}'.format(self.flags, 'b'))