mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2026-06-08 17:04:41 -04:00
Improved DTR and RTS line control
Made the force control lines group box in the Configuration UI checkable which allows the DTR and RTS checkboxes to mean either force low or force high. Also improved UI control logic to only allow valid setting combintions. Disabled network port text edit for OmniRig. Cleared network port combo box list for network interfaces like HRD and DXLab Commander, was erroneously showing COM ports. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5222 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
@@ -157,8 +157,8 @@ HamlibTransceiver::HamlibTransceiver (int model_number
|
||||
, TransceiverFactory::DataBits cat_data_bits
|
||||
, TransceiverFactory::StopBits cat_stop_bits
|
||||
, TransceiverFactory::Handshake cat_handshake
|
||||
, bool cat_dtr_always_on
|
||||
, bool cat_rts_always_on
|
||||
, TransceiverFactory::LineControl cat_dtr_control
|
||||
, TransceiverFactory::LineControl cat_rts_control
|
||||
, TransceiverFactory::PTTMethod ptt_type
|
||||
, TransceiverFactory::TXAudioSource back_ptt_port
|
||||
, QString const& ptt_port
|
||||
@@ -193,13 +193,14 @@ HamlibTransceiver::HamlibTransceiver (int model_number
|
||||
case TransceiverFactory::handshake_hardware: set_conf ("serial_handshake", "Hardware"); break;
|
||||
}
|
||||
|
||||
if (cat_dtr_always_on)
|
||||
if (TransceiverFactory::no_control != cat_dtr_control)
|
||||
{
|
||||
set_conf ("dtr_state", "ON");
|
||||
set_conf ("dtr_state", TransceiverFactory::force_high == cat_dtr_control ? "ON" : "OFF");
|
||||
}
|
||||
if (TransceiverFactory::handshake_hardware != cat_handshake && cat_rts_always_on)
|
||||
if (TransceiverFactory::handshake_hardware != cat_handshake
|
||||
&& TransceiverFactory::no_control != cat_rts_control)
|
||||
{
|
||||
set_conf ("rts_state", "ON");
|
||||
set_conf ("rts_state", TransceiverFactory::force_high == cat_rts_control ? "ON" : "OFF");
|
||||
}
|
||||
|
||||
switch (ptt_type)
|
||||
|
||||
Reference in New Issue
Block a user