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

Fix double ;; in FT450 exception handling 

Add FT450 to special 60m exceptions
pull/518/head
Michael Black W9MDB 2021-01-21 06:37:26 -06:00
rodzic 599974bcea
commit 20d5bc0b9e
2 zmienionych plików z 9 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -738,11 +738,12 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
} }
/* vfo should now be modified to a valid VFO constant. */ /* vfo should now be modified to a valid VFO constant. */
/* DX3000/DX5000 can only do VFO_MEM on 60M */ /* DX3000/DX5000/450 can only do VFO_MEM on 60M */
/* So we will not change freq in that case */ /* So we will not change freq in that case */
special_60m = newcat_is_rig(rig, RIG_MODEL_FTDX3000); special_60m = newcat_is_rig(rig, RIG_MODEL_FTDX3000);
/* duplicate the following line to add more rigs */ /* duplicate the following line to add more rigs */
special_60m |= newcat_is_rig(rig, RIG_MODEL_FTDX5000); special_60m |= newcat_is_rig(rig, RIG_MODEL_FTDX5000);
special_60m |= newcat_is_rig(rig, RIG_MODEL_FT450);
switch (vfo) switch (vfo)
{ {
@ -998,19 +999,19 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{ {
if (c == 'B') if (c == 'B')
{ {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "VS1;F%c%0*"PRIll"%c;VS0;", c, snprintf(priv->cmd_str, sizeof(priv->cmd_str), "VS1;F%c%0*"PRIll";VS0;", c,
priv->width_frequency, (int64_t)freq, cat_term); priv->width_frequency, (int64_t)freq);
} }
else else
{ {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "F%c%0*"PRIll"%c", c, snprintf(priv->cmd_str, sizeof(priv->cmd_str), "F%c%0*"PRIll";", c,
priv->width_frequency, (int64_t)freq, cat_term); priv->width_frequency, (int64_t)freq);
} }
} }
else else
{ {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "F%c%0*"PRIll"%c", c, snprintf(priv->cmd_str, sizeof(priv->cmd_str), "F%c%0*"PRIll";", c,
priv->width_frequency, (int64_t)freq, cat_term); priv->width_frequency, (int64_t)freq);
} }
rig_debug(RIG_DEBUG_TRACE, "%s:%d cmd_str = %s\n", __func__, __LINE__, rig_debug(RIG_DEBUG_TRACE, "%s:%d cmd_str = %s\n", __func__, __LINE__,

2
rigs/yaesu/newcat.h
Wyświetl plik

@ -50,7 +50,7 @@
typedef char ncboolean; typedef char ncboolean;
/* shared function version */ /* shared function version */
#define NEWCAT_VER "20210120" #define NEWCAT_VER "20210121"
/* Hopefully large enough for future use, 128 chars plus '\0' */ /* Hopefully large enough for future use, 128 chars plus '\0' */
#define NEWCAT_DATA_LEN 129 #define NEWCAT_DATA_LEN 129