Bug fixes and slope tuning support for the TS-850.

Thanks to Rob Frohne, KL7NA


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

include/hamlib/rig.h

@@ -2,7 +2,7 @@
  *  Hamlib Interface - API header
  *  Copyright (c) 2000-2005 by Stephane Fillod and Frank Singleton
  *
- *	$Id: rig.h,v 1.121 2007-02-28 08:52:49 mardigras Exp $
+ *	$Id: rig.h,v 1.122 2007-08-18 12:55:46 n0nb 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
@@ -605,6 +605,8 @@ enum rig_level_e {
 	RIG_LEVEL_VOXGAIN =	(1<<21),/*!< VOX gain level, arg float [0.0 .. 1.0] */
 	RIG_LEVEL_VOXDELAY =  RIG_LEVEL_VOX,	/*!< VOX delay, arg int (tenth of seconds) */
 	RIG_LEVEL_ANTIVOX =	(1<<22),/*!< anti-VOX level, arg float [0.0 .. 1.0] */
+	RIG_LEVEL_SLOPE_LOW = (1<<23),/*!<Slope tune, low frequency cut, */
+	RIG_LEVEL_SLOPE_HIGH = (1<<24),/*!<Slope tune, high frequency cut, */
 	//RIG_LEVEL_LINEOUT =	(1<<23),/*!< Lineout Volume, arg float [0.0 .. 1.0] */
 
 		/*!< These ones are not settable */
@@ -612,7 +614,7 @@ enum rig_level_e {
 	RIG_LEVEL_SQLSTAT =	(1<<27),/*!< SQL status, arg int (open=1/closed=0). Deprecated, use get_dcd instead */
 	RIG_LEVEL_SWR =		(1<<28),/*!< SWR, arg float [0.0..infinite] */
 	RIG_LEVEL_ALC =		(1<<29),/*!< ALC, arg float */
-	RIG_LEVEL_STRENGTH =	(1<<30) /*!< Effective (calibrated) signal strength relative to S9, arg int (dB) */
+	RIG_LEVEL_STRENGTH =(1<<30) /*!< Effective (calibrated) signal strength relative to S9, arg int (dB) */
 	/*RIG_LEVEL_BWC =		(1<<31)*/ /*!< Bandwidth Control, arg int (Hz) */
 };
 
@@ -733,8 +735,8 @@ typedef enum {
 	RIG_MODE_FAX =          (1<<15),/*!< Facsimile Mode */
 	RIG_MODE_SAM =          (1<<16),/*!< Synchronous AM double sideband */
 	RIG_MODE_SAL =          (1<<17),/*!< Synchronous AM lower sideband */
-	RIG_MODE_SAH =          (1<<18) /*!< Synchronous AM upper (higher) sideband */
+	RIG_MODE_SAH =          (1<<18), /*!< Synchronous AM upper (higher) sideband */
-
+	RIG_MODE_DSB =			(1<<19) /*!< Double sideband suppressed carrier */
 } rmode_t;
 
 /** \brief macro for backends, no to be used by rig_set_mode et al. */

kenwood/kenwood.c

@@ -2,7 +2,7 @@
  *  Hamlib Kenwood backend - main file
  *  Copyright (c) 2000-2005 by Stephane Fillod and others
  *
- *	$Id: kenwood.c,v 1.93 2006-04-10 18:00:38 pa4tu Exp $
+ *	$Id: kenwood.c,v 1.94 2007-08-18 12:55:46 n0nb 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
@@ -167,7 +167,7 @@ transaction_write:
         return RIG_OK;  /* don't want a reply */
     }
 
