hamlib-cvs-digest — hamlib commit digest

[Hamlib-cvs-digest] CVS: hamlib/src rig.c,1.5,1.6

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

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

Modified Files:
	rig.c 
Log Message:
* Added "hamlib-doc" source comments, ala kernel-doc,gnome-doc.
  See doc/ subdirectory for more info. The work is still in progress,
  the current comments are pretty shallow rigth now, they're still
  lacking the valuable information like semantics, side effects,
  special cases, error definitions, etc. that makes a good API documention.
  Please help commenting, fixing typos and mispellings!
* renamed rig_*_rpt_* functions to rig_*_rptr_* to be more uniform
* made use of setting_t type in *_has_* functions
* removed set_volume, get_volume, set_squelch, get_squelch,
  get_squelch_status, set_ant, get_ant, int et_att, get_att,
  set_preamp, get_preamp, set_power, and get_power
  in favor of set_level/get_level.
* set_func takes one more arg for the status (activate or desactivate)


Index: rig.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/src/rig.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** rig.c	2000/10/16 22:08:51	1.5
--- rig.c	2000/10/22 16:08:23	1.6
***************
*** 67,72 ****
  };
  
! /*
!  * TODO: check table bounds, use gettext
   */
  const char *rigerror(int errnum)
--- 67,82 ----
  };
  
! /**
[...1760 lines suppressed...]
!  *      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_trn()
   */
  int rig_get_trn(RIG *rig, int *trn)
  {
***************
*** 1325,1328 ****
--- 1557,1566 ----
  			return rig->caps->get_trn(rig, trn);
  }
+ 
+ 
+ /*
+  * more rig_* to come -- FS
+  *
+  */
  
  

[Hamlib-cvs-digest] CVS: hamlib/icom icom_defs.h,1.3,1.4

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

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

Modified Files:
	icom_defs.h 
Log Message:
* Various defines renamed (S_SET -> S_CTL)
* S_LVL_* added


Index: icom_defs.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/icom_defs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** icom_defs.h	2000/10/10 22:17:34	1.3
--- icom_defs.h	2000/10/16 22:37:22	1.4
***************
*** 68,79 ****
  #define C_CTL_SPLT	0x0f		/* Control split, Sc */
  #define C_SET_TS	0x10		/* Set tuning step, Sc */
! #define C_SET_ATT	0x11		/* Set attenuator, Sc */
! #define C_SET_ANT	0x12		/* Set antenna, Sc */
  #define C_CTL_ANN	0x13		/* Control announce (speech synth.), Sc */
! #define C_SET_AFRF	0x14		/* Set AF/RF/squelch, Sc */
  #define C_RD_SQSM	0x15		/* Read squelch condiction/S-meter level, Sc */
! #define C_SET_FUNC	0x16		/* Function settings (AGC,NB,etc.), Sc */
  #define C_SND_CW	0x17		/* Send CW message */
  #define C_RD_TRXID	0x19		/* Read transceiver ID code */
  #define C_CTL_PTT	0x1c		/* Control Transmit On/Off, Sc */
  #define C_CTL_MISC	0x7f		/* Miscellaneous control, Sc */
--- 68,82 ----
  #define C_CTL_SPLT	0x0f		/* Control split, Sc */
  #define C_SET_TS	0x10		/* Set tuning step, Sc */
! #define C_CTL_ATT	0x11		/* Set attenuator, Sc */
! #define C_CTL_ANT	0x12		/* Set antenna, Sc */
  #define C_CTL_ANN	0x13		/* Control announce (speech synth.), Sc */
! #define C_CTL_LVL	0x14		/* Set AF/RF/squelch, Sc */
  #define C_RD_SQSM	0x15		/* Read squelch condiction/S-meter level, Sc */
! #define C_CTL_FUNC	0x16		/* Function settings (AGC,NB,etc.), Sc */
  #define C_SND_CW	0x17		/* Send CW message */
+ #define C_SET_PWR	0x18		/* Set Power ON/OFF, Sc */
  #define C_RD_TRXID	0x19		/* Read transceiver ID code */
+ #define C_CTL_MEM	0x1a		/* Misc memory/bank functions, Sc */
+ #define C_SET_TONE	0x1b		/* Set tone frequency */
  #define C_CTL_PTT	0x1c		/* Control Transmit On/Off, Sc */
  #define C_CTL_MISC	0x7f		/* Miscellaneous control, Sc */
***************
*** 121,125 ****
  
  /*
!  * Set Attenuator (C_SET_ATT) subcommands
   */
  #define S_ATT_RD	0x00		/* Without subcommand, reads out setting */
--- 124,128 ----
  
  /*
!  * Set Attenuator (C_CTL_ATT) subcommands
   */
  #define S_ATT_RD	0x00		/* Without subcommand, reads out setting */
***************
*** 146,149 ****
--- 149,172 ----
  
  /*
+  * Function settings (C_CTL_LVL) subcommands
+  */
+ #define S_LVL_AF		0x01		/* AF level setting */
+ #define S_LVL_RF		0x02		/* RF level setting */
+ #define S_LVL_SQL		0x03		/* SQL level setting */
+ #define S_LVL_IF		0x04		/* IF shift setting */
+ #define S_LVL_APF		0x05		/* APF level setting */
+ #define S_LVL_NR		0x06		/* NR level setting */
+ #define S_LVL_PBTIN		0x07		/* Twin PBT setting (inside) */
+ #define S_LVL_PBTOUT	0x08		/* Twin PBT setting (outside) */
+ #define S_LVL_CWPITCH	0x09		/* CW pitch setting */
+ #define S_LVL_RFPOWER	0x0a		/* RF power setting */
+ #define S_LVL_MICGAIN	0x0b		/* MIC gain setting */
+ #define S_LVL_KEYSPD	0x0c		/* Key Speed setting */
+ #define S_LVL_NOTCHF	0x0d		/* Notch freq. setting */
+ #define S_LVL_COMP		0x0e		/* Compressor level setting */
+ #define S_LVL_BKINDL	0x0f		/* BKin delay setting */
+ #define S_LVL_BALANCE	0x10		/* Balance setting (Dual watch) */
+ 
+ /*
   * Read squelch condition/S-meter level (C_RD_SQSM) subcommands
   */
***************
*** 152,165 ****
  
  /*
!  * Function settings (C_SET_FUNC) subcommands
   */
! #define S_PAMP	0x02		/* Preamp setting */
! #define S_AGC	0x12		/* AGC setting */
! #define S_NB	0x22		/* NB setting */
! #define S_TONE	0x42		/* TONE setting */
! #define S_TSQL	0x43		/* TSQL setting */
! #define S_COMP	0x44		/* COMP setting */
! #define S_VOX	0x46		/* VOX setting */
! #define S_BKIN	0x47		/* BK-IN setting */
  
  /*
--- 175,188 ----
  
  /*
!  * Function settings (C_CTL_FUNC) subcommands
   */
! #define S_FUNC_PAMP	0x02		/* Preamp setting */
! #define S_FUNC_AGC	0x12		/* AGC setting */
! #define S_FUNC_NB	0x22		/* NB setting */
! #define S_FUNC_TONE	0x42		/* TONE setting */
! #define S_FUNC_TSQL	0x43		/* TSQL setting */
! #define S_FUNC_COMP	0x44		/* COMP setting */
! #define S_FUNC_VOX	0x46		/* VOX setting */
! #define S_FUNC_BKIN	0x47		/* BK-IN setting */
  
  /*
***************
*** 173,176 ****
--- 196,205 ----
  #define S_PTT_ON	0x00		/* no documentation, not tested! */
  #define S_PTT_OFF	0x01		/* please confirm (IC-756Pro, IC-746) --SF */
+ 
+ /*
+  * Memory contents (C_CTL_MEM) subcommands
+  */
+ #define S_MEM_CNTNT	0x00
+ #define S_MEM_CNTNT_SLCT	0x01
  
  #endif /* _ICOM_DEFS_H */

[Hamlib-cvs-digest] CVS: hamlib/icom icom.h,1.5,1.6

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

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

Modified Files:
	icom.h 
Log Message:
new prototypes (*_level,*_channel)

Index: icom.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/icom.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** icom.h	2000/10/10 21:58:31	1.5
--- icom.h	2000/10/16 22:35:57	1.6
***************
*** 54,58 ****
  int icom_set_ptt(RIG *rig, ptt_t ptt);
  int icom_get_ptt(RIG *rig, ptt_t *ptt);
! int icom_get_strength(RIG *rig, int *strength);
  int icom_decode_event(RIG *rig);
  
--- 54,61 ----
  int icom_set_ptt(RIG *rig, ptt_t ptt);
  int icom_get_ptt(RIG *rig, ptt_t *ptt);
! int icom_set_level(RIG *rig, setting_t set, value_t val);
! int icom_get_level(RIG *rig, setting_t set, value_t *val);
! int icom_set_channel(RIG *rig, const channel_t *chan);
! int icom_get_channel(RIG *rig, channel_t *chan);
  int icom_decode_event(RIG *rig);
  

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

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

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

Modified Files:
	icom.c 
Log Message:
* more CI-V addresses, RIG_MODEL_IC820 still missing
* Added icom_[sg]et_channel (untested, not complete)
* Added icom_[sg]et_level (30% implemented, get_strength tested and OK)


Index: icom.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/icom.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** icom.c	2000/10/10 21:58:31	1.6
--- icom.c	2000/10/16 22:34:22	1.7
***************
*** 146,151 ****
  		{ RIG_MODEL_IC706MKII, 0x4e },
  		{ RIG_MODEL_IC706MKIIG, 0x58 },
- 		{ RIG_MODEL_IC1271, 0x24 },
- 		{ RIG_MODEL_IC1275, 0x18 },
  		{ RIG_MODEL_IC271, 0x20 },
  		{ RIG_MODEL_IC275, 0x10 },
--- 146,149 ----
***************
*** 154,189 ****
  		{ RIG_MODEL_IC475, 0x14 },
  		{ RIG_MODEL_IC575, 0x16 },
  		{ RIG_MODEL_IC725, 0x28 },
  		{ RIG_MODEL_IC726, 0x30 },
  		{ RIG_MODEL_IC731, 0x04 },
  		{ RIG_MODEL_IC735, 0x04 },
  		{ RIG_MODEL_IC751, 0x1c },
  		{ RIG_MODEL_IC751A, 0x1c },
  		{ RIG_MODEL_IC756, 0x50 },
  		{ RIG_MODEL_IC761, 0x1e },
  		{ RIG_MODEL_IC765, 0x2c },
  		{ RIG_MODEL_IC775, 0x46 },
  		{ RIG_MODEL_IC781, 0x26 },
  		{ RIG_MODEL_IC821, 0x4c },
  		{ RIG_MODEL_IC821H, 0x4c },
  		{ RIG_MODEL_IC970, 0x2e },
! 		{ RIG_MODEL_ICR7000, 0x08 },
  		{ RIG_MODEL_ICR71, 0x1a },
- 		{ RIG_MODEL_ICR7100, 0x34 },
  		{ RIG_MODEL_ICR72, 0x32 },
  		{ RIG_MODEL_ICR8500, 0x4a },
  		{ RIG_MODEL_ICR9000, 0x2a },
! 		{ RIG_MODEL_ICR75, UNKNOWN_ADDR },
! 		{ RIG_MODEL_IC707, UNKNOWN_ADDR },
  		{ RIG_MODEL_IC718, UNKNOWN_ADDR },
