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

Fix ft1000mp.c set_vfo to remove the existing command 

It seems to swap the frequencies on the rig
https://github.com/Hamlib/Hamlib/issues/561
pull/572/head^2
Michael Black W9MDB 2021-02-22 23:56:53 -06:00
rodzic 0aec4d8bea
commit f6cb3cb342
1 zmienionych plików z 6 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
rigs/yaesu/ft1000mp.c
Wyświetl plik

@ -222,7 +222,7 @@ const struct rig_caps ft1000mp_caps =
RIG_MODEL(RIG_MODEL_FT1000MP), RIG_MODEL(RIG_MODEL_FT1000MP),
.model_name = "FT-1000MP", .model_name = "FT-1000MP",
.mfg_name = "Yaesu", .mfg_name = "Yaesu",
.version = "20210121.0", .version = "20210222.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -356,7 +356,7 @@ const struct rig_caps ft1000mpmkv_caps =
RIG_MODEL(RIG_MODEL_FT1000MPMKV), RIG_MODEL(RIG_MODEL_FT1000MPMKV),
.model_name = "MARK-V FT-1000MP", .model_name = "MARK-V FT-1000MP",
.mfg_name = "Yaesu", .mfg_name = "Yaesu",
.version = "20210121.0", .version = "20210222.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -490,7 +490,7 @@ const struct rig_caps ft1000mpmkvfld_caps =
RIG_MODEL(RIG_MODEL_FT1000MPMKVFLD), RIG_MODEL(RIG_MODEL_FT1000MPMKVFLD),
.model_name = "MARK-V Field FT-1000MP", .model_name = "MARK-V Field FT-1000MP",
.mfg_name = "Yaesu", .mfg_name = "Yaesu",
.version = "20210121.0", .version = "20210222.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -1058,7 +1058,7 @@ int ft1000mp_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
int ft1000mp_set_vfo(RIG *rig, vfo_t vfo) int ft1000mp_set_vfo(RIG *rig, vfo_t vfo)
{ {
unsigned char cmd_index = 0; /* index of sequence to send */ //unsigned char cmd_index = 0; /* index of sequence to send */
rig_debug(RIG_DEBUG_TRACE, "ft1000mp: ft1000mp_set_vfo called %s\n", rig_debug(RIG_DEBUG_TRACE, "ft1000mp: ft1000mp_set_vfo called %s\n",
rig_strvfo(vfo)); rig_strvfo(vfo));
@ -1075,6 +1075,7 @@ int ft1000mp_set_vfo(RIG *rig, vfo_t vfo)
vfo = rig->state.current_vfo; vfo = rig->state.current_vfo;
} }
#if 0 // seems switching VFOs like this changes the frequencies in the response
switch (vfo) switch (vfo)
{ {
case RIG_VFO_A: case RIG_VFO_A:
@ -1102,6 +1103,7 @@ int ft1000mp_set_vfo(RIG *rig, vfo_t vfo)
* phew! now send cmd to rig * phew! now send cmd to rig
*/ */
ft1000mp_send_priv_cmd(rig, cmd_index); ft1000mp_send_priv_cmd(rig, cmd_index);
#endif
return RIG_OK; return RIG_OK;