mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Replace RIG_LEVEL_VOX with RIG_LEVEL_VOXDELAY

pull/224/head
Michael Black 2020-03-24 10:02:17 -05:00
rodzic 86159408a4
commit 9d8ddd4582
10 zmienionych plików z 18 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
include/hamlib/rig.h
Wyświetl plik

@ -737,7 +737,7 @@ enum rig_level_e {
RIG_LEVEL_NONE = 0, /*!< '' -- No Level */
RIG_LEVEL_PREAMP = (1 << 0), /*!< \c PREAMP -- Preamp, arg int (dB) */
RIG_LEVEL_ATT = (1 << 1), /*!< \c ATT -- Attenuator, arg int (dB) */
RIG_LEVEL_VOX = (1 << 2), /*!< \c VOX -- VOX delay, arg int (tenth of seconds) */
RIG_LEVEL_VOXDELAY = (1 << 2), /*!< \c VOXDELAY -- VOX delay, arg int (tenth of seconds) */
RIG_LEVEL_AF = (1 << 3), /*!< \c AF -- Volume, arg float [0.0 ... 1.0] */
RIG_LEVEL_RF = (1 << 4), /*!< \c RF -- RF gain (not TX power), arg float [0.0 ... 1.0] */
RIG_LEVEL_SQL = (1 << 5), /*!< \c SQL -- Squelch, arg float [0.0 ... 1.0] */
@ -757,7 +757,6 @@ enum rig_level_e {
RIG_LEVEL_BALANCE = (1 << 19), /*!< \c BAL -- Balance (Dual Watch), arg float [0.0 ... 1.0] */
RIG_LEVEL_METER = (1 << 20), /*!< \c METER -- Display meter, arg int (see enum meter_level_e) */
RIG_LEVEL_VOXGAIN = (1 << 21), /*!< \c VOXGAIN -- VOX gain level, arg float [0.0 ... 1.0] */
RIG_LEVEL_VOXDELAY = RIG_LEVEL_VOX, /*!< Synonym of RIG_LEVEL_VOX */
RIG_LEVEL_ANTIVOX = (1 << 22), /*!< \c ANTIVOX -- anti-VOX level, arg float [0.0 ... 1.0] */
RIG_LEVEL_SLOPE_LOW = (1 << 23), /*!< \c SLOPE_LOW -- Slope tune, low frequency cut, */
RIG_LEVEL_SLOPE_HIGH = (1 << 24), /*!< \c SLOPE_HIGH -- Slope tune, high frequency cut, */

4
rigs/kenwood/pihpsdr.c
Wyświetl plik

@ -38,7 +38,7 @@
#define PIHPSDR_FUNC_ALL (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_BC|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_ANF|RIG_FUNC_COMP)
#define PIHPSDR_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_VOX|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_COMP|RIG_LEVEL_AGC|RIG_LEVEL_BKINDL|RIG_LEVEL_METER|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH)
#define PIHPSDR_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_VOXDELAY|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_COMP|RIG_LEVEL_AGC|RIG_LEVEL_BKINDL|RIG_LEVEL_METER|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH)
#define PIHPSDR_MAINVFO (RIG_VFO_A|RIG_VFO_B)
#define PIHPSDR_SUBVFO (RIG_VFO_C)
@ -995,7 +995,7 @@ int pihpsdr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_VOX:
case RIG_LEVEL_VOXDELAY:
retval = kenwood_transaction(rig, "VD", lvlbuf, sizeof(lvlbuf));
if (retval != RIG_OK)

2
rigs/kenwood/trc80.c
Wyświetl plik

@ -40,7 +40,7 @@
#define TRC80_LEVEL_ALL (RIG_LEVEL_STRENGTH|RIG_LEVEL_AF|RIG_LEVEL_MICGAIN|\
RIG_LEVEL_RFPOWER|RIG_LEVEL_CWPITCH|RIG_LEVEL_BKIN_DLYMS|\
RIG_LEVEL_SQL|RIG_LEVEL_VOX)
RIG_LEVEL_SQL|RIG_LEVEL_VOXDELAY)
#define TRC80_PARMS (RIG_PARM_NONE)

4
rigs/kenwood/ts2000.c
Wyświetl plik

@ -35,7 +35,7 @@
#define TS2000_FUNC_ALL (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_BC|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_ANF|RIG_FUNC_COMP)
#define TS2000_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_VOX|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_COMP|RIG_LEVEL_AGC|RIG_LEVEL_BKINDL|RIG_LEVEL_METER|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH)
#define TS2000_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_VOXDELAY|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_COMP|RIG_LEVEL_AGC|RIG_LEVEL_BKINDL|RIG_LEVEL_METER|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH)
#define TS2000_MAINVFO (RIG_VFO_A|RIG_VFO_B)
#define TS2000_SUBVFO (RIG_VFO_C)
@ -878,7 +878,7 @@ int ts2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_VOX:
case RIG_LEVEL_VOXDELAY:
retval = kenwood_transaction(rig, "VD", lvlbuf, sizeof(lvlbuf));
if (retval != RIG_OK)

4
rigs/kenwood/ts990s.c
Wyświetl plik