-    memset(data,0,*datasize);
+    memset(data,0,(*datasize)-1);
     retval = read_string(&rs->rigport, data, *datasize, cmdtrm, strlen(cmdtrm));
     if (retval < 0) {
         if (retry_read++ < rig->state.rigport.retry)
@@ -626,6 +626,22 @@ int kenwood_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 				level_len = sprintf(levelbuf, "RA00;");
 		break;
 
+	case RIG_LEVEL_SLOPE_HIGH:
+		if(val.i>20 || val.i < 0)
+			return -RIG_EINVAL;
+		ack_len=0;
+		level_len = sprintf(levelbuf,"SH%02d;",(val.i));
+		return  kenwood_transaction (rig, levelbuf, level_len, ackbuf, &ack_len);
+		break;
+		
+	case RIG_LEVEL_SLOPE_LOW:
+			if(val.i>20 || val.i < 0)
+			return -RIG_EINVAL;
+		ack_len=0;
+		level_len = sprintf(levelbuf,"SL%02d;",(val.i));
+		return  kenwood_transaction (rig, levelbuf, level_len, ackbuf, &ack_len);
+		break;
+		
 	default:
 		rig_debug(RIG_DEBUG_ERR,"Unsupported set_level %d", level);
 		return -RIG_EINVAL;
@@ -701,7 +717,7 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
 		/* Frontend expects:  -54 = S0, 0 = S9  */
 		if (level==RIG_LEVEL_STRENGTH)
-			val->i = (val->i * 4) - 54;
+			val->i = (val->i * 4) - 54; // There is a better way of doing this with a calibration table.  See ts850.c.
 		break;
 
 	case RIG_LEVEL_ATT:
@@ -754,7 +770,24 @@ int kenwood_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 		else if (agclevel < 170) val->i = 2;
 		else if (agclevel <= 255) val->i = 3;
 		return ret;
-
+	case RIG_LEVEL_SLOPE_LOW:
+		lvl_len = 50;
+		retval = kenwood_transaction (rig, "SL;", 3, lvlbuf, &lvl_len);
+		if (retval != RIG_OK)
+			return retval;
+		lvlbuf[4]='\0';
+		val->i=atoi(&lvlbuf[2]);
+		break;
+		
+	case RIG_LEVEL_SLOPE_HIGH:
+		lvl_len = 50;
+		retval = kenwood_transaction (rig, "SH;", 3, lvlbuf, &lvl_len);
+		if (retval != RIG_OK)
+			return retval;
+		lvlbuf[4]='\0';
+		val->i=atoi(&lvlbuf[2]);
+		break;
+		
 	case RIG_LEVEL_PREAMP:
 	case RIG_LEVEL_IF:
 	case RIG_LEVEL_APF:
@@ -832,7 +865,7 @@ int kenwood_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
 	case RIG_FUNC_LOCK:
 		fct_len = sprintf(fctbuf,"LK%c;", (0==status)?'0':'1');
 		return kenwood_transaction (rig, fctbuf, fct_len, ackbuf, &ack_len);
-
+		
 	default:
 		rig_debug(RIG_DEBUG_ERR,"Unsupported set_func %#x", func);
 		return -RIG_EINVAL;

src/settings.c

@@ -16,7 +16,7 @@
  *  Hamlib Interface - func/level/parm
  *  Copyright (c) 2000-2006 by Stephane Fillod
  *
- *	$Id: settings.c,v 1.8 2006-10-15 00:27:52 aa6e Exp $
+ *	$Id: settings.c,v 1.9 2007-08-18 12:55:46 n0nb 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
@@ -146,9 +146,10 @@ int HAMLIB_API rig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 	 * Special case(frontend emulation): calibrated S-meter reading
 	 */
 	if (level == RIG_LEVEL_STRENGTH && 
-			(caps->has_get_level & RIG_LEVEL_STRENGTH) == 0 &&
+			(caps->has_get_level & RIG_LEVEL_STRENGTH) &&
 			rig_has_get_level(rig,RIG_LEVEL_RAWSTR)) {
 
+	
 		value_t rawstr;
 		retcode = rig_get_level(rig, vfo, RIG_LEVEL_RAWSTR, &rawstr);
 		if (retcode != RIG_OK)

tests/rigctl.1

@@ -231,11 +231,11 @@ Get func status.
 Set level/value:
 PREAMP, ATT, VOX, AF, RF, SQL, IF, APF, NR, PBT_IN,
 PBT_OUT, CWPITCH, RFPOWER, MICGAIN, KEYSPD, NOTCHF, COMP,
-AGC, BKINDL, BAL, METER, VOXGAIN, ANTIVOX. Plus "extra" levels.
+AGC, BKINDL, BAL, METER, VOXGAIN, ANTIVOX. SLOPE_LOW, SLOPE_HIGH, Plus "extra" levels.
 .TP
 .B l, get_level
 Get level value: also
-SWR, ALC, STRENGTH, RAWSTR.
+SWR, ALC, STRENGTH, RAWSTR, SLOPE_LOW, SLOPE_HIGH.
 .TP
 .B P, set_parm
 Set parm/value: