[Hamlib-cvs-digest] CVS: hamlib/tests rigctl.c,1.3,1.4 testrig.c,1.5,1.6 testtrn.c,1.1,1.2

[Stephane F. <f4...@us...>]

Update of /cvsroot/hamlib/hamlib/tests
In directory slayer.i.sourceforge.net:/tmp/cvs-serv5046/tests

Modified Files:
	rigctl.c testrig.c testtrn.c 
Log Message:
* updates since the new API now requires a target VFO to be specified.
  Mainly, RIG_VFO_CURR is used, which should ensure the same behaviour
  of the tests programs as before.


Index: rigctl.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/rigctl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** rigctl.c	2000/12/04 23:39:18	1.3
--- rigctl.c	2000/12/05 22:04:44	1.4
***************
*** 206,210 ****
  		printf("Frequency: ");
  		scanf("%Ld", &freq);
! 		return rig_set_freq(rig, freq);
  }
  
--- 206,210 ----
  		printf("Frequency: ");
  		scanf("%Ld", &freq);
! 		return rig_set_freq(rig, RIG_VFO_CURR, freq);
  }
  
***************
*** 214,218 ****
  		freq_t freq;
  
! 		status = rig_get_freq(rig, &freq);
  		printf("Frequency: %Ld\n", freq);
  		return status;
--- 214,218 ----
  		freq_t freq;
  
! 		status = rig_get_freq(rig, RIG_VFO_CURR, &freq);
  		printf("Frequency: %Ld\n", freq);
  		return status;
***************
*** 228,232 ****
  		printf("Passband: ");
  		scanf("%d", (int*)&width);
! 		return rig_set_mode(rig, mode, width);
  }
  
--- 228,232 ----
  		printf("Passband: ");
  		scanf("%d", (int*)&width);
! 		return rig_set_mode(rig, RIG_VFO_CURR, mode, width);
  }
  
***************
*** 238,242 ****
  		pbwidth_t width;
  
! 		status = rig_get_mode(rig, &mode, &width);
  		printf("Mode: %d\nPassband: %d\n", mode, width);
  		return status;
--- 238,242 ----
  		pbwidth_t width;
  
! 		status = rig_get_mode(rig, RIG_VFO_CURR, &mode, &width);
  		printf("Mode: %d\nPassband: %d\n", mode, width);
  		return status;
***************
*** 271,275 ****
  		printf("PTT: ");
  		scanf("%d", (int*)&ptt);
! 		return rig_set_ptt(rig, ptt);
  }
  
--- 271,275 ----
  		printf("PTT: ");
  		scanf("%d", (int*)&ptt);
! 		return rig_set_ptt(rig, RIG_VFO_CURR, ptt);
  }
  
***************
*** 280,284 ****
  		ptt_t ptt;
  
! 		status = rig_get_ptt(rig, &ptt);
  		printf("PTT: %d\n", ptt);
  		return status;
--- 280,284 ----
  		ptt_t ptt;
  
! 		status = rig_get_ptt(rig, RIG_VFO_CURR, &ptt);
  		printf("PTT: %d\n", ptt);
  		return status;
***************
*** 292,296 ****
  		printf("Repeater shift: ");
  		scanf("%d", (int*)&rptr_shift);
! 		return rig_set_rptr_shift(rig, rptr_shift);
  }
  
--- 292,296 ----
  		printf("Repeater shift: ");
  		scanf("%d", (int*)&rptr_shift);
! 		return rig_set_rptr_shift(rig, RIG_VFO_CURR, rptr_shift);
  }
  
***************
*** 301,305 ****
  		rptr_shift_t rptr_shift;
  
! 		status = rig_get_rptr_shift(rig, &rptr_shift);
  		printf("Repeater shift: %d\n", rptr_shift);
  		return status;
--- 301,305 ----
  		rptr_shift_t rptr_shift;
  
! 		status = rig_get_rptr_shift(rig, RIG_VFO_CURR, &rptr_shift);
  		printf("Repeater shift: %d\n", rptr_shift);
  		return status;
***************
*** 313,317 ****
  		printf("Repeater shift offset: ");
  		scanf("%ld", &rptr_offs);
! 		return rig_set_rptr_offs(rig, rptr_offs);
  }
  
