[Gpredict-svn] SF.net SVN: gpredict:[287] trunk/src/gtk-rig-ctrl.c

[<cs...@us...>]

Revision: 287
          http://gpredict.svn.sourceforge.net/gpredict/?rev=287&view=rev
Author:   csete
Date:     2009-05-09 14:57:34 +0000 (Sat, 09 May 2009)

Log Message:
-----------
Moved error count checking up to cycle controller.

Modified Paths:
--------------
    trunk/src/gtk-rig-ctrl.c

Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c	2009-05-01 23:10:40 UTC (rev 286)
+++ trunk/src/gtk-rig-ctrl.c	2009-05-09 14:57:34 UTC (rev 287)
@@ -1278,6 +1278,19 @@
             
         }
     }
+
+    /* perform error count checking */
+    if (ctrl->errcnt >= MAX_ERROR_COUNT) {
+        /* disengage device */
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ctrl->LockBut), FALSE);
+        ctrl->engaged = FALSE;
+        ctrl->errcnt = 0;
+        sat_log_log (SAT_LOG_LEVEL_ERROR,
+                        _("%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"),
+                        __FUNCTION__, MAX_ERROR_COUNT);
+        
+        //g_print ("ERROR. WROPS = %d\n", ctrl->wrops);
+    }
     
     //g_print ("       WROPS = %d\n", ctrl->wrops);
     
@@ -1397,17 +1410,6 @@
         }
     }
     
-    if (ctrl->errcnt >= MAX_ERROR_COUNT) {
-        /* disengage device */
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ctrl->LockBut), FALSE);
-        ctrl->engaged = FALSE;
-        ctrl->errcnt = 0;
-        sat_log_log (SAT_LOG_LEVEL_ERROR,
-                        _("%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"),
-                        __FUNCTION__, MAX_ERROR_COUNT);
-        
-        //g_print ("ERROR. WROPS = %d\n", ctrl->wrops);
-    }
 }
 
 
@@ -1521,18 +1523,6 @@
         }
     }
     
-    if (ctrl->errcnt >= MAX_ERROR_COUNT) {
-        /* disengage device */
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ctrl->LockBut), FALSE);
-        ctrl->engaged = FALSE;
-        ctrl->errcnt = 0;
-        sat_log_log (SAT_LOG_LEVEL_ERROR,
-                        _("%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"),
-                        __FUNCTION__, MAX_ERROR_COUNT);
-        
-        //g_print ("ERROR. WROPS = %d\n", ctrl->wrops);
-    }
-
 }
 
 
@@ -1774,18 +1764,6 @@
 
     } /* else dialchange on downlink */
 
-    /* perform error count checking */
-    if (ctrl->errcnt >= MAX_ERROR_COUNT) {
-        /* disengage device */
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ctrl->LockBut), FALSE);
-        ctrl->engaged = FALSE;
-        ctrl->errcnt = 0;
-        sat_log_log (SAT_LOG_LEVEL_ERROR,
-                        _("%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"),
-                        __FUNCTION__, MAX_ERROR_COUNT);
-        
-        //g_print ("ERROR. WROPS = %d\n", ctrl->wrops);
-    }
 
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.