diff --git a/rigs/adat/adt_200a.c b/rigs/adat/adt_200a.c index be40c043b..8f2220a6b 100644 --- a/rigs/adat/adt_200a.c +++ b/rigs/adat/adt_200a.c @@ -170,6 +170,7 @@ const struct rig_caps adt_200a_caps = { RIG_MODE_FM, Hz(12000) }, RIG_FLT_END, }, + .str_cal = ADT_200A_STR_CAL, // .cfgparams = adt_200a_cfg_params, diff --git a/rigs/adat/adt_200a.h b/rigs/adat/adt_200a.h index cb0270e6f..102214f08 100644 --- a/rigs/adat/adt_200a.h +++ b/rigs/adat/adt_200a.h @@ -107,6 +107,20 @@ #define ADT_200A_RIT 9999 #define ADT_200A_XIT 9999 +// This is more-than-likely not accurate +#define ADT_200A_STR_CAL {9, {\ + { 0, -60},\ + { 3, -48},\ + { 6, -36},\ + { 9, -24},\ + {12, -12},\ + {15, 0},\ + {20, 20},\ + {25, 40},\ + {30, 60}}\ + } + + // ADT-200A FUNCs #define ADT_200A_FUNCS (RIG_FUNC_VOX|RIG_FUNC_NB|RIG_FUNC_NR) diff --git a/rigs/alinco/dx77.c b/rigs/alinco/dx77.c index 2532304be..0445b046b 100644 --- a/rigs/alinco/dx77.c +++ b/rigs/alinco/dx77.c @@ -203,8 +203,21 @@ const struct rig_caps dx77_caps = RIG_CHAN_END, }, - .rx_range_list1 = { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ - .tx_range_list1 = { RIG_FRNG_END, }, + .rx_range_list1 = { + { + .startf = kHz(500), .endf = MHz(30), .modes = DX77_OTHER_TX_MODES, + .low_power = -1, .high_power = -1, RIG_VFO_A, RIG_ANT_NONE + }, + { + .startf = kHz(500), .endf = MHz(30), .modes = DX77_AM_TX_MODES, + .low_power = -1, .high_power = -1 , RIG_VFO_A, RIG_ANT_NONE + }, + RIG_FRNG_END, + }, + .rx_range_list2 = {RIG_FRNG_END,}, + .tx_range_list1 = {RIG_FRNG_END,}, + .tx_range_list2 = {RIG_FRNG_END,}, + .rx_range_list2 = { {kHz(500), MHz(30), DX77_ALL_MODES, -1, -1, DX77_VFO}, diff --git a/rigs/alinco/dxsr8.c b/rigs/alinco/dxsr8.c index 7c30a047f..5caef61b5 100644 --- a/rigs/alinco/dxsr8.c +++ b/rigs/alinco/dxsr8.c @@ -43,7 +43,7 @@ #define DXSR8_PARM_ALL RIG_PARM_NONE -#define DXSR8_VFO RIG_VFO_NONE +#define DXSR8_VFO RIG_VFO_A /* Line Feed */ #define EOM "\r\n" diff --git a/rigs/flexradio/sdr1k.c b/rigs/flexradio/sdr1k.c index 3c3022739..b278df640 100644 --- a/rigs/flexradio/sdr1k.c +++ b/rigs/flexradio/sdr1k.c @@ -82,7 +82,7 @@ struct sdr1k_priv_data #define SDR1K_LEVEL RIG_LEVEL_PREAMP #define SDR1K_PARM RIG_PARM_NONE -#define SDR1K_MODES (RIG_MODE_NONE) +#define SDR1K_MODES (RIG_MODE_USB|RIG_MODE_CW) #define SDR1K_VFO RIG_VFO_A @@ -172,6 +172,10 @@ const struct rig_caps sdr1k_rig_caps = .tuning_steps = { {SDR1K_MODES, 1}, RIG_TS_END, }, + .filters = { + {RIG_MODE_ALL, RIG_FLT_ANY}, + RIG_FLT_END + }, .priv = NULL, /* priv */ .rig_init = sdr1k_init, diff --git a/rigs/kit/miniVNA.c b/rigs/kit/miniVNA.c index 6fe0e7c4d..c9ee126f5 100644 --- a/rigs/kit/miniVNA.c +++ b/rigs/kit/miniVNA.c @@ -77,13 +77,22 @@ const struct rig_caps miniVNA_caps = .timeout = 1000, .retry = 3, - .rx_range_list1 = { {.startf = kHz(100), .endf = MHz(180), .modes = RIG_MODE_NONE, .low_power = -1, .high_power = -1, RIG_VFO_A}, + .rx_range_list1 = { {.startf = kHz(100), .endf = MHz(180), .modes = RIG_MODE_CW, .low_power = -1, .high_power = -1, RIG_VFO_A}, RIG_FRNG_END, }, - .tx_range_list1 = { {.startf = kHz(100), .endf = MHz(180), .modes = RIG_MODE_NONE, .low_power = -1, .high_power = -1, RIG_VFO_A}, + .tx_range_list1 = { {.startf = kHz(100), .endf = MHz(180), .modes = RIG_MODE_CW, .low_power = W(0), .high_power = W(.004), RIG_VFO_A}, RIG_FRNG_END, }, - .tuning_steps = { {RIG_MODE_NONE, 1}, RIG_TS_END, }, + .tuning_steps = { + // Rem: no support for changing tuning step + {RIG_MODE_ALL, 1}, + RIG_TS_END, + }, + + .filters = { + {RIG_MODE_ALL, RIG_FLT_ANY}, + RIG_FLT_END + }, .set_freq = miniVNA_set_freq, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS diff --git a/rigs/rs/ek89x.c b/rigs/rs/ek89x.c index 83fdebe78..810bdb4d8 100644 --- a/rigs/rs/ek89x.c +++ b/rigs/rs/ek89x.c @@ -584,6 +584,12 @@ const struct rig_caps ek89x_caps = }, .tx_range_list2 = {RIG_FRNG_END,}, + .tuning_steps = { + // Rem: no support for changing tuning step + {RIG_MODE_ALL, 1}, + RIG_TS_END, + }, + /* .tuning_steps = { {EK89X_MODES,1}, diff --git a/rigs/rs/xk2100.c b/rigs/rs/xk2100.c index faa6f3e66..2683fe0c3 100644 --- a/rigs/rs/xk2100.c +++ b/rigs/rs/xk2100.c @@ -136,6 +136,12 @@ const struct rig_caps xk2100_caps = }, .tx_range_list2 = {RIG_FRNG_END,}, + .tuning_steps = { + // Rem: no support for changing tuning step + {RIG_MODE_ALL, 1}, + RIG_TS_END, + }, + /* .tuning_steps = { {XK2100_MODES,1}, diff --git a/rigs/tapr/dsp10.c b/rigs/tapr/dsp10.c index 792ab6e4b..f351ae5f7 100644 --- a/rigs/tapr/dsp10.c +++ b/rigs/tapr/dsp10.c @@ -104,11 +104,11 @@ const struct rig_caps dsp10_caps = .rx_range_list1 = { RIG_FRNG_END, }, /* FIXME: enter region 1 setting */ .tx_range_list1 = { RIG_FRNG_END, }, .rx_range_list2 = { - {MHz(144), kHz(148), DSP10_MODES, -1, -1, DSP10_VFO}, + {MHz(144), MHz(148), DSP10_MODES, -1, -1, DSP10_VFO}, RIG_FRNG_END, }, .tx_range_list2 = { - {MHz(144), kHz(148), DSP10_MODES, mW(20), mW(20), DSP10_VFO}, + {MHz(144), MHz(148), DSP10_MODES, mW(20), mW(20), DSP10_VFO}, RIG_FRNG_END, }, .tuning_steps = { diff --git a/rigs/winradio/g313-posix.c b/rigs/winradio/g313-posix.c index 5abf4ebff..6903011b7 100644 --- a/rigs/winradio/g313-posix.c +++ b/rigs/winradio/g313-posix.c @@ -39,7 +39,7 @@ #define G313_FUNC RIG_FUNC_NONE #define G313_LEVEL (RIG_LEVEL_ATT | RIG_LEVEL_AGC | RIG_LEVEL_RF | RIG_LEVEL_STRENGTH | RIG_LEVEL_RAWSTR) -#define G313_MODES (RIG_MODE_NONE) +#define G313_MODES (RIG_MODE_USB) #define TOK_SHM_AUDIO 0x150901 #define TOK_SHM_IF 0x150902 diff --git a/rigs/winradio/g313-win.c b/rigs/winradio/g313-win.c index 2c22bb057..eba4ee65f 100644 --- a/rigs/winradio/g313-win.c +++ b/rigs/winradio/g313-win.c @@ -25,7 +25,7 @@ #define G313_FUNC RIG_FUNC_NONE #define G313_LEVEL (RIG_LEVEL_ATT | RIG_LEVEL_AGC | RIG_LEVEL_RF | RIG_LEVEL_STRENGTH | RIG_LEVEL_RAWSTR) -#define G313_MODES (RIG_MODE_NONE) +#define G313_MODES (RIG_MODE_USB) #if defined (_WIN32) || !defined(OTHER_POSIX)