--- 313,317 ----
  		printf("Repeater shift offset: ");
  		scanf("%ld", &rptr_offs);
! 		return rig_set_rptr_offs(rig, RIG_VFO_CURR, rptr_offs);
  }
  
***************
*** 322,326 ****
  		unsigned long rptr_offs;
  
! 		status = rig_get_rptr_offs(rig, &rptr_offs);
  		printf("Repeater shift offset: %ld\n", rptr_offs);
  		return status;
--- 322,326 ----
  		unsigned long rptr_offs;
  
! 		status = rig_get_rptr_offs(rig, RIG_VFO_CURR, &rptr_offs);
  		printf("Repeater shift offset: %ld\n", rptr_offs);
  		return status;
***************
*** 334,338 ****
  		printf("CTCSS tone: ");
  		scanf("%d", &tone);
! 		return rig_set_ctcss(rig, tone);
  }
  
--- 334,338 ----
  		printf("CTCSS tone: ");
  		scanf("%d", &tone);
! 		return rig_set_ctcss(rig, RIG_VFO_CURR, tone);
  }
  
***************
*** 343,347 ****
  		unsigned int tone;
  
! 		status = rig_get_ctcss(rig, &tone);
  		printf("CTCSS tone: %d\n", tone);
  		return status;
--- 343,347 ----
  		unsigned int tone;
  
! 		status = rig_get_ctcss(rig, RIG_VFO_CURR, &tone);
  		printf("CTCSS tone: %d\n", tone);
  		return status;
***************
*** 355,359 ****
  		printf("DCS code: ");
  		scanf("%d", &code);
! 		return rig_set_dcs(rig, code);
  }
  
--- 355,359 ----
  		printf("DCS code: ");
  		scanf("%d", &code);
! 		return rig_set_dcs(rig, RIG_VFO_CURR, code);
  }
  
***************
*** 364,368 ****
  		unsigned int code;
  
! 		status = rig_get_dcs(rig, &code);
  		printf("DCS code: %d\n", code);
  		return status;
--- 364,368 ----
  		unsigned int code;
  
! 		status = rig_get_dcs(rig, RIG_VFO_CURR, &code);
  		printf("DCS code: %d\n", code);
  		return status;
***************
*** 378,382 ****
  		printf("Transmit frequency: ");
  		scanf("%Ld", &txfreq);
! 		return rig_set_split_freq(rig, rxfreq, txfreq);
  }
  
--- 378,382 ----
  		printf("Transmit frequency: ");
  		scanf("%Ld", &txfreq);
! 		return rig_set_split_freq(rig, RIG_VFO_CURR, rxfreq, txfreq);
  }
  
***************
*** 387,391 ****
  		freq_t rxfreq,txfreq;
  
! 		status = rig_get_split_freq(rig, &rxfreq, &txfreq);
  		printf("Receive frequency: %Ld\n", rxfreq);
  		printf("Transmit frequency: %Ld\n", txfreq);
--- 387,391 ----
  		freq_t rxfreq,txfreq;
  
! 		status = rig_get_split_freq(rig, RIG_VFO_CURR, &rxfreq, &txfreq);
  		printf("Receive frequency: %Ld\n", rxfreq);
  		printf("Transmit frequency: %Ld\n", txfreq);
***************
*** 400,404 ****
  		printf("Split mode: ");
  		scanf("%d", (int*)&split);
! 		return rig_set_split(rig, split);
  }
  
--- 400,404 ----
  		printf("Split mode: ");
  		scanf("%d", (int*)&split);
! 		return rig_set_split(rig, RIG_VFO_CURR, split);
  }
  
***************
*** 409,413 ****
  		split_t split;
  
! 		status = rig_get_split(rig, &split);
  		printf("Split mode: %d\n", split);
  		return status;
--- 409,413 ----
  		split_t split;
  
! 		status = rig_get_split(rig, RIG_VFO_CURR, &split);
  		printf("Split mode: %d\n", split);
  		return status;
***************
*** 421,425 ****
  		printf("Tuning step: ");
  		scanf("%ld", &ts);
! 		return rig_set_ts(rig, ts);
  }
  
--- 421,425 ----
  		printf("Tuning step: ");
  		scanf("%ld", &ts);