- 		{ RIG_MODEL_IC728, UNKNOWN_ADDR },
- 		{ RIG_MODEL_IC729, UNKNOWN_ADDR },
- 		{ RIG_MODEL_IC731, UNKNOWN_ADDR },
- 		{ RIG_MODEL_IC736, UNKNOWN_ADDR },
- 		{ RIG_MODEL_IC737, UNKNOWN_ADDR },
- 		{ RIG_MODEL_IC738, UNKNOWN_ADDR },
- 		{ RIG_MODEL_IC746, UNKNOWN_ADDR },
- 		{ RIG_MODEL_IC756PRO, UNKNOWN_ADDR },
- 		{ RIG_MODEL_IC820, UNKNOWN_ADDR },
  		{ -1, 0 },
  };
--- 152,189 ----
  		{ RIG_MODEL_IC475, 0x14 },
  		{ RIG_MODEL_IC575, 0x16 },
+ 		{ RIG_MODEL_IC707, 0x3e },
  		{ RIG_MODEL_IC725, 0x28 },
  		{ RIG_MODEL_IC726, 0x30 },
+ 		{ RIG_MODEL_IC728, 0x38 },
+ 		{ RIG_MODEL_IC729, 0x3a },
  		{ RIG_MODEL_IC731, 0x04 },
  		{ RIG_MODEL_IC735, 0x04 },
+ 		{ RIG_MODEL_IC736, 0x40 },
+ 		{ RIG_MODEL_IC746, 0x56 },
+ 		{ RIG_MODEL_IC737, 0x3c },
+ 		{ RIG_MODEL_IC738, 0x44 },
  		{ RIG_MODEL_IC751, 0x1c },
  		{ RIG_MODEL_IC751A, 0x1c },
  		{ RIG_MODEL_IC756, 0x50 },
+ 		{ RIG_MODEL_IC756PRO, 0x5c },
  		{ RIG_MODEL_IC761, 0x1e },
  		{ RIG_MODEL_IC765, 0x2c },
  		{ RIG_MODEL_IC775, 0x46 },
  		{ RIG_MODEL_IC781, 0x26 },
+ 		{ RIG_MODEL_IC820, 0x42 },
  		{ RIG_MODEL_IC821, 0x4c },
  		{ RIG_MODEL_IC821H, 0x4c },
  		{ RIG_MODEL_IC970, 0x2e },
! 		{ RIG_MODEL_IC1271, 0x24 },
! 		{ RIG_MODEL_IC1275, 0x18 },
  		{ RIG_MODEL_ICR71, 0x1a },
  		{ RIG_MODEL_ICR72, 0x32 },
+ 		{ RIG_MODEL_ICR75, 0x5a },
+ 		{ RIG_MODEL_ICR7000, 0x08 },
+ 		{ RIG_MODEL_ICR7100, 0x34 },
  		{ RIG_MODEL_ICR8500, 0x4a },
  		{ RIG_MODEL_ICR9000, 0x2a },
! 		{ RIG_MODEL_MINISCOUT, 0x94 },
  		{ RIG_MODEL_IC718, UNKNOWN_ADDR },
  		{ -1, 0 },
  };
***************
*** 435,462 ****
  /*
   * icom_get_strength
!  * Assumes rig!=NULL, rig->state.priv!=NULL, freq!=NULL
   */
