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

merge fix

pull/252/head
Michael Black 2020-05-12 12:28:59 -05:00
rodzic bc8cab13b4 6a199559fa
commit 4459b0b53b
3 zmienionych plików z 9 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -474,7 +474,7 @@ const struct rig_caps ic9700_caps =
// Hopefully any future changes in bandplans can be fixed with firmware updates
// So we use the global REGION2 macros in here
.rx_range_list1 = { // USA Version
.rx_range_list1 = { // USA Version -- United States
{MHz(144), MHz(148), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "USA"},
{MHz(430), MHz(450), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "USA"},
{MHz(1240), MHz(1300), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "USA"},
@ -490,7 +490,7 @@ const struct rig_caps ic9700_caps =
RIG_FRNG_END,
},
.rx_range_list2 = { // EUR Version
.rx_range_list2 = { // EUR Version -- Europe
{MHz(144), MHz(146), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "EUR"},
{MHz(430), MHz(440), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "EUR"},
{MHz(1240), MHz(1300), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "EUR"},
@ -506,7 +506,7 @@ const struct rig_caps ic9700_caps =
RIG_FRNG_END,
},
.rx_range_list3 = { // ITR Version
.rx_range_list3 = { // ITR Version -- Italy
{MHz(144), MHz(146), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "ITR"},
{MHz(430), MHz(434), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "ITR"},
{MHz(435), MHz(438), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "ITR"},
@ -528,7 +528,7 @@ const struct rig_caps ic9700_caps =
RIG_FRNG_END,
},
.rx_range_list4 = { // TPE Version
.rx_range_list4 = { // TPE Version -- Taiwan ??
{MHz(144), MHz(146), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "TPE"},
{MHz(430), MHz(432), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "TPE"},
{MHz(1260), MHz(1265), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "TPE"},
@ -544,7 +544,7 @@ const struct rig_caps ic9700_caps =
RIG_FRNG_END,
},
.rx_range_list5 = { // KOR Version
.rx_range_list5 = { // KOR Version -- Republic of Korea
{MHz(144), MHz(146), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "KOR"},
{MHz(430), MHz(440), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "KOR"},
{MHz(1260), MHz(1300), IC9700_ALL_RX_MODES, -1, -1, IC9700_VFOS, RIG_ANT_CURR, "KOR"},

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

@ -4005,8 +4005,11 @@ int icom_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
*tx_freq = priv->vfob_freq;
return RIG_OK;
}
<<<<<<< HEAD
>>>>>>> 28ce6d0b54b500fc8b7329eed58b725b94690d3d
}
=======
>>>>>>> 6a199559fa99a8d9cb82716e1dad6cfc486c4852
rig_debug(RIG_DEBUG_VERBOSE, "%s curr_vfo=%s\n", __func__,
rig_strvfo(priv->curr_vfo));

3
tests/rigctl_parse.c
Wyświetl plik

@ -4287,7 +4287,7 @@ declare_proto_rig(send_cmd)
// need to move the eom_buf to rig-specifc backends
// we'll let KENWOOD backends use the ; char in the rigctl commands
if (backend_num == RIG_KENWOOD)
if (backend_num == RIG_KENWOOD || backend_num == RIG_YAESU)
{
rig_debug(RIG_DEBUG_TRACE, "%s: KENWOOD\n", __func__);
eom_buf[0] = 0;
@ -4297,7 +4297,6 @@ declare_proto_rig(send_cmd)
rig_debug(RIG_DEBUG_TRACE, "%s: arg1=%s\n", __func__, arg1);
if (send_cmd_term == -1
|| backend_num == RIG_YAESU
|| backend_num == RIG_ICOM
|| backend_num == RIG_KACHINA
|| backend_num == RIG_MICROTUNE