! 		return rig_set_ts(rig, RIG_VFO_CURR, ts);
  }
  
***************
*** 430,434 ****
  		unsigned long ts;
  
! 		status = rig_get_ts(rig, &ts);
  		printf("Tuning step: %ld\n", ts);
  		return status;
--- 430,434 ----
  		unsigned long ts;
  
! 		status = rig_get_ts(rig, RIG_VFO_CURR, &ts);
  		printf("Tuning step: %ld\n", ts);
  		return status;
***************
*** 485,489 ****
  		printf("Bank: ");
  		scanf("%d", &bank);
! 		return rig_set_bank(rig, bank);
  }
  
--- 485,489 ----
  		printf("Bank: ");
  		scanf("%d", &bank);
! 		return rig_set_bank(rig, RIG_VFO_CURR, bank);
  }
  
***************
*** 495,499 ****
  		printf("Memory#: ");
  		scanf("%d", &ch);
! 		return rig_set_mem(rig, ch);
  }
  
--- 495,499 ----
  		printf("Memory#: ");
  		scanf("%d", &ch);
! 		return rig_set_mem(rig, RIG_VFO_CURR, ch);
  }
  
***************
*** 504,508 ****
  		int ch;
  
! 		status = rig_get_mem(rig, &ch);
  		printf("Memory#: %d\n", ch);
  		return status;
--- 504,508 ----
  		int ch;
  
! 		status = rig_get_mem(rig, RIG_VFO_CURR, &ch);
  		printf("Memory#: %d\n", ch);
  		return status;
***************
*** 516,520 ****
  		printf("Mem/VFO op: ");
  		scanf("%d", (int*)&op);
! 		return rig_mv_ctl(rig, op);
  }
  
--- 516,520 ----
  		printf("Mem/VFO op: ");
  		scanf("%d", (int*)&op);
! 		return rig_mv_ctl(rig, RIG_VFO_CURR, op);
  }
  
***************
*** 538,542 ****
  		printf("Transceive: ");
  		scanf("%d", &trn);
! 		return rig_set_trn(rig, trn);
  }
  
--- 538,542 ----
  		printf("Transceive: ");
  		scanf("%d", &trn);
! 		return rig_set_trn(rig, RIG_VFO_CURR, trn);
  }
  
***************
*** 547,551 ****
  		int trn;
  
! 		status = rig_get_trn(rig, &trn);
  		printf("Transceive: %d\n", trn);
  		return status;
--- 547,551 ----
  		int trn;
  
! 		status = rig_get_trn(rig, RIG_VFO_CURR, &trn);
  		printf("Transceive: %d\n", trn);
  		return status;

Index: testrig.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/testrig.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** testrig.c	2000/12/05 19:32:48	1.5
--- testrig.c	2000/12/05 22:04:44	1.6
***************
*** 6,9 ****
--- 6,10 ----
  #include <stdio.h>
  #include <string.h>
+ #include <unistd.h>
  
  #define SERIAL_PORT "/dev/ttyS0"
***************
*** 72,93 ****
  	 */
  	
! 	retcode = rig_set_freq(my_rig, 28350125); /* 10m */
  	sleep(2);
! 	retcode = rig_set_freq(my_rig, 21235175); /* 15m  */
  	sleep(2);
! 	retcode = rig_set_freq(my_rig, 770000); /* KAAM */
  	sleep(2);
! 	retcode = rig_set_freq(my_rig, 7250100); /* 40m  */
  	sleep(2);
! 	retcode = rig_set_freq(my_rig, 3980000); /* 80m  */
  	sleep(2);
! 	retcode = rig_set_freq(my_rig, 1875000); /* 160m  */
  	sleep(2);
! 	retcode = rig_set_freq(my_rig, 14250375); /* cq de vk3fcs */
  	sleep(2);
  #if 0
! 	retcode = rig_set_freq(my_rig, 145100000); /* 2m  */
  	sleep(2);
! 	retcode = rig_set_freq(my_rig, 435125000); /* 70cm  */
  	sleep(2);
  #endif
--- 73,94 ----
  	 */
  	
! 	retcode = rig_set_freq(my_rig, RIG_VFO_CURR, 28350125); /* 10m */
  	sleep(2);
