w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-18 05:32:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use the new hamlib {set,get}_*_mode() function no bandwidth change feature

Browse Source 
This    change     requires    a    hamlib    including     the    SHA
222ad74de7ab7e2894522101643265c36188e9c5

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6658 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2016-04-28 21:05:59 +00:00
parent d915ba0daa
commit bcf0c93327
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
HamlibTransceiver.cpp
View File

@ -538,7 +538,7 @@ int HamlibTransceiver::do_start ()
update_rx_frequency (dummy_frequency_); update_rx_frequency (dummy_frequency_);
if (RIG_MODE_NONE != dummy_mode_) if (RIG_MODE_NONE != dummy_mode_)
{ {
rig_set_mode (rig_.data (), RIG_VFO_CURR, dummy_mode_, RIG_PASSBAND_NORMAL); rig_set_mode (rig_.data (), RIG_VFO_CURR, dummy_mode_, RIG_PASSBAND_NOCHANGE);
update_mode (map_mode (dummy_mode_)); update_mode (map_mode (dummy_mode_));
} }
} }
@ -650,7 +650,7 @@ void HamlibTransceiver::do_frequency (Frequency f, MODE m, bool no_ignore)
if (new_mode != current_mode) if (new_mode != current_mode)
{ {
TRACE_CAT ("HamlibTransceiver", "rig_set_mode mode = " << rig_strrmode (new_mode)); TRACE_CAT ("HamlibTransceiver", "rig_set_mode mode = " << rig_strrmode (new_mode));
error_check (rig_set_mode (rig_.data (), RIG_VFO_CURR, new_mode, RIG_PASSBAND_NORMAL), tr ("setting current VFO mode")); error_check (rig_set_mode (rig_.data (), RIG_VFO_CURR, new_mode, RIG_PASSBAND_NOCHANGE), tr ("setting current VFO mode"));
// for the 2nd time because a mode change may have caused a // for the 2nd time because a mode change may have caused a
// frequency change // frequency change
@ -659,7 +659,7 @@ void HamlibTransceiver::do_frequency (Frequency f, MODE m, bool no_ignore)
// for the second time because some rigs change mode according // for the second time because some rigs change mode according
// to frequency such as the TS-2000 auto mode setting // to frequency such as the TS-2000 auto mode setting
TRACE_CAT ("HamlibTransceiver", "rig_set_mode mode = " << rig_strrmode (new_mode)); TRACE_CAT ("HamlibTransceiver", "rig_set_mode mode = " << rig_strrmode (new_mode));
error_check (rig_set_mode (rig_.data (), RIG_VFO_CURR, new_mode, RIG_PASSBAND_NORMAL), tr ("setting current VFO mode")); error_check (rig_set_mode (rig_.data (), RIG_VFO_CURR, new_mode, RIG_PASSBAND_NOCHANGE), tr ("setting current VFO mode"));
} }
update_mode (m); update_mode (m);
} }
@ -728,7 +728,7 @@ void HamlibTransceiver::do_tx_frequency (Frequency tx, bool no_ignore)
if (new_mode != current_mode) if (new_mode != current_mode)
{ {
TRACE_CAT ("HamlibTransceiver", "rig_set_mode mode = " << rig_strrmode (new_mode)); TRACE_CAT ("HamlibTransceiver", "rig_set_mode mode = " << rig_strrmode (new_mode));
error_check (rig_set_mode (rig_.data (), RIG_VFO_CURR, new_mode, RIG_PASSBAND_NORMAL), tr ("setting current VFO mode")); error_check (rig_set_mode (rig_.data (), RIG_VFO_CURR, new_mode, RIG_PASSBAND_NOCHANGE), tr ("setting current VFO mode"));
} }
} }
update_other_frequency (tx); update_other_frequency (tx);
@ -741,7 +741,7 @@ void HamlibTransceiver::do_tx_frequency (Frequency tx, bool no_ignore)
auto new_mode = map_mode (state ().mode ()); auto new_mode = map_mode (state ().mode ());
TRACE_CAT ("HamlibTransceiver", "rig_set_split_freq_mode freq = " << tx TRACE_CAT ("HamlibTransceiver", "rig_set_split_freq_mode freq = " << tx
<< " mode = " << rig_strrmode (new_mode)); << " mode = " << rig_strrmode (new_mode));
error_check (rig_set_split_freq_mode (rig_.data (), RIG_VFO_CURR, tx, new_mode, RIG_PASSBAND_NORMAL), tr ("setting split TX frequency and mode")); error_check (rig_set_split_freq_mode (rig_.data (), RIG_VFO_CURR, tx, new_mode, RIG_PASSBAND_NOCHANGE), tr ("setting split TX frequency and mode"));
} }
else else
{ {
@ -800,7 +800,7 @@ void HamlibTransceiver::do_mode (MODE mode)
if (new_mode != current_mode) if (new_mode != current_mode)
{ {
TRACE_CAT ("HamlibTransceiver", "rig_set_mode mode = " << rig_strrmode (new_mode)); TRACE_CAT ("HamlibTransceiver", "rig_set_mode mode = " << rig_strrmode (new_mode));
error_check (rig_set_mode (rig_.data (), RIG_VFO_CURR, new_mode, RIG_PASSBAND_NORMAL), tr ("setting current VFO mode")); error_check (rig_set_mode (rig_.data (), RIG_VFO_CURR, new_mode, RIG_PASSBAND_NOCHANGE), tr ("setting current VFO mode"));
} }
} }
@ -813,7 +813,7 @@ void HamlibTransceiver::do_mode (MODE mode)
if (new_mode != current_mode) if (new_mode != current_mode)
{ {
TRACE_CAT ("HamlibTransceiver", "rig_set_mode mode = " << rig_strrmode (new_mode)); TRACE_CAT ("HamlibTransceiver", "rig_set_mode mode = " << rig_strrmode (new_mode));
error_check (rig_set_mode (rig_.data (), RIG_VFO_CURR, new_mode, RIG_PASSBAND_NORMAL), tr ("setting current VFO mode")); error_check (rig_set_mode (rig_.data (), RIG_VFO_CURR, new_mode, RIG_PASSBAND_NOCHANGE), tr ("setting current VFO mode"));
} }
} }
else if (state ().split () && !one_VFO_) else if (state ().split () && !one_VFO_)
@ -825,7 +825,7 @@ void HamlibTransceiver::do_mode (MODE mode)
{ {
TRACE_CAT ("HamlibTransceiver", "rig_set_split_mode mode = " << rig_strrmode (new_mode)); TRACE_CAT ("HamlibTransceiver", "rig_set_split_mode mode = " << rig_strrmode (new_mode));
hamlib_tx_vfo_fixup fixup (rig_.data (), tx_vfo); hamlib_tx_vfo_fixup fixup (rig_.data (), tx_vfo);
error_check (rig_set_split_mode (rig_.data (), RIG_VFO_CURR, new_mode, RIG_PASSBAND_NORMAL), tr ("setting split TX VFO mode")); error_check (rig_set_split_mode (rig_.data (), RIG_VFO_CURR, new_mode, RIG_PASSBAND_NOCHANGE), tr ("setting split TX VFO mode"));
} }
} }
update_mode (mode); update_mode (mode);