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

Remove cache from FT-817 get_freq -- comments indicate 2 consistent reads are needed for some reason 

https://github.com/Hamlib/Hamlib/issues/329
pull/345/head
Michael Black W9MDB 2020-06-25 23:20:55 -05:00
rodzic 98f5e17ed3
commit 0ac0d4911a
2 zmienionych plików z 8 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
rigs/yaesu/ft817.c
Wyświetl plik

@ -164,7 +164,7 @@ const struct rig_caps ft817_caps =
RIG_MODEL(RIG_MODEL_FT817), RIG_MODEL(RIG_MODEL_FT817),
.model_name = "FT-817", .model_name = "FT-817",
.mfg_name = "Yaesu", .mfg_name = "Yaesu",
.version = "20200616.0", .version = "20200625.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -495,14 +495,15 @@ int ft817_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
while ((f1 == 0 || f1 != f2) && retries-- > 0) while ((f1 == 0 || f1 != f2) && retries-- > 0)
{ {
if (check_cache_timeout(&p->fm_status_tv)) rig_debug(RIG_DEBUG_TRACE, "%s: retries=%d\n", __func__, retries);
if ((n = ft817_get_status(rig, FT817_NATIVE_CAT_GET_FREQ_MODE_STATUS)) < 0) if ((n = ft817_get_status(rig, FT817_NATIVE_CAT_GET_FREQ_MODE_STATUS)) < 0)
{ {
return n; return n;
} }
f1 = f2; f1 = f2;
f2 = from_bcd_be(p->fm_status, 8); f2 = from_bcd_be(p->fm_status, 8);
dump_hex(p->fm_status, 5);
} }
if (retries >= 0) if (retries >= 0)

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

@ -113,7 +113,7 @@ enum ft817_native_cmd_e {
FT817_NATIVE_CAT_PWR_WAKE, FT817_NATIVE_CAT_PWR_WAKE,
FT817_NATIVE_CAT_PWR_ON, FT817_NATIVE_CAT_PWR_ON,
FT817_NATIVE_CAT_PWR_OFF, FT817_NATIVE_CAT_PWR_OFF,
FT817_NATIVE_CAT_EEPROM_READ, FT817_NATIVE_CAT_EEPROM_READ,
FT817_NATIVE_SIZE /* end marker */ FT817_NATIVE_SIZE /* end marker */
}; };