Index: Configuration.cpp =================================================================== --- Configuration.cpp (revision 6343) +++ Configuration.cpp (working copy) @@ -391,6 +391,7 @@ Q_SLOT void on_CAT_handshake_button_group_buttonClicked (int); Q_SLOT void on_CAT_poll_interval_spin_box_valueChanged (int); Q_SLOT void on_split_mode_button_group_buttonClicked (int); + Q_SLOT void on_split_resolution_combo_box_activated (int); Q_SLOT void on_test_CAT_push_button_clicked (); Q_SLOT void on_test_PTT_push_button_clicked (bool checked); Q_SLOT void on_force_DTR_combo_box_currentIndexChanged (int); @@ -520,6 +521,7 @@ qint32 id_interval_; qint32 ntrials_; qint32 aggressive_; + qint32 split_resolution_; double degrade_; bool id_after_73_; bool tx_QSY_allowed_; @@ -601,6 +603,7 @@ qint32 Configuration::id_interval () const {return m_->id_interval_;} qint32 Configuration::ntrials() const {return m_->ntrials_;} qint32 Configuration::aggressive() const {return m_->aggressive_;} +qint32 Configuration::split_resolution() const {return m_->split_resolution_;} double Configuration::degrade() const {return m_->degrade_;} bool Configuration::id_after_73 () const {return m_->id_after_73_;} bool Configuration::tx_QSY_allowed () const {return m_->tx_QSY_allowed_;} @@ -1029,6 +1032,7 @@ ui_->CW_id_interval_spin_box->setValue (id_interval_); ui_->sbNtrials->setValue (ntrials_); ui_->sbAggressive->setValue (aggressive_); + ui_->split_resolution_combo_box->setCurrentText (QString::number(split_resolution_)); ui_->sbDegrade->setValue (degrade_); ui_->PTT_method_button_group->button (rig_params_.ptt_type)->setChecked (true); ui_->save_path_display_label->setText (save_directory_.absolutePath ()); @@ -1159,6 +1163,7 @@ id_interval_ = settings_->value ("IDint", 0).toInt (); ntrials_ = settings_->value ("nTrials", 6).toInt (); aggressive_ = settings_->value ("Aggressive", 0).toInt (); + split_resolution_ = settings_->value ("SplitResolution",500).toInt (); save_directory_ = settings_->value ("SaveDir", default_save_directory_.absolutePath ()).toString (); azel_directory_ = settings_->value ("AzElDir", default_azel_directory_.absolutePath ()).toString (); @@ -1373,6 +1378,7 @@ settings_->setValue ("TXAudioSource", QVariant::fromValue (rig_params_.audio_source)); settings_->setValue ("Polling", rig_params_.poll_interval); settings_->setValue ("SplitMode", QVariant::fromValue (rig_params_.split_mode)); + settings_->setValue ("SplitResolution", split_resolution_); settings_->setValue ("VHFUHF", enable_VHF_features_); settings_->setValue ("Decode52", decode_at_52s_); settings_->setValue ("TwoPass", twoPass_); @@ -1741,6 +1747,7 @@ id_interval_ = ui_->CW_id_interval_spin_box->value (); ntrials_ = ui_->sbNtrials->value (); aggressive_ = ui_->sbAggressive->value (); + split_resolution_ = ui_->split_resolution_combo_box->currentText ().toInt (); degrade_ = ui_->sbDegrade->value (); id_after_73_ = ui_->CW_id_after_73_check_box->isChecked (); tx_QSY_allowed_ = ui_->tx_QSY_check_box->isChecked (); @@ -1961,6 +1968,10 @@ required_tx_frequency_ = 0; } +void Configuration::impl::on_split_resolution_combo_box_activated (int /* id */) +{ + split_resolution_ = ui_->split_resolution_combo_box->currentText ().toInt (); +} void Configuration::impl::on_test_CAT_push_button_clicked () { if (!validate ()) Index: Configuration.hpp =================================================================== --- Configuration.hpp (revision 6343) +++ Configuration.hpp (working copy) @@ -93,6 +93,7 @@ qint32 id_interval () const; qint32 ntrials() const; qint32 aggressive() const; + qint32 split_resolution() const; double degrade() const; bool id_after_73 () const; bool tx_QSY_allowed () const; Index: Configuration.ui =================================================================== --- Configuration.ui (revision 6343) +++ Configuration.ui (working copy) @@ -405,704 +405,894 @@ Radio interface configuration settings. - - - - - - 0 - 0 - - - - Settings that control your CAT interface. - - - CAT Control - - - - - - QFormLayout::ExpandingFieldsGrow + + + + 9 + 37 + 264 + 345 + + + + + 0 + 0 + + + + Settings that control your CAT interface. + + + CAT Control + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + Port: - - - - Port: - - - CAT_port_combo_box - - - - - - - - 1 - 0 - - - - Serial port used for CAT control. - - - true - - - - - - QComboBox::NoInsert - - - - + + CAT_port_combo_box + + - - + + - - 0 + + 1 0 - - Serial Port Parameters + + Serial port used for CAT control. - - - - - QFormLayout::ExpandingFieldsGrow + + true + + + + + + QComboBox::NoInsert + + + + + + + + + + 0 + 0 + + + + Serial Port Parameters + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + Baud Rate: - - - - Baud Rate: - - - CAT_serial_baud_combo_box - - - - - - - - 0 - 0 - - - - Serial port data rate which must match the setting of your radio. - - - 0 - - - - 1200 - - - - - 2400 - - - - - 4800 - - - - - 9600 - - - - - 19200 - - - - - 38400 - - - - - 57600 - - - - - 115200 - - - - - - - - - - <html><head/><body><p>Number of data bits used to communicate with your radio's CAT interface (usually eight).</p></body></html> + + CAT_serial_baud_combo_box - - Data Bits - - - - - - Se&ven - - - CAT_data_bits_button_group - - - - - - - E&ight - - - true - - - CAT_data_bits_button_group - - - - - - + + + + + 0 + 0 + + - <html><head/><body><p>Number of stop bits used when communicating with your radio's CAT interface</p><p>(consult you radio's manual for details).</p></body></html> + Serial port data rate which must match the setting of your radio. - - Stop Bits + + 0 - - - - - On&e - - - CAT_stop_bits_button_group - - - - - - - T&wo - - - true - - - CAT_stop_bits_button_group - - - - + + 2147483645 + + + + 1200 + + + + + 2400 + + + + + 4800 + + + + + 9600 + + + + + 19200 + + + + + 38400 + + + + + 57600 + + + + + 115200 + + - - - - <html><head/><body><p>Flow control protocol used between this computer and your radio's CAT interface (usually &quot;None&quot; but some require &quot;Hardware&quot;).</p></body></html> - - - Handshake - - + + + + + + <html><head/><body><p>Number of data bits used to communicate with your radio's CAT interface (usually eight).</p></body></html> + + + Data Bits + + + + + + Se&ven + + + CAT_data_bits_button_group + + + + + + + E&ight + + + true + + + CAT_data_bits_button_group + + + + + + + + + + <html><head/><body><p>Number of stop bits used when communicating with your radio's CAT interface</p><p>(consult you radio's manual for details).</p></body></html> + + + Stop Bits + + + + + + On&e + + + CAT_stop_bits_button_group + + + + + + + T&wo + + + true + + + CAT_stop_bits_button_group + + + + + + + + + + <html><head/><body><p>Flow control protocol used between this computer and your radio's CAT interface (usually &quot;None&quot; but some require &quot;Hardware&quot;).</p></body></html> + + + Handshake + + + + + + &None + + + true + + + CAT_handshake_button_group + + + + + + + Software flow control (very rare on CAT interfaces). + + + XON/XOFF + + + CAT_handshake_button_group + + + + + + + Flow control using the RTS and CTS RS-232 control lines +not often used but some radios have it as an option and +a few, particularly some Kenwood rigs, require it). + + + &Hardware + + + CAT_handshake_button_group + + + + + + + + + + Special control of CAT port control lines. + + + Force Control Lines + + + false + + + + - + - &None + DTR: - - true + + force_DTR_combo_box - - CAT_handshake_button_group - - - - Software flow control (very rare on CAT interfaces). - - - XON/XOFF - - - CAT_handshake_button_group - + + + + + + + + + High + + + + + Low + + - - - - Flow control using the RTS and CTS RS-232 control lines -not often used but some radios have it as an option and -a few, particularly some Kenwood rigs, require it). - + + + + + + - &Hardware + RTS: - - CAT_handshake_button_group - + + force_RTS_combo_box + - - - - - - - Special control of CAT port control lines. - - - Force Control Lines - - - false - - - - - - - - DTR: - - - force_DTR_combo_box - - + + + + + + - - - - - - - - - - High - - - - - Low - - - + + + High + - - - - - - - - RTS: - - - force_RTS_combo_box - - + + + Low + - - - - - - - - - - High - - - - - Low - - - - - + - - - - - - - - - - - - Qt::Horizontal - - - - - - - Qt::Vertical - - - - - - - - 0 - 0 - - - - How this program activates the PTT on your radio - - - PTT Method - - + + + + + + + + + + + + + 331 + 274 + 306 + 16 + + + + Qt::Horizontal + + + + + + 322 + 37 + 16 + 445 + + + + Qt::Vertical + + + + + + 331 + 37 + 121 + 101 + + + + + 0 + 0 + + + + How this program activates the PTT on your radio + + + PTT Method + + + + + + <html><head/><body><p>No PTT activation, instead the radio's automatic VOX is used to key the transmitter.</p><p>Use this if you have no radio interface hardware.</p></body></html> + + + VO&X + + + PTT_method_button_group + + + + + + + <html><head/><body><p>Use the RS-232 DTR control line to toggle your radio's PTT,</p><p>requires hardware to inteface the line.</p><p>Some commercial interface units also use this method.</p><p>The DTR control line of the CAT serial port may be used for this or</p><p>a DTR control line on a different serial port may be used.</p></body></html> + + + &DTR + + + true + + + PTT_method_button_group + + + + + + + Some radios support PTT via CAT commands, +use this option if your radio supports it and you have no +other hardware interface for PTT. + + + C&AT + + + PTT_method_button_group + + + + + + + <html><head/><body><p>Use the RS-232 RTS control line to toggle your radio's PTT,</p><p>requires hardware to inteface the line.</p><p>Some commercial interface units also use this method.</p><p>The RTS control line of the CAT serial port may be used for this or</p><p>a RTS control line on a different serial port may be used.</p><p>Note that this options is not available on the CAT serial port</p><p>when hardware flow control is used.</p></body></html> + + + R&TS + + + PTT_method_button_group + + + + + + + QFormLayout::ExpandingFieldsGrow + - - - <html><head/><body><p>No PTT activation, instead the radio's automatic VOX is used to key the transmitter.</p><p>Use this if you have no radio interface hardware.</p></body></html> - + - VO&X + Port: - - PTT_method_button_group - + + PTT_port_combo_box + - + + + + 1 + 0 + + - <html><head/><body><p>Use the RS-232 DTR control line to toggle your radio's PTT,</p><p>requires hardware to inteface the line.</p><p>Some commercial interface units also use this method.</p><p>The DTR control line of the CAT serial port may be used for this or</p><p>a DTR control line on a different serial port may be used.</p></body></html> + <html><head/><body><p>Select the RS-232 serial port utilised for PTT control,</p><p>this option is available when DTR or RTS is selected above</p><p>as a transmit method.</p><p>This port can be the same one as the one used for CAT control.</p><p>For some interface types the special value CAT may be chosen,</p><p>this is used for non-serial CAT interfaces that can control</p><p>serial port control lines remotely (OmniRig for example).</p></body></html> - - &DTR - - + true - - PTT_method_button_group - - - - - - - Some radios support PTT via CAT commands, -use this option if your radio supports it and you have no -other hardware interface for PTT. + + - - C&AT + + -1 - - PTT_method_button_group - - - - - - - <html><head/><body><p>Use the RS-232 RTS control line to toggle your radio's PTT,</p><p>requires hardware to inteface the line.</p><p>Some commercial interface units also use this method.</p><p>The RTS control line of the CAT serial port may be used for this or</p><p>a RTS control line on a different serial port may be used.</p><p>Note that this options is not available on the CAT serial port</p><p>when hardware flow control is used.</p></body></html> + + QComboBox::NoInsert - - R&TS - - - PTT_method_button_group - - - - - QFormLayout::ExpandingFieldsGrow - - - - - Port: - - - PTT_port_combo_box - - - - - - - - 1 - 0 - - - - <html><head/><body><p>Select the RS-232 serial port utilised for PTT control,</p><p>this option is available when DTR or RTS is selected above</p><p>as a transmit method.</p><p>This port can be the same one as the one used for CAT control.</p><p>For some interface types the special value CAT may be chosen,</p><p>this is used for non-serial CAT interfaces that can control</p><p>serial port control lines remotely (OmniRig for example).</p></body></html> - - - true - - - - - - -1 - - - QComboBox::NoInsert - - - - - - - - - - - Modulation mode selected on radio. - - - Mode - - - - - - <html><head/><body><p>USB is usually the correct modulation mode,</p><p>unless the radio has a special data or packet mode setting</p><p>for AFSK operation.</p></body></html> - - - US&B - - - true - - - TX_mode_button_group - - - - - - - Don't allow the program to set the radio mode + + + + + + + 331 + 218 + 187 + 50 + + + + Modulation mode selected on radio. + + + Mode + + + + + + <html><head/><body><p>USB is usually the correct modulation mode,</p><p>unless the radio has a special data or packet mode setting</p><p>for AFSK operation.</p></body></html> + + + US&B + + + true + + + TX_mode_button_group + + + + + + + Don't allow the program to set the radio mode (not recommended but use if the wrong mode or bandwidth is selected). - - - None - - - TX_mode_button_group - - - - - - - If this is availabe then it is usually the correct mode for this program. - - - Data/P&kt - - - TX_mode_button_group - - - - - - - - - - Some radios can select the audio input using a CAT command, + + + None + + + TX_mode_button_group + + + + + + + If this is availabe then it is usually the correct mode for this program. + + + Data/P&kt + + + TX_mode_button_group + + + + + + + + + 331 + 153 + 167 + 50 + + + + Some radios can select the audio input using a CAT command, this setting allows you to select which audio input will be used (if it is available then generally the Rear/Data option is best). - - - Transmit Audio Source - - - - - - Rear&/Data - - - TX_audio_source_button_group - - - - - - - &Front/Mic - - - true - - - TX_audio_source_button_group - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Horizontal - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - + + + Transmit Audio Source + + + + + + Rear&/Data + + + TX_audio_source_button_group + + + + + + + &Front/Mic + + + true + + + TX_audio_source_button_group + + + + + + + + + 331 + 144 + 306 + 16 + + + + Qt::Horizontal + + + + + + 331 + 209 + 306 + 16 + + + + Qt::Horizontal + + + + + + 330 + 290 + 306 + 71 + + + + + 0 + 0 + + + + Split Operation + + + + + 10 + 20 + 48 + 17 + + + + None + + + true + + + split_mode_button_group + + + + + + 107 + 20 + 38 + 17 + + + + Rig + + + split_mode_button_group + + + + + + 205 + 20 + 56 + 17 + + + + Fake It + + + split_mode_button_group + + + + + + 10 + 42 + 129 + 22 + + + + + + + + 0 + 0 + + - Rig: + Split Resolution: - rig_combo_box + PTT_port_combo_box - - + + + + true + - + 1 0 - - - - - - Poll Interval: + + <html><head/><body><p>Audio base freq computation of split offset.</p><p>You should use the best (e.g. 1) resolution your rig supports. e.g. Freq=1 means your tuner never has to retune when you change offset</p><p>500 - audio starts in 1500-2000Hz range.</p><p>100 - audio starts in 1500-1600 range.</p><p>10 - audio starts in 1500-1510 range.</p><p>1 audio starts at 1500</body></html> - - CAT_poll_interval_spin_box + + false - - - - - - s + + QComboBox::InsertAtBottom - - 1 + + 0 + + + 500 + + + + + 100 + + + + + 10 + + + + + 1 + + - - - - - Qt::Horizontal - - - - - - - - - Attempt to connect to the radio with these settings. + + + + + + + + Rig: + + + rig_combo_box + + + + + + + + 1 + 0 + + + + + + + + Poll Interval: + + + CAT_poll_interval_spin_box + + + + + + + s + + + 1 + + + + + + + + + 331 + 356 + 206 + 119 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Attempt to connect to the radio with these settings. Another dialog will pop up where you can verify correct operation. - - - Test CAT - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 40 - 20 - - - - - - - - Attempt to activate the transmitter. + + + Test CAT + + + + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + + + 40 + 20 + + + + + + + + Attempt to activate the transmitter. Click again to deactivate. Normally no power should be output since there is no audio being generated at this time. Check that any Tx indication on your radio and/or your radio interface behave as expected. - - - QPushButton:checked { + + + QPushButton:checked { background-color: red; border-style : outset; border-width: 1px; @@ -1111,73 +1301,32 @@ min-width: 5em; padding: 3px; } - - - Test PTT - - - true - - - - - - - - - Split Operation - - - - + - None + Test PTT - + true - - split_mode_button_group - - - - - Rig - - - split_mode_button_group - - - - - - - Fake It - - - split_mode_button_group - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + @@ -2491,12 +2640,12 @@ + - + + - - - + Index: mainwindow.cpp =================================================================== --- mainwindow.cpp (revision 6343) +++ mainwindow.cpp (working copy) @@ -4151,7 +4151,7 @@ // m_bSimplex is false, so we can use split mode if requested if (m_config.split_mode () && m_mode != "JT4") { // Don't use XIT in JT4, we may be using Doppler control - m_XIT=(n/500)*500 - 1500; + m_XIT=(n/m_config.split_resolution())*m_config.split_resolution() - 1500; } if (m_monitoring || m_transmitting) {