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

Set comp is also rejected in AM/FM/RTTY modes by certain Yaesu newcat rigs

pull/507/head
Mikael Nousiainen 2021-01-13 00:04:10 +02:00
rodzic 7be0af0362
commit 49128645b1
1 zmienionych plików z 20 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -5067,6 +5067,7 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{
newcat_get_mode(rig, vfo, &mode, &width);
}
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "NR0%d%c", status ? 1 : 0,
cat_term);
@ -5086,12 +5087,20 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
break;
}
case RIG_FUNC_COMP:
case RIG_FUNC_COMP: {
pbwidth_t width;
rmode_t mode = 0;
if (!newcat_valid_command(rig, "PR"))
{
return -RIG_ENAVAIL;
}
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
newcat_get_mode(rig, vfo, &mode, &width);
}
if (is_ft891 || is_ft991 || is_ftdx1200 || is_ftdx3000 || is_ftdx101)
{
// There seems to be an error in the manuals for some of these rigs stating that values should be 1 = OFF and 2 = ON, but they are 0 = OFF and 1 = ON instead
@ -5104,7 +5113,17 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
cat_term);
}
// Some Yaesu rigs reject this command in AM/FM/RTTY modes
if (is_ft991 || is_ftdx5000 || is_ftdx101)
{
if (mode & RIG_MODE_AM || mode & RIG_MODE_FM || mode & RIG_MODE_AMN || mode & RIG_MODE_FMN ||
mode & RIG_MODE_RTTY || mode & RIG_MODE_RTTYR)
{
priv->question_mark_response_means_rejected = 1;
}
}
break;
}
case RIG_FUNC_VOX:
if (!newcat_valid_command(rig, "VX"))