hamlib-cvs-digest — hamlib commit digest

[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 ) {

[Hamlib-cvs-digest] CVS: hamlib/src rig.c,1.10,1.11

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

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

Modified Files:
	rig.c 
Log Message:
* all the API functions are now targetted to a particular VFO.
  This is a major change in the library interface, and the implementation
  is not complete yet (especially in the backends), but the API should
  be fine. Anyway, at this stage of developement, interface design 
  experimenting matters more than completeness.
* added new shortfreq_t type for frequencies on 31bits (up to 2GHz)
  for use by offset/shifts/etc.


Index: rig.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/src/rig.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** rig.c	2000/12/04 23:39:18	1.10
--- rig.c	2000/12/05 22:01:02	1.11
***************
*** 338,341 ****
--- 338,342 ----
   *      rig_set_freq - set the frequency of the current VFO
   *      @rig:	The rig handle
+  *      @vfo:	The target VFO
   *      @freq:	The frequency to set to
   *
***************
*** 349,353 ****
   */
  
[...1219 lines suppressed...]
  		if (!rig || !rig->caps || !trn)
--- 1746,1750 ----
   *      SEE ALSO: rig_set_trn()
   */
! int rig_get_trn(RIG *rig, vfo_t vfo, int *trn)
  {
  		if (!rig || !rig->caps || !trn)
***************
*** 1718,1722 ****
  			return -RIG_ENAVAIL;
  		else
! 			return rig->caps->get_trn(rig, trn);
  }
  
--- 1754,1758 ----
  			return -RIG_ENAVAIL;
  		else
! 			return rig->caps->get_trn(rig, vfo, trn);
  }
  

[Hamlib-cvs-digest] CVS: hamlib/aor aor.c,1.2,1.3 aor.h,1.2,1.3

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

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

Modified Files:
	aor.c aor.h 
Log Message:
* all the API functions are now targetted to a particular VFO.
  This is a major change in the library interface, and the implementation
  is not complete yet (especially in the backends), but the API should
  be fine. Anyway, at this stage of developement, interface design 
  experimenting matters more than completeness.
* added new shortfreq_t type for frequencies on 31bits (up to 2GHz)
  for use by offset/shifts/etc.


Index: aor.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/aor/aor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** aor.c	2000/12/04 23:39:17	1.2
--- aor.c	2000/12/05 22:01:00	1.3
***************
*** 116,120 ****
   * Assumes rig!=NULL
   */