! 	retcode = rig_set_freq(my_rig, RIG_VFO_CURR, 21235175); /* 15m  */
  	sleep(2);
! 	retcode = rig_set_freq(my_rig, RIG_VFO_CURR, 770000); /* KAAM */
  	sleep(2);
! 	retcode = rig_set_freq(my_rig, RIG_VFO_CURR, 7250100); /* 40m  */
  	sleep(2);
! 	retcode = rig_set_freq(my_rig, RIG_VFO_CURR, 3980000); /* 80m  */
  	sleep(2);
! 	retcode = rig_set_freq(my_rig, RIG_VFO_CURR, 1875000); /* 160m  */
  	sleep(2);
! 	retcode = rig_set_freq(my_rig, RIG_VFO_CURR, 14250375); /* cq de vk3fcs */
  	sleep(2);
  #if 0
! 	retcode = rig_set_freq(my_rig, RIG_VFO_CURR, 145100000); /* 2m  */
  	sleep(2);
! 	retcode = rig_set_freq(my_rig, RIG_VFO_CURR, 435125000); /* 70cm  */
  	sleep(2);
  #endif
***************
*** 97,101 ****
  	} 
  
! 	retcode = rig_set_mode(my_rig, RIG_MODE_LSB, RIG_PASSBAND_NORMAL);
  
  	if (retcode != RIG_OK ) {
--- 98,102 ----
  	} 
  
! 	retcode = rig_set_mode(my_rig, RIG_VFO_CURR, RIG_MODE_LSB, RIG_PASSBAND_NORMAL);
  
  	if (retcode != RIG_OK ) {
***************
*** 116,120 ****
  	}
  
! 	retcode = rig_get_freq(my_rig, &freq);
  	
  	if (retcode == RIG_OK ) {
--- 117,121 ----
  	}
  
! 	retcode = rig_get_freq(my_rig, RIG_VFO_CURR, &freq);
  	
  	if (retcode == RIG_OK ) {
***************
*** 124,128 ****
  	}
  
! 	retcode = rig_get_mode(my_rig, &rmode, &width);
  
  	if (retcode == RIG_OK ) {
--- 125,129 ----
  	}
  
! 	retcode = rig_get_mode(my_rig, RIG_VFO_CURR, &rmode, &width);
  
  	if (retcode == RIG_OK ) {
***************
*** 132,136 ****
  	}
  
! 	retcode = rig_get_strength(my_rig, &strength);
  
  	if (retcode == RIG_OK ) {
--- 133,137 ----
  	}
  
! 	retcode = rig_get_strength(my_rig, RIG_VFO_CURR, &strength);
  
  	if (retcode == RIG_OK ) {
***************
*** 148,161 ****
  	return 0;
  }
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  
--- 149,151 ----

Index: testtrn.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/testtrn.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** testtrn.c	2000/10/08 21:20:44	1.1
--- testtrn.c	2000/12/05 22:04:44	1.2
***************
*** 10,14 ****
  #define SERIAL_PORT "/dev/ttyS0"
  
! int myfreq_event(RIG *rig, freq_t freq)
  {
  		printf("Rig changed freq to %LiHz\n",freq);
--- 10,14 ----
  #define SERIAL_PORT "/dev/ttyS0"
  
! int myfreq_event(RIG *rig, vfo_t vfo, freq_t freq)
  {
  		printf("Rig changed freq to %LiHz\n",freq);
***************
*** 54,58 ****
  	
  
! 	retcode = rig_set_freq(my_rig, 439700000);
  
  	if (retcode != RIG_OK ) {
--- 54,58 ----
  	
  
! 	retcode = rig_set_freq(my_rig, RIG_VFO_CURR, 439700000);
  
  	if (retcode != RIG_OK ) {
***************
*** 62,66 ****
  	my_rig->callbacks.freq_event = myfreq_event;
  
! 	retcode = rig_set_trn(my_rig, RIG_TRN_ON);
  
  	if (retcode != RIG_OK ) {
--- 62,66 ----
  	my_rig->callbacks.freq_event = myfreq_event;
  
! 	retcode = rig_set_trn(my_rig, RIG_VFO_CURR, RIG_TRN_ON);
  
  	if (retcode != RIG_OK ) {