patch from Mark J. Fine, plus generic code and fixes of mine

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1741 7ae35d74-ebe9-4afe-98af-79ac388436b8

jrc/jrc.c

@@ -1,8 +1,8 @@
 /*
  *  Hamlib JRC backend - main file
- *  Copyright (c) 2001-2003 by Stephane Fillod
+ *  Copyright (c) 2001-2004 by Stephane Fillod
  *
- *	$Id: jrc.c,v 1.11 2003-11-16 17:14:43 fillods Exp $
+ *	$Id: jrc.c,v 1.12 2004-05-19 08:57:45 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <string.h>  /* String function definitions */
 #include <unistd.h>  /* UNIX standard function definitions */
+#include <math.h>
 
 #include "hamlib/rig.h"
 #include "serial.h"
@@ -116,14 +117,14 @@ int jrc_close(RIG *rig)
  */
 int jrc_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 {
+		struct jrc_priv_caps *priv = (struct jrc_priv_caps*)rig->caps->priv;
 		char freqbuf[BUFSZ];
 		int freq_len;
 
-		/* max 10 digits */
+		if (freq >= (freq_t)pow(10, priv->max_freq_len))
-		if (freq >= GHz(10))
 		  return -RIG_EINVAL;
 
-		freq_len = sprintf(freqbuf, "F%10Ld" EOM, (long long)freq);
+		freq_len = sprintf(freqbuf, "F%0*Ld" EOM, priv->max_freq_len, (long long)freq);
 
 		return jrc_transaction (rig, freqbuf, freq_len, NULL, NULL);
 }
@@ -134,23 +135,26 @@ int jrc_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
  */
 int jrc_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
 {
+		struct jrc_priv_caps *priv = (struct jrc_priv_caps*)rig->caps->priv;
 		int freq_len, retval;
 		char freqbuf[BUFSZ];
 		long long f;
 
-		retval = jrc_transaction (rig, "F" EOM, 2, freqbuf, &freq_len);
+		//note: JRCs use "I" to get information
+		retval = jrc_transaction (rig, "I" EOM, 2, freqbuf, &freq_len);
 		if (retval != RIG_OK)
 		  return retval;
 				
-		if (freq_len != 12) {
+		//I command returns Iabdffffffffg<CR>
+		if (freqbuf[0] != 'I' || freq_len != priv->info_len) {
 		  rig_debug(RIG_DEBUG_ERR,"jrc_get_freq: wrong answer %s, "
 			    "len=%d\n", freqbuf, freq_len);
 		  return -RIG_ERJCTED;
 		}
-		freqbuf[freq_len-1] = '\0';
+		freqbuf[4+priv->max_freq_len] = '\0';
 
 		/* extract freq */
-		sscanf(freqbuf+1, "%llu", &f);
+		sscanf(freqbuf+4, "%llu", &f);
 		*freq = f;
 
 		return RIG_OK;
@@ -168,7 +172,7 @@ int jrc_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
 		const char *bandwidth;
 
 		switch (mode) {
-				/* FIXME: WFM, MD_AMS and ECSS modes */
+		  /* FIXME: ECSS modes */
 		case RIG_MODE_CW:       amode = MD_CW; break;
 		case RIG_MODE_USB:      amode = MD_USB; break;
 		case RIG_MODE_LSB:      amode = MD_LSB; break;
@@ -176,10 +180,10 @@ int jrc_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
 		case RIG_MODE_AM:       amode = MD_AM; break;
 		case RIG_MODE_RTTY:	amode = MD_RTTY; break;
 		case RIG_MODE_WFM:	amode = MD_WFM; break;
+		case RIG_MODE_AMS:	amode = MD_AMS; break;
 		default:
 		  rig_debug(RIG_DEBUG_ERR,
-								"jrc_set_mode: unsupported mode %d\n",
+			    "jrc_set_mode: unsupported mode %d\n", mode);
-								mode);
 		  return -RIG_EINVAL;
 		}
 
@@ -188,23 +192,89 @@ int jrc_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
 		if (retval != RIG_OK)
 		  return retval;
 
-		/*
+		if (width == RIG_PASSBAND_NORMAL)
-		 * determine passband
+			width = rig_passband_normal(rig, mode);
-		 */
+
-		if (width != RIG_PASSBAND_NORMAL && 
+		if (width <= s_Hz(1500))
-						width < rig_passband_normal(rig, mode))
+		  bandwidth = "B2" EOM; /*narr*/
-				bandwidth = "B2" EOM;	/* narrow */
+		else if (width <= s_Hz(4000))
-		else if (width != RIG_PASSBAND_NORMAL && 
+		  bandwidth = "B1" EOM; /*inter*/
-						width > rig_passband_normal(rig, mode))
+		else if (width <= s_Hz(9000))
-				bandwidth = "B0" EOM;	/* wide */
+		  bandwidth = "B0" EOM; /*wide*/
+		else if (rig->caps->rig_model == RIG_MODEL_NRD535)
+		  bandwidth = "B3" EOM; /*aux - nrd535 only*/
 		else
-				bandwidth = "B1" EOM;	/* intermediate */
+		  bandwidth = "B1" EOM; /*inter*/
 
 		retval = jrc_transaction (rig, bandwidth, 3, NULL, NULL);
 
 		return retval;
 }
 