! int icom_get_strength(RIG *rig, int *strength)
  {
  		struct icom_priv_data *priv;
  		struct rig_state *rig_s;
! 		unsigned char strbuf[16];
! 		int str_len;
! 		float str;
  
  		rig_s = &rig->state;
  		priv = (struct icom_priv_data*)rig_s->priv;
  
! 		icom_transaction (rig, C_RD_SQSM, S_SML, NULL, 0, strbuf, &str_len);
  
  		/*
  		 * strbuf should contain Cn,Sc,Data area
  		 */
! 		str_len-=2;
! 		if (str_len != 2) {
! 				rig_debug(RIG_DEBUG_ERR,"icom_get_strength: wrong frame len=%d\n",
! 								str_len);
  				return -RIG_EPROTO;
  		}
  
  		/*	
--- 435,574 ----
  /*
   * icom_get_strength
!  * Assumes rig!=NULL, rig->state.priv!=NULL
!  */
! int icom_set_level(RIG *rig, setting_t set, value_t val)
! {
! 			return -RIG_ENIMPL;
! }
! 
! /*
!  * icom_get_strength
!  * Assumes rig!=NULL, rig->state.priv!=NULL, val!=NULL
   */
! int icom_get_level(RIG *rig, setting_t set, value_t *val)
  {
  		struct icom_priv_data *priv;
  		struct rig_state *rig_s;
! 		unsigned char lvlbuf[16];
! 		int lvl_len;
! 		int lvl_cn, lvl_sc;		/* Command Number, Subcommand */
! 		int icom_val;
  
  		rig_s = &rig->state;
  		priv = (struct icom_priv_data*)rig_s->priv;
+ 
+ 
+ 		switch (set) {
+ 		case RIG_LEVEL_PREAMP:
+ 			lvl_cn = C_CTL_FUNC;
+ 			lvl_sc = S_FUNC_PAMP;
+ 			break;
+ 		case RIG_LEVEL_ATT:
+ 			lvl_cn = C_CTL_ATT;
+ 			lvl_sc = -1;
+ 			break;
+ 		case RIG_LEVEL_ANT:
+ 			lvl_cn = C_CTL_ANT;
+ 			lvl_sc = -1;
+ 			break;
+ 		case RIG_LEVEL_AF:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_AF;
+ 			break;
+ 		case RIG_LEVEL_RF:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_RF;
+ 			break;
+ 		case RIG_LEVEL_SQL:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_SQL;
+ 			break;
+ 		case RIG_LEVEL_IF:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_IF;
+ 			break;
+ 		case RIG_LEVEL_APF:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_APF;
+ 			break;
+ 		case RIG_LEVEL_NR:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_NR;
+ 			break;
+ 		case RIG_LEVEL_PBT_IN:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_PBTIN;
+ 			break;
+ 		case RIG_LEVEL_PBT_OUT:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_PBTOUT;
+ 			break;
+ 		case RIG_LEVEL_CWPITCH:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_CWPITCH;
+ 			break;
+ 		case RIG_LEVEL_RFPOWER:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_RFPOWER;
+ 			break;
+ 		case RIG_LEVEL_MICGAIN:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_MICGAIN;
+ 			break;
+ 		case RIG_LEVEL_KEYSPD:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_KEYSPD;
+ 			break;
+ 		case RIG_LEVEL_NOTCHF:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_NOTCHF;
+ 			break;
+ 		case RIG_LEVEL_COMP:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_COMP;
+ 			break;
+ 		case RIG_LEVEL_AGC:
+ 			lvl_cn = C_CTL_FUNC;
+ 			lvl_sc = S_FUNC_AGC;
+ 			break;
+ 		case RIG_LEVEL_BKINDL:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_BKINDL;
+ 			break;
+ 		case RIG_LEVEL_BALANCE:
+ 			lvl_cn = C_CTL_LVL;
+ 			lvl_sc = S_LVL_BALANCE;
+ 			break;
+ 		case RIG_LEVEL_ANN:
+ 			lvl_cn = C_CTL_ANN;
+ 			lvl_sc = -1;
+ 			break;
  
! 		case RIG_LEVEL_SQLSTAT:
! 			lvl_cn = C_RD_SQSM;
! 			lvl_sc = S_SQL;
! 			break;
! 		case RIG_LEVEL_STRENGTH:
! 			lvl_cn = C_RD_SQSM;
! 			lvl_sc = S_SML;
! 			break;
! 		default:
! 			rig_debug(RIG_DEBUG_ERR,"Unsupported get level %d", set);
! 			return -RIG_EINVAL;
! 		}
! 
! 		icom_transaction (rig, lvl_cn, lvl_sc, NULL, 0, lvlbuf, &lvl_len);
  
  		/*
  		 * strbuf should contain Cn,Sc,Data area
  		 */
! 		lvl_len-=2;
! #if 0
! 		if (lvl_len != 2) {
! 				rig_debug(RIG_DEBUG_ERR,"icom_get_level: wrong frame len=%d\n",
! 								lvl_len);
  				return -RIG_EPROTO;
  		}
+ #endif
  
  		/*	
***************
*** 464,473 ****
  		 * (from_bcd is little endian)
  		 */
! 		str = (strbuf[2]&0x0f)*100+ (strbuf[3]>>4)*10 + (strbuf[3]&0x0f);
! #ifndef DONT_WANT_STR_DB
! 		/* translate it to dBs */
! 		str = (str-47)*114/(223-47);
  #endif
! 		*strength = rint(str);
  
  		return RIG_OK;
--- 576,593 ----
  		 * (from_bcd is little endian)
  		 */
! 		icom_val = from_bcd_be(lvlbuf+2, lvl_len*2);
! 
! #define STR_FLOOR 44.0
! #define STR_CEILING 223.0
! #define STR_MAX 114.0	/* S9+60db */
! #ifndef max
! #define max(a,b) ((a)>(b)?(a):(b))
  #endif
! 		/* translate to db */
! 		if (set == RIG_LEVEL_STRENGTH)
! 			val->i = rint(STR_MAX/(STR_CEILING-STR_FLOOR)*max(icom_val-STR_FLOOR,0));
! 		else
! 			val->i = icom_val;
! 		rig_debug(RIG_DEBUG_VERBOSE,"%d %d %d\n",lvl_len,icom_val,val->i);
  
  		return RIG_OK;
***************
*** 689,692 ****
--- 809,908 ----
  				return -RIG_EPROTO;	/* not found, unsupported */
  		}
+ 
+ 		return RIG_OK;
+ }
+ 
+ /*
+  * icom_set_channel
+  * Assumes rig!=NULL, rig->state.priv!=NULL, chan!=NULL
+  */
+ int icom_set_channel(RIG *rig, const channel_t *chan)
+ {
+ 		struct icom_priv_data *priv;
+ 		struct rig_state *rig_s;
+ 		unsigned char chanbuf[24], ackbuf[16];
+ 		int chan_len,freq_len,ack_len;
+ 		int icmode;
+ 
+ 		rig_s = &rig->state;
+ 		priv = (struct icom_priv_data*)rig_s->priv;
+ 
+ 		to_bcd_be(chanbuf,chan->channel_num,4);
+ 
+ 		chanbuf[2] = S_MEM_CNTNT_SLCT;
+ 
+ 		freq_len = priv->civ_731_mode ? 4:5;
+ 		/*	
+ 		 * to_bcd requires nibble len
+ 		 */
+ 		to_bcd(chanbuf+3, chan->freq, freq_len*2);
+ 
+ 		chan_len = 3+freq_len+1;
+ 
+ 		icmode = hamlib2icom_mode(chan->mode);
+ 		chanbuf[chan_len++] = icmode&0xff;
+ 		chanbuf[chan_len++] = icmode>>8;
+ 		to_bcd_be(chanbuf+chan_len++,chan->att,2);
+ 		to_bcd_be(chanbuf+chan_len++,chan->preamp,2);
+ 		to_bcd_be(chanbuf+chan_len++,chan->ant,2);
+ 		memset(chanbuf+chan_len, 0, 8);
+ 		strncpy(chanbuf+chan_len, chan->channel_desc, 8);
+ 		chan_len += 8;
+ 
+ 		icom_transaction (rig, C_CTL_MEM, S_MEM_CNTNT, chanbuf, chan_len, ackbuf, &ack_len);
+ 
+ 		if (ack_len != 1 || ackbuf[0] != ACK) {
+ 				rig_debug(RIG_DEBUG_ERR,"icom_set_channel: ack NG (%#.2x),
+ 								len=%d\n", ackbuf[0],ack_len);
+ 				return -RIG_ERJCTED;
+ 		}
+ 
+ 		return RIG_OK;
+ }
+ 
+ /*
+  * icom_get_channel
+  * Assumes rig!=NULL, rig->state.priv!=NULL, chan!=NULL
+  */
+ int icom_get_channel(RIG *rig, channel_t *chan)
+ {
+ 		struct icom_priv_data *priv;
+ 		struct rig_state *rig_s;
+ 		unsigned char chanbuf[24];
+ 		int chan_len,freq_len;
+ 
+ 		rig_s = &rig->state;
+ 		priv = (struct icom_priv_data*)rig_s->priv;
+ 
+ 		to_bcd_be(chanbuf,chan->channel_num,4);
+ 		chan_len = 2;
+ 
+ 		freq_len = priv->civ_731_mode ? 4:5;
+ 
+ 		icom_transaction (rig, C_CTL_MEM, S_MEM_CNTNT, chanbuf, chan_len, chanbuf, &chan_len);
+ 
+ 		/*
+ 		 * freqbuf should contain Cn,Data area
+ 		 */
+ 		chan_len--;
+ 		if (freq_len != freq_len+16) {
+ 				rig_debug(RIG_DEBUG_ERR,"icom_get_channel: wrong frame len=%d\n",
+ 								chan_len);
+ 				return -RIG_ERJCTED;
+ 		}
+ 
+ 		/*	
+ 		 * from_bcd requires nibble len
+ 		 */
+ 		chan->freq = from_bcd(chanbuf+4, freq_len*2);
+ 
+ 		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);
+ 		chan->preamp = from_bcd_be(chanbuf+chan_len++,2);
+ 		chan->ant = from_bcd_be(chanbuf+chan_len++,2);
+ 		strncpy(chan->channel_desc, chanbuf+chan_len, 8);
  
  		return RIG_OK;

[Hamlib-cvs-digest] CVS: hamlib/icom ic706.c,1.5,1.6

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

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

Modified Files:
	ic706.c 
Log Message:
* Reworked the RIG_MODE_* defines. see rig.h
* Added has_level caps fields


Index: ic706.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/ic706.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ic706.c	2000/10/09 01:17:19	1.5
--- ic706.c	2000/10/16 22:32:36	1.6
***************
*** 42,57 ****
  
  
! #define IC706_ALL_RX_MODES (RIG_MODE_AM| RIG_MODE_CW| RIG_MODE_USB| RIG_MODE_LSB| RIG_MODE_RTTY| RIG_MODE_FM| RIG_MODE_WFM| RIG_MODE_NFM| RIG_MODE_NAM| RIG_MODE_CWR)
! #define IC706_1MHZ_TS_MODES (RIG_MODE_AM|RIG_MODE_FM|RIG_MODE_WFM|RIG_MODE_NFM|RIG_MODE_NAM)
! #define IC706_1HZ_TS_MODES (RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_RTTY|RIG_MODE_CWR)
  
  /* tx doesn't have WFM.
   * 100W in all modes but AM (40W)
   */ 
! #define IC706_OTHER_TX_MODES (RIG_MODE_AM| RIG_MODE_CW| RIG_MODE_USB| RIG_MODE_LSB| RIG_MODE_RTTY| RIG_MODE_FM| RIG_MODE_NFM| RIG_MODE_NAM| RIG_MODE_CWR)
! #define IC706_AM_TX_MODES (RIG_MODE_AM| RIG_MODE_NAM)
  
  #define IC706_FUNC_ALL (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_COMP|RIG_FUNC_VOX|RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_SBKIN|RIG_FUNC_FBKIN)
  
  /*
   * ic706 rigs capabilities.
--- 42,59 ----
  
  
! #define IC706_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_RTTY|RIG_MODE_FM)
! #define IC706_1MHZ_TS_MODES (RIG_MODE_AM|RIG_MODE_FM)
! #define IC706_1HZ_TS_MODES (RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_RTTY)
  
  /* tx doesn't have WFM.
   * 100W in all modes but AM (40W)
   */ 
! #define IC706_OTHER_TX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_RTTY|RIG_MODE_FM)
! #define IC706_AM_TX_MODES (RIG_MODE_AM)
  
  #define IC706_FUNC_ALL (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_COMP|RIG_FUNC_VOX|RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_SBKIN|RIG_FUNC_FBKIN)
  
+ #define IC706_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_SQL|RIG_LEVEL_SQLSTAT|RIG_LEVEL_STRENGTH)
+ 
  /*
   * ic706 rigs capabilities.
***************
*** 62,66 ****
    RIG_MODEL_IC706, "IC-706", "Icom", "0.2", RIG_STATUS_ALPHA,
    RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, 101, RIG_TRN_ON,
    { {KHz(30),199999999,IC706_ALL_RX_MODES,-1,-1},{0,0,0,0,0}, }, /* rx range */
    { {KHz(1800),1999999,IC706_OTHER_TX_MODES,5000,100000},	/* 100W class */
--- 64,69 ----
    RIG_MODEL_IC706, "IC-706", "Icom", "0.2", RIG_STATUS_ALPHA,
    RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, IC706_LEVEL_ALL,
!   IC706_LEVEL_ALL, 101, RIG_TRN_ON,
    { {KHz(30),199999999,IC706_ALL_RX_MODES,-1,-1},{0,0,0,0,0}, }, /* rx range */
    { {KHz(1800),1999999,IC706_OTHER_TX_MODES,5000,100000},	/* 100W class */
***************
*** 108,112 ****
    RIG_MODEL_IC706MKII, "IC-706MKII", "Icom", "0.2", RIG_STATUS_ALPHA,
    RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, 101, RIG_TRN_ON,
    { {30000,199999999,IC706_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, }, /* rx range */
    { {1800000,1999999,IC706_OTHER_TX_MODES,5000,100000},	/* 100W class */
--- 111,116 ----
    RIG_MODEL_IC706MKII, "IC-706MKII", "Icom", "0.2", RIG_STATUS_ALPHA,
    RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL, IC706_LEVEL_ALL,
!   IC706_LEVEL_ALL, 101, RIG_TRN_ON,
    { {30000,199999999,IC706_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, }, /* rx range */
    { {1800000,1999999,IC706_OTHER_TX_MODES,5000,100000},	/* 100W class */
***************
*** 159,163 ****
    RIG_MODEL_IC706MKIIG, "IC-706MKIIG", "Icom", "0.2", RIG_STATUS_ALPHA,
    RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL|RIG_FUNC_NR|RIG_FUNC_ANF, 101, RIG_TRN_ON,
    { {30000,199999999,IC706_ALL_RX_MODES,-1,-1},	/* this trx also has UHF */
   	{400000000,470000000,IC706_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, },
--- 163,168 ----
    RIG_MODEL_IC706MKIIG, "IC-706MKIIG", "Icom", "0.2", RIG_STATUS_ALPHA,
    RIG_TYPE_MOBILE, RIG_PTT_NONE, 300, 19200, 8, 1, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE, 0, 0, 2000, 3, IC706_FUNC_ALL|RIG_FUNC_NR|RIG_FUNC_ANF,
!   IC706_LEVEL_ALL, IC706_LEVEL_ALL, 101, RIG_TRN_ON,
    { {30000,199999999,IC706_ALL_RX_MODES,-1,-1},	/* this trx also has UHF */
   	{400000000,470000000,IC706_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, },
***************
*** 203,209 ****
    icom_init, icom_cleanup, NULL, NULL, NULL /* probe not supported yet */,
    icom_set_freq, icom_get_freq, icom_set_mode, icom_get_mode, icom_set_vfo,
- get_strength: icom_get_strength,
- decode_event: icom_decode_event,
    NULL, 
  };
  
--- 208,217 ----
    icom_init, icom_cleanup, NULL, NULL, NULL /* probe not supported yet */,
    icom_set_freq, icom_get_freq, icom_set_mode, icom_get_mode, icom_set_vfo,
    NULL, 
+ decode_event: icom_decode_event,
+ set_level: icom_set_level,
+ get_level: icom_get_level,
+ set_channel: icom_set_channel,
+ get_channel: icom_get_channel,
  };
  

[Hamlib-cvs-digest] CVS: hamlib/icom frame.c,1.3,1.4

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

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

Modified Files:
	frame.c 
Log Message:
* Accomodate with new API modes, WFM is FM + Wide filter

Index: frame.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/frame.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** frame.c	2000/10/09 01:17:19	1.3
--- frame.c	2000/10/16 22:30:32	1.4
***************
*** 256,261 ****
  		case RIG_MODE_RTTY:	icmode = S_RTTY; break;
  		case RIG_MODE_FM:	icmode = S_FM; break;
- 		case RIG_MODE_WFM:	icmode = S_WFM; break;
  #if 0
  		case RIG_MODE_NFM:	icmode = S_FM; icmode_ext = 0x01; break;
  		case RIG_MODE_NAM:	icmode = S_AM; break;
--- 256,262 ----
  		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;
***************
*** 287,291 ****
  		case S_CW:	mode = RIG_MODE_CW; break;
  		case S_FM:	mode = RIG_MODE_FM; break;
! 		case S_WFM:	mode = RIG_MODE_WFM; break;
  		case S_USB:	mode = RIG_MODE_USB; break;
  		case S_LSB:	mode = RIG_MODE_LSB; break;
--- 288,292 ----
  		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;

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

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

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

Modified Files:
	Makefile.am 
Log Message:
* Listed local include files

Index: Makefile.am
===================================================================
RCS file: /cvsroot/hamlib/hamlib/icom/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am	2000/10/01 12:32:24	1.1
--- Makefile.am	2000/10/16 22:28:45	1.2
***************
*** 3,4 ****
--- 3,5 ----
  lib_LIBRARIES = libhamlib-icom.a
  libhamlib_icom_a_SOURCES = ic706.c icom.c frame.c
+ noinst_HEADERS = frame.h icom.h icom_defs.h

[Hamlib-cvs-digest] CVS: hamlib/ft747 ft747.c,1.18,1.19

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

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

Modified Files:
	ft747.c 
Log Message:
Misc changes to accomodate with new API, pls check modes handling and new has_level caps field

Index: ft747.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/ft747/ft747.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** ft747.c	2000/10/14 03:55:26	1.18
--- ft747.c	2000/10/16 22:27:11	1.19
***************
*** 52,58 ****
--- 52,65 ----
   */
  
+ #if 0
  #define FT747_ALL_RX_MODES (RIG_MODE_AM| RIG_MODE_CW| RIG_MODE_USB| RIG_MODE_LSB| RIG_MODE_NAM| RIG_MODE_NCW)
  #define FT747_SSB_CW_RX_MODES (RIG_MODE_CW| RIG_MODE_USB| RIG_MODE_LSB| RIG_MODE_NCW)
  #define FT747_AM_RX_MODES (RIG_MODE_AM| RIG_MODE_NAM)
+ #else
+ #define FT747_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB)
+ #define FT747_SSB_CW_RX_MODES (RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB)
+ #define FT747_AM_RX_MODES (RIG_MODE_AM)
+ #endif
+ 
  #define FT747_FM_RX_MODES (RIG_MODE_FM)
  
***************
*** 75,79 ****
    RIG_MODEL_FT747, "FT-747GX", "Yaesu", "0.1", RIG_STATUS_ALPHA,
    RIG_TYPE_MOBILE, RIG_PTT_NONE, 4800, 4800, 8, 2, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE, FT747_WRITE_DELAY, FT747_POST_WRITE_DELAY, 2000, 0,FT747_FUNC_ALL,20,RIG_TRN_OFF,
    { {100000,29999900,FT747_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, }, /* rx range */
    
--- 82,86 ----
    RIG_MODEL_FT747, "FT-747GX", "Yaesu", "0.1", RIG_STATUS_ALPHA,
    RIG_TYPE_MOBILE, RIG_PTT_NONE, 4800, 4800, 8, 2, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE, FT747_WRITE_DELAY, FT747_POST_WRITE_DELAY, 2000, 0,FT747_FUNC_ALL,0,0,20,RIG_TRN_OFF,
    { {100000,29999900,FT747_ALL_RX_MODES,-1,-1}, {0,0,0,0,0}, }, /* rx range */
    
***************
*** 304,307 ****
--- 311,315 ----
      mymode = MODE_SET_FMW;
      break;
+ #if 0
    case RIG_MODE_NFM:
      mymode = MODE_SET_FMN;
***************
*** 316,319 ****
--- 324,328 ----
      mymode = MODE_SET_AMW;
      break;
+ #endif
    default:
      return -RIG_EINVAL;		/* sorry, wrong MODE */
***************
*** 360,363 ****
--- 369,373 ----
      (*rmode) = RIG_MODE_LSB;
      break;
+ #if 0
    case MODE_FMN:
      (*rmode) = RIG_MODE_NFM;
***************
*** 369,372 ****
--- 379,383 ----
      (*rmode) = RIG_MODE_NCW;
      break;
+ #endif
    default:
      return -RIG_EINVAL;		/* sorry, wrong mode */

[Hamlib-cvs-digest] CVS: hamlib/ft847 ft847.c,1.23,1.24

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

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

Modified Files:
	ft847.c 
Log Message:
Misc changes to accomodate with new API, pls check modes handling and new has_level caps field

Index: ft847.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/ft847/ft847.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** ft847.c	2000/10/09 01:17:19	1.23
--- ft847.c	2000/10/16 22:27:12	1.24
***************
*** 49,55 ****
--- 49,61 ----
   */
  
+ #if 0
  #define FT847_ALL_RX_MODES (RIG_MODE_AM| RIG_MODE_CW| RIG_MODE_USB| RIG_MODE_LSB| RIG_MODE_RTTY| RIG_MODE_FM| RIG_MODE_WFM| RIG_MODE_NFM| RIG_MODE_NAM| RIG_MODE_CWR)
  #define FT847_SSB_CW_RX_MODES (RIG_MODE_CW| RIG_MODE_USB| RIG_MODE_LSB| RIG_MODE_NCW)
  #define FT847_AM_FM_RX_MODES (RIG_MODE_AM| RIG_MODE_NAM |RIG_MODE_FM |RIG_MODE_NFM )
+ #else
+ #define FT847_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_RTTY|RIG_MODE_FM)
+ #define FT847_SSB_CW_RX_MODES (RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB)
+ #define FT847_AM_FM_RX_MODES (RIG_MODE_AM|RIG_MODE_FM)
+ #endif
  
  /* tx doesn't have WFM.
***************
*** 57,62 ****
--- 63,73 ----
   * 50W in 2m/70cm (12.5 watts AM carrier)
   */ 
+ #if 0
  #define FT847_OTHER_TX_MODES (RIG_MODE_AM| RIG_MODE_CW| RIG_MODE_USB| RIG_MODE_LSB| RIG_MODE_RTTY| RIG_MODE_FM| RIG_MODE_NFM| RIG_MODE_NAM| RIG_MODE_CWR)
  #define FT847_AM_TX_MODES (RIG_MODE_AM| RIG_MODE_NAM)
+ #else
+ #define FT847_OTHER_TX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_USB|RIG_MODE_LSB|RIG_MODE_RTTY|RIG_MODE_FM)
+ #define FT847_AM_TX_MODES (RIG_MODE_AM)
+ #endif
  
  #define FT847_FUNC_ALL (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_COMP|RIG_FUNC_VOX|RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_SBKIN|RIG_FUNC_FBKIN)	/* fix */
***************
*** 70,74 ****
    RIG_MODEL_FT847, "FT-847", "Yaesu", "0.1", RIG_STATUS_ALPHA,
    RIG_TYPE_TRANSCEIVER,RIG_PTT_NONE, 4800, 57600, 8, 2, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE,FT847_WRITE_DELAY ,FT847_POST_WRITE_DELAY, 100, 0, FT847_FUNC_ALL, 78, RIG_TRN_OFF,
    { {100000,76000000,FT847_ALL_RX_MODES,-1,-1}, /* rx range begin */
      {108000000,174000000,FT847_ALL_RX_MODES,-1,-1},
--- 81,85 ----
    RIG_MODEL_FT847, "FT-847", "Yaesu", "0.1", RIG_STATUS_ALPHA,
    RIG_TYPE_TRANSCEIVER,RIG_PTT_NONE, 4800, 57600, 8, 2, RIG_PARITY_NONE, 
!   RIG_HANDSHAKE_NONE,FT847_WRITE_DELAY ,FT847_POST_WRITE_DELAY, 100, 0, FT847_FUNC_ALL, 0, 0, 78, RIG_TRN_OFF,
    { {100000,76000000,FT847_ALL_RX_MODES,-1,-1}, /* rx range begin */
      {108000000,174000000,FT847_ALL_RX_MODES,-1,-1},

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

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

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

Modified Files:
	dumpcaps.c 
Log Message:
Updated after caps has been reworked

Index: dumpcaps.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/dumpcaps.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** dumpcaps.c	2000/10/10 22:13:26	1.3
--- dumpcaps.c	2000/10/16 22:13:05	1.4
***************
*** 169,173 ****
  	printf("Tuning steps:\n");
  	for (i=0; i<TSLSTSIZ && caps->tuning_steps[i].ts; i++) {
! 			printf("\t%dHz:\t%s\n",caps->tuning_steps[i].ts,
  							decode_modes(caps->tuning_steps[i].modes));
  	}
--- 169,173 ----
  	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));
  	}
***************
*** 187,200 ****
  	printf("Can set tuning step:\t%c\n",caps->set_ts!=NULL?'Y':'N');
  	printf("Can get tuning step:\t%c\n",caps->get_ts!=NULL?'Y':'N');
- 	printf("Can set power:\t%c\n",caps->set_power!=NULL?'Y':'N');
- 	printf("Can get power:\t%c\n",caps->get_power!=NULL?'Y':'N');
- 	printf("Can set volume:\t%c\n",caps->set_volume!=NULL?'Y':'N');
- 	printf("Can get volume:\t%c\n",caps->get_volume!=NULL?'Y':'N');
  	printf("Can set power on:\t%c\n",caps->set_poweron!=NULL?'Y':'N');
  	printf("Can set power off:\t%c\n",caps->set_poweroff!=NULL?'Y':'N');
- 	printf("Can get S-meter level:\t%c\n",caps->get_strength!=NULL?'Y':'N');
- 	printf("Can set squelch:\t%c\n",caps->set_squelch!=NULL?'Y':'N');
- 	printf("Can get squelch:\t%c\n",caps->get_squelch!=NULL?'Y':'N');
- 	printf("Can get squelch status:\t%c\n",caps->get_squelch_status!=NULL?'Y':'N');
  	printf("Can set transceive:\t%c\n",caps->set_trn!=NULL?'Y':'N');
  	printf("Can get transceive:\t%c\n",caps->get_trn!=NULL?'Y':'N');
--- 187,192 ----
***************
*** 223,226 ****
--- 215,220 ----
  	if (modes&RIG_MODE_RTTY) strcat(buf,"RTTY ");
  	if (modes&RIG_MODE_FM) strcat(buf,"FM ");
+ #if 0
+ 	if (modes&RIG_MODE_CWR) strcat(buf,"CWR ");
  	if (modes&RIG_MODE_NFM) strcat(buf,"NFM ");
  	if (modes&RIG_MODE_WFM) strcat(buf,"WFM ");
***************
*** 229,233 ****
  	if (modes&RIG_MODE_NCW) strcat(buf,"NCW ");
  	if (modes&RIG_MODE_WCW) strcat(buf,"WCW ");
- 	if (modes&RIG_MODE_CWR) strcat(buf,"CWR ");
  	if (modes&RIG_MODE_NUSB) strcat(buf,"NUSB ");
  	if (modes&RIG_MODE_WUSB) strcat(buf,"WUSB ");
--- 223,226 ----
***************
*** 236,239 ****
--- 229,233 ----
  	if (modes&RIG_MODE_NRTTY) strcat(buf,"NRTTY ");
  	if (modes&RIG_MODE_WRTTY) strcat(buf,"WRTTY ");
+ #endif
  
  	return buf;

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

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

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

Modified Files:
	testbcd.c 
Log Message:
Added Big Endian tests

Index: testbcd.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/tests/testbcd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** testbcd.c	2000/10/08 21:43:00	1.2
--- testbcd.c	2000/10/16 22:10:37	1.3
***************
*** 17,21 ****
  
  	if (argc != 2) {
! 			fprintf(stderr,"%s <freq>\n",argv[0]);
  			exit(1);
  	}
--- 17,21 ----
  
  	if (argc != 2) {
! 			fprintf(stderr,"Usage: %s <freq>\n",argv[0]);
  			exit(1);
  	}
***************
*** 23,30 ****
--- 23,37 ----
  	f = atoi(argv[1]);
  
+ 	printf("Little Endian mode\n");
  	printf("Frequency: %lld\n",f);
  	to_bcd(b, f, 10);
  	printf("BCD: %2.2x,%2.2x,%2.2x,%2.2x,%2.2x\n",b[0],b[1],b[2],b[3],b[4]);
  	printf("Result after recoding: %lld\n", from_bcd(b, 10));
+ 
+ 	printf("\nBig Endian mode\n");
+ 	printf("Frequency: %lld\n",f);
+ 	to_bcd_be(b, f, 10);
+ 	printf("BCD: %2.2x,%2.2x,%2.2x,%2.2x,%2.2x\n",b[0],b[1],b[2],b[3],b[4]);
+ 	printf("Result after recoding: %lld\n", from_bcd_be(b, 10));
  
  	return 0;

[Hamlib-cvs-digest] CVS: hamlib/src rig.c,1.4,1.5

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

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

Modified Files:
	rig.c 
Log Message:
* Added rig_[sg]et_passband to [sg]et narrow/normal/wide filter. These are a good companions to rig_[sg]et_mode. Maybe they should be merged?

* Added rig_[sg]et_rpt_offs to set/get repeater offset

* Added rig_split functions: rig_[sg]et_split_freq (set RX and TX freq) and rig_[sg]et_split to activate split mode

* Added rig_[gs]et_level, however rig_set_preamp/rig_set_att/rig_set_ant et al. will be removed very soon.

* Added Memory/VFO handling routines (actually wrappers, like the rest)


Index: rig.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/src/rig.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** rig.c	2000/10/10 22:11:48	1.4
--- rig.c	2000/10/16 22:08:51	1.5
***************
*** 293,298 ****
--- 293,329 ----
  }
  
+ /*
+  * 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;	/* not implemented */
+ 		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;	/* not implemented */
+ 		else
+ 			return rig->caps->get_passband(rig, width);
+ }
+ 
+ /*
   * rig_set_vfo
   *
***************
*** 405,409 ****
  			return -RIG_EINVAL;
  
! 		if (rig->caps->get_ts == NULL)
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
--- 436,440 ----
  			return -RIG_EINVAL;
  
! 		if (rig->caps->get_rpt_shift == NULL)
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
***************
*** 411,417 ****
--- 442,548 ----
  }
  
+ /*
+  * rig_set_rpt_offs
+  * Set the repeater offset
+  */
+ 
+ int rig_set_rpt_offs(RIG *rig, unsigned long rptr_offs)
+ {
+ 		if (!rig || !rig->caps)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->set_rpt_offs == NULL)
+ 			return -RIG_ENAVAIL;	/* not implemented */
+ 		else
+ 			return rig->caps->set_rpt_offs(rig, rptr_offs);
+ }
+ 
+ /*
+  * rig_get_rpt_offs
+  * Get the current repeater offset
+  */
+ 
+ int rig_get_rpt_offs(RIG *rig, unsigned long *rptr_offs)
+ {
+ 		if (!rig || !rig->caps || !rptr_offs)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->get_rpt_offs == NULL)
+ 			return -RIG_ENAVAIL;	/* not implemented */
+ 		else
+ 			return rig->caps->get_rpt_offs(rig, rptr_offs);
+ }
+ 
+ 
+ /*
+  * rig_set_split_freq
+  * Set the split frequencies
+  */
+ 
+ int rig_set_split_freq(RIG *rig, freq_t rx_freq, freq_t tx_freq)
+ {
+ 		if (!rig || !rig->caps)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->set_split_freq == NULL)
+ 			return -RIG_ENAVAIL;	/* not implemented */
+ 		else
+ 			return rig->caps->set_split_freq(rig, rx_freq, tx_freq);
+ }
+ 
+ /*
+  * rig_get_split_freq
+  * Get the current split frequencies
+  */
+ 
+ int rig_get_split_freq(RIG *rig, freq_t *rx_freq, freq_t *tx_freq)
+ {
+ 		if (!rig || !rig->caps || !rx_freq || !tx_freq)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->get_split_freq == NULL)
+ 			return -RIG_ENAVAIL;	/* not implemented */
+ 		else
+ 			return rig->caps->get_split_freq(rig, rx_freq, tx_freq);
+ }
+ 
  
  
  /*
+  * rig_set_split
+  * Set the split mode
+  */
+ 
+ int rig_set_split(RIG *rig, split_t split)
+ {
+ 		if (!rig || !rig->caps)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->set_split == NULL)
+ 			return -RIG_ENAVAIL;	/* not implemented */
+ 		else
+ 			return rig->caps->set_split(rig, split);
+ }
+ 
+ /*
+  * rig_get_split
+  * Get the current split mode
+  */
+ 
+ int rig_get_split(RIG *rig, split_t *split)
+ {
+ 		if (!rig || !rig->caps || !split)
+ 			return -RIG_EINVAL;
+ 
+ 		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
***************
*** 445,449 ****
  }
  
! 
  /*
   * rig_set_power
--- 576,580 ----
  }
  
! #if 0
  /*
   * rig_set_power
***************
*** 478,481 ****
--- 609,613 ----
  			return rig->caps->get_power(rig, power);
  }
+ #endif
  
  /*
***************
*** 531,534 ****
--- 663,667 ----
  }
  
+ #if 0
  
  /*
***************
*** 600,604 ****
  
  /*
!  * rig_set_tonesq
   * Set CTCSS.
   * NB: tone is NOT in HZ, but in tenth of Hz!
--- 733,850 ----
  
  /*
!  * rig_get_squelch_status
!  * Read squelch status (open/closed)
!  */
! 
! int rig_get_squelch_status(RIG *rig, int *sql_status)
! {
! 		if (!rig || !rig->caps || !sql_status)
! 			return -RIG_EINVAL;
! 
! 		if (rig->caps->get_squelch_status == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
! 		else
! 			return rig->caps->get_squelch_status(rig, sql_status);
! }
! 
! /*
!  * rig_set_ant
!  * Set antenna number
!  */
! 
! int rig_set_ant(RIG *rig, int ant)
! {
! 		if (!rig || !rig->caps)
! 			return -RIG_EINVAL;
! 
! 		if (rig->caps->set_ant == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
! 		else
! 			return rig->caps->set_ant(rig, ant);
! }
! 
! /*
!  * rig_get_ant
!  * Read squelch condition
!  */
! 
! int rig_get_ant(RIG *rig, int *ant)
! {
! 		if (!rig || !rig->caps || !ant)
! 			return -RIG_EINVAL;
! 
! 		if (rig->caps->get_ant == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
! 		else
! 			return rig->caps->get_ant(rig, ant);
! }
! 
! /*
!  * rig_set_att
!  * Set attenuator (db)
!  */
! 
! int rig_set_att(RIG *rig, int att)
! {
! 		if (!rig || !rig->caps)
! 			return -RIG_EINVAL;
! 
! 		if (rig->caps->set_att == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
! 		else
! 			return rig->caps->set_att(rig, att);
! }
! 
! /*
!  * rig_get_att
!  * Read attenuator (db)
!  */
! 
! int rig_get_att(RIG *rig, int *att)
! {
! 		if (!rig || !rig->caps || !att)
! 			return -RIG_EINVAL;
! 
! 		if (rig->caps->get_att == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
! 		else
! 			return rig->caps->get_att(rig, att);
! }
! 
! /*
!  * rig_set_preamp
!  * Set preamp (db)
!  */
! 
! int rig_set_preamp(RIG *rig, int preamp)
! {
! 		if (!rig || !rig->caps)
! 			return -RIG_EINVAL;
! 
! 		if (rig->caps->set_preamp == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
! 		else
! 			return rig->caps->set_preamp(rig, preamp);
! }
! 
! /*
!  * rig_get_preamp
!  * Read preamp (db)
!  */
! 
! int rig_get_preamp(RIG *rig, int *preamp)
! {
! 		if (!rig || !rig->caps || !preamp)
! 			return -RIG_EINVAL;
! 
! 		if (rig->caps->get_preamp == NULL)
! 			return -RIG_ENAVAIL;	/* not implemented */
! 		else
! 			return rig->caps->get_preamp(rig, preamp);
! }
! #endif
! 
! /*
!  * rig_set_ctcss
   * Set CTCSS.
   * NB: tone is NOT in HZ, but in tenth of Hz!
***************
*** 608,641 ****
   */
  
! int rig_set_tonesq(RIG *rig, unsigned int tone)
  {
  		if (!rig || !rig->caps)
  			return -RIG_EINVAL;
  
! 		if (rig->caps->set_tonesq == NULL)
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
! 			return rig->caps->set_tonesq(rig, tone);
  }
  
  /*
!  * rig_get_tonesq
   * Read CTCSS
   * NB: tone is NOT in HZ, but in tenth of Hz!
   */
  
! int rig_get_tonesq(RIG *rig, unsigned int *tone)
  {
  		if (!rig || !rig->caps || !tone)
  			return -RIG_EINVAL;
  
! 		if (rig->caps->get_tonesq == NULL)
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
! 			return rig->caps->get_tonesq(rig, tone);
  }
  
  /*
!  * rig_set_tone
   * Set subaudible tone to access a repeater.
   * NB: tone is NOT in HZ, but in tenth of Hz!
--- 854,887 ----
   */
  
! int rig_set_ctcss(RIG *rig, unsigned int tone)
  {
  		if (!rig || !rig->caps)
  			return -RIG_EINVAL;
  
! 		if (rig->caps->set_ctcss == NULL)
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
! 			return rig->caps->set_ctcss(rig, tone);
  }
  
  /*
!  * rig_get_ctcss
   * Read CTCSS
   * NB: tone is NOT in HZ, but in tenth of Hz!
   */
  
! int rig_get_ctcss(RIG *rig, unsigned int *tone)
  {
  		if (!rig || !rig->caps || !tone)
  			return -RIG_EINVAL;
  
! 		if (rig->caps->get_ctcss == NULL)
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
! 			return rig->caps->get_ctcss(rig, tone);
  }
  
  /*
!  * rig_set_dcs
   * Set subaudible tone to access a repeater.
   * NB: tone is NOT in HZ, but in tenth of Hz!
***************
*** 645,677 ****
   */
  
! int rig_set_tone(RIG *rig, unsigned int tone)
  {
  		if (!rig || !rig->caps)
  			return -RIG_EINVAL;
  
! 		if (rig->caps->set_tone == NULL)
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
! 			return rig->caps->set_tone(rig, tone);
  }
  
  /*
!  * rig_get_tone
   * Read current subaudible tone to access a repeater.
   * NB: tone is NOT in HZ, but in tenth of Hz!
   */
  
! int rig_get_tone(RIG *rig, unsigned int *tone)
  {
  		if (!rig || !rig->caps || !tone)
  			return -RIG_EINVAL;
  
! 		if (rig->caps->get_tone == NULL)
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
! 			return rig->caps->get_tone(rig, tone);
  }
  
  
  /*
   * rig_get_strength
--- 891,924 ----
   */
  
! int rig_set_dcs(RIG *rig, unsigned int tone)
  {
  		if (!rig || !rig->caps)
  			return -RIG_EINVAL;
  
! 		if (rig->caps->set_dcs == NULL)
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
! 			return rig->caps->set_dcs(rig, tone);
  }
  
  /*
!  * rig_get_dcs
   * Read current subaudible tone to access a repeater.
   * NB: tone is NOT in HZ, but in tenth of Hz!
   */
  
! int rig_get_dcs(RIG *rig, unsigned int *tone)
  {
  		if (!rig || !rig->caps || !tone)
  			return -RIG_EINVAL;
  
! 		if (rig->caps->get_dcs == NULL)
  			return -RIG_ENAVAIL;	/* not implemented */
  		else
! 			return rig->caps->get_dcs(rig, tone);
  }
  
  
+ #if 0
  /*
   * rig_get_strength
***************
*** 690,693 ****
--- 937,941 ----
  			return rig->caps->get_strength(rig, strength);
  }
+ #endif
  
  /*
***************
*** 818,827 ****
  #endif
  
  
  /*
   * "macro" to check if a rig has a function,
   * example:  if (rig_has_func(my_rig, RIG_FUNC_FAGC)) disp_fagc_button();
   */
! int rig_has_func(RIG *rig, unsigned long func)
  {
  		if (!rig || !rig->caps)
--- 1066,1130 ----
  #endif
  
+ /*
+  * rig_set_level
+  */
+ int rig_set_level(RIG *rig, setting_t set, value_t val)
+ {
+ 		if (!rig || !rig->caps)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->set_level == NULL)
+ 			return -RIG_ENAVAIL;	/* not implemented */
+ 		else
+ 			return rig->caps->set_level(rig, set, val);
+ }
+ 
+ /*
+  * rig_get_level
+  */
+ 
+ int rig_get_level(RIG *rig, setting_t set, value_t *val)
+ {
+ 		if (!rig || !rig->caps || !val)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->get_level == NULL)
+ 			return -RIG_ENAVAIL;	/* not implemented */
+ 		else
+ 			return rig->caps->get_level(rig, set, val);
+ }
  
  /*
+  * "macro" to check if a rig can *get* a level setting,
+  * example:  if (rig_has_set_level(my_rig, RIG_LVL_STRENGTH)) disp_Smeter();
+  */
+ int rig_has_level(RIG *rig, setting_t level)
+ {
+ 		if (!rig || !rig->caps)
+ 				return -1;
+ 
+ 		return (rig->caps->has_level & level);
+ }
+ 
+ 
+ /*
+  * "macro" to check if a rig can *set* a level setting,
+  * example:  if (rig_has_set_level(my_rig, RIG_LVL_RFPOWER)) crank_tx();
+  */
+ int rig_has_set_level(RIG *rig, setting_t level)
+ {
+ 		if (!rig || !rig->caps)
+ 				return -1;
+ 
+ 		return (rig->caps->has_set_level & level);
+ }
+ 
+ 
+ 
+ /*
   * "macro" to check if a rig has a function,
   * example:  if (rig_has_func(my_rig, RIG_FUNC_FAGC)) disp_fagc_button();
   */
! int rig_has_func(RIG *rig, setting_t func)
  {
  		if (!rig || !rig->caps)
***************
*** 835,839 ****
   */
  
! int rig_set_func(RIG *rig, unsigned long func)
  {
  		if (!rig || !rig->caps)
--- 1138,1142 ----
   */
  
! int rig_set_func(RIG *rig, setting_t func)
  {
  		if (!rig || !rig->caps)
***************
*** 852,856 ****
   */
  
! int rig_get_func(RIG *rig, unsigned long *func)
  {
  		if (!rig || !rig->caps || !func)
--- 1155,1159 ----
   */
  
! int rig_get_func(RIG *rig, setting_t *func)
  {
  		if (!rig || !rig->caps || !func)
***************
*** 863,867 ****
--- 1166,1249 ----
  }
  
+ /*
+  * rig_set_mem
+  * Set memory channel number.
+  * Should not be obliged to be in memory mode. Depends on rig. YMMV.
+  */
+ 
+ int rig_set_mem(RIG *rig, int ch)
+ {
+ 		if (!rig || !rig->caps)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->set_mem == NULL)
+ 			return -RIG_ENAVAIL;	/* not implemented */
+ 		else
+ 			return rig->caps->set_mem(rig, ch);
+ }
+ 
+ /*
+  * rig_get_mem
+  * Get memory channel number
+  * Should not be obliged to be in memory mode. Depends on rig. YMMV.
+  */
+ 
+ int rig_get_mem(RIG *rig, int *ch)
+ {
+ 		if (!rig || !rig->caps || !ch)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->get_mem == NULL)
+ 			return -RIG_ENAVAIL;	/* not implemented */
+ 		else
+ 			return rig->caps->get_mem(rig, ch);
+ }
+ 
+ /*
+  * rig_mv_ctl
+  * Memory/VFO operations, cf mv_op_t enum
+  */
+ 
+ int rig_mv_ctl(RIG *rig, mv_op_t op)
+ {
+ 		if (!rig || !rig->caps)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->mv_ctl == NULL)
+ 			return -RIG_ENAVAIL;	/* not implemented */
+ 		else
+ 			return rig->caps->mv_ctl(rig, op);
+ }
+ 
+ /*
+  * rig_set_channel
+  */
+ 
+ int rig_set_channel(RIG *rig, const channel_t *chan)
+ {
+ 		if (!rig || !rig->caps || !chan)
+ 			return -RIG_EINVAL;
+ 
+ 		if (rig->caps->set_channel == NULL)
+ 			return -RIG_ENAVAIL;	/* not implemented */
+ 		else
+ 			return rig->caps->set_channel(rig, chan);
+ }
+ 
+ /*
+  * rig_get_channel
+  * The channel to get data about is stored in chan->channel_num
+  */
+ 
+ int rig_get_channel(RIG *rig, channel_t *chan)
+ {
+ 		if (!rig || !rig->caps || !chan)
+ 			return -RIG_EINVAL;
  
+ 		if (rig->caps->get_channel == NULL)
+ 			return -RIG_ENAVAIL;	/* not implemented */
+ 		else
+ 			return rig->caps->get_channel(rig, chan);
+ }
  
  /*

[Hamlib-cvs-digest] CVS: hamlib/include/hamlib rig.h,1.3,1.4

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

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

Modified Files:
	rig.h 
Log Message:
* Replaced rig_?et_volume/rig_?et_squelch/rig_get_squelch_status/rig_get_strength/rig_?et_ant/rig_?et_att/rig_?et_preamp by rig_set_level/rig_get_level. This is a good saving in terms of namespace, but a potential gain in messy backend implementation. Feedback welcome.

* Added rig_has_level/rig_has_set_level (cloned from their *_func cousins)

* Reworked the RIG_MODE_* defines. The filter information (narrow, normal, wide) has been splited for less complexity. Thus adding rig_[sg]et_passband.

* Reworked the vfo_t enum. Main is now an alias for VFO A, Sub for VFO B, Sat for VFO C. I'm almost sure it's a wrong assumption. Could someone tell if Main is or is not VFO A ?

* Coded in a Memory/VFO handling proposal. Access is done through mv_ctl. See mem_vfo_op_e for a list of available operations.

* Renamed [sg]et_tone to [sg]et_dcs and [sg]et_tonesq to [sg]et_ctcss.



Index: rig.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/include/hamlib/rig.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** rig.h	2000/10/10 22:09:54	1.3
--- rig.h	2000/10/16 21:58:03	1.4
***************
*** 82,86 ****
  	RIG_PORT_NETWORK,
  	RIG_PORT_DEVICE,	/* Device driver, like for the WinRADIO */
! 	RIG_PORT_ULTRA		/* IrDA Ultra protocol */
  };
  
--- 82,86 ----
  	RIG_PORT_NETWORK,
  	RIG_PORT_DEVICE,	/* Device driver, like for the WinRADIO */
! 	RIG_PORT_ULTRA		/* IrDA Ultra protocol! */
  };
  
***************
*** 138,154 ****
  enum vfo_e {
  	RIG_VFO_MAIN = 0,
- 	RIG_VFO_RX,
- 	RIG_VFO_TX,
  	RIG_VFO_SUB,
! 	RIG_VFO_SAT_RX,
! 	RIG_VFO_SAT_TX,
! 	RIG_VFO_A,
! 	RIG_VFO_B,
! 	RIG_VFO_C
! 
  };
  
  typedef enum vfo_e vfo_t;
  
  enum ptt_e {
  	RIG_PTT_OFF = 0,
--- 138,158 ----
  enum vfo_e {
  	RIG_VFO_MAIN = 0,
  	RIG_VFO_SUB,
! 	RIG_VFO_SAT,
! 	RIG_VFO_A = RIG_VFO_MAIN,
! 	RIG_VFO_B = RIG_VFO_SUB,
! 	RIG_VFO_C = RIG_VFO_SAT
  };
  
  typedef enum vfo_e vfo_t;
  
+ enum passband_width_e {
+ 	RIG_PASSBAND_NORMAL = 0,
+ 	RIG_PASSBAND_NARROW,
+ 	RIG_PASSBAND_WIDE
+ };
+ 
+ typedef enum passband_width_e pbwidth_t;
+ 
  enum ptt_e {
  	RIG_PTT_OFF = 0,
***************
*** 159,163 ****
  
  enum ptt_type_e {
! 	RIG_PTT_RIG = 0,		/* PTT controlable through the rig interface */
  	RIG_PTT_SERIAL,				/* PTT accessed through CTS/RTS */
  	RIG_PTT_PARALLEL,			/* PTT accessed through DATA0 */
--- 163,167 ----
  
  enum ptt_type_e {
! 	RIG_PTT_RIG = 0,			/* legacy PTT */
  	RIG_PTT_SERIAL,				/* PTT accessed through CTS/RTS */
  	RIG_PTT_PARALLEL,			/* PTT accessed through DATA0 */
***************
*** 165,171 ****
  };
  
- 
  typedef enum ptt_type_e ptt_type_t;
  
  /*
   * tranceive mode, ie. the rig notify the host of any event,
--- 169,241 ----
  };
  
  typedef enum ptt_type_e ptt_type_t;
  
+ 
+ enum mem_vfo_op_e {
+ 	RIG_MVOP_VFO_MODE = 0,
+ 	RIG_MVOP_MEM_MODE,
+ 	RIG_MVOP_VFO_CPY,		/* VFO A = VFO B */
+ 	RIG_MVOP_VFO_XCHG,		/* Exchange VFO A/B */
+ 	RIG_MVOP_DUAL_OFF,		/* Dual watch off */
+ 	RIG_MVOP_DUAL_ON,		/* Dual watch on */
+ 	RIG_MVOP_FROM_VFO,		/* VFO->MEM */
+ 	RIG_MVOP_TO_VFO,		/* MEM->VFO */
+ 	RIG_MVOP_MCL			/* Memory clear */
+ };
+ 
+ typedef enum mem_vfo_op_e mv_op_t;
+ 
+ 
+ /* When optional speech synthesizer is installed */
+ enum ann_level_e {
+ 		RIG_ANN_OFF = 0,
+ 		RIG_ANN_FREQ,
+ 		RIG_ANN_RXMODE,
+ 		RIG_ANN_ALL
+ };
+ 
+ enum agc_level_e {
+ 		RIG_AGC_OFF = 0,
+ 		RIG_AGC_SUPERFAST,
+ 		RIG_AGC_FAST,
+ 		RIG_AGC_SLOW
+ };
+ 
+ /*
+  * Universal approach for use by set_level/get_level
+  */
+ union value_u {
+ 		int i;		
+ 		float f;
+ };
+ typedef union value_u value_t;
+ 
+ #define RIG_LEVEL_PREAMP	(1<<0)	/* Preamp, arg int (db) */
+ #define RIG_LEVEL_ATT		(1<<1)	/* Attenuator, arg int (db) */
+ #define RIG_LEVEL_ANT		(1<<2)	/* Antenna, arg int (numbering from 0) */
+ #define RIG_LEVEL_AF		(1<<3)	/* Volume, arg float [0.0..1.0] */
+ #define RIG_LEVEL_RF		(1<<4)	/* RF gain (not TX power), arg float [0.0..1.0] */
+ #define RIG_LEVEL_SQL		(1<<5)	/* Squelch, arg float [0.0 .. 1.0] */
+ #define RIG_LEVEL_IF		(1<<6)	/* IF, arg int (Hz) */
+ #define RIG_LEVEL_APF		(1<<7)	/* APF?, arg float [0.0 .. 1.0] */
+ #define RIG_LEVEL_NR		(1<<8)	/* Noise Reduction, arg float [0.0 .. 1.0] */
+ #define RIG_LEVEL_PBT_IN	(1<<9)	/* Twin PBT (inside), arg float [0.0 .. 1.0] */
+ #define RIG_LEVEL_PBT_OUT	(1<<10)	/* Twin PBT (outside), arg float [0.0 .. 1.0] */
+ #define RIG_LEVEL_CWPITCH	(1<<11)	/* CW pitch, arg int (Hz) */
+ #define RIG_LEVEL_RFPOWER	(1<<12)	/* RF Power, arg float [0.0 .. 1.0] */
+ #define RIG_LEVEL_MICGAIN	(1<<13)	/* MIC Gain, arg float [0.0 .. 1.0] */
+ #define RIG_LEVEL_KEYSPD	(1<<14)	/* Key Speed, arg int (WPM) */
+ #define RIG_LEVEL_NOTCHF	(1<<15)	/* Notch Freq., arg int (Hz) */
+ #define RIG_LEVEL_COMP		(1<<16)	/* Compressor, arg float [0.0 .. 1.0] */
+ #define RIG_LEVEL_AGC		(1<<17)	/* AGC, arg int (see enum agc_level_e) */
+ #define RIG_LEVEL_BKINDL	(1<<18)	/* BKin Delay, arg int (tenth of dots) */
+ #define RIG_LEVEL_BALANCE	(1<<19)	/* Balance (Dual Watch), arg float [0.0 .. 1.0] */
+ #define RIG_LEVEL_ANN		(1<<20)	/* Announce, arg int (see enum ann_level_e) */
+ 		/* These ones are not settable */
+ #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) */
+ 
+ typedef unsigned long setting_t;	/* at least 32 bits */
+ 
  /*
   * tranceive mode, ie. the rig notify the host of any event,
***************
*** 218,228 ****
  #define RIG_MODE_RTTY	(1<<4)
  #define RIG_MODE_FM    	(1<<5)
! #define RIG_MODE_NFM	(1<<6)	/* should we distinguish modes w/ filers? */
! #define RIG_MODE_WFM	(1<<7)
! #define RIG_MODE_NAM	(1<<8)	/* 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_CWR	(1<<12)	/* Reverse CW */
  #define RIG_MODE_NUSB	(1<<13)	
  #define RIG_MODE_WUSB	(1<<14)	
--- 288,304 ----
  #define RIG_MODE_RTTY	(1<<4)
  #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)	
***************
*** 231,234 ****
--- 307,311 ----
  #define RIG_MODE_NRTTY	(1<<17)	
  #define RIG_MODE_WRTTY	(1<<18)	
+ #endif
  
  
***************
*** 276,280 ****
    vfo_t vfo;
    int power;	/* in mW */
!   signed int preamp;	/* in dB, if < 0, this is attenuator */
    unsigned long tuning_step;	/* */
    unsigned char channel_desc[MAXCHANDESC];
--- 353,359 ----
    vfo_t vfo;
    int power;	/* in mW */
!   int att;	/* in db */
!   int preamp;	/* in db */
!   int ant;	/* antenna number */
    unsigned long tuning_step;	/* */
    unsigned char channel_desc[MAXCHANDESC];
***************
*** 318,322 ****
--- 397,406 ----
    int retry;		/* maximum number of retries, 0 to disable */
    unsigned long has_func;		/* bitwise OR'ed RIG_FUNC_FAGC, NG, etc. */
+   unsigned long has_level;		/* bitwise OR'ed RIG_LEVEL_* */
+   unsigned long has_set_level;		/* bitwise OR'ed RIG_LEVEL_* */
    int chan_qty;		/* number of channels */
+ #if 0
+   int chan_desc_sz;   /* memory channel size, 0 if none */
+ #endif
    int transceive;	/* the rig is able to generate events, to be used by callbacks */
    freq_range_t rx_range_list[FRQRANGESIZ];
***************
*** 351,356 ****
    int (*set_ptt)(RIG *rig, ptt_t ptt); /* ptt on/off */
    int (*get_ptt)(RIG *rig, ptt_t *ptt); /* get ptt status */
  
!   int (*set_rpt_shift)(RIG *rig, rptr_shift_t rptr_shift );	/* set repeater shift */
    int (*get_rpt_shift)(RIG *rig, rptr_shift_t *rptr_shift);	/* get repeater shift */
  
--- 435,443 ----
    int (*set_ptt)(RIG *rig, ptt_t ptt); /* ptt on/off */
    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_rpt_shift)(RIG *rig, rptr_shift_t rptr_shift);	/* set repeater shift */
    int (*get_rpt_shift)(RIG *rig, rptr_shift_t *rptr_shift);	/* get repeater shift */
  
***************
*** 366,373 ****
    int (*get_ts)(RIG *rig, unsigned long *ts); /* get tuning step */
  
!   int (*set_tone)(RIG *rig, unsigned int tone);	/* set tone */
!   int (*get_tone)(RIG *rig, unsigned int *tone);	/* get tone */
!   int (*set_tonesq)(RIG *rig, unsigned int tone);	/* set tone squelch */
!   int (*get_tonesq)(RIG *rig, unsigned int *tone);	/* get tone squelch */
  
    /*
--- 453,460 ----
    int (*get_ts)(RIG *rig, unsigned long *ts); /* get tuning step */
  
!   int (*set_dcs)(RIG *rig, unsigned int tone);	/* set tone */
!   int (*get_dcs)(RIG *rig, unsigned int *tone);	/* get tone */
!   int (*set_ctcss)(RIG *rig, unsigned int tone);	/* set tone squelch */
!   int (*get_ctcss)(RIG *rig, unsigned int *tone);	/* get tone squelch */
  
    /*
***************
*** 377,386 ****
--- 464,476 ----
     * on all bands/modes. Have to work this out.. --SF
     */
+ #if 0
    int (*set_power)(RIG *rig, float power);	/* set TX power [0.0 .. 1.0] */
    int (*get_power)(RIG *rig, float *power);
+ #endif
  
    int (*power2mW)(RIG *rig, unsigned int *mwpower, float power, freq_t freq, rmode_t mode);
    int (*mW2power)(RIG *rig, float *power, unsigned int mwpower, freq_t freq, rmode_t mode);
  
+ #if 0
    int (*set_volume)(RIG *rig, float vol);	/* select vol from 0.0 and 1.0 */
    int (*get_volume)(RIG *rig, float *vol);	/* get volume */
***************
*** 390,409 ****
    int (*get_squelch_status)(RIG *rig, int *sql_status);	/* get squelch status */
    int (*get_strength)(RIG *rig, int *strength);	/* get signal strength */
  
    int (*set_poweron)(RIG *rig);
    int (*set_poweroff)(RIG *rig);
  
    int (*set_func)(RIG *rig, unsigned long func); /* activate the function(s) */
    int (*get_func)(RIG *rig, unsigned long *func); /* get the setting from rig */
  
!   int (*set_mem)(RIG *rig, int ch);
!   int (*get_mem)(RIG *rig, int *ch);
!   int (*mem_clear)(RIG *rig);
!   int (*mem_to_vfo)(RIG *rig);
!   int (*vfo_to_mem)(RIG *rig);	/* memory write */
! /* also VFO A=B, and Switch VFO A and B, set to VFO mode, set to MEM mode */
  
    int (*set_trn)(RIG *rig, int trn);	/* activate transceive mode on radio */
!   int (*get_trn)(RIG *rig, int *trn);	/* PCR-1000 can do that */
  
  
--- 480,511 ----
    int (*get_squelch_status)(RIG *rig, int *sql_status);	/* get squelch status */
    int (*get_strength)(RIG *rig, int *strength);	/* get signal strength */
+ #endif
  
    int (*set_poweron)(RIG *rig);
    int (*set_poweroff)(RIG *rig);
  
+ #if 0
+   int (*set_ant)(RIG *rig, int ant);	/* set antenna number */
+   int (*get_ant)(RIG *rig, int *ant);	/* get antenna number */
+ 
+   int (*set_att)(RIG *rig, int att);	/* set attenuator */
+   int (*get_att)(RIG *rig, int *att);	/* get attenuator */
+ 
+   int (*set_preamp)(RIG *rig, int preamp);	/* set preamp */
+   int (*get_preamp)(RIG *rig, int *preamp);	/* get preamp */
+ #endif
+ 
+   int (*set_level)(RIG *rig, setting_t set, value_t val);/* set level setting */
+   int (*get_level)(RIG *rig, setting_t set, value_t *val);/* set level setting*/
+ 
    int (*set_func)(RIG *rig, unsigned long func); /* activate the function(s) */
    int (*get_func)(RIG *rig, unsigned long *func); /* get the setting from rig */
  
!   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 */
  
  
***************
*** 505,508 ****
--- 607,613 ----
  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 */
  extern int rig_get_vfo(RIG *rig, vfo_t *vfo); /* get vfo */
***************
*** 516,519 ****
--- 621,629 ----
  extern int rig_get_rpt_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 tone);
+ extern int rig_get_dcs(RIG *rig, unsigned int *tone);
+ 
  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);
***************
*** 529,532 ****
--- 639,643 ----
  extern int rig_mW2power(RIG *rig, float *power, unsigned int mwpower, freq_t freq, rmode_t mode);
  
+ #if 0
  extern int rig_set_volume(RIG *rig, float vol);
  extern int rig_get_volume(RIG *rig, float *vol);
***************
*** 534,542 ****
  extern int rig_get_squelch(RIG *rig, float *sql);
  extern int rig_get_squelch_status(RIG *rig, int *sql_status);
- extern int rig_set_tonesq(RIG *rig, unsigned int tone);
- extern int rig_get_tonesq(RIG *rig, unsigned int *tone);
- extern int rig_set_tone(RIG *rig, unsigned int tone);
- extern int rig_get_tone(RIG *rig, unsigned int *tone);
  extern int rig_get_strength(RIG *rig, int *strength);
  extern int rig_set_poweron(RIG *rig);
  extern int rig_set_poweroff(RIG *rig);
--- 645,663 ----
  extern int rig_get_squelch(RIG *rig, float *sql);
  extern int rig_get_squelch_status(RIG *rig, int *sql_status);
  extern int rig_get_strength(RIG *rig, int *strength);
+ extern int rig_set_ant(RIG *rig, int ant);
+ extern int rig_get_ant(RIG *rig, int *ant);
+ extern int rig_set_att(RIG *rig, int att);
+ extern int rig_get_att(RIG *rig, int *att);
+ extern int rig_set_preamp(RIG *rig, int preamp);
+ extern int rig_get_preamp(RIG *rig, int *preamp);
+ #else
+ 
+ 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))
+ #endif
+ 
  extern int rig_set_poweron(RIG *rig);
  extern int rig_set_poweroff(RIG *rig);
***************
*** 548,555 ****
  
  extern RIG *rig_probe(const char *rig_path);
  
! extern int rig_has_func(RIG *rig, unsigned long func);	/* is part of capabilities? */
! extern int rig_set_func(RIG *rig, unsigned long func);	/* activate the function(s) */
! extern int rig_get_func(RIG *rig, unsigned long *func); /* get the setting from rig */
  
  extern int rig_set_trn(RIG *rig, int trn); /* activate the transceive mode */
--- 669,686 ----
  
  extern RIG *rig_probe(const char *rig_path);
+ 
+ extern int rig_has_level(RIG *rig, setting_t level);
+ extern int rig_has_set_level(RIG *rig, setting_t level);
+ 
+ extern int rig_has_func(RIG *rig, setting_t func);	/* is part of capabilities? */
+ extern int rig_set_func(RIG *rig, setting_t func);	/* activate the function(s) */
+ extern int rig_get_func(RIG *rig, setting_t *func); /* get the setting from rig */
+ 
+ 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 */

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

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

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

Modified Files:
	misc.c misc.h 
Log Message:
* fix in to_bcd(), in case of odd len numbers
* Added to_bcd_be/from_bcd_be for Big endian BCD representation


Index: misc.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/src/misc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** misc.c	2000/10/08 21:43:00	1.2
--- misc.c	2000/10/16 21:53:22	1.3
***************
*** 144,149 ****
  			bcd_data[i] = a;
  	}
