Issue #92 - Small refactoring of enable_monitoring function

ait/gui/__init__.py

@@ -389,9 +389,9 @@ def telem_handler(session):
         for k, v in tlm.getDefaultDict().iteritems():
             packet_dict[v.uid] = v
 
-        notif_thrshld = cfg.AitConfig().get('notifications.options.threshold')
-        if cfg.AitConfig().get('notifications.options.frequency'):
-            notif_freq = cfg.AitConfig().get('notifications.options.frequency')
+        notif_thrshld = ait.config.get('notifications.options.threshold')
+        if ait.config.get('notifications.options.frequency'):
+            notif_freq = ait.config.get('notifications.options.frequency')
         else:
             notif_freq = float('inf')
 
@@ -419,21 +419,23 @@ def telem_handler(session):
                                 log.error(msg)
 
                                 limit_trip_repeats[packet.name][field] += 1
+                                repeats = limit_trip_repeats[packet.name][field]
 
-                                if (limit_trip_repeats[packet.name][field] == notif_thrshld or
-                                    (limit_trip_repeats[packet.name][field] - notif_thrshld)
-                                     % notif_freq == 0):
+                                if (repeats == notif_thrshld or
+                                    (repeats > notif_thrshld and
+                                    (repeats - notif_thrshld) % notif_freq == 0)):
                                     notify.trigger_notification('limit-error', msg)
 
                             elif defn.warn(v):
                                 msg = 'Field {} warning out of limit with value {}'.format(field, v)
                                 log.warn(msg)
 
                                 limit_trip_repeats[packet.name][field] += 1
+                                repeats = limit_trip_repeats[packet.name][field]
 
-                                if (limit_trip_repeats[packet.name][field] == notif_thrshld or
-                                    (limit_trip_repeats[packet.name][field] - notif_thrshld)
-                                     % notif_freq == 0):
+                                if (repeats == notif_thrshld or
+                                    (repeats > notif_thrshld and
+                                    (repeats - notif_thrshld) % notif_freq == 0)):
                                     notify.trigger_notification('limit-warn', msg)
 
                             else: