From 6d034c941f9ed6cad0940543fb46eb0d3de8b3be Mon Sep 17 00:00:00 2001 From: Michael Black Date: Tue, 24 Mar 2020 09:36:36 -0500 Subject: [PATCH 1/7] Remove copy of RIG_LEVEL settings in ar7030.c --- rigs/aor/ar7030.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/rigs/aor/ar7030.c b/rigs/aor/ar7030.c index b1976538a..b046e93e8 100644 --- a/rigs/aor/ar7030.c +++ b/rigs/aor/ar7030.c @@ -504,46 +504,6 @@ static int ar7030_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width) } - -/*! - RIG_LEVEL_NONE = 0, < None - RIG_LEVEL_PREAMP = (1<<0), < Preamp, arg int (dB) - RIG_LEVEL_ATT = (1<<1), < Attenuator, arg int (dB) - RIG_LEVEL_VOX = (1<<2), < VOX delay, arg int (tenth of seconds) -af_vol RIG_LEVEL_AF = (1<<3), < Volume, arg float [0.0..1.0] -rfgain RIG_LEVEL_RF = (1<<4), < RF gain (not TX power), arg float [-0.4..0.0..0.1 > -40..0..10 dB] -sqlval RIG_LEVEL_SQL = (1<<5), < Squelch, arg float [0.0 .. 1.0] - RIG_LEVEL_IF = (1<<6), < IF, arg int (Hz) - RIG_LEVEL_APF = (1<<7), < APF, arg float [0.0 .. 1.0] - RIG_LEVEL_NR = (1<<8), < Noise Reduction, arg float [0.0 .. 1.0] - RIG_LEVEL_PBT_IN = (1<<9), < Twin PBT (inside), arg float [0.0 .. 1.0] - RIG_LEVEL_PBT_OUT = (1<<10),< Twin PBT (outside), arg float [0.0 .. 1.0] -bfoval RIG_LEVEL_CWPITCH = (1<<11),< CW pitch, arg int (Hz) - RIG_LEVEL_RFPOWER = (1<<12),< RF Power, arg float [0.0 .. 1.0] - RIG_LEVEL_MICGAIN = (1<<13),< MIC Gain, arg float [0.0 .. 1.0] - RIG_LEVEL_KEYSPD = (1<<14),< Key Speed, arg int (WPM) - RIG_LEVEL_NOTCHF = (1<<15),< Notch Freq., arg int (Hz) - RIG_LEVEL_COMP = (1<<16),< Compressor, arg float [0.0 .. 1.0] -agcspd RIG_LEVEL_AGC = (1<<17),< AGC, arg int (see enum agc_level_e) - Current AGC speed : 0 = Fast 2 = Slow 1 = Medium 3 = Off. - RIG_LEVEL_BKINDL = (1<<18),< BKin Delay, arg int (tenth of dots) - RIG_LEVEL_BALANCE = (1<<19),< Balance (Dual Watch), arg float [0.0 .. 1.0] - RIG_LEVEL_METER = (1<<20),< Display meter, arg int (see enum meter_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_LINEOUT = (1<<23),< Lineout Volume, arg float [0.0 .. 1.0] - - < These ones are not settable -Rou.14 RIG_LEVEL_RAWSTR = (1<<26),< Raw (A/D) value for signal strength, specific to each rig, arg int - 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 - RIG_LEVEL_ALC = (1<<29),< ALC, arg float -smval 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) -*/ static int ar7030_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { switch (level) From 73b4257cfb28187f468260ce7006764531c35647 Mon Sep 17 00:00:00 2001 From: Michael Black Date: Tue, 24 Mar 2020 09:58:04 -0500 Subject: [PATCH 2/7] cppcheck-suppress rigctlcom.c --- tests/rigctlcom.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/rigctlcom.c b/tests/rigctlcom.c index 047a9d128..6c568fdb5 100644 --- a/tests/rigctlcom.c +++ b/tests/rigctlcom.c @@ -715,6 +715,7 @@ static int handle_ts2000(void *arg) int p15 = 0; // P15 Shift status dummy value for now int retval = rig_get_freq(my_rig, RIG_VFO_A, &freq); char response[64]; + // cppcheck-suppress * char *fmt = "IF%011"PRIll"%04d+%05d%1d%1d%1d%02d%1d%1"PRIll"%1d%1d%1d%1d%02d%1d;"; if (retval != RIG_OK) From ab77eea8b6589281ef1c01620a25c119cc37122f Mon Sep 17 00:00:00 2001 From: Michael Black Date: Tue, 24 Mar 2020 09:59:18 -0500 Subject: [PATCH 3/7] Fix cppcheck warnings in misc.c --- src/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/misc.c b/src/misc.c index f0b951152..3a869912a 100644 --- a/src/misc.c +++ b/src/misc.c @@ -640,7 +640,7 @@ static struct { { RIG_LEVEL_PREAMP, "PREAMP" }, { RIG_LEVEL_ATT, "ATT" }, - { RIG_LEVEL_VOX, "VOX" }, + { RIG_LEVEL_VOXDELAY, "VOXDELAY" }, { RIG_LEVEL_AF, "AF" }, { RIG_LEVEL_RF, "RF" }, { RIG_LEVEL_SQL, "SQL" }, From aa7e822d98bc55c3974a703449c23e6924ada0a5 Mon Sep 17 00:00:00 2001 From: Michael Black Date: Tue, 24 Mar 2020 10:00:22 -0500 Subject: [PATCH 4/7] cppcheck-suppress rigctl_parse.c --- tests/rigctl_parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c index 0c448d793..53ed437f5 100644 --- a/tests/rigctl_parse.c +++ b/tests/rigctl_parse.c @@ -1879,7 +1879,7 @@ declare_proto_rig(get_freq) { int status; freq_t freq; - // cppcheck-suppress + // cppcheck-suppress * char *fmt = "%"PRIll"%c"; status = rig_get_freq(rig, vfo, &freq); From e3cfdbd4535c1a58960bca2428e37ab318b2be66 Mon Sep 17 00:00:00 2001 From: Michael Black Date: Tue, 24 Mar 2020 10:00:46 -0500 Subject: [PATCH 5/7] Fix cppcheck warnings in memcsv.c --- tests/memcsv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/memcsv.c b/tests/memcsv.c index ad159bd77..4fdcb5691 100644 --- a/tests/memcsv.c +++ b/tests/memcsv.c @@ -601,7 +601,7 @@ int dump_csv_chan(RIG *rig, if (mem_caps->ant) { - fprintf(f, "%d%c", chan.ant, csv_sep); + fprintf(f, "%u%c", chan.ant, csv_sep); } if (mem_caps->freq) @@ -676,22 +676,22 @@ int dump_csv_chan(RIG *rig, if (mem_caps->ctcss_tone) { - fprintf(f, "%d%c", chan.ctcss_tone, csv_sep); + fprintf(f, "%u%c", chan.ctcss_tone, csv_sep); } if (mem_caps->ctcss_sql) { - fprintf(f, "%d%c", chan.ctcss_sql, csv_sep); + fprintf(f, "%u%c", chan.ctcss_sql, csv_sep); } if (mem_caps->dcs_code) { - fprintf(f, "%d%c", chan.dcs_code, csv_sep); + fprintf(f, "%u%c", chan.dcs_code, csv_sep); } if (mem_caps->dcs_sql) { - fprintf(f, "%d%c", chan.dcs_sql, csv_sep); + fprintf(f, "%u%c", chan.dcs_sql, csv_sep); } if (mem_caps->scan_group) From 86159408a42e9b54c13c6977e4d4e8079736689d Mon Sep 17 00:00:00 2001 From: Michael Black Date: Tue, 24 Mar 2020 10:01:47 -0500 Subject: [PATCH 6/7] Add CtrlHandler to neverused.c --- src/neverused.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/neverused.c b/src/neverused.c index 4e64a804a..b147b14d8 100644 --- a/src/neverused.c +++ b/src/neverused.c @@ -24,6 +24,7 @@ void never_used() amp_token_foreach(); amp_unregister(); cm108_dcd_get(); + CtrlHandler(); elad_close(); elad_get_channel(); elad_get_ctcss_sql(); From 9d8ddd458296cbd9512e1f6626f9c8890001ed63 Mon Sep 17 00:00:00 2001 From: Michael Black Date: Tue, 24 Mar 2020 10:02:17 -0500 Subject: [PATCH 7/7] Replace RIG_LEVEL_VOX with RIG_LEVEL_VOXDELAY --- include/hamlib/rig.h | 3 +-- rigs/kenwood/pihpsdr.c | 4 ++-- rigs/kenwood/trc80.c | 2 +- rigs/kenwood/ts2000.c | 4 ++-- rigs/kenwood/ts990s.c | 4 ++-- rigs/tentec/orion.c | 6 +++--- rigs/tentec/orion.h | 2 +- rigs/tentec/pegasus.c | 2 +- rigs/tentec/tt550.c | 4 ++-- rigs/yaesu/newcat.c | 6 +++--- 10 files changed, 18 insertions(+), 19 deletions(-) diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h index 84e06cdbf..58cb4c389 100644 --- a/include/hamlib/rig.h +++ b/include/hamlib/rig.h @@ -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, */ diff --git a/rigs/kenwood/pihpsdr.c b/rigs/kenwood/pihpsdr.c index 62aaa21e4..f1b6f9a88 100644 --- a/rigs/kenwood/pihpsdr.c +++ b/rigs/kenwood/pihpsdr.c @@ -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) diff --git a/rigs/kenwood/trc80.c b/rigs/kenwood/trc80.c index e5d81b1c0..5e6f691e8 100644 --- a/rigs/kenwood/trc80.c +++ b/rigs/kenwood/trc80.c @@ -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) diff --git a/rigs/kenwood/ts2000.c b/rigs/kenwood/ts2000.c index 090f4fc6f..41ae62a72 100644 --- a/rigs/kenwood/ts2000.c +++ b/rigs/kenwood/ts2000.c @@ -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) diff --git a/rigs/kenwood/ts990s.c b/rigs/kenwood/ts990s.c index 839692012..32378d406 100644 --- a/rigs/kenwood/ts990s.c +++ b/rigs/kenwood/ts990s.c @@ -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) diff --git a/rigs/tentec/orion.c b/rigs/tentec/orion.c index 33bb3b2f9..ece1a7ad6 100644 --- a/rigs/tentec/orion.c +++ b/rigs/tentec/orion.c @@ -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); diff --git a/rigs/tentec/orion.h b/rigs/tentec/orion.h index 7074efc8f..16598b9a6 100644 --- a/rigs/tentec/orion.h +++ b/rigs/tentec/orion.h @@ -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) diff --git a/rigs/tentec/pegasus.c b/rigs/tentec/pegasus.c index 870c93fd9..a8e33741a 100644 --- a/rigs/tentec/pegasus.c +++ b/rigs/tentec/pegasus.c @@ -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) diff --git a/rigs/tentec/tt550.c b/rigs/tentec/tt550.c index 7598bf834..9612d4ec3 100644 --- a/rigs/tentec/tt550.c +++ b/rigs/tentec/tt550.c @@ -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; diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index 1669c51e9..64154128a 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -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;