! 	if (bcd_len&1)
  			bcd_data[i] |= freq%10;	/* NB: high nibble is left uncleared */
  
  	return bcd_data;
--- 144,151 ----
  			bcd_data[i] = a;
  	}
! 	if (bcd_len&1) {
! 			bcd_data[i] &= 0xf0;
  			bcd_data[i] |= freq%10;	/* NB: high nibble is left uncleared */
+ 	}
  
  	return bcd_data;
***************
*** 174,177 ****
--- 176,225 ----
  }
  
+ /*
+  * Same as to_bcd, but in Big Endian mode
+  */
+ unsigned char *
+ to_bcd_be(unsigned char bcd_data[], unsigned long long freq, int bcd_len)
+ {
+ 	int i;
+ 	unsigned char a;
+ 
+ 	/* '450'-> 0,4;5,0 */
+ 
+ 	for (i=(bcd_len/2)-1; i >= 0; i--) {
+ 			a = freq%10;
+ 			freq /= 10;
+ 			a |= (freq%10)<<4;
+ 			freq /= 10;
+ 			bcd_data[i] = a;
+ 	}
+ 	if (bcd_len&1) {
+ 			bcd_data[0] &= 0xf0;
+ 			bcd_data[0] |= freq%10;	/* NB: high nibble is left uncleared */
+ 	}
+ 
+ 	return bcd_data;
+ }
+ 
+ /*
+  * Same as from_bcd, but in Big Endian mode
+  */
+ unsigned long long from_bcd_be(const unsigned char bcd_data[], int bcd_len)
+ {
+ 	int i;
+ 	freq_t f = 0;
+ 
+ 	if (bcd_len&1)
+ 			f = bcd_data[0] & 0x0f;
+ 
+ 	for (i=bcd_len&1; i < (bcd_len+1)/2; i++) {
+ 			f *= 10;
+ 			f += bcd_data[i]>>4;
+ 			f *= 10;
+ 			f += bcd_data[i] & 0x0f;
+ 	}
+ 	
+ 	return f;
+ }
  
  /*

Index: misc.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/src/misc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** misc.h	2000/10/08 21:43:41	1.2
--- misc.h	2000/10/16 21:53:22	1.3
***************
*** 75,78 ****
--- 75,84 ----
  unsigned long long from_bcd(const unsigned char bcd_data[], int bcd_len);
  
+ /*
+  * same as to_bcd and from_bcd, but in Big Endian mode
+  */
+ unsigned char *to_bcd_be(unsigned char bcd_data[], unsigned long long freq, int bcd_len);
+ unsigned long long from_bcd_be(const unsigned char bcd_data[], int bcd_len);
+ 
  #endif /* _MISC_H */
  

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

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

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