+/*
+ * jrc_get_mode
+ * Assumes rig!=NULL, freq!=NULL
+ */
+int jrc_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
+{
+		struct jrc_priv_caps *priv = (struct jrc_priv_caps*)rig->caps->priv;
+		int freq_len, retval;
+		char freqbuf[BUFSZ];
+		char cmode;
+		char cwidth;
+		
+		//note: JRCs use "I" to get information
+		retval = jrc_transaction (rig, "I" EOM, 2, freqbuf, &freq_len);
+		if (retval != RIG_OK)
+		  return retval;
+
+		//I command returns Iabdffffffffg<CR>
+		if (freqbuf[0] != 'I' || freq_len != priv->info_len) {
+		  rig_debug(RIG_DEBUG_ERR,"jrc_get_mode: wrong answer %s, "
+			    "len=%d\n", freqbuf, freq_len);
+		  return -RIG_ERJCTED;
+		}
+
+		/* extract width and mode */
+		cwidth = freqbuf[2];
+		cmode = freqbuf[3];
+
+		switch(cwidth) {
+		case '0' : *width = s_Hz(6000); break; //wide
+		case '1' : *width = s_Hz(2000); break; //inter
+		case '2' : *width = s_Hz(1000); break; //narr
+		case '3' : *width = s_Hz(12000); break; //aux - nrd535 only
+		default:
+		  rig_debug(RIG_DEBUG_ERR,
+			    "jrc_get_mode: unsupported width %c\n",
+			    cwidth);
+		  *width = RIG_PASSBAND_NORMAL;
+		  return -RIG_EINVAL;
+		}
+
+		switch(cmode) {
+		  /* FIXME: FAX/AMS, and ECSS modes */
+		case '0' : *mode = RIG_MODE_RTTY; break;
+		case '1' : *mode = RIG_MODE_CW; break;
+		case '2' : *mode = RIG_MODE_USB; break;
+		case '3' : *mode = RIG_MODE_LSB; break;
+		case '4' : *mode = RIG_MODE_AM; break;
+		case '5' : *mode = RIG_MODE_FM; break;
+		case '6' : *mode = RIG_MODE_AMS; break;  //FAX on nrd535
+		case '7' : *mode = RIG_MODE_AMS; break;  //ECSS-USB
+		case '8' : *mode = RIG_MODE_AMS; break;  //ECSS-LSB
+		case '9' : *mode = RIG_MODE_WFM; break;  //nrd545 only
+		default:
+		  rig_debug(RIG_DEBUG_ERR,
+			    "jrc_get_mode: unsupported mode %c\n",
+			    cmode);
+		  *mode = RIG_MODE_NONE;
+		  return -RIG_EINVAL;
+		}
+
+		return RIG_OK;
+}
+
 /*
  * jrc_set_func
  * Assumes rig!=NULL
@@ -220,7 +290,7 @@ int jrc_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
 		switch (func) {
 		case RIG_FUNC_FAGC:
 				/* FIXME: FAGC levels */
