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
This commit is contained in:
Bill Somerville 2015-07-03 17:32:57 +00:00
parent 99442421de
commit b8e67a5809
2 changed files with 8 additions and 2 deletions

View File

@ -1416,7 +1416,10 @@ void Configuration::impl::set_rig_invariants ()
} }
} }
ui_->CAT_serial_port_parameters_group_box->setEnabled (is_serial_CAT); 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 (); auto const& cat_port = ui_->CAT_port_combo_box->currentText ();

View File

@ -261,7 +261,10 @@ HamlibTransceiver::HamlibTransceiver (int model_number, TransceiverFactory::Para
if (params.force_line_control) if (params.force_line_control)
{ {
set_conf ("dtr_state", params.dtr_high ? "ON" : "OFF"); 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");
}
} }
} }