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

Merge pull request #420 from mikaelnousiainen/icom-repeater-shift-ic9700-tuning-steps-fixes 

Fix Icom repeater shift + split and add tuning steps for IC-9700
pull/425/head
Michael Black 2020-10-14 11:26:15 -05:00 zatwierdzone przez GitHub
rodzic 7d7622face a77e82be4e
commit fe1d705e33
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
4 zmienionych plików z 33 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
rigs/icom/ic7300.c
Wyświetl plik

@ -247,7 +247,7 @@ static const struct icom_priv_caps IC9700_priv_caps =
0xA2, /* default address */
0, /* 731 mode */
1, /* no XCHG to avoid display flickering */
ic7300_ts_sc_list,
ic9700_ts_sc_list,
.serial_USB_echo_check = 1, /* USB CI-V may not echo */
.agc_levels_present = 1,
.agc_levels = {

32
rigs/icom/icom.c
Wyświetl plik

@ -369,11 +369,25 @@ const struct ts_sc_list ic705_ts_sc_list[] =
{kHz(25), 0x11},
{kHz(50), 0x12},
{kHz(100), 0x13},
{0, 0x13}, /* programmable tuning step not supported */
{0, 0},
};
const struct ts_sc_list ic9700_ts_sc_list[] =
{
{10, 0x00},
{100, 0x01},
{500, 0x02},
{kHz(1), 0x03},
{kHz(5), 0x04},
{kHz(6.25), 0x05},
{kHz(10), 0x06},
{kHz(12.5), 0x07},
{kHz(20), 0x08},
{kHz(25), 0x09},
{kHz(50), 0x10},
{kHz(100), 0x11},
{0, 0},
};
/* rtty filter list for some DSP rigs ie PRO */
#define RTTY_FIL_NB 5
@ -3639,6 +3653,7 @@ int icom_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *rptr_shift)
switch (rptrbuf[1])
{
case S_DUP_OFF:
case S_DUP_DD_RPS:
*rptr_shift = RIG_RPT_SHIFT_NONE; /* Simplex mode */
break;
@ -3650,6 +3665,12 @@ int icom_get_rptr_shift(RIG *rig, vfo_t vfo, rptr_shift_t *rptr_shift)
*rptr_shift = RIG_RPT_SHIFT_PLUS; /* Duplex + mode */
break;
// The same command indicates split state, which means simplex mode
case S_SPLT_OFF:
case S_SPLT_ON:
*rptr_shift = RIG_RPT_SHIFT_NONE; /* Simplex mode */
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported shift %d", __func__,
rptrbuf[1]);
@ -4967,6 +4988,13 @@ int icom_get_split_vfo(RIG *rig, vfo_t vfo, split_t *split, vfo_t *tx_vfo)
*split = RIG_SPLIT_ON;
break;
// The same command indicates repeater shift state, which means that split is off
case S_DUP_M:
case S_DUP_P:
case S_DUP_DD_RPS:
*split = RIG_SPLIT_OFF;
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: unsupported split %d", __func__,
splitbuf[1]);

1
rigs/icom/icom.h
Wyświetl plik

@ -218,6 +218,7 @@ extern const struct ts_sc_list ic7000_ts_sc_list[];
extern const struct ts_sc_list ic7100_ts_sc_list[];
extern const struct ts_sc_list ic7200_ts_sc_list[];
extern const struct ts_sc_list ic7300_ts_sc_list[];
extern const struct ts_sc_list ic9700_ts_sc_list[];
extern const struct ts_sc_list ic910_ts_sc_list[];
extern const struct ts_sc_list ic718_ts_sc_list[];
extern const struct ts_sc_list x108g_ts_sc_list[];

1
rigs/icom/icom_defs.h
Wyświetl plik

@ -207,6 +207,7 @@
#define S_DUP_OFF 0x10 /* Simplex mode */
#define S_DUP_M 0x11 /* Duplex - mode */
#define S_DUP_P 0x12 /* Duplex + mode */
#define S_DUP_DD_RPS 0x13 /* DD Repeater Simplex mode (RPS) */
/*
* Set Attenuator (C_CTL_ATT) subcommands