Modified Files:
	Makefile.am 
Log Message:
* Listed local include files

Index: Makefile.am
===================================================================
RCS file: /cvsroot/hamlib/hamlib/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am	2000/10/08 21:41:54	1.2
--- Makefile.am	2000/10/16 21:50:33	1.3
***************
*** 3,4 ****
--- 3,5 ----
  lib_LIBRARIES = libhamlib.a
  libhamlib_a_SOURCES = rig.c serial.c misc.c register.c event.c
+ noinst_HEADERS = event.h misc.h serial.h

[Hamlib-cvs-digest] CVS: hamlib/include/hamlib riglist.h,1.2,1.3

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

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

Modified Files:
	riglist.h 
Log Message:
* Added RIG_MODEL_MINISCOUT


Index: riglist.h
===================================================================
RCS file: /cvsroot/hamlib/hamlib/include/hamlib/riglist.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** riglist.h	2000/10/10 22:05:23	1.2
--- riglist.h	2000/10/16 21:48:48	1.3
***************
*** 83,87 ****
  	RIG_MODEL_ICR8500,
  	RIG_MODEL_ICR9000,
! 	RIG_MODEL_PCR1000
  
  	/* etc. */
--- 83,88 ----
  	RIG_MODEL_ICR8500,
  	RIG_MODEL_ICR9000,
