w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-08 17:04:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feat-boost-log

Browse Source
This commit is contained in:
Bill Somerville
2020-10-01 19:55:53 +01:00
parent c5f4c1557b d73c51beca
commit 837821b117
10 changed files with 251 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Transceiver/HamlibTransceiver.cpp
+6 -2
View File
@@ -14,6 +14,10 @@
#include "moc_HamlibTransceiver.cpp"
#if HAVE_HAMLIB_OLD_CACHING
#define HAMLIB_CACHE_ALL CACHE_ALL
#endif
namespace
{
// Unfortunately bandwidth is conflated with mode, this is probably
@@ -592,7 +596,7 @@ int HamlibTransceiver::do_start ()
}
}
#if HAVE_HAMLIB_CACHING
#if HAVE_HAMLIB_CACHING || HAVE_HAMLIB_OLD_CACHING
// we must disable Hamlib caching because it lies about frequency
// for less than 1 Hz resolution rigs
auto orig_cache_timeout = rig_get_cache_timeout_ms (rig_.data (), HAMLIB_CACHE_ALL);
@@ -639,7 +643,7 @@ int HamlibTransceiver::do_start ()
resolution = -1; // best guess
}
#if HAVE_HAMLIB_CACHING
#if HAVE_HAMLIB_CACHING || HAVE_HAMLIB_OLD_CACHING
// revert Hamlib cache timeout
rig_set_cache_timeout_ms (rig_.data (), HAMLIB_CACHE_ALL, orig_cache_timeout);
#endif