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

Fix Barret set_freq and serial# and new try on software version

pull/928/head
Mike Black W9MDB 2022-01-07 16:20:26 -06:00
rodzic 9731b5fda2
commit 1d19a0ffbc
3 zmienionych plików z 5 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
rigs/barrett/4050.c
Wyświetl plik

@ -84,7 +84,7 @@ const struct rig_caps barrett4050_caps =
RIG_MODEL(RIG_MODEL_BARRETT_4050), RIG_MODEL(RIG_MODEL_BARRETT_4050),
.model_name = "4050", .model_name = "4050",
.mfg_name = "Barrett", .mfg_name = "Barrett",
.version = BACKEND_VER ".0", .version = BACKEND_VER ".0a",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_ALPHA, .status = RIG_STATUS_ALPHA,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -202,7 +202,7 @@ int barrett4050_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
return retval; return retval;
} }
if (sscanf(response, "%4d%8lf%8lf", &chan, &freq_rx, &freq_tx) != 2) if (sscanf(response, "%4d%8lf%8lf", &chan, &freq_rx, &freq_tx) != 3)
{ {
rig_debug(RIG_DEBUG_ERR, "%s: unable to parse chan/freq from %s\n", __func__, rig_debug(RIG_DEBUG_ERR, "%s: unable to parse chan/freq from %s\n", __func__,
response); response);

2
rigs/barrett/950.c
Wyświetl plik

@ -200,7 +200,7 @@ int barrett950_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
return retval; return retval;
} }
if (sscanf(response, "%4d%8lf%8lf", &chan, &freq_rx, &freq_tx) != 2) if (sscanf(response, "%4d%8lf%8lf", &chan, &freq_rx, &freq_tx) != 3)
{ {
rig_debug(RIG_DEBUG_ERR, "%s: unable to parse chan/freq from %s\n", __func__, rig_debug(RIG_DEBUG_ERR, "%s: unable to parse chan/freq from %s\n", __func__,
response); response);

7
rigs/barrett/barrett.c
Wyświetl plik

@ -659,15 +659,12 @@ const char *barrett_get_info(RIG *rig)
{ {
rig_debug(RIG_DEBUG_WARN, "%s: IDS command failed: %s\n", __func__, rig_debug(RIG_DEBUG_WARN, "%s: IDS command failed: %s\n", __func__,
strerror(retval)); strerror(retval));
}
else
{
response = "unknown"; response = "unknown";
} }
rig_debug(RIG_DEBUG_VERBOSE, "%s: Barrett series %s, serial# %s\n", __func__, rig_debug(RIG_DEBUG_VERBOSE, "%s: Barrett series %s, serial# %s\n", __func__,
series, response); series, response);
retval = barrett_transaction(rig, "IVF", 0, &response); retval = barrett_transaction(rig, "IV", 0, &response);
if (retval == RIG_OK) if (retval == RIG_OK)
{ {
@ -675,7 +672,7 @@ const char *barrett_get_info(RIG *rig)
} }
else else
{ {
rig_debug(RIG_DEBUG_VERBOSE, "Software Version %s\n", response); rig_debug(RIG_DEBUG_VERBOSE, "Barrett software Version %s\n", response);
} }
return response; return response;