! int aor_set_freq(RIG *rig, freq_t freq)
  {
  		unsigned char freqbuf[16], ackbuf[16];
--- 116,120 ----
   * Assumes rig!=NULL
   */
! int aor_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
  {
  		unsigned char freqbuf[16], ackbuf[16];
***************
*** 142,146 ****
   * Assumes rig!=NULL, freq!=NULL
   */
! int aor_get_freq(RIG *rig, freq_t *freq)
  {
  		unsigned char freqbuf[16];
--- 142,146 ----
   * Assumes rig!=NULL, freq!=NULL
   */
! int aor_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
  {
  		unsigned char freqbuf[16];
***************
*** 160,164 ****
   * Assumes rig!=NULL
   */
! int aor_set_mode(RIG *rig, rmode_t mode, pbwidth_t width)
  {
  		unsigned char mdbuf[16],ackbuf[16];
--- 160,164 ----
   * Assumes rig!=NULL
   */
! int aor_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
  {
  		unsigned char mdbuf[16],ackbuf[16];
***************
*** 216,220 ****
   * Assumes rig!=NULL, mode!=NULL
   */
! int aor_get_mode(RIG *rig, rmode_t *mode, pbwidth_t *width)
  {
  		unsigned char ackbuf[16];
--- 216,220 ----
   * Assumes rig!=NULL, mode!=NULL
   */
! int aor_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
  {
  		unsigned char ackbuf[16];
***************
*** 265,269 ****
   * Assumes rig!=NULL
   */
! int aor_set_ts(RIG *rig, unsigned long ts)
  {
  		unsigned char tsbuf[16],ackbuf[16];
--- 265,269 ----
   * Assumes rig!=NULL
   */
! int aor_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts)
  {
  		unsigned char tsbuf[16],ackbuf[16];
***************
*** 315,319 ****
  		return RIG_OK;
  }
- 
  
  
--- 315,318 ----

Index: aor.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/aor/aor.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** aor.h	2000/12/04 23:39:17	1.2
--- aor.h	2000/12/05 22:01:00	1.3
***************
*** 32,41 ****
  int aor_close(RIG *rig);
  
! int aor_set_freq(RIG *rig, freq_t freq);
! int aor_get_freq(RIG *rig, freq_t *freq);
! int aor_set_mode(RIG *rig, rmode_t mode, pbwidth_t width);
! int aor_get_mode(RIG *rig, rmode_t *mode, pbwidth_t *width);
  
! int aor_set_ts(RIG *rig, unsigned long ts);
  int aor_set_poweroff(RIG *rig);
  
--- 32,41 ----
  int aor_close(RIG *rig);
  
! int aor_set_freq(RIG *rig, vfo_t vfo, freq_t freq);
! int aor_get_freq(RIG *rig, vfo_t vfo, freq_t *freq);
! int aor_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width);
! int aor_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width);
  
! int aor_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts);
  int aor_set_poweroff(RIG *rig);
  

[Hamlib-cvs-digest] CVS: hamlib/icom icom.c,1.10,1.11 icom.h,1.9,1.10

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

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

Modified Files:
	icom.c icom.h 
Log Message:
* all the API functions are now targetted to a particular VFO.
  This is a major change in the library interface, and the implementation
  is not complete yet (especially in the backends), but the API should
  be fine. Anyway, at this stage of developement, interface design 
  experimenting matters more than completeness.
* added new shortfreq_t type for frequencies on 31bits (up to 2GHz)
  for use by offset/shifts/etc.


Index: icom.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/icom.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** icom.c	2000/12/04 23:39:17	1.10
--- icom.c	2000/12/05 22:01:02	1.11
***************
*** 279,283 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_freq(RIG *rig, freq_t freq)
  {
  		struct icom_priv_data *priv;
--- 279,283 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
  {
  		struct icom_priv_data *priv;
***************
*** 311,315 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL, freq!=NULL
   */
! int icom_get_freq(RIG *rig, freq_t *freq)
  {
  		struct icom_priv_data *priv;
--- 311,315 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL, freq!=NULL
   */
! int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
  {
  		struct icom_priv_data *priv;
***************
*** 355,359 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_mode(RIG *rig, rmode_t mode, pbwidth_t width)
  {
  		struct icom_priv_data *priv;
--- 355,359 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
  {
  		struct icom_priv_data *priv;
***************
*** 382,386 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL, mode!=NULL, width!=NULL
   */
! int icom_get_mode(RIG *rig, rmode_t *mode, pbwidth_t *width)
  {
  		struct icom_priv_data *priv;
--- 382,386 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL, mode!=NULL, width!=NULL
   */
! int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
  {
  		struct icom_priv_data *priv;
***************
*** 446,450 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_level(RIG *rig, setting_t level, value_t val)
  {
  			return -RIG_ENIMPL;
--- 446,450 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
  {
  			return -RIG_ENIMPL;
***************
*** 455,459 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL, val!=NULL
   */
! int icom_get_level(RIG *rig, setting_t level, value_t *val)
  {
  		struct icom_priv_data *priv;
--- 455,459 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL, val!=NULL
   */
! int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
  {
  		struct icom_priv_data *priv;
***************
*** 607,611 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_ptt(RIG *rig, ptt_t ptt)
  {
  		struct icom_priv_data *priv;
--- 607,611 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
  {
  		struct icom_priv_data *priv;
***************
*** 634,638 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL, ptt!=NULL
   */
! int icom_get_ptt(RIG *rig, ptt_t *ptt)
  {
  		struct icom_priv_data *priv;
--- 634,638 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL, ptt!=NULL
   */
! int icom_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
  {
  		struct icom_priv_data *priv;
***************
*** 665,669 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_rptr_shift(RIG *rig, rptr_shift_t rptr_shift)
  {
  		struct icom_priv_data *priv;
--- 665,669 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift)
  {
  		struct icom_priv_data *priv;
***************
*** 707,711 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL, rptr_shift!=NULL
   */
! int icom_get_rptr_shift(RIG *rig, rptr_shift_t *rptr_shift)
  {
  		struct icom_priv_data *priv;
--- 707,711 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL, rptr_shift!=NULL
   */
! int icom_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *rptr_shift)
  {
  		struct icom_priv_data *priv;
***************
*** 751,755 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_rptr_offs(RIG *rig, unsigned long rptr_offs)
  {
  		struct icom_priv_data *priv;
--- 751,755 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t rptr_offs)
  {
  		struct icom_priv_data *priv;
***************
*** 782,786 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL, rptr_offs!=NULL
   */
! int icom_get_rptr_offs(RIG *rig, unsigned long *rptr_offs)
  {
  		struct icom_priv_data *priv;
--- 782,786 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL, rptr_offs!=NULL
   */
! int icom_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *rptr_offs)
  {
  		struct icom_priv_data *priv;
***************
*** 819,830 ****
   * FIXME: status
   */
! int icom_set_split_freq(RIG *rig, freq_t rx_freq, freq_t tx_freq)
  {
  		int status;
  
  		status = icom_set_vfo(rig, RIG_VFO_B);
! 		status |= icom_set_freq(rig, tx_freq);
  		status |= icom_set_vfo(rig, RIG_VFO_A);
! 		status |= icom_set_freq(rig, rx_freq);
  
  		return status;
--- 819,830 ----
   * FIXME: status
   */
! int icom_set_split_freq(RIG *rig, vfo_t vfo, freq_t rx_freq, freq_t tx_freq)
  {
  		int status;
  
  		status = icom_set_vfo(rig, RIG_VFO_B);
! 		status |= icom_set_freq(rig, RIG_VFO_CURR, tx_freq);
  		status |= icom_set_vfo(rig, RIG_VFO_A);
! 		status |= icom_set_freq(rig, RIG_VFO_CURR, rx_freq);
  
  		return status;
***************
*** 837,848 ****
   * FIXME: status
   */
! int icom_get_split_freq(RIG *rig, freq_t *rx_freq, freq_t *tx_freq)
  {
  		int status;
  
  		status = icom_set_vfo(rig, RIG_VFO_B);
! 		status |= icom_get_freq(rig, tx_freq);
  		status |= icom_set_vfo(rig, RIG_VFO_A);
! 		status |= icom_get_freq(rig, rx_freq);
  
  		return status;
--- 837,848 ----
   * FIXME: status
   */
! int icom_get_split_freq(RIG *rig, vfo_t vfo, freq_t *rx_freq, freq_t *tx_freq)
  {
  		int status;
  
  		status = icom_set_vfo(rig, RIG_VFO_B);
! 		status |= icom_get_freq(rig, RIG_VFO_CURR, tx_freq);
  		status |= icom_set_vfo(rig, RIG_VFO_A);
! 		status |= icom_get_freq(rig, RIG_VFO_CURR, rx_freq);
  
  		return status;
***************
*** 853,857 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_split(RIG *rig, split_t split)
  {
  		struct icom_priv_data *priv;
--- 853,857 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_split(RIG *rig, vfo_t vfo, split_t split)
  {
  		struct icom_priv_data *priv;
***************
*** 892,896 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL, split!=NULL
   */
! int icom_get_split(RIG *rig, split_t *split)
  {
  		struct icom_priv_data *priv;
--- 892,896 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL, split!=NULL
   */
! int icom_get_split(RIG *rig, vfo_t vfo, split_t *split)
  {
  		struct icom_priv_data *priv;
***************
*** 933,937 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_ts(RIG *rig, unsigned long ts)
  {
  		struct icom_priv_data *priv;
--- 933,937 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts)
  {
  		struct icom_priv_data *priv;
***************
*** 969,973 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL, ts!=NULL
   */
! int icom_get_ts(RIG *rig, unsigned long *ts)
  {
  		struct icom_priv_data *priv;
--- 969,973 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL, ts!=NULL
   */
! int icom_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts)
  {
  		struct icom_priv_data *priv;
***************
*** 1148,1152 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_mem(RIG *rig, int ch)
  {
  		struct icom_priv_data *priv;
--- 1148,1152 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_mem(RIG *rig, vfo_t vfo, int ch)
  {
  		struct icom_priv_data *priv;
***************
*** 1175,1179 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_bank(RIG *rig, int bank)
  {
  		struct icom_priv_data *priv;
--- 1175,1179 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_bank(RIG *rig, vfo_t vfo, int bank)
  {
  		struct icom_priv_data *priv;
***************
*** 1202,1206 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_mv_ctl(RIG *rig, mv_op_t op)
  {
  		struct icom_priv_data *priv;
--- 1202,1206 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_mv_ctl(RIG *rig, vfo_t vfo, mv_op_t op)
  {
  		struct icom_priv_data *priv;
***************
*** 1303,1307 ****
  				if (rig->callbacks.freq_event) {
  					freq = from_bcd(buf+5, (priv->civ_731_mode ? 4:5)*2);
! 					return rig->callbacks.freq_event(rig,freq);
  				} else
  						return -RIG_ENAVAIL;
--- 1303,1307 ----
  				if (rig->callbacks.freq_event) {
  					freq = from_bcd(buf+5, (priv->civ_731_mode ? 4:5)*2);
! 					return rig->callbacks.freq_event(rig,RIG_VFO_CURR,freq);
  				} else
  						return -RIG_ENAVAIL;
***************
*** 1310,1314 ****
  				if (rig->callbacks.mode_event) {
  					icom2hamlib_mode(buf[5]| buf[6]<<8, &mode, &width);
! 					return rig->callbacks.mode_event(rig,mode,width);
  				} else
  						return -RIG_ENAVAIL;
--- 1310,1314 ----
  				if (rig->callbacks.mode_event) {
  					icom2hamlib_mode(buf[5]| buf[6]<<8, &mode, &width);
! 					return rig->callbacks.mode_event(rig,RIG_VFO_CURR,mode,width);
  				} else
  						return -RIG_ENAVAIL;

Index: icom.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/icom.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** icom.h	2000/12/04 23:39:17	1.9
--- icom.h	2000/12/05 22:01:02	1.10
***************
*** 29,35 ****
  #define _ICOM_H 1
  
  
  struct ts_sc_list {
! 	unsigned long ts;	/* tuning step */
  	unsigned char sc;	/* sub command */
  };
--- 29,37 ----
  #define _ICOM_H 1
  
+ #include <hamlib/rig.h>
  
+ 
  struct ts_sc_list {
! 	shortfreq_t ts;	/* tuning step */
  	unsigned char sc;	/* sub command */
  };
***************
*** 43,68 ****
  int icom_init(RIG *rig);
  int icom_cleanup(RIG *rig);
! int icom_set_freq(RIG *rig, freq_t freq);
! int icom_get_freq(RIG *rig, freq_t *freq);
! int icom_set_mode(RIG *rig, rmode_t mode, pbwidth_t width);
! int icom_get_mode(RIG *rig, rmode_t *mode, pbwidth_t *width);
  int icom_set_vfo(RIG *rig, vfo_t vfo);
! int icom_set_rptr_shift(RIG *rig, rptr_shift_t rptr_shift);
! int icom_get_rptr_shift(RIG *rig, rptr_shift_t *rptr_shift);
! int icom_set_rptr_offs(RIG *rig, unsigned long rptr_offs);
! int icom_get_rptr_offs(RIG *rig, unsigned long *rptr_offs);
! int icom_set_split_freq(RIG *rig, freq_t rx_freq, freq_t tx_freq);
! int icom_get_split_freq(RIG *rig, freq_t *rx_freq, freq_t *tx_freq);
! int icom_set_split(RIG *rig, split_t split);
! int icom_get_split(RIG *rig, split_t *split);
! int icom_set_ts(RIG *rig, unsigned long ts);
! int icom_get_ts(RIG *rig, unsigned long *ts);
! int icom_set_ptt(RIG *rig, ptt_t ptt);
! int icom_get_ptt(RIG *rig, ptt_t *ptt);
! int icom_set_bank(RIG *rig, int bank);
! int icom_set_mem(RIG *rig, int ch);
! int icom_mv_ctl(RIG *rig, mv_op_t op);
! int icom_set_level(RIG *rig, setting_t level, value_t val);
! int icom_get_level(RIG *rig, setting_t level, value_t *val);
  int icom_set_channel(RIG *rig, const channel_t *chan);
  int icom_get_channel(RIG *rig, channel_t *chan);
--- 45,70 ----
  int icom_init(RIG *rig);
  int icom_cleanup(RIG *rig);
! int icom_set_freq(RIG *rig, vfo_t vfo, freq_t freq);
! int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq);
! int icom_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width);
! int icom_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width);
  int icom_set_vfo(RIG *rig, vfo_t vfo);
! int icom_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift);
! int icom_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *rptr_shift);
! int icom_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t rptr_offs);
! int icom_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *rptr_offs);
! int icom_set_split_freq(RIG *rig, vfo_t vfo, freq_t rx_freq, freq_t tx_freq);
! int icom_get_split_freq(RIG *rig, vfo_t vfo, freq_t *rx_freq, freq_t *tx_freq);
! int icom_set_split(RIG *rig, vfo_t vfo, split_t split);
! int icom_get_split(RIG *rig, vfo_t vfo, split_t *split);
! int icom_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts);
! int icom_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts);
! int icom_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt);
! int icom_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt);
! int icom_set_bank(RIG *rig, vfo_t vfo, int bank);
! int icom_set_mem(RIG *rig, vfo_t vfo, int ch);
! int icom_mv_ctl(RIG *rig, vfo_t vfo, mv_op_t op);
! int icom_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
! int icom_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
  int icom_set_channel(RIG *rig, const channel_t *chan);
  int icom_get_channel(RIG *rig, channel_t *chan);

[Hamlib-cvs-digest] CVS: hamlib/include/hamlib rig.h,1.10,1.11

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

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

Modified Files:
	rig.h 
Log Message:
* all the API functions are now targetted to a particular VFO.
  This is a major change in the library interface, and the implementation
  is not complete yet (especially in the backends), but the API should
  be fine. Anyway, at this stage of developement, interface design 
  experimenting matters more than completeness.
* added new shortfreq_t type for frequencies on 31bits (up to 2GHz)
  for use by offset/shifts/etc.


Index: rig.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/include/hamlib/rig.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** rig.h	2000/12/04 23:39:17	1.10
--- rig.h	2000/12/05 22:01:03	1.11
***************
*** 143,147 ****
  	RIG_VFO_A = RIG_VFO_MAIN,
  	RIG_VFO_B = RIG_VFO_SUB,
! 	RIG_VFO_C = RIG_VFO_SAT
  };
  
--- 143,149 ----
  	RIG_VFO_A = RIG_VFO_MAIN,
  	RIG_VFO_B = RIG_VFO_SUB,
! 	RIG_VFO_C = RIG_VFO_SAT,
! 	RIG_VFO_CURR,		/* current VFO */
! 	RIG_VFO_ALL			/* apply to all VFO (when used as target) */
  };
  
***************
*** 267,273 ****
  
  /*
!  * frequency type in Hz, must be >32bits for SHF! 
   */
  typedef long long freq_t;
  
  #define Hz(f)	((freq_t)(f))
--- 269,277 ----
  
  /*
!  * freq_t: frequency type in Hz, must be >32bits for SHF! 
!  * shortfreq_t: frequency on 31bits, suitable for offsets, shifts, etc..
   */
  typedef long long freq_t;
+ typedef signed long shortfreq_t;
  
  #define Hz(f)	((freq_t)(f))
***************
*** 282,285 ****
--- 286,290 ----
  #define Watts(p) ((int)((p)*1000))
  #define KW(p)	 ((int)((p)*1000000L))
+ #define MW(p)	 ((int)((p)*1000000000L))	/* geeez! :) */
  
  typedef unsigned int rmode_t;	/* radio mode  */
***************
*** 326,330 ****
  struct tuning_step_list {
    rmode_t modes;	/* bitwise OR'ed RIG_MODE_* */
!   unsigned long ts;		/* tuning step in Hz */
  };
  
--- 331,335 ----
  struct tuning_step_list {
    rmode_t modes;	/* bitwise OR'ed RIG_MODE_* */
!   shortfreq_t ts;		/* tuning step in Hz */
  };
  
***************
*** 341,344 ****
--- 346,350 ----
    freq_t freq;
    rmode_t mode;
+   pbwidth_t width;
    vfo_t vfo;
    int power;	/* in mW */
***************
*** 346,350 ****
    int preamp;	/* in db */
    int ant;	/* antenna number */
!   unsigned long tuning_step;	/* */
    unsigned char channel_desc[MAXCHANDESC];
  };
--- 352,356 ----
    int preamp;	/* in db */
    int ant;	/* antenna number */
!   shortfreq_t tuning_step;	/* */
    unsigned char channel_desc[MAXCHANDESC];
  };
***************
*** 406,410 ****
    int (*rig_cleanup)(RIG *rig);
    int (*rig_open)(RIG *rig);	/* called when port just opened */
!   int (*rig_close)(RIG *rig);	/* called before port is to close */
    int (*rig_probe)(RIG *rig); /* Experimental: may work.. */
    
--- 412,416 ----
    int (*rig_cleanup)(RIG *rig);
    int (*rig_open)(RIG *rig);	/* called when port just opened */
!   int (*rig_close)(RIG *rig);	/* called before port is to be closed */
    int (*rig_probe)(RIG *rig); /* Experimental: may work.. */
    
***************
*** 414,455 ****
     */
    
!   int (*set_freq)(RIG *rig, freq_t freq); /* select freq */
!   int (*get_freq)(RIG *rig, freq_t *freq); /* get freq */
  
!   int (*set_mode)(RIG *rig, rmode_t mode, pbwidth_t width); /* select mode */
!   int (*get_mode)(RIG *rig, rmode_t *mode, pbwidth_t *width); /* get mode */
  
    int (*set_vfo)(RIG *rig, vfo_t vfo); /* select vfo (A,B, etc.) */
    int (*get_vfo)(RIG *rig, vfo_t *vfo); /* get vfo */
  
!   int (*set_ptt)(RIG *rig, ptt_t ptt); /* ptt on/off */
!   int (*get_ptt)(RIG *rig, ptt_t *ptt); /* get ptt status */
  
!   int (*set_rptr_shift)(RIG *rig, rptr_shift_t rptr_shift);	/* set repeater shift */
!   int (*get_rptr_shift)(RIG *rig, rptr_shift_t *rptr_shift);	/* get repeater shift */
  
!   int (*set_rptr_offs)(RIG *rig, unsigned long offs);/*set duplex offset freq*/
!   int (*get_rptr_offs)(RIG *rig, unsigned long *offs);/*get duplex offset freq*/
  
!   int (*set_split_freq)(RIG *rig, freq_t rx_freq, freq_t tx_freq);
!   int (*get_split_freq)(RIG *rig, freq_t *rx_freq, freq_t *tx_freq);
!   int (*set_split)(RIG *rig, split_t split);
!   int (*get_split)(RIG *rig, split_t *split);
! 
!   int (*set_rit)(RIG *rig, signed long rit);
!   int (*get_rit)(RIG *rig, signed long *rit);
! 
!   int (*set_ts)(RIG *rig, unsigned long ts); /* set tuning step */
!   int (*get_ts)(RIG *rig, unsigned long *ts); /* get tuning step */
! 
!   int (*set_dcs)(RIG *rig, unsigned int code);
!   int (*get_dcs)(RIG *rig, unsigned int *code);
!   int (*set_ctcss)(RIG *rig, unsigned int tone);
!   int (*get_ctcss)(RIG *rig, unsigned int *tone);
! 
!   int (*set_dcs_sql)(RIG *rig, unsigned int code);
!   int (*get_dcs_sql)(RIG *rig, unsigned int *code);
!   int (*set_ctcss_sql)(RIG *rig, unsigned int tone);
!   int (*get_ctcss_sql)(RIG *rig, unsigned int *tone);
  
    /*
--- 420,461 ----
     */
    
!   int (*set_freq)(RIG *rig, vfo_t vfo, freq_t freq); /* select freq */
!   int (*get_freq)(RIG *rig, vfo_t vfo, freq_t *freq); /* get freq */
  
!   int (*set_mode)(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); /* select mode */
!   int (*get_mode)(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); /* get mode */
  
    int (*set_vfo)(RIG *rig, vfo_t vfo); /* select vfo (A,B, etc.) */
    int (*get_vfo)(RIG *rig, vfo_t *vfo); /* get vfo */
  
!   int (*set_ptt)(RIG *rig, vfo_t vfo, ptt_t ptt); /* ptt on/off */
!   int (*get_ptt)(RIG *rig, vfo_t vfo, ptt_t *ptt); /* get ptt status */
  
!   int (*set_rptr_shift)(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift);	/* set repeater shift */
!   int (*get_rptr_shift)(RIG *rig, vfo_t vfo, rptr_shift_t *rptr_shift);	/* get repeater shift */
  
!   int (*set_rptr_offs)(RIG *rig, vfo_t vfo, shortfreq_t offs);/*set duplex offset freq*/
!   int (*get_rptr_offs)(RIG *rig, vfo_t vfo, shortfreq_t *offs);/*get duplex offset freq*/
  
!   int (*set_split_freq)(RIG *rig, vfo_t vfo, freq_t rx_freq, freq_t tx_freq);
!   int (*get_split_freq)(RIG *rig, vfo_t vfo, freq_t *rx_freq, freq_t *tx_freq);
!   int (*set_split)(RIG *rig, vfo_t vfo, split_t split);
!   int (*get_split)(RIG *rig, vfo_t vfo, split_t *split);
! 
!   int (*set_rit)(RIG *rig, vfo_t vfo, shortfreq_t rit);
!   int (*get_rit)(RIG *rig, vfo_t vfo, shortfreq_t *rit);
! 
!   int (*set_ts)(RIG *rig, vfo_t vfo, shortfreq_t ts); /* set tuning step */
!   int (*get_ts)(RIG *rig, vfo_t vfo, shortfreq_t *ts); /* get tuning step */
! 
!   int (*set_dcs)(RIG *rig, vfo_t vfo, unsigned int code);
!   int (*get_dcs)(RIG *rig, vfo_t vfo, unsigned int *code);
!   int (*set_ctcss)(RIG *rig, vfo_t vfo, unsigned int tone);
!   int (*get_ctcss)(RIG *rig, vfo_t vfo, unsigned int *tone);
! 
!   int (*set_dcs_sql)(RIG *rig, vfo_t vfo, unsigned int code);
!   int (*get_dcs_sql)(RIG *rig, vfo_t vfo, unsigned int *code);
!   int (*set_ctcss_sql)(RIG *rig, vfo_t vfo, unsigned int tone);
!   int (*get_ctcss_sql)(RIG *rig, vfo_t vfo, unsigned int *tone);
  
    /*
***************
*** 465,481 ****
    int (*set_poweroff)(RIG *rig);
  
!   int (*set_level)(RIG *rig, setting_t level, value_t val);/* set level setting */
!   int (*get_level)(RIG *rig, setting_t level, value_t *val);/* set level setting*/
  
!   int (*set_func)(RIG *rig, setting_t func, int status); /* activate the function(s) */
!   int (*get_func)(RIG *rig, setting_t *func); /* get the setting from rig */
  
!   int (*set_bank)(RIG *rig, int bank);			/* set memory bank number */
!   int (*set_mem)(RIG *rig, int ch);			/* set memory channel number */
!   int (*get_mem)(RIG *rig, int *ch);		/* get memory channel number */
!   int (*mv_ctl)(RIG *rig, mv_op_t op);		/* Mem/VFO operation */
  
!   int (*set_trn)(RIG *rig, int trn);	/* activate transceive mode on radio */
!   int (*get_trn)(RIG *rig, int *trn);	/* PCR-1000 can do that, ICR75 too */
  
  
--- 471,487 ----
    int (*set_poweroff)(RIG *rig);
  
!   int (*set_level)(RIG *rig, vfo_t vfo, setting_t level, value_t val);/* set level setting */
!   int (*get_level)(RIG *rig, vfo_t vfo, setting_t level, value_t *val);/* set level setting*/
  
!   int (*set_func)(RIG *rig, vfo_t vfo, setting_t func, int status); /* activate the function(s) */
!   int (*get_func)(RIG *rig, vfo_t vfo, setting_t *func); /* get the setting from rig */
  
!   int (*set_bank)(RIG *rig, vfo_t vfo, int bank);			/* set memory bank number */
!   int (*set_mem)(RIG *rig, vfo_t vfo, int ch);			/* set memory channel number */
!   int (*get_mem)(RIG *rig, vfo_t vfo, int *ch);		/* get memory channel number */
!   int (*mv_ctl)(RIG *rig, vfo_t vfo, mv_op_t op);		/* Mem/VFO operation */
  
!   int (*set_trn)(RIG *rig, vfo_t vfo, int trn);	/* activate transceive mode on radio */
!   int (*get_trn)(RIG *rig, vfo_t vfo, int *trn);	/* PCR-1000 can do that, ICR75 too */
  
  
***************
*** 546,553 ****
   */
  struct rig_callbacks {
! 	int (*freq_event)(RIG *rig, freq_t freq); 
! 	int (*mode_event)(RIG *rig, rmode_t mode, pbwidth_t width); 
  	int (*vfo_event)(RIG *rig, vfo_t vfo); 
! 	int (*ptt_event)(RIG *rig, ptt_t mode); 
  	/* etc.. */
  };
--- 552,559 ----
   */
  struct rig_callbacks {
! 	int (*freq_event)(RIG *rig, vfo_t vfo, freq_t freq); 
! 	int (*mode_event)(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); 
  	int (*vfo_event)(RIG *rig, vfo_t vfo); 
! 	int (*ptt_event)(RIG *rig, vfo_t vfo, ptt_t mode); 
  	/* etc.. */
  };
***************
*** 575,623 ****
     */
  
! extern int rig_set_freq(RIG *rig, freq_t freq); /* select freq */
! extern int rig_get_freq(RIG *rig, freq_t *freq); /* get freq */
  
! extern int rig_set_mode(RIG *rig, rmode_t mode, pbwidth_t width); /* select mode */
! extern int rig_get_mode(RIG *rig, rmode_t *mode, pbwidth_t *width); /* get mode */
  
  extern int rig_set_vfo(RIG *rig, vfo_t vfo); /* select vfo */
  extern int rig_get_vfo(RIG *rig, vfo_t *vfo); /* get vfo */
  
! extern int rig_set_ptt(RIG *rig, ptt_t ptt); /* ptt on/off */
! extern int rig_get_ptt(RIG *rig, ptt_t *ptt); /* get ptt status */
  
! extern int rig_set_rptr_shift(RIG *rig, rptr_shift_t rptr_shift); /* set repeater shift */
! extern int rig_get_rptr_shift(RIG *rig, rptr_shift_t *rptr_shift); /* get repeater shift */
! extern int rig_set_rptr_offs(RIG *rig, unsigned long rptr_offs); /* set repeater offset */
! extern int rig_get_rptr_offs(RIG *rig, unsigned long *rptr_offs); /* get repeater offset */
! 
! extern int rig_set_ctcss(RIG *rig, unsigned int tone);
! extern int rig_get_ctcss(RIG *rig, unsigned int *tone);
! extern int rig_set_dcs(RIG *rig, unsigned int code);
! extern int rig_get_dcs(RIG *rig, unsigned int *code);
! 
! extern int rig_set_ctcss_sql(RIG *rig, unsigned int tone);
! extern int rig_get_ctcss_sql(RIG *rig, unsigned int *tone);
! extern int rig_set_dcs_sql(RIG *rig, unsigned int code);
! extern int rig_get_dcs_sql(RIG *rig, unsigned int *code);
! 
! extern int rig_set_split_freq(RIG *rig, freq_t rx_freq, freq_t tx_freq);
! extern int rig_get_split_freq(RIG *rig, freq_t *rx_freq, freq_t *tx_freq);
! extern int rig_set_split(RIG *rig, split_t split);
! extern int rig_get_split(RIG *rig, split_t *split);
  
! extern int rig_set_rit(RIG *rig, signed long rit);
! extern int rig_get_rit(RIG *rig, signed long *rit);
  
! extern int rig_set_ts(RIG *rig, unsigned long ts); /* set tuning step */
! extern int rig_get_ts(RIG *rig, unsigned long *ts); /* get tuning step */
  
  extern int rig_power2mW(RIG *rig, unsigned int *mwpower, float power, freq_t freq, rmode_t mode);
  extern int rig_mW2power(RIG *rig, float *power, unsigned int mwpower, freq_t freq, rmode_t mode);
  
! extern int rig_set_level(RIG *rig, setting_t level, value_t val);
! extern int rig_get_level(RIG *rig, setting_t level, value_t *val);
  
! #define rig_get_strength(r,s) rig_get_level((r), RIG_LEVEL_STRENGTH, (value_t*)(s))
  
  extern int rig_set_poweron(RIG *rig);
--- 581,629 ----
     */
  
! extern int rig_set_freq(RIG *rig, vfo_t vfo, freq_t freq); /* select freq */
! extern int rig_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); /* get freq */
  
! extern int rig_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); /* select mode */
! extern int rig_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); /* get mode */
  
  extern int rig_set_vfo(RIG *rig, vfo_t vfo); /* select vfo */
  extern int rig_get_vfo(RIG *rig, vfo_t *vfo); /* get vfo */
  
! extern int rig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt); /* ptt on/off */
! extern int rig_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt); /* get ptt status */
  
! extern int rig_set_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t rptr_shift); /* set repeater shift */
! extern int rig_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *rptr_shift); /* get repeater shift */
! extern int rig_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t rptr_offs); /* set repeater offset */
! extern int rig_get_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t *rptr_offs); /* get repeater offset */
! 
! extern int rig_set_ctcss(RIG *rig, vfo_t vfo, unsigned int tone);
! extern int rig_get_ctcss(RIG *rig, vfo_t vfo, unsigned int *tone);
! extern int rig_set_dcs(RIG *rig, vfo_t vfo, unsigned int code);
! extern int rig_get_dcs(RIG *rig, vfo_t vfo, unsigned int *code);
! 
! extern int rig_set_ctcss_sql(RIG *rig, vfo_t vfo, unsigned int tone);
! extern int rig_get_ctcss_sql(RIG *rig, vfo_t vfo, unsigned int *tone);
! extern int rig_set_dcs_sql(RIG *rig, vfo_t vfo, unsigned int code);
! extern int rig_get_dcs_sql(RIG *rig, vfo_t vfo, unsigned int *code);
! 
! extern int rig_set_split_freq(RIG *rig, vfo_t vfo, freq_t rx_freq, freq_t tx_freq);
! extern int rig_get_split_freq(RIG *rig, vfo_t vfo, freq_t *rx_freq, freq_t *tx_freq);
! extern int rig_set_split(RIG *rig, vfo_t vfo, split_t split);
! extern int rig_get_split(RIG *rig, vfo_t vfo, split_t *split);
  
! extern int rig_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit);
! extern int rig_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit);
  
! extern int rig_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts); /* set tuning step */
! extern int rig_get_ts(RIG *rig, vfo_t vfo, shortfreq_t *ts); /* get tuning step */
  
  extern int rig_power2mW(RIG *rig, unsigned int *mwpower, float power, freq_t freq, rmode_t mode);
  extern int rig_mW2power(RIG *rig, float *power, unsigned int mwpower, freq_t freq, rmode_t mode);
  
! extern int rig_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
! extern int rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
  
! #define rig_get_strength(r,v,s) rig_get_level((r),(v),RIG_LEVEL_STRENGTH, (value_t*)(s))
  
  extern int rig_set_poweron(RIG *rig);
***************
*** 635,651 ****
  
  extern setting_t rig_has_func(RIG *rig, setting_t func);	/* is part of capabilities? */
! extern int rig_set_func(RIG *rig, setting_t func, int status);	/* activate the function(s) */
! extern int rig_get_func(RIG *rig, setting_t *func); /* get the setting from rig */
  
! extern int rig_set_bank(RIG *rig, int bank);	/* set memory bank number */
! extern int rig_set_mem(RIG *rig, int ch);		/* set memory channel number */
! extern int rig_get_mem(RIG *rig, int *ch);		/* get memory channel number */
! extern int rig_mv_ctl(RIG *rig, mv_op_t op);	/* Mem/VFO operation */
  
  extern int rig_set_channel(RIG *rig, const channel_t *chan);
  extern int rig_get_channel(RIG *rig, channel_t *chan);
  
! extern int rig_set_trn(RIG *rig, int trn); /* activate the transceive mode */
! extern int rig_get_trn(RIG *rig, int *trn);
  
  
--- 641,657 ----
  
  extern setting_t rig_has_func(RIG *rig, setting_t func);	/* is part of capabilities? */
! extern int rig_set_func(RIG *rig, vfo_t vfo, setting_t func, int status);	/* activate the function(s) */
! extern int rig_get_func(RIG *rig, vfo_t vfo, setting_t *func); /* get the setting from rig */
  
! extern int rig_set_bank(RIG *rig, vfo_t vfo, int bank);	/* set memory bank number */
! extern int rig_set_mem(RIG *rig, vfo_t vfo, int ch);		/* set memory channel number */
! extern int rig_get_mem(RIG *rig, vfo_t vfo, int *ch);		/* get memory channel number */
! extern int rig_mv_ctl(RIG *rig, vfo_t vfo, mv_op_t op);	/* Mem/VFO operation */
  
  extern int rig_set_channel(RIG *rig, const channel_t *chan);
  extern int rig_get_channel(RIG *rig, channel_t *chan);
  
! extern int rig_set_trn(RIG *rig, vfo_t vfo, int trn); /* activate the transceive mode */
! extern int rig_get_trn(RIG *rig, vfo_t vfo, int *trn);
  
  
***************
*** 671,674 ****
  
  #endif /* _RIG_H */
- 
  
--- 677,679 ----

[Hamlib-cvs-digest] CVS: hamlib TODO,1.11,1.12

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

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

Modified Files:
	TODO 
Log Message:
* more stuff to do

Index: TODO
===================================================================
RCS file: /cvsroot/hamlib/hamlib/TODO,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** TODO	2000/11/01 23:19:03	1.11
--- TODO	2000/12/05 21:52:44	1.12
***************
*** 23,27 ****
  16. Write .spec (rpm) and .deb (debian) package files
  18. rewrite the post_write_delay. Active delay is a waste of cycles!
! 
  
  DONE
--- 23,33 ----
  16. Write .spec (rpm) and .deb (debian) package files
  18. rewrite the post_write_delay. Active delay is a waste of cycles!
! 19. specify how to access Reverse modes (CWR, RTTYW). through set_mode?
! 20. rework API include files to support C++ (__BEGIN_DECLS/__END_DECLS, etc.)
! 21. grab cygwin and test portability under Win32 (what about MacOS?)
! 22. handle nicely different versions of same rig coming for 
! 	ITU region1/region2 ham band (-> freq ranges in capabilities)
! 23. add support in the API for additional filters, DSP bandpass control
! 24. Should Hamlib (the library itself) be LGPL'ed ?
  
  DONE

[Hamlib-cvs-digest] CVS: hamlib/doc Makefile.am,1.2,1.3

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

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

Modified Files:
	Makefile.am 
Log Message:
* added NOTES in the distribution

Index: Makefile.am
===================================================================
RCS file: /cvsroot/hamlib/hamlib/doc/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am	2000/10/29 10:17:08	1.2
--- Makefile.am	2000/12/05 21:51:36	1.3
***************
*** 1,2 ****
  noinst_SCRIPTS = hamlib-doc split-man.pl
! EXTRA_DIST = hamlib-doc split-man.pl
--- 1,2 ----
  noinst_SCRIPTS = hamlib-doc split-man.pl
! EXTRA_DIST = hamlib-doc split-man.pl NOTES

[Hamlib-cvs-digest] CVS: hamlib/tests testrig.c,1.4,1.5

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

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

Modified Files:
	testrig.c 
Log Message:
* [sg]et_mode is now responsible for setting/getting the passband


Index: testrig.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/testrig.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** testrig.c	2000/11/25 21:52:41	1.4
--- testrig.c	2000/12/05 19:32:48	1.5
***************
*** 14,17 ****
--- 14,18 ----
  	freq_t freq;		/* frequency  */
  	rmode_t rmode;		/* radio mode of operation */
+ 	pbwidth_t width;
  	vfo_t vfo;		/* vfo selection */
  	int strength;		/* S-Meter level */
***************
*** 96,100 ****
  	} 
  
! 	retcode = rig_set_mode(my_rig, RIG_MODE_LSB);
  
  	if (retcode != RIG_OK ) {
--- 97,101 ----
  	} 
  
! 	retcode = rig_set_mode(my_rig, RIG_MODE_LSB, RIG_PASSBAND_NORMAL);
  
  	if (retcode != RIG_OK ) {
***************
*** 123,127 ****
  	}
  
! 	retcode = rig_get_mode(my_rig, &rmode);
  
  	if (retcode == RIG_OK ) {
--- 124,128 ----
  	}
  
! 	retcode = rig_get_mode(my_rig, &rmode, &width);
  
  	if (retcode == RIG_OK ) {

[Hamlib-cvs-digest] CVS: hamlib/include config.h.in,1.1,1.2

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

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

Modified Files:
	config.h.in 
Log Message:
* regenerated due to added libgd option

Index: config.h.in
===================================================================
RCS file: /cvsroot/hamlib/hamlib/include/config.h.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** config.h.in	2000/10/01 12:44:00	1.1
--- config.h.in	2000/12/04 23:45:28	1.2
***************
*** 39,42 ****
--- 39,45 ----
  #undef HAVE_DLOPEN
  
+ /* Define if you have the gdImageCreate function.  */
+ #undef HAVE_GDIMAGECREATE
+ 
  /* Define if you have the select function.  */
  #undef HAVE_SELECT
***************
*** 57,60 ****
--- 60,66 ----
  #undef HAVE_FCNTL_H
  
+ /* Define if you have the <gd.h> header file.  */
+ #undef HAVE_GD_H
+ 
  /* Define if you have the <sys/ioctl.h> header file.  */
  #undef HAVE_SYS_IOCTL_H
***************
*** 71,74 ****
--- 77,83 ----
  /* Define if you have the dl library (-ldl).  */
  #undef HAVE_LIBDL
+ 
+ /* Define if you have the gd library (-lgd).  */
+ #undef HAVE_LIBGD
  
  /* Define if you have the intl library (-lintl).  */

[Hamlib-cvs-digest] CVS: hamlib/icom frame.c,1.5,1.6 frame.h,1.3,1.4 icom.c,1.9,1.10 icom.h,1.8,1.9

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

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

Modified Files:
	frame.c frame.h icom.c icom.h 
Log Message:
* removed [sg]et_passband in favor of an enhanced [sg]et_mode which
  includes the passband, since most rigs tie these parameters together
  quite often. For exemple, WFM is (RIG_MODE_FM,RIG_PASSBAND_WIDE) in Hamlib.
  Another set of functions will be needed to fine tune aditional 
  frequency response/filters.


Index: frame.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/frame.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** frame.c	2000/11/01 23:21:47	1.5
--- frame.c	2000/12/04 23:39:17	1.6
***************
*** 195,199 ****
  
  
! unsigned short hamlib2icom_mode(rmode_t mode)
  {
  		int icmode, icmode_ext;
--- 195,202 ----
  
  
! /*
!  * TODO: be more exhaustive
!  */
! unsigned short hamlib2icom_mode(rmode_t mode, pbwidth_t width)
  {
  		int icmode, icmode_ext;
***************
*** 207,228 ****
  		case RIG_MODE_LSB:	icmode = S_LSB; break;
  		case RIG_MODE_RTTY:	icmode = S_RTTY; break;
! 		case RIG_MODE_FM:	icmode = S_FM; break;
! #if 0
! 		case RIG_MODE_WFM:	icmode = S_WFM; break;
! 
! 		case RIG_MODE_NFM:	icmode = S_FM; icmode_ext = 0x01; break;
! 		case RIG_MODE_NAM:	icmode = S_AM; break;
! 		case RIG_MODE_WAM:	icmode = S_AM; break;
! 		case RIG_MODE_NCW:	icmode = S_CW; break;
! 		case RIG_MODE_WCW:	icmode = S_CW; break;
! 		case RIG_MODE_CWR:	icmode = S_CW; break;
! 		case RIG_MODE_NUSB:	icmode = S_USB; break;
! 		case RIG_MODE_WUSB:	icmode = S_USB; break;
! 		case RIG_MODE_NLSB:	icmode = S_LSB; break;
! 		case RIG_MODE_WLSB:	icmode = S_LSB; break;
! 		case RIG_MODE_NRTTY: icmode = S_RTTY; break;
! 		case RIG_MODE_WRTTY: icmode = S_RTTY; break;
! #endif
! 
  		default:
  			rig_debug(RIG_DEBUG_ERR,"icom: Unsupported Hamlib mode %d\n",mode);
--- 210,217 ----
  		case RIG_MODE_LSB:	icmode = S_LSB; break;
  		case RIG_MODE_RTTY:	icmode = S_RTTY; break;
! 		case RIG_MODE_FM:	
! 							icmode = width==RIG_PASSBAND_WIDE?S_WFM:S_FM;
! 							icmode_ext = width==RIG_PASSBAND_NARROW?0x01:0x00;
! 							break;
  		default:
  			rig_debug(RIG_DEBUG_ERR,"icom: Unsupported Hamlib mode %d\n",mode);
***************
*** 232,247 ****
  }
  
! rmode_t icom2hamlib_mode(unsigned short icmode)
  {
! 		rmode_t mode;
  
  		switch (icmode & 0xff) {
! 		case S_AM:	mode = RIG_MODE_AM; break;
! 		case S_CW:	mode = RIG_MODE_CW; break;
! 		case S_FM:	mode = RIG_MODE_FM; break;
! 		case S_WFM:	mode = RIG_MODE_FM; break;	/* and set width to wide.. */
! 		case S_USB:	mode = RIG_MODE_USB; break;
! 		case S_LSB:	mode = RIG_MODE_LSB; break;
! 		case S_RTTY:	mode = RIG_MODE_RTTY; break;
  		case 0xff:	mode = 0; break;	/* blank mem channel */
  
--- 221,239 ----
  }
  
! void icom2hamlib_mode(unsigned short icmode, rmode_t *mode, pbwidth_t *width)
  {
! 		*width = RIG_PASSBAND_NORMAL;
  
  		switch (icmode & 0xff) {
! 		case S_AM:	*mode = RIG_MODE_AM; break;
! 		case S_CW:	*mode = RIG_MODE_CW; break;
! 		case S_FM:	*mode = RIG_MODE_FM; break;
! 		case S_WFM:	
! 					*mode = RIG_MODE_FM;
! 					*width = RIG_PASSBAND_WIDE;
! 					break;
! 		case S_USB:	*mode = RIG_MODE_USB; break;
! 		case S_LSB:	*mode = RIG_MODE_LSB; break;
! 		case S_RTTY:	*mode = RIG_MODE_RTTY; break;
  		case 0xff:	mode = 0; break;	/* blank mem channel */
  
***************
*** 249,255 ****
  			rig_debug(RIG_DEBUG_ERR,"icom: Unsupported Icom mode %#.2x\n",
  							icmode);
! 			mode = 0;
  		}
- 		return mode;
  }
  
--- 241,246 ----
  			rig_debug(RIG_DEBUG_ERR,"icom: Unsupported Icom mode %#.2x\n",
  							icmode);
! 			*mode = 0;
  		}
  }
  

Index: frame.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/frame.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** frame.h	2000/11/01 23:21:47	1.3
--- frame.h	2000/12/04 23:39:17	1.4
***************
*** 39,44 ****
  int read_icom_frame(FILE *stream, unsigned char rxbuffer[], int timeout);
  
! unsigned short hamlib2icom_mode(rmode_t mode);
! rmode_t icom2hamlib_mode(unsigned short icmode);
  
  #endif /* _FRAME_H */
--- 39,44 ----
  int read_icom_frame(FILE *stream, unsigned char rxbuffer[], int timeout);
  
! unsigned short hamlib2icom_mode(rmode_t mode, pbwidth_t width);
! void icom2hamlib_mode(unsigned short icmode, rmode_t *mode, pbwidth_t *width);
  
  #endif /* _FRAME_H */

Index: icom.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/icom.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** icom.c	2000/10/29 16:25:56	1.9
--- icom.c	2000/12/04 23:39:17	1.10
***************
*** 355,359 ****
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_mode(RIG *rig, rmode_t mode)
  {
  		struct icom_priv_data *priv;
--- 355,359 ----
   * Assumes rig!=NULL, rig->state.priv!=NULL
   */
! int icom_set_mode(RIG *rig, rmode_t mode, pbwidth_t width)
  {
  		struct icom_priv_data *priv;
***************
*** 365,369 ****
  		priv = (struct icom_priv_data*)rig_s->priv;
  
! 		icmode = hamlib2icom_mode(mode);
  
  		icom_transaction (rig, C_SET_MODE, icmode, NULL, 0, ackbuf, &ack_len);
--- 365,369 ----
  		priv = (struct icom_priv_data*)rig_s->priv;
  
! 		icmode = hamlib2icom_mode(mode,width);
  
  		icom_transaction (rig, C_SET_MODE, icmode, NULL, 0, ackbuf, &ack_len);
***************
*** 380,386 ****
  /*
   * icom_get_mode
!  * Assumes rig!=NULL, rig->state.priv!=NULL, mode!=NULL
   */
! int icom_get_mode(RIG *rig, rmode_t *mode)
  {
  		struct icom_priv_data *priv;
--- 380,386 ----
  /*
   * icom_get_mode
!  * Assumes rig!=NULL, rig->state.priv!=NULL, mode!=NULL, width!=NULL
   */
! int icom_get_mode(RIG *rig, rmode_t *mode, pbwidth_t *width)
  {
  		struct icom_priv_data *priv;
***************
*** 404,408 ****
  		}
  
! 		*mode = icom2hamlib_mode(modebuf[1]| modebuf[2]<<8);
  
  		return RIG_OK;
--- 404,408 ----
  		}
  
! 		icom2hamlib_mode(modebuf[1]| modebuf[2]<<8, mode, width);
  
  		return RIG_OK;
***************
*** 1031,1035 ****
  		chan_len = 3+freq_len+1;
  
! 		icmode = hamlib2icom_mode(chan->mode);
  		chanbuf[chan_len++] = icmode&0xff;
  		chanbuf[chan_len++] = icmode>>8;
--- 1031,1035 ----
  		chan_len = 3+freq_len+1;
  
! 		icmode = hamlib2icom_mode(chan->mode, RIG_PASSBAND_NORMAL); /* FIXME */
  		chanbuf[chan_len++] = icmode&0xff;
  		chanbuf[chan_len++] = icmode>>8;
***************
*** 1062,1065 ****
--- 1062,1066 ----
  		unsigned char chanbuf[24];
  		int chan_len,freq_len;
+ 		pbwidth_t width; 	/* FIXME */
  
  		rig_s = &rig->state;
***************
*** 1090,1094 ****
  		chan_len = 4+freq_len+1;
  
! 		chan->mode = icom2hamlib_mode(chanbuf[chan_len] | chanbuf[chan_len+1]);
  		chan_len += 2;
  		chan->att = from_bcd_be(chanbuf+chan_len++,2);
--- 1091,1096 ----
  		chan_len = 4+freq_len+1;
  
! 		icom2hamlib_mode(chanbuf[chan_len] | chanbuf[chan_len+1], 
! 						&chan->mode, &width);
  		chan_len += 2;
  		chan->att = from_bcd_be(chanbuf+chan_len++,2);
***************
*** 1280,1283 ****
--- 1282,1286 ----
  		freq_t freq;
  		rmode_t mode;
+ 		pbwidth_t width; 
  
  		rig_debug(RIG_DEBUG_VERBOSE, "icom: icom_decode called\n");
***************
*** 1306,1311 ****
  		case C_SND_MODE:
  				if (rig->callbacks.mode_event) {
! 					mode = icom2hamlib_mode(buf[5]| buf[6]<<8);
! 					return rig->callbacks.mode_event(rig,mode);
  				} else
  						return -RIG_ENAVAIL;
--- 1309,1314 ----
  		case C_SND_MODE:
  				if (rig->callbacks.mode_event) {
! 					icom2hamlib_mode(buf[5]| buf[6]<<8, &mode, &width);
! 					return rig->callbacks.mode_event(rig,mode,width);
  				} else
  						return -RIG_ENAVAIL;

Index: icom.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/icom.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** icom.h	2000/10/29 16:26:23	1.8
--- icom.h	2000/12/04 23:39:17	1.9
***************
*** 45,50 ****
  int icom_set_freq(RIG *rig, freq_t freq);
  int icom_get_freq(RIG *rig, freq_t *freq);
! int icom_set_mode(RIG *rig, rmode_t mode);
! int icom_get_mode(RIG *rig, rmode_t *mode);
  int icom_set_vfo(RIG *rig, vfo_t vfo);
  int icom_set_rptr_shift(RIG *rig, rptr_shift_t rptr_shift);
--- 45,50 ----
  int icom_set_freq(RIG *rig, freq_t freq);
  int icom_get_freq(RIG *rig, freq_t *freq);
! int icom_set_mode(RIG *rig, rmode_t mode, pbwidth_t width);
! int icom_get_mode(RIG *rig, rmode_t *mode, pbwidth_t *width);
  int icom_set_vfo(RIG *rig, vfo_t vfo);
  int icom_set_rptr_shift(RIG *rig, rptr_shift_t rptr_shift);

[Hamlib-cvs-digest] CVS: hamlib/include/hamlib rig.h,1.9,1.10

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

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

Modified Files:
	rig.h 
Log Message:
* removed [sg]et_passband in favor of an enhanced [sg]et_mode which
  includes the passband, since most rigs tie these parameters together
  quite often. For exemple, WFM is (RIG_MODE_FM,RIG_PASSBAND_WIDE) in Hamlib.
  Another set of functions will be needed to fine tune aditional 
  frequency response/filters.


Index: rig.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/include/hamlib/rig.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** rig.h	2000/11/28 22:31:40	1.9
--- rig.h	2000/12/04 23:39:17	1.10
***************
*** 239,243 ****
  #define RIG_LEVEL_STRENGTH	(1<<31)	/* Signal strength, arg int (db) */
  
! typedef unsigned long setting_t;	/* at least 32 bits */
  
  /*
--- 239,243 ----
  #define RIG_LEVEL_STRENGTH	(1<<31)	/* Signal strength, arg int (db) */
  
! typedef unsigned long setting_t;	/* 32 bits might not be enough.. */
  
  /*
***************
*** 285,289 ****
  typedef unsigned int rmode_t;	/* radio mode  */
  
! /* Do not use an enum since this will be used w/ rig_mode_t bit fields */
  #define RIG_MODE_NONE  	0
  #define RIG_MODE_AM    	(1<<0)
--- 285,293 ----
  typedef unsigned int rmode_t;	/* radio mode  */
  
! /*
!  * Do not use an enum since this will be used w/ rig_mode_t bit fields.
!  * Also, how should CW reverse sideband and RTTY reverse
!  * sideband be handled?
!  * */
  #define RIG_MODE_NONE  	0
  #define RIG_MODE_AM    	(1<<0)
***************
*** 294,316 ****
  #define RIG_MODE_FM    	(1<<5)
  
- /* The following are deprecated */
- /* use the get/set_filter to manipulate these bits */
- #if 0
- #define RIG_MODE_WFM	(1<<6)
- #define RIG_MODE_CWR	(1<<7)	/* CW reverse sideband*/
- #define RIG_MODE_RTTYR	(1<<8)	/* RTTY reverse sideband */
- 
- #define RIG_MODE_NFM	(1<<19)	/* should we distinguish modes w/ filers? */
- #define RIG_MODE_NAM	(1<<20)	/* Narrow AM */
- #define RIG_MODE_WAM	(1<<9)	/* Wide AM */
- #define RIG_MODE_NCW	(1<<10)	
- #define RIG_MODE_WCW	(1<<11)	
- #define RIG_MODE_NUSB	(1<<13)	
- #define RIG_MODE_WUSB	(1<<14)	
- #define RIG_MODE_NLSB	(1<<15)	
- #define RIG_MODE_WLSB	(1<<16)	
- #define RIG_MODE_NRTTY	(1<<17)	
- #define RIG_MODE_WRTTY	(1<<18)	
- #endif
  
  
--- 298,301 ----
***************
*** 432,437 ****
    int (*get_freq)(RIG *rig, freq_t *freq); /* get freq */
  
!   int (*set_mode)(RIG *rig, rmode_t mode); /* select mode */
!   int (*get_mode)(RIG *rig, rmode_t *mode); /* get mode */
  
    int (*set_vfo)(RIG *rig, vfo_t vfo); /* select vfo (A,B, etc.) */
--- 417,422 ----
    int (*get_freq)(RIG *rig, freq_t *freq); /* get freq */
  
!   int (*set_mode)(RIG *rig, rmode_t mode, pbwidth_t width); /* select mode */
!   int (*get_mode)(RIG *rig, rmode_t *mode, pbwidth_t *width); /* get mode */
  
    int (*set_vfo)(RIG *rig, vfo_t vfo); /* select vfo (A,B, etc.) */
***************
*** 441,447 ****
    int (*get_ptt)(RIG *rig, ptt_t *ptt); /* get ptt status */
  
-   int (*set_passband)(RIG *rig, pbwidth_t width); /* select width */
-   int (*get_passband)(RIG *rig, pbwidth_t *width); /* get width */
- 
    int (*set_rptr_shift)(RIG *rig, rptr_shift_t rptr_shift);	/* set repeater shift */
    int (*get_rptr_shift)(RIG *rig, rptr_shift_t *rptr_shift);	/* get repeater shift */
--- 426,429 ----
***************
*** 565,569 ****
  struct rig_callbacks {
  	int (*freq_event)(RIG *rig, freq_t freq); 
! 	int (*mode_event)(RIG *rig, rmode_t mode); 
  	int (*vfo_event)(RIG *rig, vfo_t vfo); 
  	int (*ptt_event)(RIG *rig, ptt_t mode); 
--- 547,551 ----
  struct rig_callbacks {
  	int (*freq_event)(RIG *rig, freq_t freq); 
! 	int (*mode_event)(RIG *rig, rmode_t mode, pbwidth_t width); 
  	int (*vfo_event)(RIG *rig, vfo_t vfo); 
  	int (*ptt_event)(RIG *rig, ptt_t mode); 
***************
*** 595,604 ****
  extern int rig_set_freq(RIG *rig, freq_t freq); /* select freq */
  extern int rig_get_freq(RIG *rig, freq_t *freq); /* get freq */
- 
- extern int rig_set_mode(RIG *rig, rmode_t mode); /* select mode */
- extern int rig_get_mode(RIG *rig, rmode_t *mode); /* get mode */
  
! extern int rig_set_passband(RIG *rig, pbwidth_t width); /* select width */
! extern int rig_get_passband(RIG *rig, pbwidth_t *width); /* get width */
  
  extern int rig_set_vfo(RIG *rig, vfo_t vfo); /* select vfo */
--- 577,583 ----
  extern int rig_set_freq(RIG *rig, freq_t freq); /* select freq */
  extern int rig_get_freq(RIG *rig, freq_t *freq); /* get freq */
  
! extern int rig_set_mode(RIG *rig, rmode_t mode, pbwidth_t width); /* select mode */
! extern int rig_get_mode(RIG *rig, rmode_t *mode, pbwidth_t *width); /* get mode */
  
  extern int rig_set_vfo(RIG *rig, vfo_t vfo); /* select vfo */

[Hamlib-cvs-digest] CVS: hamlib/tests rigctl.c,1.2,1.3

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

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

Modified Files:
	rigctl.c 
Log Message:
* removed [sg]et_passband in favor of an enhanced [sg]et_mode which
  includes the passband, since most rigs tie these parameters together
  quite often. For exemple, WFM is (RIG_MODE_FM,RIG_PASSBAND_WIDE) in Hamlib.
  Another set of functions will be needed to fine tune aditional 
  frequency response/filters.


Index: rigctl.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/rigctl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** rigctl.c	2000/11/28 22:34:37	1.2
--- rigctl.c	2000/12/04 23:39:18	1.3
***************
*** 47,52 ****
  static int set_mode(RIG *rig);
  static int get_mode(RIG *rig);
- static int set_passband(RIG *rig);
- static int get_passband(RIG *rig);
  static int set_vfo(RIG *rig);
  static int get_vfo(RIG *rig);
--- 47,50 ----
***************
*** 86,91 ****
  		{ 'M', "rig_set_mode", set_mode },
  		{ 'm', "rig_get_mode", get_mode },
- 		{ 'P', "rig_set_passband", set_passband },
- 		{ 'p', "rig_get_passband", get_passband },
  		{ 'V', "rig_set_vfo", set_vfo },
  		{ 'v', "rig_get_vfo", get_vfo },
--- 84,87 ----
***************
*** 226,264 ****
  {
  		rmode_t mode;
  
  		printf("Mode: ");
  		scanf("%d", &mode);
- 		return rig_set_mode(rig, mode);
- }
- 
- 
- static int get_mode(RIG *rig)
- {
- 		int status;
- 		rmode_t mode;
- 
- 		status = rig_get_mode(rig, &mode);
- 		printf("Mode: %d\n", mode);
- 		return status;
- }
- 
- 
- static int set_passband(RIG *rig)
- {
- 		pbwidth_t width;
- 
  		printf("Passband: ");
  		scanf("%d", (int*)&width);
! 		return rig_set_passband(rig, width);
  }
  
  
! static int get_passband(RIG *rig)
  {
  		int status;
  		pbwidth_t width;
  
! 		status = rig_get_passband(rig, &width);
! 		printf("Passband: %d\n", width);
  		return status;
  }
--- 222,243 ----
  {
  		rmode_t mode;
+ 		pbwidth_t width;
  
  		printf("Mode: ");
  		scanf("%d", &mode);
  		printf("Passband: ");
  		scanf("%d", (int*)&width);
! 		return rig_set_mode(rig, mode, width);
  }
  
  
! static int get_mode(RIG *rig)
  {
  		int status;
+ 		rmode_t mode;
  		pbwidth_t width;
  
! 		status = rig_get_mode(rig, &mode, &width);
! 		printf("Mode: %d\nPassband: %d\n", mode, width);
  		return status;
  }

[Hamlib-cvs-digest] CVS: hamlib/aor aor.c,1.1,1.2 aor.h,1.1,1.2

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

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

Modified Files:
	aor.c aor.h 
Log Message:
* removed [sg]et_passband in favor of an enhanced [sg]et_mode which
  includes the passband, since most rigs tie these parameters together
  quite often. For exemple, WFM is (RIG_MODE_FM,RIG_PASSBAND_WIDE) in Hamlib.
  Another set of functions will be needed to fine tune aditional 
  frequency response/filters.


Index: aor.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/aor/aor.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** aor.c	2000/11/01 23:23:56	1.1
--- aor.c	2000/12/04 23:39:17	1.2
***************
*** 160,164 ****
   * Assumes rig!=NULL
   */
! int aor_set_mode(RIG *rig, rmode_t mode)
  {
  		unsigned char mdbuf[16],ackbuf[16];
--- 160,164 ----
   * Assumes rig!=NULL
   */
! int aor_set_mode(RIG *rig, rmode_t mode, pbwidth_t width)
  {
  		unsigned char mdbuf[16],ackbuf[16];
***************
*** 166,174 ****
  
  		switch (mode) {
! 			case RIG_MODE_AM:       aormode = MD_AM; break;
  			case RIG_MODE_CW:       aormode = MD_CW; break;
  			case RIG_MODE_USB:      aormode = MD_USB; break;
  			case RIG_MODE_LSB:      aormode = MD_LSB; break;
! 			case RIG_MODE_FM:       aormode = MD_NFM; break;
  			case RIG_MODE_RTTY:
  			default:
--- 166,196 ----
  
  		switch (mode) {
! 			case RIG_MODE_AM:       
! 					switch(width) {
! 						case RIG_PASSBAND_NORMAL: aormode = MD_AM; break;
! 						case RIG_PASSBAND_WIDE: aormode = MD_WAM; break;
! 						case RIG_PASSBAND_NARROW: aormode = MD_NAM; break;
! 						default:
! 							rig_debug(RIG_DEBUG_ERR,
! 								"aor_set_mode: unsupported passband %d %d\n",
! 								mode, width);
! 						return -RIG_EINVAL;
! 					}
! 					break;
  			case RIG_MODE_CW:       aormode = MD_CW; break;
  			case RIG_MODE_USB:      aormode = MD_USB; break;
  			case RIG_MODE_LSB:      aormode = MD_LSB; break;
! 			case RIG_MODE_FM:
! 					switch(width) {
! 						case RIG_PASSBAND_NORMAL: aormode = MD_NFM; break;
! 						case RIG_PASSBAND_WIDE: aormode = MD_WFM; break;
! 						case RIG_PASSBAND_NARROW: aormode = MD_SFM; break;
! 						default:
! 							rig_debug(RIG_DEBUG_ERR,
! 								"aor_set_mode: unsupported passband %d %d\n",
! 								mode, width);
! 						return -RIG_EINVAL;
! 					}
! 					break;
  			case RIG_MODE_RTTY:
  			default:
***************
*** 194,198 ****
   * Assumes rig!=NULL, mode!=NULL
   */
! int aor_get_mode(RIG *rig, rmode_t *mode)
  {
  		unsigned char ackbuf[16];
--- 216,220 ----
   * Assumes rig!=NULL, mode!=NULL
   */
! int aor_get_mode(RIG *rig, rmode_t *mode, pbwidth_t *width)
  {
  		unsigned char ackbuf[16];
***************
*** 208,217 ****
--- 230,255 ----
  		}
  
+ 		*width = RIG_PASSBAND_NORMAL;
  		switch (ackbuf[0]) {
  			case MD_AM:		*mode = RIG_MODE_AM; break;
+ 			case MD_NAM:	
+ 							*mode = RIG_MODE_AM;
+ 							*width = RIG_PASSBAND_NARROW; 
+ 							break;
+ 			case MD_WAM:	
+ 							*mode = RIG_MODE_AM;
+ 							*width = RIG_PASSBAND_WIDE; 
+ 							break;
  			case MD_CW:		*mode = RIG_MODE_CW; break;
  			case MD_USB:	*mode = RIG_MODE_USB; break;
  			case MD_LSB:	*mode = RIG_MODE_LSB; break;
  			case MD_NFM:	*mode = RIG_MODE_FM; break;
+ 			case MD_SFM:	
+ 							*mode = RIG_MODE_FM;
+ 							*width = RIG_PASSBAND_NARROW; 
+ 							break;
+ 			case MD_WFM:	*mode = RIG_MODE_FM;
+ 							*width = RIG_PASSBAND_WIDE; 
+ 							break;
  			default:
  				rig_debug(RIG_DEBUG_ERR,"aor_get_mode: unsupported mode %d\n",

Index: aor.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/aor/aor.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** aor.h	2000/11/01 23:23:56	1.1
--- aor.h	2000/12/04 23:39:17	1.2
***************
*** 34,39 ****
  int aor_set_freq(RIG *rig, freq_t freq);
  int aor_get_freq(RIG *rig, freq_t *freq);
! int aor_set_mode(RIG *rig, rmode_t mode);
! int aor_get_mode(RIG *rig, rmode_t *mode);
  
  int aor_set_ts(RIG *rig, unsigned long ts);
--- 34,39 ----
  int aor_set_freq(RIG *rig, freq_t freq);
  int aor_get_freq(RIG *rig, freq_t *freq);
! int aor_set_mode(RIG *rig, rmode_t mode, pbwidth_t width);
! int aor_get_mode(RIG *rig, rmode_t *mode, pbwidth_t *width);
  
  int aor_set_ts(RIG *rig, unsigned long ts);

[Hamlib-cvs-digest] CVS: hamlib/src rig.c,1.9,1.10

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

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

Modified Files:
	rig.c 
Log Message:
* removed [sg]et_passband in favor of an enhanced [sg]et_mode which
  includes the passband, since most rigs tie these parameters together
  quite often. For exemple, WFM is (RIG_MODE_FM,RIG_PASSBAND_WIDE) in Hamlib.
  Another set of functions will be needed to fine tune aditional 
  frequency response/filters.


Index: rig.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/src/rig.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** rig.c	2000/11/28 22:33:37	1.9
--- rig.c	2000/12/04 23:39:18	1.10
***************
*** 399,404 ****
--- 399,407 ----
   *      @rig:	The rig handle
   *      @mode:	The mode to set to
+  *      @width:	The passband width to set to
   *
   *      The rig_set_mode() function sets the mode of the current VFO.
+  *      As a begining, the backend is free to ignore the @width argument,
+  *      however, it would be nice to at least honor the WFM case.
   *
   *      RETURN VALUE: The rig_set_mode() function returns %RIG_OK
***************
*** 409,413 ****
   */
  
! int rig_set_mode(RIG *rig, rmode_t mode)
  {
  		if (!rig || !rig->caps)
--- 412,416 ----
   */
  
! int rig_set_mode(RIG *rig, rmode_t mode, pbwidth_t width)
  {
  		if (!rig || !rig->caps)
***************
*** 417,421 ****
  			return -RIG_ENAVAIL;
  		else
! 			return rig->caps->set_mode(rig, mode);
  }
  
--- 420,424 ----
  			return -RIG_ENAVAIL;
  		else
! 			return rig->caps->set_mode(rig, mode, width);
  }
  
***************
*** 424,429 ****
--- 427,435 ----
   *      @rig:	The rig handle
   *      @mode:	The location where to store the current mode
+  *      @width:	The location where to store the current passband width
   *
   *      The rig_set_mode() function retrieves the mode of the current VFO.
+  *      If the backend is unable to determine the width, it must
+  *      return %RIG_PASSBAND_NORMAL as a default.
   *
   *      RETURN VALUE: The rig_get_mode() function returns %RIG_OK
***************
*** 434,440 ****
   */
  
! int rig_get_mode(RIG *rig, rmode_t *mode)
  {
! 		if (!rig || !rig->caps || !mode)
  			return -RIG_EINVAL;
  
--- 440,446 ----
   */
  
! int rig_get_mode(RIG *rig, rmode_t *mode, pbwidth_t *width)
  {
! 		if (!rig || !rig->caps || !mode || !width)
  			return -RIG_EINVAL;
  
***************
*** 442,478 ****
  			return -RIG_ENAVAIL;
  		else
! 			return rig->caps->get_mode(rig, mode);
! }
! 
! /*
!  * rig_set_passband
!  *
!  */
! 
! int rig_set_passband(RIG *rig, pbwidth_t width)
! {
! 		if (!rig || !rig->caps)
! 			return -RIG_EINVAL;
! 
! 		if (rig->caps->set_passband == NULL)
! 			return -RIG_ENAVAIL;
! 		else
! 			return rig->caps->set_passband(rig, width);
! }
! 
! /*
!  * rig_get_passband
!  *
!  */
! 
! int rig_get_passband(RIG *rig, pbwidth_t *width)
! {
! 		if (!rig || !rig->caps || !width)
! 			return -RIG_EINVAL;
! 
! 		if (rig->caps->get_passband == NULL)
! 			return -RIG_ENAVAIL;
! 		else
! 			return rig->caps->get_passband(rig, width);
  }
  
--- 448,452 ----
  			return -RIG_ENAVAIL;
  		else
! 			return rig->caps->get_mode(rig, mode, width);
  }
  

[Hamlib-cvs-digest] CVS: hamlib/doc NOTES,NONE,1.1

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

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

Added Files:
	NOTES 
Log Message:
Initial release

--- NEW FILE ---

Here is how to generate man pages:

./hamlib-doc -man ../src/rig.c  | ./split-man.pl man

[Hamlib-cvs-digest] CVS: hamlib configure,1.5,1.6

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

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

Modified Files:
	configure 
Log Message:
* regenerate (libgd check)

Index: configure
===================================================================
RCS file: /cvsroot/hamlib/hamlib/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** configure	2000/11/01 23:16:41	1.5
--- configure	2000/11/28 22:38:11	1.6
***************
*** 810,817 ****
  
  
  # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:816: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 810,820 ----
  
[...1291 lines suppressed...]
+ 
+ 
  
  
***************
*** 2787,2790 ****
--- 2944,2948 ----
  s%@MAKEINFO@%$MAKEINFO%g
  s%@SET_MAKE@%$SET_MAKE%g
+ s%@hamlibdocdir@%$hamlibdocdir%g
  s%@CC@%$CC%g
  s%@LN_S@%$LN_S%g
***************
*** 2802,2805 ****
--- 2960,2964 ----
  s%@RANLIB@%$RANLIB%g
  s%@LIBTOOL@%$LIBTOOL%g
+ s%@RIGMATRIX@%$RIGMATRIX%g
  s%@INCLUDES@%$INCLUDES%g
  s%@NET@%$NET%g

[Hamlib-cvs-digest] CVS: hamlib configure.in,1.5,1.6

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

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

Modified Files:
	configure.in 
Log Message:
* check for libgd, and build rigmatrix accordingly

Index: configure.in
===================================================================
RCS file: /cvsroot/hamlib/hamlib/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** configure.in	2000/11/01 23:16:41	1.5
--- configure.in	2000/11/28 22:36:41	1.6
***************
*** 9,12 ****
--- 9,16 ----
  AC_ARG_PROGRAM
  
+ dnl directory for docs (html)
+ AC_SUBST(hamlibdocdir)
+ hamlibdocdir=$datadir/doc/hamlib
+ 
  dnl Checks for programs.
  AC_PROG_CC
***************
*** 63,66 ****
--- 67,85 ----
     [enable_dynamic=no])
  fi
+ 
+ if test "${enable_rigmatrix}" != "no"; then
+   AC_CHECK_HEADERS(gd.h,
+   [AC_CHECK_LIB(gd,gdImageCreate)
+   AC_CHECK_FUNCS(gdImageCreate, , enable_rigmatrix=no)],
+    [enable_rigmatrix=no])
+ fi
+ if test "${ac_cv_header_gd_h}" = "no"; then
+   echo "disabling rigmatrix generation"
+   RIGMATRIX=
+ else
+   echo "enabling rigmatrix generation"
+   RIGMATRIX=rigmatrix
+ fi
+ AC_SUBST(RIGMATRIX)
  
  AC_SUBST(INCLUDES)

[Hamlib-cvs-digest] CVS: hamlib/tests Makefile.am,1.6,1.7

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

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

Modified Files:
	Makefile.am 
Log Message:
* made rigmatrix build optional

Index: Makefile.am
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Makefile.am	2000/11/01 23:24:39	1.6
--- Makefile.am	2000/11/28 22:35:28	1.7
***************
*** 1,4 ****
! bin_PROGRAMS = dumpcaps testrig testtrn testbcd listrigs rigctl rigmatrix
  LDADD = ../src/libhamlib.la
  listrigs_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la "-dlopen" ../aor/libhamlib-aor.la
  dumpcaps_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la "-dlopen" ../aor/libhamlib-aor.la
--- 1,9 ----
! bin_PROGRAMS = dumpcaps testrig testtrn testbcd listrigs rigctl @RIGMATRIX@
! EXTRA_PROGRAMS = rigmatrix
! 
! # all the programs need this
  LDADD = ../src/libhamlib.la
+ 
+ ## Linker options
  listrigs_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la "-dlopen" ../aor/libhamlib-aor.la
  dumpcaps_LDADD = ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la "-dlopen" ../aor/libhamlib-aor.la
***************
*** 8,11 ****
--- 13,18 ----
  # rigmatrix needs also libgd
  rigmatrix_LDADD = -lgd ../src/libhamlib.la "-dlopen" ../icom/libhamlib-icom.la "-dlopen" ../ft747/libhamlib-ft747.la "-dlopen" ../ft847/libhamlib-ft847.la "-dlopen" ../aor/libhamlib-aor.la
+ 
+ ## Dependencies
  dumpcaps_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la ../aor/libhamlib-aor.la
  testrig_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la
***************
*** 14,17 ****
--- 21,26 ----
  rigctl_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la
  rigmatrix_DEPENDENCIES = ../icom/libhamlib-icom.la ../ft747/libhamlib-ft747.la ../ft847/libhamlib-ft847.la ../aor/libhamlib-aor.la
+ 
+ ## Source list
  testrig_SOURCES = testrig.c
  testtrn_SOURCES = testtrn.c

[Hamlib-cvs-digest] CVS: hamlib/tests dumpcaps.c,1.6,1.7 rigctl.c,1.1,1.2

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

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

Modified Files:
	dumpcaps.c rigctl.c 
Log Message:
* misc format fixup

Index: dumpcaps.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/dumpcaps.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** dumpcaps.c	2000/11/01 23:27:26	1.6
--- dumpcaps.c	2000/11/28 22:34:37	1.7
***************
*** 171,175 ****
  	printf("Tuning steps:\n");
  	for (i=0; i<TSLSTSIZ && caps->tuning_steps[i].ts; i++) {
! 			printf("\t%iHz:\t%s\n",caps->tuning_steps[i].ts,
  							decode_modes(caps->tuning_steps[i].modes));
  	}
--- 171,175 ----
  	printf("Tuning steps:\n");
  	for (i=0; i<TSLSTSIZ && caps->tuning_steps[i].ts; i++) {
! 			printf("\t%liHz:\t%s\n",caps->tuning_steps[i].ts,
  							decode_modes(caps->tuning_steps[i].modes));
  	}

Index: rigctl.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/rigctl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** rigctl.c	2000/10/29 16:35:29	1.1
--- rigctl.c	2000/11/28 22:34:37	1.2
***************
*** 249,253 ****
  
  		printf("Passband: ");
! 		scanf("%d", &width);
  		return rig_set_passband(rig, width);
  }
--- 249,253 ----
  
  		printf("Passband: ");
! 		scanf("%d", (int*)&width);
  		return rig_set_passband(rig, width);
  }
***************
*** 270,274 ****
  
  		printf("VFO: ");
! 		scanf("%d", &vfo);
  		return rig_set_vfo(rig, vfo);
  }
--- 270,274 ----
  
  		printf("VFO: ");
! 		scanf("%d", (int*)&vfo);
  		return rig_set_vfo(rig, vfo);
  }
***************
*** 291,295 ****
  
  		printf("PTT: ");
! 		scanf("%d", &ptt);
  		return rig_set_ptt(rig, ptt);
  }
--- 291,295 ----
  
  		printf("PTT: ");
! 		scanf("%d", (int*)&ptt);
  		return rig_set_ptt(rig, ptt);
  }
***************
*** 312,316 ****
  
  		printf("Repeater shift: ");
! 		scanf("%d", &rptr_shift);
  		return rig_set_rptr_shift(rig, rptr_shift);
  }
--- 312,316 ----
  
  		printf("Repeater shift: ");
! 		scanf("%d", (int*)&rptr_shift);
  		return rig_set_rptr_shift(rig, rptr_shift);
  }
***************
*** 333,337 ****
  
  		printf("Repeater shift offset: ");
! 		scanf("%d", &rptr_offs);
  		return rig_set_rptr_offs(rig, rptr_offs);
  }
--- 333,337 ----
  
  		printf("Repeater shift offset: ");
! 		scanf("%ld", &rptr_offs);
  		return rig_set_rptr_offs(rig, rptr_offs);
  }
***************
*** 344,348 ****
  
  		status = rig_get_rptr_offs(rig, &rptr_offs);
! 		printf("Repeater shift offset: %d\n", rptr_offs);
  		return status;
  }
--- 344,348 ----
  
  		status = rig_get_rptr_offs(rig, &rptr_offs);
! 		printf("Repeater shift offset: %ld\n", rptr_offs);
  		return status;
  }
***************
*** 420,424 ****
  
  		printf("Split mode: ");
! 		scanf("%d", &split);
  		return rig_set_split(rig, split);
  }
--- 420,424 ----
  
  		printf("Split mode: ");
! 		scanf("%d", (int*)&split);
  		return rig_set_split(rig, split);
  }
***************
*** 441,445 ****
  
  		printf("Tuning step: ");
! 		scanf("%d", &ts);
  		return rig_set_ts(rig, ts);
  }
--- 441,445 ----
  
  		printf("Tuning step: ");
! 		scanf("%ld", &ts);
  		return rig_set_ts(rig, ts);
  }
***************
*** 452,456 ****
  
  		status = rig_get_ts(rig, &ts);
! 		printf("Tuning step: %d\n", ts);
  		return status;
  }
--- 452,456 ----
  
  		status = rig_get_ts(rig, &ts);
! 		printf("Tuning step: %ld\n", ts);
  		return status;
  }
***************
*** 536,540 ****
  
  		printf("Mem/VFO op: ");
! 		scanf("%d", &op);
  		return rig_mv_ctl(rig, op);
  }
--- 536,540 ----
  
  		printf("Mem/VFO op: ");
! 		scanf("%d", (int*)&op);
  		return rig_mv_ctl(rig, op);
  }

[Hamlib-cvs-digest] CVS: hamlib/src rig.c,1.8,1.9

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

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

Modified Files:
	rig.c 
Log Message:
* cleanup, removed "not implemented" misleading comments
* added added squelch primitives of DCS/CTCSS
* added set/get_RIT and rig_get_info wrappers


Index: rig.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/src/rig.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** rig.c	2000/10/29 16:30:43	1.8
--- rig.c	2000/11/28 22:33:37	1.9
***************
*** 358,362 ****
  
  		if (rig->caps->set_freq == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_freq(rig, freq);
--- 358,362 ----
  
  		if (rig->caps->set_freq == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_freq(rig, freq);
***************
*** 385,389 ****
  
  		if (rig->caps->get_freq == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else {
  			status = rig->caps->get_freq(rig, freq);
--- 385,389 ----
  
  		if (rig->caps->get_freq == NULL)
! 			return -RIG_ENAVAIL;
  		else {
  			status = rig->caps->get_freq(rig, freq);
***************
*** 415,419 ****
  
  		if (rig->caps->set_mode == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_mode(rig, mode);
--- 415,419 ----
  
  		if (rig->caps->set_mode == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_mode(rig, mode);
***************
*** 440,444 ****
  
  		if (rig->caps->get_mode == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_mode(rig, mode);
--- 440,444 ----
  
  		if (rig->caps->get_mode == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_mode(rig, mode);
***************
*** 456,460 ****
  
  		if (rig->caps->set_passband == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_passband(rig, width);
--- 456,460 ----
  
  		if (rig->caps->set_passband == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_passband(rig, width);
***************
*** 472,476 ****
  
  		if (rig->caps->get_passband == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_passband(rig, width);
--- 472,476 ----
  
  		if (rig->caps->get_passband == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_passband(rig, width);
***************
*** 497,501 ****
  
  		if (rig->caps->set_vfo == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_vfo(rig, vfo);
--- 497,501 ----
  
  		if (rig->caps->set_vfo == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_vfo(rig, vfo);
***************
*** 522,526 ****
  
  		if (rig->caps->get_vfo == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_vfo(rig, vfo);
--- 522,526 ----
  
  		if (rig->caps->get_vfo == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_vfo(rig, vfo);
***************
*** 548,552 ****
  		case RIG_PTT_RIG:
  			if (rig->caps->set_ptt == NULL)
! 				return -RIG_ENIMPL;	/* not implemented */
  			else
  				return rig->caps->set_ptt(rig, ptt);
--- 548,552 ----
  		case RIG_PTT_RIG:
  			if (rig->caps->set_ptt == NULL)
! 				return -RIG_ENIMPL;
  			else
  				return rig->caps->set_ptt(rig, ptt);
***************
*** 555,561 ****
  		case RIG_PTT_SERIAL:
  		case RIG_PTT_PARALLEL:
  		case RIG_PTT_NONE:
  		default:
! 				return -RIG_ENIMPL;	/* not implemented */
  		}
  }
--- 555,563 ----
  		case RIG_PTT_SERIAL:
  		case RIG_PTT_PARALLEL:
+ 				return -RIG_ENIMPL;	/* not implemented */
+ 
  		case RIG_PTT_NONE:
  		default:
! 				return -RIG_ENAVAIL;	/* not available */
  		}
  }
***************
*** 583,587 ****
  		case RIG_PTT_RIG:
  			if (rig->caps->get_ptt == NULL)
! 				return -RIG_ENIMPL;	/* not implemented */
  			else
  				return rig->caps->get_ptt(rig, ptt);
--- 585,589 ----
  		case RIG_PTT_RIG:
  			if (rig->caps->get_ptt == NULL)
! 				return -RIG_ENIMPL;
  			else
  				return rig->caps->get_ptt(rig, ptt);
***************
*** 618,622 ****
  
  		if (rig->caps->set_rptr_shift == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_rptr_shift(rig, rptr_shift);
--- 620,624 ----
  
  		if (rig->caps->set_rptr_shift == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_rptr_shift(rig, rptr_shift);
***************
*** 642,646 ****
  
  		if (rig->caps->get_rptr_shift == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_rptr_shift(rig, rptr_shift);
--- 644,648 ----
  
  		if (rig->caps->get_rptr_shift == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_rptr_shift(rig, rptr_shift);
***************
*** 667,671 ****
  
  		if (rig->caps->set_rptr_offs == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_rptr_offs(rig, rptr_offs);
--- 669,673 ----
  
  		if (rig->caps->set_rptr_offs == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_rptr_offs(rig, rptr_offs);
***************
*** 692,696 ****
  
  		if (rig->caps->get_rptr_offs == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_rptr_offs(rig, rptr_offs);
--- 694,698 ----
  
  		if (rig->caps->get_rptr_offs == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_rptr_offs(rig, rptr_offs);
***************
*** 719,723 ****
  
  		if (rig->caps->set_split_freq == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_split_freq(rig, rx_freq, tx_freq);
--- 721,725 ----
  
  		if (rig->caps->set_split_freq == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_split_freq(rig, rx_freq, tx_freq);
***************
*** 745,749 ****
  
  		if (rig->caps->get_split_freq == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_split_freq(rig, rx_freq, tx_freq);
--- 747,751 ----
  
  		if (rig->caps->get_split_freq == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_split_freq(rig, rx_freq, tx_freq);
***************
*** 771,775 ****
  
  		if (rig->caps->set_split == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_split(rig, split);
--- 773,777 ----
  
  		if (rig->caps->set_split == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_split(rig, split);
***************
*** 795,805 ****
  
  		if (rig->caps->get_split == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_split(rig, split);
  }
  
  
  /**
   *      rig_set_ts - set the Tuning Step
   *      @rig:	The rig handle
--- 797,859 ----
  
  		if (rig->caps->get_split == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_split(rig, split);
  }
  
+ /**
+  *      rig_set_rit - set the RIT
+  *      @rig:	The rig handle
+  *      @rit:	The RIT offset to adjust to
+  *
+  *      The rig_set_rit() function sets the current RIT offset.
+  *      A value of 0 for @rit disables RIT.
+  *
+  *      RETURN VALUE: The rig_set_rit() function returns %RIG_OK
+  *      if the operation has been sucessful, or a negative value
+  *      if an error occured (in which case, cause is set appropriately).
+  *
+  *      SEE ALSO: rig_get_rit()
+  */
  
+ int rig_set_rit(RIG *rig, signed long rit)
+ {
+ 		if (!rig || !rig->caps)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->set_rit == NULL)
+ 			return -RIG_ENAVAIL;
+ 		else
+ 			return rig->caps->set_rit(rig, rit);
+ }
+ 
  /**
+  *      rig_get_rit - get the current RIT offset
+  *      @rig:	The rig handle
+  *      @rit:	The location where to store the current RIT offset
+  *
+  *      The rig_get_rit() function retrieves the current RIT offset.
+  *
+  *      RETURN VALUE: The rig_get_rit() function returns %RIG_OK
+  *      if the operation has been sucessful, or a negative value
+  *      if an error occured (in which case, cause is set appropriately).
+  *
+  *      SEE ALSO: rig_set_rit()
+  */
+ 
+ int rig_get_rit(RIG *rig, signed long *rit)
+ {
+ 		if (!rig || !rig->caps || !rit)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->get_rit == NULL)
+ 			return -RIG_ENAVAIL;
+ 		else
+ 			return rig->caps->get_rit(rig, rit);
+ }
+ 
+ 
+ 
+ /**
   *      rig_set_ts - set the Tuning Step
   *      @rig:	The rig handle
***************
*** 821,825 ****
  
  		if (rig->caps->set_ts == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_ts(rig, ts);
--- 875,879 ----
  
  		if (rig->caps->set_ts == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_ts(rig, ts);
***************
*** 846,850 ****
  
  		if (rig->caps->get_ts == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_ts(rig, ts);
--- 900,904 ----
  
  		if (rig->caps->get_ts == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_ts(rig, ts);
***************
*** 962,966 ****
  
  		if (rig->caps->set_ctcss == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_ctcss(rig, tone);
--- 1016,1020 ----
  
  		if (rig->caps->set_ctcss == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_ctcss(rig, tone);
***************
*** 996,1000 ****
  
  		if (rig->caps->get_ctcss == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_ctcss(rig, tone);
--- 1050,1054 ----
  
  		if (rig->caps->get_ctcss == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_ctcss(rig, tone);
***************
*** 1022,1026 ****
  
  		if (rig->caps->set_dcs == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_dcs(rig, code);
--- 1076,1080 ----
  
  		if (rig->caps->set_dcs == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_dcs(rig, code);
***************
*** 1047,1051 ****
  
  		if (rig->caps->get_dcs == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_dcs(rig, code);
--- 1101,1105 ----
  
  		if (rig->caps->get_dcs == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_dcs(rig, code);
***************
*** 1053,1056 ****
--- 1107,1221 ----
  
  /**
+  *      rig_set_ctcss_sql - set CTCSS squelch
+  *      @rig:	The rig handle
+  *      @tone:	The PL tone to set the squelch to
+  *
+  *      The rig_set_ctcss_sql() function sets the current Continuous Tone
+  *      Controlled Squelch System (CTCSS) sub-audible squelch tone.
+  *      NB, @tone is NOT in Hz, but in tenth of Hz! This way,
+  *      if you want to set subaudible tone of 88.5 Hz for example,
+  *      then pass 885 to this function. Also, to disable Tone squelch,
+  *      set @tone to 0.
+  *
+  *      RETURN VALUE: The rig_set_ctcss_sql() function returns %RIG_OK
+  *      if the operation has been sucessful, or a negative value
+  *      if an error occured (in which case, cause is set appropriately).
+  *
+  *      SEE ALSO: rig_get_ctcss_sql(), rig_set_ctcss()
+  */
+ 
+ int rig_set_ctcss_sql(RIG *rig, unsigned int tone)
+ {
+ 		if (!rig || !rig->caps)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->set_ctcss_sql == NULL)
+ 			return -RIG_ENAVAIL;
+ 		else
+ 			return rig->caps->set_ctcss_sql(rig, tone);
+ }
+ 
+ /**
+  *      rig_get_ctcss_sql - get the current CTCSS squelch
+  *      @rig:	The rig handle
+  *      @tone:	The location where to store the current tone
+  *
+  *      The rig_get_ctcss_sql() function retrieves the current Continuous Tone
+  *      Controlled Squelch System (CTCSS) sub-audible squelch tone.
+  *      NB, @tone is NOT in Hz, but in tenth of Hz! This way,
+  *      if the function rig_get_ctcss() returns a subaudible tone of 885
+  *      for example, then the real tone is 88.5 Hz. 
+  *      Also, a value of 0 for @tone means the Tone squelch is disabled.
+  *
+  *      RETURN VALUE: The rig_get_ctcss_sql() function returns %RIG_OK
+  *      if the operation has been sucessful, or a negative value
+  *      if an error occured (in which case, cause is set appropriately).
+  *
+  *      SEE ALSO: rig_set_ctcss_sql(), rig_get_ctcss()
+  */
+ int rig_get_ctcss_sql(RIG *rig, unsigned int *tone)
+ {
+ 		if (!rig || !rig->caps || !tone)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->get_ctcss_sql == NULL)
+ 			return -RIG_ENAVAIL;
+ 		else
+ 			return rig->caps->get_ctcss_sql(rig, tone);
+ }
+ 
+ /**
+  *      rig_set_dcs_sql - set the current DCS
+  *      @rig:	The rig handle
+  *      @code:	The tone to set to
+  *
+  *      The rig_set_dcs_sql() function sets the current Digitally-Coded Squelch
+  *      code.
+  *
+  *      RETURN VALUE: The rig_set_dcs_sql() function returns %RIG_OK
+  *      if the operation has been sucessful, or a negative value
+  *      if an error occured (in which case, cause is set appropriately).
+  *
+  *      SEE ALSO: rig_get_dcs_sql(), rig_set_dcs()
+  */
+ 
+ int rig_set_dcs_sql(RIG *rig, unsigned int code)
+ {
+ 		if (!rig || !rig->caps)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->set_dcs_sql == NULL)
+ 			return -RIG_ENAVAIL;
+ 		else
+ 			return rig->caps->set_dcs_sql(rig, code);
+ }
+ 
+ /**
+  *      rig_get_dcs_sql - get the current DCS
+  *      @rig:	The rig handle
+  *      @code:	The location where to store the current tone
+  *
+  *      The rig_get_dcs_sql() function retrieves the current 
+  *      Digitally-Coded Squelch. 
+  *
+  *      RETURN VALUE: The rig_get_dcs_sql() function returns %RIG_OK
+  *      if the operation has been sucessful, or a negative value
+  *      if an error occured (in which case, cause is set appropriately).
+  *
+  *      SEE ALSO: rig_get_dcs_sql(), rig_get_dcs()
+  */
+ int rig_get_dcs_sql(RIG *rig, unsigned int *code)
+ {
+ 		if (!rig || !rig->caps || !code)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->get_dcs_sql == NULL)
+ 			return -RIG_ENAVAIL;
+ 		else
+ 			return rig->caps->get_dcs_sql(rig, code);
+ }
+ 
+ 
+ /**
   *      rig_set_poweron - turn on the radio
   *      @rig:	The rig handle
***************
*** 1071,1075 ****
  
  		if (rig->caps->set_poweron == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_poweron(rig);
--- 1236,1240 ----
  
  		if (rig->caps->set_poweron == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_poweron(rig);
***************
*** 1095,1099 ****
  
  		if (rig->caps->set_poweroff == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_poweroff(rig);
--- 1260,1264 ----
  
  		if (rig->caps->set_poweroff == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_poweroff(rig);
***************
*** 1155,1159 ****
  
  		if (rig->caps->set_level == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_level(rig, level, val);
--- 1320,1324 ----
  
  		if (rig->caps->set_level == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_level(rig, level, val);
***************
*** 1182,1186 ****
  
  		if (rig->caps->get_level == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_level(rig, level, val);
--- 1347,1351 ----
  
  		if (rig->caps->get_level == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_level(rig, level, val);
***************
*** 1284,1288 ****
  
  		if (rig->caps->set_func == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_func(rig, func, status);
--- 1449,1453 ----
  
  		if (rig->caps->set_func == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_func(rig, func, status);
***************
*** 1311,1315 ****
  
  		if (rig->caps->get_func == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_func(rig, func);
--- 1476,1480 ----
  
  		if (rig->caps->get_func == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_func(rig, func);
***************
*** 1338,1342 ****
  
  		if (rig->caps->set_mem == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_mem(rig, ch);
--- 1503,1507 ----
  
  		if (rig->caps->set_mem == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_mem(rig, ch);
***************
*** 1364,1368 ****
  
  		if (rig->caps->get_mem == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_mem(rig, ch);
--- 1529,1533 ----
  
  		if (rig->caps->get_mem == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_mem(rig, ch);
***************
*** 1389,1393 ****
  
  		if (rig->caps->mv_ctl == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->mv_ctl(rig, op);
--- 1554,1558 ----
  
  		if (rig->caps->mv_ctl == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->mv_ctl(rig, op);
***************
*** 1416,1420 ****
  
  		if (rig->caps->set_bank == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_bank(rig, bank);
--- 1581,1585 ----
  
  		if (rig->caps->set_bank == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_bank(rig, bank);
***************
*** 1443,1447 ****
  
  		if (rig->caps->set_channel == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->set_channel(rig, chan);
--- 1608,1612 ----
  
  		if (rig->caps->set_channel == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->set_channel(rig, chan);
***************
*** 1469,1473 ****
  
  		if (rig->caps->get_channel == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_channel(rig, chan);
--- 1634,1638 ----
  
  		if (rig->caps->get_channel == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_channel(rig, chan);
***************
*** 1577,1583 ****
  
  		if (rig->caps->get_trn == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
  		else
  			return rig->caps->get_trn(rig, trn);
  }
  
--- 1742,1772 ----
  
  		if (rig->caps->get_trn == NULL)
! 			return -RIG_ENAVAIL;
  		else
  			return rig->caps->get_trn(rig, trn);
+ }
+ 
+ /**
+  *      rig_get_info - get general information from the radio
+  *      @rig:	The rig handle
+  *
+  *      The rig_get_info() function retrieves some general information
+  *      from the radio. This can include firmware revision, exact
+  *      model name, or just nothing. 
+  *
+  *      RETURN VALUE: The rig_get_info() function returns a pointer
+  *      to freshly allocated memory containing the ASCIIZ string 
+  *      if the operation has been sucessful, or NULL 
+  *      if an error occured.
+  */
+ unsigned char* rig_get_info(RIG *rig)
+ {
+ 		if (!rig || !rig->caps)
+ 			return NULL;
+ 
+ 		if (rig->caps->get_info == NULL)
+ 			return NULL;
+ 		else
+ 			return rig->caps->get_info(rig);
  }
  

[Hamlib-cvs-digest] CVS: hamlib/include/hamlib rig.h,1.8,1.9

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

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

Modified Files:
	rig.h 
Log Message:
* added squelch primitives of DCS/CTCSS
* added set/get_RIT and rig_get_info()


Index: rig.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/include/hamlib/rig.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** rig.h	2000/10/30 21:45:27	1.8
--- rig.h	2000/11/28 22:31:40	1.9
***************
*** 234,237 ****
--- 234,239 ----
  #define RIG_LEVEL_ANN		(1<<20)	/* Announce, arg int (see enum ann_level_e) */
  		/* These ones are not settable */
+ #define RIG_LEVEL_SWR		(1<<28)	/* SWR, arg float */
+ #define RIG_LEVEL_ALC		(1<<29)	/* ALC, arg float */
  #define RIG_LEVEL_SQLSTAT	(1<<30)	/* SQL status, arg int (open=1/closed=0) */
  #define RIG_LEVEL_STRENGTH	(1<<31)	/* Signal strength, arg int (db) */
***************
*** 260,263 ****
--- 262,266 ----
  #define RIG_FUNC_ANF    	(1<<8)		/* Automatic Notch Filter (DSP) */
  #define RIG_FUNC_NR     	(1<<9)		/* Noise Reduction (DSP) */
+ #define RIG_FUNC_AIP     	(1<<10)		/* AIP (Kenwood) */
  
  
***************
*** 452,455 ****
--- 455,461 ----
    int (*get_split)(RIG *rig, split_t *split);
  
+   int (*set_rit)(RIG *rig, signed long rit);
+   int (*get_rit)(RIG *rig, signed long *rit);
+ 
    int (*set_ts)(RIG *rig, unsigned long ts); /* set tuning step */
    int (*get_ts)(RIG *rig, unsigned long *ts); /* get tuning step */
***************
*** 460,463 ****
--- 466,474 ----
    int (*get_ctcss)(RIG *rig, unsigned int *tone);
  
+   int (*set_dcs_sql)(RIG *rig, unsigned int code);
+   int (*get_dcs_sql)(RIG *rig, unsigned int *code);
+   int (*set_ctcss_sql)(RIG *rig, unsigned int tone);
+   int (*get_ctcss_sql)(RIG *rig, unsigned int *tone);
+ 
    /*
     * It'd be nice to have a power2mW and mW2power functions
***************
*** 496,499 ****
--- 507,513 ----
    int (*get_channel)(RIG *rig, channel_t *chan);
  
+   /* get firmware info, etc. */
+   unsigned char* (*get_info)(RIG *rig);
+ 
    /* more to come... */
  };
***************
*** 604,607 ****
--- 618,626 ----
  extern int rig_get_dcs(RIG *rig, unsigned int *code);
  
+ extern int rig_set_ctcss_sql(RIG *rig, unsigned int tone);
+ extern int rig_get_ctcss_sql(RIG *rig, unsigned int *tone);
+ extern int rig_set_dcs_sql(RIG *rig, unsigned int code);
+ extern int rig_get_dcs_sql(RIG *rig, unsigned int *code);
+ 
  extern int rig_set_split_freq(RIG *rig, freq_t rx_freq, freq_t tx_freq);
  extern int rig_get_split_freq(RIG *rig, freq_t *rx_freq, freq_t *tx_freq);
***************
*** 609,612 ****
--- 628,634 ----
  extern int rig_get_split(RIG *rig, split_t *split);
  
+ extern int rig_set_rit(RIG *rig, signed long rit);
+ extern int rig_get_rit(RIG *rig, signed long *rit);
+ 
  extern int rig_set_ts(RIG *rig, unsigned long ts); /* set tuning step */
  extern int rig_get_ts(RIG *rig, unsigned long *ts); /* get tuning step */
***************
*** 647,650 ****
--- 669,675 ----
  extern int rig_set_trn(RIG *rig, int trn); /* activate the transceive mode */
  extern int rig_get_trn(RIG *rig, int *trn);
+ 
+ 
+ extern unsigned char *rig_get_info(RIG *rig);
  
  extern const struct rig_caps *rig_get_caps(rig_model_t rig_model);

[Hamlib-cvs-digest] CVS: hamlib/include/hamlib riglist.h,1.4,1.5

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

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

Modified Files:
	riglist.h 
Log Message:
* misc reordering, added Skanti

Index: riglist.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/include/hamlib/riglist.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** riglist.h	2000/10/23 19:55:11	1.4
--- riglist.h	2000/11/28 22:28:30	1.5
***************
*** 54,70 ****
  	 * Kenwood
  	 */
  	RIG_MODEL_TS570D,
! 	RIG_MODEL_TS870S,
! 	RIG_MODEL_TS850,
! 	RIG_MODEL_TS950,
  	RIG_MODEL_TS711,
  	RIG_MODEL_TS811,
  	RIG_MODEL_TS940,
! 	RIG_MODEL_TS440,
! 	RIG_MODEL_TSR5000,
! 	RIG_MODEL_TS450S,
! 	RIG_MODEL_TS690S,
  	RIG_MODEL_TS950SDX,
! 	RIG_MODEL_TS50,
  
  	/*
--- 54,71 ----
  	 * Kenwood
  	 */
+ 	RIG_MODEL_TS50,
+ 	RIG_MODEL_TS440,
+ 	RIG_MODEL_TS450S,
  	RIG_MODEL_TS570D,
! 	RIG_MODEL_TS690S,
  	RIG_MODEL_TS711,
+ 	RIG_MODEL_TS790,
  	RIG_MODEL_TS811,
+ 	RIG_MODEL_TS850,
+ 	RIG_MODEL_TS870S,
  	RIG_MODEL_TS940,
! 	RIG_MODEL_TS950,
  	RIG_MODEL_TS950SDX,
! 	RIG_MODEL_R5000,
  
  	/*
***************
*** 175,178 ****
--- 176,180 ----
  	 */
  	RIG_MODEL_HF150,
+ 	RIG_MODEL_HF225,
  	RIG_MODEL_HF250,
  
***************
*** 198,201 ****
--- 200,210 ----
  	RIG_MODEL_EK895,
  	RIG_MODEL_EK070,
+ 
+ 	/*
+ 	 * Skanti
+ 	 */
+ 	RIG_MODEL_TRP7000,
+ 	RIG_MODEL_TRP8000,
+ 	RIG_MODEL_TRP9000,
  
  	RIG_MODEL_KWZ30,	/* KNEISNER +DOERING */

[Hamlib-cvs-digest] CVS: hamlib/icom ic706.c,1.7,1.8

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

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

Modified Files:
	ic706.c 
Log Message:
* added split/rptr capability

Index: ic706.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/ic706.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ic706.c	2000/10/23 19:48:12	1.7
--- ic706.c	2000/11/28 22:26:20	1.8
***************
*** 222,225 ****
--- 222,231 ----
  set_rptr_shift: icom_set_rptr_shift,
  get_rptr_shift: icom_get_rptr_shift,
+ set_rptr_offs: icom_set_rptr_offs,
+ get_rptr_offs: icom_get_rptr_offs,
+ set_split_freq: icom_set_split_freq,
+ get_split_freq: icom_get_split_freq,
+ set_split: icom_set_split,
+ get_split: icom_get_split,
  };
  

[Hamlib-cvs-digest] CVS: hamlib/icom TODO.icom,1.1,1.2

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

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

Modified Files:
	TODO.icom 
Log Message:
some work done

Index: TODO.icom
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/TODO.icom,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TODO.icom	2000/09/16 01:43:48	1.1
--- TODO.icom	2000/11/28 22:23:43	1.2
***************
*** 13,17 ****
  4. write a gentable script to generate C structs from rig list file
  5. write a basic (G)UI to easily edit rig caps and generate C structs
- 6. maybe share freq2bcd and bcd2freq with other rigs?
  7. more than one Icom can share the same serial port!! (->check with frontend)
  8.
--- 13,16 ----
***************
*** 21,23 ****
--- 20,24 ----
  
  3. rename ic706 -> icom and make it generic!
+ 
+ 6. maybe share freq2bcd and bcd2freq with other rigs?
  

[Hamlib-cvs-digest] CVS: hamlib/tests testrig.c,1.3,1.4

[Frank S. <jav...@us...>]

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

Modified Files:
	testrig.c 
Log Message:
more set_freq() examples



Index: testrig.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/testrig.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** testrig.c	2000/10/09 01:17:20	1.3
--- testrig.c	2000/11/25 21:52:41	1.4
***************
*** 66,70 ****
  	}
  
! 	retcode = rig_set_freq(my_rig, 439700000); /* cq de vk3fcs */
  
  	if (retcode != RIG_OK ) {
--- 66,94 ----
  	}
  
! 
! 	/*
! 	 * Lets try some frequencies
! 	 */
! 	
! 	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
  
  	if (retcode != RIG_OK ) {