w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-19 10:32:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Disallow split mode working with dummy rig.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3992 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2014-04-07 23:40:32 +00:00
parent bfd4deb7c7
commit 589f0d56b5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Configuration.cpp
View File

@ -420,7 +420,11 @@ bool Configuration::quick_call () const {return m_->quick_call_;}
bool Configuration::disable_TX_on_73 () const {return m_->disable_TX_on_73_;} bool Configuration::disable_TX_on_73 () const {return m_->disable_TX_on_73_;}
bool Configuration::watchdog () const {return m_->watchdog_;} bool Configuration::watchdog () const {return m_->watchdog_;}
bool Configuration::TX_messages () const {return m_->TX_messages_;} bool Configuration::TX_messages () const {return m_->TX_messages_;}
bool Configuration::split_mode () const {return m_->rig_params_.split_mode_ != TransceiverFactory::split_mode_none;} bool Configuration::split_mode () const
{
bool have_rig = m_->transceiver_factory_.CAT_port_type (m_->rig_params_.rig_name_) != TransceiverFactory::Capabilities::none;
return have_rig && m_->rig_params_.split_mode_ != TransceiverFactory::split_mode_none;
}
Bands * Configuration::bands () {return &m_->bands_;} Bands * Configuration::bands () {return &m_->bands_;}
StationList * Configuration::stations () {return &m_->stations_;} StationList * Configuration::stations () {return &m_->stations_;}
FrequencyList * Configuration::frequencies () {return &m_->frequencies_;} FrequencyList * Configuration::frequencies () {return &m_->frequencies_;}

6
HamlibTransceiver.cpp
View File

@ -174,13 +174,9 @@ HamlibTransceiver::HamlibTransceiver (int model_number
// rig_->state.obj = this; // rig_->state.obj = this;
if (/*!is_dummy_ &&*/ !cat_port.isEmpty () /*&& cat_port != "None"*/) if (!cat_port.isEmpty ())
{ {
// #if defined (WIN32)
// set_conf ("rig_pathname", ("\\\\.\\" + cat_port).toLatin1 ().data ());
// #else
set_conf ("rig_pathname", cat_port.toLatin1 ().data ()); set_conf ("rig_pathname", cat_port.toLatin1 ().data ());
// #endif
} }
set_conf ("serial_speed", QByteArray::number (cat_baud).data ()); set_conf ("serial_speed", QByteArray::number (cat_baud).data ());