[Groundstation-commits] CVS: grig/src gnome-hamlib-rig.c,1.38,1.39 main.c,1.53,1.54

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

Update of /cvsroot/groundstation/grig/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19197

Modified Files:
	gnome-hamlib-rig.c main.c 
Log Message:
Changed default freq. and rotator readback timeout to > 1 sek.

Index: gnome-hamlib-rig.c
===================================================================
RCS file: /cvsroot/groundstation/grig/src/gnome-hamlib-rig.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** gnome-hamlib-rig.c	10 May 2003 10:54:16 -0000	1.38
--- gnome-hamlib-rig.c	29 Oct 2003 23:01:50 -0000	1.39
***************
*** 1855,1859 ****
  {
  	g_return_val_if_fail (GNOME_IS_HAMLIB_RIG (ghr), 1);
! 	g_return_val_if_fail (((timeout >= 300) || (timeout == 0)) && (timeout <= 10000), -2);
  
  	/* We need to stop the timer no matter what */
--- 1855,1860 ----
  {
  	g_return_val_if_fail (GNOME_IS_HAMLIB_RIG (ghr), 1);
! 	/* NOTE: what is a good lower limit? */
! 	g_return_val_if_fail (((timeout >= 700) || (timeout == 0)) && (timeout <= 10000), -2);
  
  	/* We need to stop the timer no matter what */
***************
*** 1907,1914 ****
  	retcode = rig_get_freq (GNOME_HAMLIB_RIG (ghr)->rig, RIG_VFO_CURR, &freq);
  	if (retcode != RIG_OK) {
! 		g_warning (_("gnome-hamlib-rig.c: Could not get frequency. Stopping timer.\n"));
! 		return FALSE;
  	}
- 	gnome_hamlib_rig_set_lcd_digits (ghr, freq);
  
   	return TRUE;
--- 1908,1917 ----
  	retcode = rig_get_freq (GNOME_HAMLIB_RIG (ghr)->rig, RIG_VFO_CURR, &freq);
  	if (retcode != RIG_OK) {
! 		g_warning (_("gnome-hamlib-rig.c: Could not get frequency.\n"));
! /*		return FALSE;*/
! 	}
! 	else {
! 		gnome_hamlib_rig_set_lcd_digits (ghr, freq);
  	}
  
   	return TRUE;

Index: main.c
===================================================================
RCS file: /cvsroot/groundstation/grig/src/main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** main.c	11 Oct 2003 18:52:57 -0000	1.53
--- main.c	29 Oct 2003 23:01:51 -0000	1.54
***************
*** 306,312 ****
  	gtk_widget_show_all (app);
  
- /* Egon: 226170272 */
- /* Grga: 203247437 */
- 
  	/* Set the correct debug level in the menubar */
  	switch (debug) {
--- 306,309 ----
***************
*** 347,351 ****
  	/* start timers */
  	if (enabletimer)
! 		gnome_hamlib_rig_set_freq_timeout (GNOME_HAMLIB_RIG (controls), 500);
  
  	gtk_main ();
--- 344,348 ----
  	/* start timers */
  	if (enabletimer)
! 		gnome_hamlib_rig_set_freq_timeout (GNOME_HAMLIB_RIG (controls), 1037);
  
  	gtk_main ();
***************
*** 450,454 ****
  
  			/* start readback timer */
! 			gnome_hamlib_rot_set_timeout (GNOME_HAMLIB_ROT (rotor), 1000);
  		}
  		else {
--- 447,451 ----
  
  			/* start readback timer */
! 			gnome_hamlib_rot_set_timeout (GNOME_HAMLIB_ROT (rotor), 1173);
  		}
  		else {