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

Merge pull request #495 from mikaelnousiainen/yaesu-ft2000-fix-vfob-for-sh-an 

Fix SH and AN commands on FT-2000 for VFOB as these commands are not targetable
pull/497/head
Michael Black 2021-01-08 06:37:25 -06:00 zatwierdzone przez GitHub
rodzic a15353ec4c 9e8b7539bb
commit 62066d5b74
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 16 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
rigs/yaesu/ft2000.c
Wyświetl plik

@ -107,7 +107,7 @@ const struct rig_caps ft2000_caps =
.write_delay = FT2000_WRITE_DELAY, .write_delay = FT2000_WRITE_DELAY,
.post_write_delay = FT2000_POST_WRITE_DELAY, .post_write_delay = FT2000_POST_WRITE_DELAY,
.timeout = 2000, .timeout = 2000,
.retry = 10, .retry = 3,
.has_get_func = FT2000_FUNCS, .has_get_func = FT2000_FUNCS,
.has_set_func = FT2000_FUNCS, .has_set_func = FT2000_FUNCS,
.has_get_level = FT2000_LEVELS, .has_get_level = FT2000_LEVELS,

19
rigs/yaesu/newcat.c
Wyświetl plik

@ -3010,7 +3010,7 @@ int newcat_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option)
return err; return err;
} }
if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE) if ((rig->caps->targetable_vfo & RIG_TARGETABLE_MODE) && !is_ft2000)
{ {
main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0'; main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';
} }
@ -3102,7 +3102,7 @@ int newcat_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
return err; return err;
} }
if (rig->caps->targetable_vfo & RIG_TARGETABLE_MODE) if ((rig->caps->targetable_vfo & RIG_TARGETABLE_MODE) && !is_ft2000)
{ {
main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0'; main_sub_vfo = (RIG_VFO_B == vfo || RIG_VFO_SUB == vfo) ? '1' : '0';
} }
@ -7465,6 +7465,10 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SH%c%d%02d;", main_sub_vfo, on, snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SH%c%d%02d;", main_sub_vfo, on,
w); w);
} }
else if (is_ft2000)
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SH0%02d;", w);
}
else else
{ {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SH%c%02d;", main_sub_vfo, w); snprintf(priv->cmd_str, sizeof(priv->cmd_str), "SH%c%02d;", main_sub_vfo, w);
@ -7690,8 +7694,15 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width)
if (sh_command_valid) if (sh_command_valid)
{ {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c%c", cmd, main_sub_vfo, if (is_ft2000)
cat_term); {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s0%c", cmd, cat_term);
}
else
{
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "%s%c%c", cmd, main_sub_vfo,
cat_term);
}
err = newcat_get_cmd(rig); err = newcat_get_cmd(rig);