kopia lustrzana https://github.com/Hamlib/Hamlib
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/340pull/345/head
rodzic
9c8561680f
commit
39670273c1
|
@ -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 = "20200629.0",
|
.version = "20200710.0",
|
||||||
.copyright = "LGPL",
|
.copyright = "LGPL",
|
||||||
.status = RIG_STATUS_STABLE,
|
.status = RIG_STATUS_STABLE,
|
||||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||||
|
@ -302,7 +302,7 @@ const struct rig_caps ft818_caps =
|
||||||
RIG_MODEL(RIG_MODEL_FT818),
|
RIG_MODEL(RIG_MODEL_FT818),
|
||||||
.model_name = "FT-818",
|
.model_name = "FT-818",
|
||||||
.mfg_name = "Yaesu",
|
.mfg_name = "Yaesu",
|
||||||
.version = "20200629.0",
|
.version = "20200710.0",
|
||||||
.copyright = "LGPL",
|
.copyright = "LGPL",
|
||||||
.status = RIG_STATUS_STABLE,
|
.status = RIG_STATUS_STABLE,
|
||||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
.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);
|
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)
|
if (retries >= 0)
|
||||||
{
|
{
|
||||||
*freq = f1 * 10;
|
*freq = f1 * 10;
|
||||||
|
@ -660,6 +666,8 @@ int ft817_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
|
||||||
return -RIG_EIO;
|
return -RIG_EIO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int ft817_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
|
int ft817_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
|
||||||
|
|
Ładowanie…
Reference in New Issue