@ -41,7 +41,7 @@
#define TS2000_FUNC_ALL (RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_BC|RIG_FUNC_NB|RIG_FUNC_NR|RIG_FUNC_ANF|RIG_FUNC_COMP)
#define TS2000_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_VOX|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_COMP|RIG_LEVEL_AGC|RIG_LEVEL_BKINDL|RIG_LEVEL_METER|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH)
#define TS2000_LEVEL_ALL (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_VOXDELAY|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_SQL|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_COMP|RIG_LEVEL_AGC|RIG_LEVEL_BKINDL|RIG_LEVEL_METER|RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH)
#define TS990S_VFO_OP (RIG_OP_BAND_UP|RIG_OP_BAND_DOWN)
#define TS990S_SCAN_OP (RIG_SCAN_VFO)
@ -437,7 +437,7 @@ int ts990s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
}
break;
case RIG_LEVEL_VOX:
case RIG_LEVEL_VOXDELAY:
retval = kenwood_safe_transaction(rig, "VD0", lvlbuf, sizeof(lvlbuf), 6);
if (retval != RIG_OK)

6
rigs/tentec/orion.c
Wyświetl plik

@ -1063,7 +1063,7 @@ const char *tt565_get_info(RIG *rig)
* \n -RIG_LEVEL_CWPITCH, int Hz
* \n -RIG_LEVEL_KEYSPD, int wpm
* \n -RIG_LEVEL_NR, noise reduction/blank, float 0.0 - 1.0
* \n -RIG_LEVEL_VOX, vox delay, float x 1/10 second
* \n -RIG_LEVEL_VOXDELAY, vox delay, float x 1/10 second
* \n -RIG_LEVEL_VOXGAIN, float 0.0 - 1.0
* \n -RIG_LEVEL_ANTIVOX, float 0.0 - 1.0
*
@ -1206,7 +1206,7 @@ int tt565_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
(int)(val.f * 9));
break;
case RIG_LEVEL_VOX:
case RIG_LEVEL_VOXDELAY:
/* VOX delay, float tenths of seconds */
cmd_len = sprintf(cmdbuf, "*TH%4.2f" EOM, 0.1 * val.f);
break;
@ -1649,7 +1649,7 @@ int tt565_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
val->f = atof(lvlbuf + 5) / 9.0; /* Note 0-9 -> 0.0 - 1.0 */
break;
case RIG_LEVEL_VOX: /* =VOXDELAY, tenths of secs. */
case RIG_LEVEL_VOXDELAY: /* =VOXDELAY, tenths of secs. */
lvl_len = sizeof(lvlbuf);
retval = tt565_transaction(rig, "?TH" EOM, 4, lvlbuf, &lvl_len);

2
rigs/tentec/orion.h
Wyświetl plik

@ -103,7 +103,7 @@ struct tt565_priv_data {
RIG_LEVEL_RF|RIG_LEVEL_NR| \
RIG_LEVEL_MICGAIN| \
RIG_LEVEL_AF|RIG_LEVEL_AGC| \
RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOX|RIG_LEVEL_ANTIVOX| \
RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_ANTIVOX| \
RIG_LEVEL_COMP|RIG_LEVEL_PREAMP| \
RIG_LEVEL_SWR|RIG_LEVEL_ATT)

2
rigs/tentec/pegasus.c
Wyświetl plik

@ -39,7 +39,7 @@
#define TT550_LEVELS (RIG_LEVEL_AGC|RIG_LEVEL_AF|RIG_LEVEL_RAWSTR|RIG_LEVEL_STRENGTH| \
RIG_LEVEL_RF|RIG_LEVEL_COMP|RIG_LEVEL_VOX|RIG_LEVEL_SQL| \
RIG_LEVEL_RF|RIG_LEVEL_COMP|RIG_LEVEL_VOXDELAY|RIG_LEVEL_SQL| \
RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD| \
RIG_LEVEL_SWR|RIG_LEVEL_ATT|RIG_LEVEL_NR|RIG_LEVEL_IF| \
RIG_LEVEL_VOXGAIN|RIG_LEVEL_ANTIVOX)

4
rigs/tentec/tt550.c
Wyświetl plik

@ -1141,7 +1141,7 @@ tt550_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
return retval;
case RIG_LEVEL_VOX:
case RIG_LEVEL_VOXDELAY:
cmd_len = sprintf(cmdbuf, "UH%c" EOM, (int)(val.f * 255));
retval = write_block(&rs->rigport, cmdbuf, cmd_len);
@ -1317,7 +1317,7 @@ tt550_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
val->f = priv->voxgain;
break;
case RIG_LEVEL_VOX:
case RIG_LEVEL_VOXDELAY:
val->f = priv->voxdelay;
break;

6
rigs/yaesu/newcat.c
Wyświetl plik

@ -2923,7 +2923,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
cat_term);
break;
case RIG_LEVEL_VOX:
case RIG_LEVEL_VOXDELAY:
if (!newcat_valid_command(rig, "VD"))
{
return -RIG_ENAVAIL;
@ -3231,7 +3231,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
cat_term);
break;
case RIG_LEVEL_VOX:
case RIG_LEVEL_VOXDELAY:
/* VOX delay, arg int (tenth of seconds) */
if (!newcat_valid_command(rig, "VD"))
@ -3442,7 +3442,7 @@ int newcat_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
break;
case RIG_LEVEL_VOX:
case RIG_LEVEL_VOXDELAY:
/* VOX delay, arg int (tenth of seconds), 100ms intervals */
val->i = atoi(retlvl) / 100;
break;