From 694028cea25976886e98e32cab7d2fadd366d788 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Thu, 16 Oct 2014 14:17:32 +0100 Subject: [PATCH 1/2] Icom IC-7410 has VFO A/B not MAIN/SUB --- icom/ic7410.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icom/ic7410.c b/icom/ic7410.c index 784972874..07df5b506 100644 --- a/icom/ic7410.c +++ b/icom/ic7410.c @@ -48,7 +48,7 @@ #define IC7410_LEVELS (RIG_LEVEL_PREAMP|RIG_LEVEL_ATT|RIG_LEVEL_AGC|RIG_LEVEL_COMP|RIG_LEVEL_BKINDL|RIG_LEVEL_BALANCE|RIG_LEVEL_NR|RIG_LEVEL_PBT_IN|RIG_LEVEL_PBT_OUT|RIG_LEVEL_CWPITCH|RIG_LEVEL_RFPOWER|RIG_LEVEL_MICGAIN|RIG_LEVEL_KEYSPD|RIG_LEVEL_NOTCHF|RIG_LEVEL_SQL|RIG_LEVEL_RAWSTR|RIG_LEVEL_AF|RIG_LEVEL_RF|RIG_LEVEL_VOXGAIN|RIG_LEVEL_VOXDELAY|RIG_LEVEL_SWR|RIG_LEVEL_ALC) -#define IC7410_VFOS (RIG_VFO_MAIN|RIG_VFO_SUB|RIG_VFO_MEM) +#define IC7410_VFOS (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM) #define IC7410_PARMS (RIG_PARM_ANN|RIG_PARM_BACKLIGHT) #define IC7410_VFO_OPS (RIG_OP_CPY|RIG_OP_XCHG|RIG_OP_FROM_VFO|RIG_OP_TO_VFO|RIG_OP_MCL|RIG_OP_TUNE) From ad8b1983af58e498687b38cde4b2b916a666ce3d Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Thu, 16 Oct 2014 16:10:19 +0100 Subject: [PATCH 2/2] Added IC-7410 data modes --- icom/ic7410.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/icom/ic7410.c b/icom/ic7410.c index 07df5b506..64fe15daa 100644 --- a/icom/ic7410.c +++ b/icom/ic7410.c @@ -36,13 +36,10 @@ #include "misc.h" #include "bandplan.h" -/* - * TODO: PSK and PSKR - */ -#define IC7410_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_FM) -#define IC7410_1HZ_TS_MODES IC7410_ALL_RX_MODES -#define IC7410_OTHER_TX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_FM) +#define IC7410_OTHER_TX_MODES (RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_SSB|RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_FM|RIG_MODE_PKTLSB|RIG_MODE_PKTUSB|RIG_MODE_PKTFM) #define IC7410_AM_TX_MODES (RIG_MODE_AM) +#define IC7410_ALL_RX_MODES IC7410_OTHER_TX_MODES | IC7410_AM_TX_MODES +#define IC7410_1HZ_TS_MODES IC7410_ALL_RX_MODES #define IC7410_FUNCS (RIG_FUNC_FAGC|RIG_FUNC_NB|RIG_FUNC_COMP|RIG_FUNC_VOX|RIG_FUNC_TONE|RIG_FUNC_TSQL|RIG_FUNC_SBKIN|RIG_FUNC_FBKIN|RIG_FUNC_NR|RIG_FUNC_MON|RIG_FUNC_MN|RIG_FUNC_ANF|RIG_FUNC_VSC|RIG_FUNC_LOCK) @@ -145,8 +142,8 @@ const struct rig_caps ic7410_caps = { .tx_range_list2 = { FRQ_RNG_HF(2,IC7410_OTHER_TX_MODES, W(2),W(100),IC7410_VFOS,IC7410_ANTS), FRQ_RNG_6m(2,IC7410_OTHER_TX_MODES, W(2),W(100),IC7410_VFOS,IC7410_ANTS), - FRQ_RNG_HF(2,IC7410_AM_TX_MODES, W(1),W(27),IC7410_VFOS,IC7410_ANTS), /* AM class */ - FRQ_RNG_6m(2,IC7410_AM_TX_MODES, W(1),W(27),IC7410_VFOS,IC7410_ANTS), /* AM class */ + FRQ_RNG_HF(2,IC7410_AM_TX_MODES, W(2),W(27),IC7410_VFOS,IC7410_ANTS), /* AM class */ + FRQ_RNG_6m(2,IC7410_AM_TX_MODES, W(2),W(27),IC7410_VFOS,IC7410_ANTS), /* AM class */ /* USA only, TBC: end of range and modes */ {MHz(5.33050),MHz(5.33350),IC7410_OTHER_TX_MODES,W(2),W(100),IC7410_VFOS,IC7410_ANTS}, /* USA only */ {MHz(5.34650),MHz(5.34950),IC7410_OTHER_TX_MODES,W(2),W(100),IC7410_VFOS,IC7410_ANTS}, /* USA only */ @@ -192,8 +189,8 @@ const struct rig_caps ic7410_caps = { .set_freq = icom_set_freq, .get_freq = icom_get_freq, -.set_mode = icom_set_mode, -.get_mode = icom_get_mode, +.set_mode = icom_set_mode_with_data, +.get_mode = icom_get_mode_with_data, .set_vfo = icom_set_vfo, .set_ant = icom_set_ant, .get_ant = icom_get_ant,