From 39670273c1ca3ebf59dc6f37c3eb810e9f2eb160 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Fri, 10 Jul 2020 17:02:16 -0500 Subject: [PATCH] FT-817/818 doing dual reads causes vfo tuning to return -RIG_EIO So we will ignore the retry errors as the read normally works but we need to allow for VFO tuning https://github.com/Hamlib/Hamlib/issues/340 --- rigs/yaesu/ft817.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c index ced515e34..2f950c1c1 100644 --- a/rigs/yaesu/ft817.c +++ b/rigs/yaesu/ft817.c @@ -164,7 +164,7 @@ const struct rig_caps ft817_caps = RIG_MODEL(RIG_MODEL_FT817), .model_name = "FT-817", .mfg_name = "Yaesu", - .version = "20200629.0", + .version = "20200710.0", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -302,7 +302,7 @@ const struct rig_caps ft818_caps = RIG_MODEL(RIG_MODEL_FT818), .model_name = "FT-818", .mfg_name = "Yaesu", - .version = "20200629.0", + .version = "20200710.0", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -650,6 +650,12 @@ int ft817_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) dump_hex(p->fm_status, 5); } +#if 1 // user must be twiddling the VFO + // usually get_freq is OK but we have to allow that f1 != f2 when knob is moving + *freq = f2 * 10; + return RIG_OK; +#else // remove this if no complaints + if (retries >= 0) { *freq = f1 * 10; @@ -660,6 +666,8 @@ int ft817_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) return -RIG_EIO; } +#endif + } int ft817_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)