! 	RIG_MODEL_PCR1000,
! 	RIG_MODEL_MINISCOUT
  
  	/* etc. */

[Hamlib-cvs-digest] CVS: hamlib/ft747 ft747.c,1.17,1.18

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

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

Modified Files:
	ft747.c 
Log Message:
minor fixes


Index: ft747.c
===================================================================
RCS file: /cvsroot/hamlib/hamlib/ft747/ft747.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** ft747.c	2000/10/09 01:17:19	1.17
--- ft747.c	2000/10/14 03:55:26	1.18
***************
*** 27,34 ****
   */
  
- 
- 
- 
- 
  #include <stdlib.h>
  #include <stdio.h>   /* Standard input/output definitions */
--- 27,30 ----
***************
*** 635,645 ****
   * init_ft747 is called by rig_backend_load
   */
! int init_ft747(void *be_handle)
! {
! 		rig_debug(RIG_DEBUG_VERBOSE, "ft747: _init called\n");
! 
! 		rig_register(&ft747_caps);
! 
! 		return RIG_OK;
  }
  
--- 631,638 ----
   * init_ft747 is called by rig_backend_load
   */
! int init_ft747(void *be_handle) {
!   rig_debug(RIG_DEBUG_VERBOSE, "ft747: _init called\n");
!   rig_register(&ft747_caps); 
!   return RIG_OK;
  }
  

