From b8e67a580938bdf5d9366a547e2c3210f5e3de5c Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Fri, 3 Jul 2015 17:32:57 +0000 Subject: [PATCH] Allow DTR line to be forced alongside hardware flow control git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5671 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- Configuration.cpp | 5 ++++- HamlibTransceiver.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Configuration.cpp b/Configuration.cpp index 143701eb2..c95ce9a53 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -1416,7 +1416,10 @@ void Configuration::impl::set_rig_invariants () } } ui_->CAT_serial_port_parameters_group_box->setEnabled (is_serial_CAT); - ui_->CAT_control_lines_group_box->setEnabled (is_serial_CAT && !is_hw_handshake); + ui_->CAT_control_lines_group_box->setEnabled (is_serial_CAT); + ui_->CAT_RTS_check_box->setEnabled (is_serial_CAT + && ui_->CAT_control_lines_group_box->isChecked () + && !is_hw_handshake); } auto const& cat_port = ui_->CAT_port_combo_box->currentText (); diff --git a/HamlibTransceiver.cpp b/HamlibTransceiver.cpp index fcad237c2..ce2ee6ec6 100644 --- a/HamlibTransceiver.cpp +++ b/HamlibTransceiver.cpp @@ -261,7 +261,10 @@ HamlibTransceiver::HamlibTransceiver (int model_number, TransceiverFactory::Para if (params.force_line_control) { set_conf ("dtr_state", params.dtr_high ? "ON" : "OFF"); - set_conf ("rts_state", params.rts_high ? "ON" : "OFF"); + if (TransceiverFactory::handshake_hardware != params.handshake) + { + set_conf ("rts_state", params.rts_high ? "ON" : "OFF"); + } } }