-			cmd_len = sprintf(cmdbuf, "G%d" EOM, status?0:2);
+			cmd_len = sprintf(cmdbuf, "G%d" EOM, status?1:2);
 
 			return jrc_transaction (rig, cmdbuf, cmd_len, NULL, NULL);
 
@@ -263,6 +333,7 @@ int jrc_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
  */
 int jrc_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
 {
+		struct jrc_priv_caps *priv = (struct jrc_priv_caps*)rig->caps->priv;
 		int retval, func_len;
 		char funcbuf[BUFSZ];
 
@@ -272,16 +343,19 @@ int jrc_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
 		switch (func) {
 		case RIG_FUNC_FAGC:
 		  /* FIXME: FAGC levels */
-			retval = jrc_transaction (rig, "G" EOM, 2, funcbuf, &func_len);
+		  //retval = jrc_transaction (rig, "G" EOM, 2, funcbuf, &func_len);
+		  retval = jrc_transaction (rig, "I" EOM, 2, funcbuf, &func_len);
 		  if (retval != RIG_OK)
 		    return retval;
 
-			if (func_len != 3 || func_len != 6) {
+		  //if (func_len != 3 || func_len != 6) {
+		if (funcbuf[0] != 'I' || func_len != priv->info_len) {
 		    rig_debug(RIG_DEBUG_ERR,"jrc_get_func: wrong answer %s, "
 			      "len=%d\n", funcbuf, func_len);
 		    return -RIG_ERJCTED;
 		  }
-			*status = funcbuf[1] != '2';
+		  //*status = funcbuf[1] != '2';
+		  *status = funcbuf[4+priv->max_freq_len] != '2';
 		  
 		  return RIG_OK;
 
@@ -360,6 +434,7 @@ int jrc_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
  */
 int jrc_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 {
+		struct jrc_priv_caps *priv = (struct jrc_priv_caps*)rig->caps->priv;
 		int cmd_len;
 		char cmdbuf[BUFSZ];
 
@@ -393,10 +468,27 @@ int jrc_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 		  return jrc_transaction (rig, cmdbuf, cmd_len, NULL, NULL);
 
 		case RIG_LEVEL_AGC:
-			cmd_len = sprintf(cmdbuf, "NN%03d" EOM, (int)(val.f*255.0));
+		  if (val.i < 10)
+		  	cmd_len = sprintf(cmdbuf, "G%d" EOM, 
+				  val.i == RIG_AGC_SLOW ? 0 : 
+				  val.i == RIG_AGC_FAST ? 1 : 2);
+		  else
+		  	cmd_len = sprintf(cmdbuf, "G3%03d" EOM, val.i/20);
 
 		  return jrc_transaction (rig, cmdbuf, cmd_len, NULL, NULL);
 
+		case RIG_LEVEL_CWPITCH:
+		  cmd_len = sprintf(cmdbuf, "%s%+05d" EOM, priv->cw_pitch, val.i);
+
+		  return jrc_transaction (rig, cmdbuf, cmd_len, NULL, NULL);
+
+		case RIG_LEVEL_IF:
+		  if (priv->pbs_len == 3)
+			  val.i /= 10;
+
+		  cmd_len = sprintf(cmdbuf, "P%+0*d" EOM, priv->pbs_len+1, val.i);
+
+		  return jrc_transaction (rig, cmdbuf, cmd_len, NULL, NULL);
 
 		default:
 		  rig_debug(RIG_DEBUG_ERR,"Unsupported set_level %d\n", level);
@@ -413,8 +505,11 @@ int jrc_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
  */
 int jrc_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 {
+		struct jrc_priv_caps *priv = (struct jrc_priv_caps*)rig->caps->priv;
 		int retval, lvl_len, lvl;
 		char lvlbuf[BUFSZ];
+		char cwbuf[BUFSZ];
+		int cw_len;
 
 		/* Optimize:
 		 *   sort the switch cases with the most frequent first
@@ -440,11 +535,13 @@ int jrc_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 		  return -RIG_ENIMPL;	/* get_dcd ? */
 
 		case RIG_LEVEL_ATT:
-			retval = jrc_transaction (rig, "A" EOM, 2, lvlbuf, &lvl_len);
+		  //retval = jrc_transaction (rig, "A" EOM, 2, lvlbuf, &lvl_len);
+		  retval = jrc_transaction (rig, "I" EOM, 2, lvlbuf, &lvl_len);
 		  if (retval != RIG_OK)
 		    return retval;
 
-			if (lvl_len != 3) {
+		  //if (lvl_len != 3) {
+		if (lvlbuf[0] != 'I' || lvl_len != priv->info_len) {
 		    rig_debug(RIG_DEBUG_ERR,"jrc_get_level: wrong answer"
 			      "len=%d\n", lvl_len);
 		    return -RIG_ERJCTED;
@@ -521,6 +618,41 @@ int jrc_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 		  val->f = (float)lvl/255.0;
 		  break;
 
+		case RIG_LEVEL_CWPITCH:
+		  cw_len = sprintf(cwbuf, "%s" EOM, priv->cw_pitch);
+
+		  retval = jrc_transaction (rig, cwbuf, cw_len, lvlbuf, &lvl_len);
+		  if (retval != RIG_OK)
+		    return retval;
+		  
+		  if (lvl_len != cw_len+5) {
+		    rig_debug(RIG_DEBUG_ERR,"jrc_get_level: wrong answer"
+			      "len=%d\n", lvl_len);
+		    return -RIG_ERJCTED;
+		  }
+
+		  sscanf(lvlbuf+(cw_len-1), "%05d", &lvl);
+		  val->i = lvl;
+		  break;
+
+		case RIG_LEVEL_IF:
+		  retval = jrc_transaction (rig, "P" EOM, 2, lvlbuf, &lvl_len);
+		  if (retval != RIG_OK)
+		    return retval;
+		  
+		if (lvlbuf[0] != 'P' || lvl_len != priv->pbs_info_len) {
+		    rig_debug(RIG_DEBUG_ERR,"jrc_get_level: wrong answer"
+			      "len=%d\n", lvl_len);
+		    return -RIG_ERJCTED;
+		  }
+
+		  sscanf(lvlbuf+1, "%d", &lvl);
+		  if (priv->pbs_len == 3)
+		    lvl *= 10;
+
+		  val->i = lvl;
+		  break;
+
 		default:
 		  rig_debug(RIG_DEBUG_ERR,"Unsupported get_level %d\n", level);
 		  return -RIG_EINVAL;
@@ -536,6 +668,7 @@ int jrc_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
  */
 int jrc_set_parm(RIG *rig, setting_t parm, value_t val)
 {
+		struct jrc_priv_caps *priv = (struct jrc_priv_caps*)rig->caps->priv;
 		int cmd_len;
 		char cmdbuf[BUFSZ];
 		int minutes;
@@ -550,7 +683,9 @@ int jrc_set_parm(RIG *rig, setting_t parm, value_t val)
 			return jrc_transaction (rig, cmdbuf, cmd_len, NULL, NULL);
 
 		case RIG_PARM_BEEP:
-			cmd_len = sprintf(cmdbuf, "U%03d" EOM, val.i?101:100);
+
+		  //cmd_len = sprintf(cmdbuf, "U%03d" EOM, val.i?101:100);
+		  cmd_len = sprintf(cmdbuf, "U%0*d" EOM, priv->beep_len, priv->beep + val.i?1:0);
 		  
 		  return jrc_transaction (rig, cmdbuf, cmd_len, NULL, NULL);
 
@@ -569,7 +704,6 @@ int jrc_set_parm(RIG *rig, setting_t parm, value_t val)
 		return RIG_OK;
 }
 
-
 /*
  * jrc_get_parm
  * Assumes rig!=NULL, val!=NULL
@@ -589,7 +723,7 @@ int jrc_get_parm(RIG *rig, setting_t parm, value_t *val)
 		    return retval;
 		  
 		  /* "Rhhmmss"CR */
-			if (lvl_len != 7) {
+		  if (lvl_len != 8) {
 		    rig_debug(RIG_DEBUG_ERR,"jrc_get_parm: wrong answer"
 			      "len=%d\n", lvl_len);
 		    return -RIG_ERJCTED;
@@ -604,6 +738,20 @@ int jrc_get_parm(RIG *rig, setting_t parm, value_t *val)
 		             10*lvlbuf[5] + lvlbuf[6];	/* secondes */
 		  break;
 		  
+		case RIG_PARM_BEEP:
+		  retval = jrc_transaction (rig, "U9" EOM, 3, lvlbuf, &lvl_len);
+		  if (retval != RIG_OK)
+		    return retval;
+		  
+		  if (lvl_len != 4) {
+		    rig_debug(RIG_DEBUG_ERR,"jrc_get_parm: wrong answer"
+			      "len=%d\n", lvl_len);
+		    return -RIG_ERJCTED;
+		  }
+
+		  val->i = lvlbuf[2] == 0 ? 0 : 1;
+		  break;
+		  
 		default:
 		  rig_debug(RIG_DEBUG_ERR,"Unsupported get_parm %d\n", parm);
 		  return -RIG_EINVAL;
@@ -697,7 +845,7 @@ int jrc_set_mem(RIG *rig, vfo_t vfo, int ch)
 		char membuf[BUFSZ];
 		int cmd_len, mem_len;
 
-		if (ch < 0 || ch > 999)
+		if (ch < 0 || ch > rig->caps->chan_list[0].end)
 		  return -RIG_EINVAL;
 
 		cmd_len = sprintf(cmdbuf, "C%03u" EOM, ch);
@@ -707,6 +855,35 @@ int jrc_set_mem(RIG *rig, vfo_t vfo, int ch)
 		return jrc_transaction (rig, cmdbuf, cmd_len, membuf, &mem_len);
 }
 
+/*
+ * jrc_get_mem
+ * Assumes rig!=NULL
+ */
+int jrc_get_mem(RIG *rig, vfo_t vfo, int *ch)
+{
+		struct jrc_priv_caps *priv = (struct jrc_priv_caps*)rig->caps->priv;
+		int mem_len, retval;
+		char membuf[BUFSZ];
+		int chan;
+
+		retval = jrc_transaction (rig, "L" EOM, 2, membuf, &mem_len);
+		if (retval != RIG_OK)
+		  return retval;
+
+		if (mem_len != priv->mem_len) {
+		  rig_debug(RIG_DEBUG_ERR,"jrc_get_mem: wrong answer %s, "
+			    "len=%d\n", membuf, mem_len);
+		  return -RIG_ERJCTED;
+		}
+		membuf[4] = '\0';
+
+		/*extract current channel*/
+		sscanf(membuf+1, "%d", &chan);
+		*ch = chan;
+
+		return RIG_OK;
+}
+
 /*
  * jrc_vfo_op
  * Assumes rig!=NULL
@@ -804,6 +981,7 @@ static int jrc2rig_mode(RIG *rig, char jmode, char jwidth,
  */
 int jrc_decode_event(RIG *rig)
 {
+		struct jrc_priv_caps *priv = (struct jrc_priv_caps*)rig->caps->priv;
 		struct rig_state *rs;
 		freq_t freq;
 		rmode_t mode;
@@ -816,9 +994,10 @@ int jrc_decode_event(RIG *rig)
 		rs = &rig->state;
 
 		/* "Iabdfg"CR */
-#define SETUP_STATUS_LEN 17
+		//#define SETUP_STATUS_LEN 17
 
-		count = read_string(&rs->rigport, buf, SETUP_STATUS_LEN, "", 0);
+		//count = read_string(&rs->rigport, buf, SETUP_STATUS_LEN, "", 0);
+		count = read_string(&rs->rigport, buf, priv->info_len, "", 0);
 		if (count < 0) {
 		  return count;
 		}
@@ -837,7 +1016,8 @@ int jrc_decode_event(RIG *rig)
 		if (rig->callbacks.freq_event) {
 		  long long f;
 		  
-			buf[14] = '\0';	/* side-effect: destroy AGC first digit! */
+		  //buf[14] = '\0';	/* side-effect: destroy AGC first digit! */
+		  buf[4+priv->max_freq_len] = '\0';	/* side-effect: destroy AGC first digit! */
 		  sscanf(buf+4, "%lld", &f);
 		  freq = f;
 		  return rig->callbacks.freq_event(rig, RIG_VFO_CURR, freq,

jrc/jrc.h

@@ -1,8 +1,8 @@
 /*
  *  Hamlib JRC backend - main header
- *  Copyright (c) 2001-2003 by Stephane Fillod
+ *  Copyright (c) 2001-2004 by Stephane Fillod
  *
- *	$Id: jrc.h,v 1.6 2003-11-16 17:14:43 fillods Exp $
+ *	$Id: jrc.h,v 1.7 2004-05-19 08:57:50 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -25,11 +25,23 @@
 
 #include <hamlib/rig.h>
 
+struct jrc_priv_caps {
+	int max_freq_len;
+	int info_len;
+	int mem_len;
+	int pbs_info_len;
+	int pbs_len;
+	int beep;
+	int beep_len;
+	const char * cw_pitch;
+};
+
 int jrc_open(RIG *rig);
 int jrc_close(RIG *rig);
 int jrc_set_freq(RIG *rig, vfo_t vfo, freq_t freq);
 int jrc_get_freq(RIG *rig, vfo_t vfo, freq_t *freq);
 int jrc_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width);
+int jrc_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width);
 int jrc_set_func(RIG *rig, vfo_t vfo, setting_t func, int status);
 int jrc_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status);
 int jrc_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
@@ -39,6 +51,7 @@ int jrc_get_parm(RIG *rig, setting_t parm, value_t *val);
 int jrc_get_dcd(RIG *rig, vfo_t vfo, dcd_t *dcd);
 int jrc_set_trn(RIG *rig, int trn);
 int jrc_set_mem(RIG *rig, vfo_t vfo, int ch);
+int jrc_get_mem(RIG *rig, vfo_t vfo, int *ch);
 int jrc_set_powerstat(RIG *rig, powerstat_t status);
 int jrc_reset(RIG *rig, reset_t reset);
 int jrc_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op);

jrc/nrd535.c

@@ -1,8 +1,8 @@
 /*
  *  Hamlib JRC backend - NRD-535 DSP description
- *  Copyright (c) 2001-2003 by Stephane Fillod
+ *  Copyright (c) 2001-2004 by Stephane Fillod
  *
- *	$Id: nrd535.c,v 1.2 2003-12-08 08:39:05 fillods Exp $
+ *	$Id: nrd535.c,v 1.3 2004-05-19 08:57:50 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -33,12 +33,12 @@
 
 #define NRD535_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_SSB|RIG_MODE_FM|RIG_MODE_RTTY)	/* + FAX */
 
-#define NRD535_FUNC (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_LOCK|RIG_FUNC_ABM|RIG_FUNC_BC|RIG_FUNC_NR)
+#define NRD535_FUNC (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_ABM)
 
-#define NRD535_LEVEL (RIG_LEVEL_SQLSTAT|RIG_LEVEL_RAWSTR|RIG_LEVEL_RF|RIG_LEVEL_AF|RIG_LEVEL_AGC|RIG_LEVEL_IF|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|RIG_LEVEL_SQL)
+#define NRD535_LEVEL (RIG_LEVEL_RAWSTR|RIG_LEVEL_ATT|RIG_LEVEL_IF|RIG_LEVEL_AGC|RIG_LEVEL_CWPITCH)
 
 /* FIXME: add more from "U" command */
-#define NRD535_PARM (RIG_PARM_TIME|RIG_PARM_BACKLIGHT|RIG_PARM_BEEP)
+#define NRD535_PARM (RIG_PARM_TIME|RIG_PARM_BEEP)
 
 #define NRD535_VFO (RIG_VFO_A)
 
@@ -66,20 +66,32 @@
 	.freq = 1,	\
 	.mode = 1,	\
 	.width = 1,	\
+	.funcs = RIG_FUNC_FAGC, \
 	.levels = RIG_LEVEL_ATT|RIG_LEVEL_AGC, \
 } 
 
+static const struct jrc_priv_caps nrd535_priv_caps = {
+	.max_freq_len = 8,
+	.info_len = 14,
+	.mem_len = 17,
+	.pbs_info_len = 7,
+	.pbs_len = 4,
+	.beep = 90,
+	.beep_len = 2,
+	.cw_pitch = "U2"
+};
+
 /*
  * NRD-535 rig capabilities.
  *
  */
 const struct rig_caps nrd535_caps = {
 .rig_model =  RIG_MODEL_NRD535,
-.model_name = "NRD-535 DSP",
+.model_name = "NRD-535D",
 .mfg_name =  "JRC",
-.version =  "0.1",
+.version =  "0.2",
 .copyright =  "LGPL",
-.status =  RIG_STATUS_UNTESTED,
+.status =  RIG_STATUS_ALPHA,
 .rig_type =  RIG_TYPE_RECEIVER,
 .ptt_type =  RIG_PTT_NONE,
 .dcd_type =  RIG_DCD_NONE,
@@ -91,7 +103,7 @@ const struct rig_caps nrd535_caps = {
 .serial_parity =  RIG_PARITY_NONE,
 .serial_handshake =  RIG_HANDSHAKE_NONE,
 .write_delay =  0,
-.post_write_delay =  0,
+.post_write_delay =  10,
 .timeout =  200,
 .retry =  3,
 
@@ -118,6 +130,7 @@ const struct rig_caps nrd535_caps = {
 .scan_ops =  RIG_SCAN_STOP|RIG_SCAN_SLCT,
 .bank_qty =   0,
 .chan_desc_sz =  0,
+.priv = (void*)&nrd535_priv_caps,
 
 .chan_list =  {
 			{ 0, 199, RIG_MTYPE_MEM, NRD535_MEM_CAP },
@@ -143,10 +156,10 @@ const struct rig_caps nrd535_caps = {
 	},
         /* mode/filter list, .remember =  order matters! */
 .filters =  {
-		{RIG_MODE_AM|RIG_MODE_FM, kHz(12)},
+		{RIG_MODE_FM, kHz(12)},
 		{NRD535_MODES, kHz(2)},
 		{NRD535_MODES, kHz(1)},
-		{NRD535_MODES, kHz(4)},
+		{NRD535_MODES, kHz(6)},
 		RIG_FLT_END,
 	},
 .str_cal = NRD535_STR_CAL,
@@ -156,6 +169,7 @@ const struct rig_caps nrd535_caps = {
 .set_freq =  jrc_set_freq,
 .get_freq =  jrc_get_freq,
 .set_mode =  jrc_set_mode,
+.get_mode =  jrc_get_mode,
 .set_func =  jrc_set_func,
 .get_func =  jrc_get_func,
 .set_level =  jrc_set_level,
@@ -166,6 +180,7 @@ const struct rig_caps nrd535_caps = {
 .set_trn =  jrc_set_trn,
 .reset =  jrc_reset,
 .set_mem =  jrc_set_mem,
+.get_mem =  jrc_get_mem,
 .vfo_op =  jrc_vfo_op,
 .scan =  jrc_scan,
 .set_powerstat =  jrc_set_powerstat,

jrc/nrd545.c

@@ -1,8 +1,8 @@
 /*
  *  Hamlib JRC backend - NRD-545 DSP description
- *  Copyright (c) 2001-2003 by Stephane Fillod
+ *  Copyright (c) 2001-2004 by Stephane Fillod
  *
- *	$Id: nrd545.c,v 1.7 2003-12-08 08:39:06 fillods Exp $
+ *	$Id: nrd545.c,v 1.8 2004-05-19 08:57:50 fillods Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -35,7 +35,7 @@
 
 #define NRD545_FUNC (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_LOCK|RIG_FUNC_ABM|RIG_FUNC_BC|RIG_FUNC_NR)
 
-#define NRD545_LEVEL (RIG_LEVEL_SQLSTAT|RIG_LEVEL_RAWSTR|RIG_LEVEL_RF|RIG_LEVEL_AF|RIG_LEVEL_AGC|RIG_LEVEL_IF|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|RIG_LEVEL_SQL)
+#define NRD545_LEVEL (RIG_LEVEL_SQLSTAT|RIG_LEVEL_RAWSTR|RIG_LEVEL_ATT|RIG_LEVEL_RF|RIG_LEVEL_AF|RIG_LEVEL_AGC|RIG_LEVEL_IF|RIG_LEVEL_NR|RIG_LEVEL_NOTCHF|RIG_LEVEL_SQL|RIG_LEVEL_IF|RIG_LEVEL_CWPITCH)
 
 /* FIXME: add more from "U" command */
 #define NRD545_PARM (RIG_PARM_TIME|RIG_PARM_BACKLIGHT|RIG_PARM_BEEP)
@@ -50,6 +50,29 @@
 		{ 255, 60 }, \
 	} }
 
+/*
+ * channel caps.
+ */
+#define NRD545_MEM_CAP {	\
+	.freq = 1,	\
+	.mode = 1,	\
+	.width = 1,	\
+	.levels = RIG_LEVEL_ATT|RIG_LEVEL_AGC, \
+} 
+
+
+static const struct jrc_priv_caps nrd545_priv_caps = {
+	.max_freq_len = 10,
+	.info_len = 18,
+	.mem_len = 21,
+	.pbs_info_len = 6,
+	.pbs_len = 3,
+	.beep = 100,
+	.beep_len = 3,
+	.cw_pitch = "U14"
+};
+
+
 /*
  * NRD-545 rig capabilities.
  *
@@ -58,7 +81,7 @@ const struct rig_caps nrd545_caps = {
 .rig_model =  RIG_MODEL_NRD545,
 .model_name = "NRD-545 DSP",
 .mfg_name =  "JRC",
-.version =  "0.1",
+.version =  "0.2",
 .copyright =  "LGPL",
 .status =  RIG_STATUS_UNTESTED,
 .rig_type =  RIG_TYPE_RECEIVER,
@@ -99,9 +122,10 @@ const struct rig_caps nrd545_caps = {
 .scan_ops =  RIG_SCAN_STOP|RIG_SCAN_SLCT,
 .bank_qty =   0,
 .chan_desc_sz =  0,
+.priv = (void*)&nrd545_priv_caps,
 
 .chan_list =  {
-			{ 0, 999, RIG_MTYPE_MEM },
+		{ 0, 999, RIG_MTYPE_MEM, NRD545_MEM_CAP },
 		RIG_CHAN_END,
 	},
 
@@ -144,6 +168,7 @@ const struct rig_caps nrd545_caps = {
 .set_freq =  jrc_set_freq,
 .get_freq =  jrc_get_freq,
 .set_mode =  jrc_set_mode,
+.get_mode =  jrc_get_mode,
 .set_func =  jrc_set_func,
 .get_func =  jrc_get_func,
 .set_level =  jrc_set_level,
@@ -154,6 +179,7 @@ const struct rig_caps nrd545_caps = {
 .set_trn =  jrc_set_trn,
 .reset =  jrc_reset,
 .set_mem =  jrc_set_mem,
+.get_mem =  jrc_get_mem,
 .vfo_op =  jrc_vfo_op,
 .scan =  jrc_scan,
 .set_powerstat =  jrc_set_powerstat,