[Hamlib-cvs-digest] Re: [Hamlib-developer] CVS Updates via email

[Frank S. <vk...@ix...>]

Frank Singleton wrote:

> 
> I have  added syncmail to CVSROOT and sent a request to
> have it activated.

Done

> 
> Should be up in 48 hrs hopefully.
> I need to configure a few things once the sourceforge
> lads have activated it for me.
> 
Done

> Then we will have some
> "very pretty" automatic cvs emails indeed :-)

Well its up and running!! I updated TODO as a test, and
the email automagically came as expected 
to ham...@li...

Note: Its more efficient if you have a daily
digest instead of 1 mail per update when you
receive the emails. This is set in your "email
preferences " on the hamlib site.

ie: "Set Digest Mode" 


Enjoy / Frank.. :)

-- 
Frank Singleton				VK3FCS

Email: victor kilo three foxtrot charlie sierra at ix dot netcom dot com

[Hamlib-cvs-digest] CVS: hamlib TODO,1.9,1.10

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

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

Modified Files:
	TODO 
Log Message:
cvs mail update works ok :-)


Index: TODO
===================================================================
RCS file: /cvsroot/hamlib/hamlib/TODO,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** TODO	2000/10/12 17:47:49	1.9
--- TODO	2000/10/12 18:37:56	1.10
***************
*** 33,37 ****
  17. In serial.c (and non serial too), use buffered IO instead of read/write,
  	for better performance. Use flushing with fwrite.
- 18. Get CVS updates mailed to out hamlib-cvs-digest list
  
  DONE
--- 33,36 ----
***************
*** 40,42 ****
--- 39,43 ----
  9. If read from rig takes > "n" seconds, then no longer
     block on read, just return error. 
+ 
+ 18. Get CVS updates mailed to our hamlib-cvs-digest list
  

[Hamlib-cvs-digest] CVS: hamlib TODO,1.8,1.9

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

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

Modified Files:
	TODO 
Log Message:
cvs mails to hamlib-cvs-digest


Index: TODO
===================================================================
RCS file: /cvsroot/hamlib/hamlib/TODO,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** TODO	2000/10/01 14:31:31	1.8
--- TODO	2000/10/12 17:47:49	1.9
***************
*** 33,36 ****
--- 33,37 ----
  17. In serial.c (and non serial too), use buffered IO instead of read/write,
  	for better performance. Use flushing with fwrite.
+ 18. Get CVS updates mailed to out hamlib-cvs-digest list
  
  DONE

[Hamlib-cvs-digest] CVS Updates via email

[Frank S. <vk...@ix...>]

> From: Stephane Fillod <f4...@fr...>
> To: ham...@li...
> Subject: [Hamlib-cvs-digest] automatic Hamlib-cvs-digest?
> 
> Frank,
> 
> Your commit reports are great, 

<blush>

>I'm wondering if I would have the time
> to do as well each time I commit. Anyway, I was more expecting this
> mailing list to *automatically* post the -m messages of the commits
> of the day.
> 
> Is it possible? Or is it something we have to add in a space cron tab
> with a script of ours?
> "Your asking the moon, please hold on...."
> 
> Cheers,
> 
> --
> Stephane                                        F4CFE

Hi hamlib crew,

Yeah this is a cross-post, but it affects us all ;-)

I have  added syncmail to CVSROOT and sent a request to
have it activated. 

Should be up in 48 hrs hopefully.
I need to configure a few things once the sourceforge
lads have activated it for me.

Then we will have some 
"very pretty" automatic cvs emails indeed :-)

Cheers..

-- 
Frank Singleton				VK3FCS

Email: victor kilo three foxtrot charlie sierra at ix dot netcom dot com

[Hamlib-cvs-digest] automatic Hamlib-cvs-digest?

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

Frank,

Your commit reports are great, I'm wondering if I would have the time
to do as well each time I commit. Anyway, I was more expecting this
mailing list to *automatically* post the -m messages of the commits
of the day. 

Is it possible? Or is it something we have to add in a space cron tab
with a script of ours? 
"Your asking the moon, please hold on...."

Cheers,

-- 
Stephane					F4CFE

[Hamlib-cvs-digest] Minor update

[Frank S. <vk...@ix...>]

Hi,

General
-------

Added post_write_delay to write_block(), to cater for rigs
that cannot handle fast sequential writes without a
delay.


Files
-----

Affected all files with references to write_block, and  rig_caps
structures. Non yaesu rigs had "0" inserted as post_write_delay .
Yaesu rigs start had "5msec" setting inserted.

CVS tree compiles and tests ok.

/Frank..

-- 
Frank Singleton				VK3FCS

Email: victor kilo three foxtrot charlie sierra at ix dot netcom dot com

[Hamlib-cvs-digest] Welcome to hamlib-cvs-digest

[Frank S. <vk...@ix...>]

Hi,

Welcome to the hamlib-cvs-digest mail list.

The main purpose of this list is to allow developers and
others of the hamlib libraries to document/commment
on CVS submits to the project.

This allows one to see what has been happening with
the CVS tree. This can assist greatly when you suddenly find
perhaps something no longers compiles properly, or there
has been an API change etc..

The submissions should provide a quick summary of what has changed,
and then a short summary for each file affected.

In order for others to understand the changes,
I propose the format of the submissions should be as follows.

Here is an example..

<snip>

Hi,


Summary
-------

Allow more options for serial speed selection
and more examples  of rig_set/get.

testrig.c
--------

Added 2 more examples of set/get

retcode = rig_set_mode(my_rig, RIG_MODE_FM);
retcode = rig_get_mode(my_rig, &rmode);

serial.c
--------

Added 9600 bps as a possible speed selection.

<snip>


Look forward to lots of useful submissions :-)


/Frank.

73's de vk3fcs/km5ws

-- 


Frank Singleton				VK3FCS

Email: victor kilo three foxtrot charlie sierra at ix dot netcom dot com