Index: Configuration.cpp =================================================================== --- Configuration.cpp (revision 5329) +++ Configuration.cpp (working copy) @@ -534,6 +534,7 @@ bool quick_call_; bool disable_TX_on_73_; bool watchdog_; + bool useRR73_; bool TX_messages_; bool enable_VHF_features_; bool decode_at_52s_; @@ -606,6 +607,7 @@ bool Configuration::quick_call () const {return m_->quick_call_;} bool Configuration::disable_TX_on_73 () const {return m_->disable_TX_on_73_;} bool Configuration::watchdog () const {return m_->watchdog_;} +bool Configuration::useRR73 () const { return m_->useRR73_; } bool Configuration::TX_messages () const {return m_->TX_messages_;} bool Configuration::enable_VHF_features () const {return m_->enable_VHF_features_;} bool Configuration::decode_at_52s () const {return m_->decode_at_52s_;} @@ -995,6 +997,7 @@ ui_->quick_call_check_box->setChecked (quick_call_); ui_->disable_TX_on_73_check_box->setChecked (disable_TX_on_73_); ui_->watchdog_check_box->setChecked (watchdog_); + ui_->useRR73_check_box->setChecked (useRR73_); ui_->TX_messages_check_box->setChecked (TX_messages_); ui_->enable_VHF_features_check_box->setChecked(enable_VHF_features_); ui_->decode_at_52s_check_box->setChecked(decode_at_52s_); @@ -1192,6 +1195,7 @@ quick_call_ = settings_->value ("QuickCall", false).toBool (); disable_TX_on_73_ = settings_->value ("73TxDisable", false).toBool (); watchdog_ = settings_->value ("Runaway", false).toBool (); + useRR73_ = settings_->value ("UseRR73", false).toBool (); TX_messages_ = settings_->value ("Tx2QSO", false).toBool (); enable_VHF_features_ = settings_->value("VHFUHF",false).toBool (); decode_at_52s_ = settings_->value("Decode52",false).toBool (); @@ -1272,6 +1276,7 @@ settings_->setValue ("QuickCall", quick_call_); settings_->setValue ("73TxDisable", disable_TX_on_73_); settings_->setValue ("Runaway", watchdog_); + settings_->setValue ("UseRR73", useRR73_); settings_->setValue ("Tx2QSO", TX_messages_); settings_->setValue ("CATForceControlLines", rig_params_.force_line_control); settings_->setValue ("DTR", rig_params_.dtr_high); @@ -1631,6 +1636,7 @@ quick_call_ = ui_->quick_call_check_box->isChecked (); disable_TX_on_73_ = ui_->disable_TX_on_73_check_box->isChecked (); watchdog_ = ui_->watchdog_check_box->isChecked (); + useRR73_ = ui_->useRR73_check_box->isChecked (); TX_messages_ = ui_->TX_messages_check_box->isChecked (); data_mode_ = static_cast (ui_->TX_mode_button_group->checkedId ()); save_directory_ = ui_->save_path_display_label->text (); Index: Configuration.hpp =================================================================== --- Configuration.hpp (revision 5329) +++ Configuration.hpp (working copy) @@ -105,6 +105,7 @@ bool quick_call () const; bool disable_TX_on_73 () const; bool watchdog () const; + bool useRR73 () const; bool TX_messages () const; bool split_mode () const; bool enable_VHF_features () const; Index: Configuration.ui =================================================================== --- Configuration.ui (revision 5329) +++ Configuration.ui (working copy) @@ -53,367 +53,465 @@ General station details and settings. - - - - - Station Details - - - - - - M&y Grid: - - - grid_line_edit - - + + + + 9 + 9 + 438 + 79 + + + + Station Details + + + + + + M&y Grid: + + + grid_line_edit + + + + + + + My C&all: + + + callsign_line_edit + + + + + + + Maidenhead locator (only the first four characters are required). + + + + + + + Station callsign. + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + true + + + <html><head/><body><p>Type 2 compound callsigns are those with prefixes or suffixes not included in the allowed shortlist (See Help-&gt;Add-on prefixes and suffixes).</p><p>This option determines which generated messages should contain your full type 2 compound call sign rather than your base callsign. It only applies if you have a type 2 compound callsign.</p><p>This option controls the way the messages that are used to answer CQ calls are generated. Generated messages 6 (CQ) and 5 (73) will always contain your full callsign. The JT65 and JT9 protocols allow for some standard messages with your full call at the expense of another piece of information such as the DX call or your locator.</p><p>Choosing message 1 omits the DX callsign which may be an issue when replying to CQ calls. Choosing message 3 also omits the DX callsign and many versions of this and other software will not extract the report. Choosing neither means that your full callsign only goes in your message 5 (73) so your QSO partner my log the wrong callsign.</p><p>None of these options are perfect, message 3 is best but be aware your QSO partner may not log the report you send them.</p></body></html> + + + 1 + + + + Full call in Tx1 + - - - - My C&all: - - - callsign_line_edit - - + + + Full call in Tx3 + - - - - Maidenhead locator (only the first four characters are required). - - + + + Full call in Tx5 only + - - + + + + + + Message generation for type 2 compound callsign holders: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + type_2_msg_gen_combo_box + + + + + + + + + 9 + 176 + 643 + 16 + + + + Qt::Horizontal + + + + + + 9 + 185 + 422 + 122 + + + + Display + + + + + + Show if decoded stations are new DXCC entities or worked before. + + + Show &DXCC entity and worked before status + + + false + + + + + + + Include a separator line between periods in the band activity window. + + + &Blank line between decoding periods + + + + + + + - Station callsign. + Set the font characteristics for the application. - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - true - - - <html><head/><body><p>Type 2 compound callsigns are those with prefixes or suffixes not included in the allowed shortlist (See Help-&gt;Add-on prefixes and suffixes).</p><p>This option determines which generated messages should contain your full type 2 compound call sign rather than your base callsign. It only applies if you have a type 2 compound callsign.</p><p>This option controls the way the messages that are used to answer CQ calls are generated. Generated messages 6 (CQ) and 5 (73) will always contain your full callsign. The JT65 and JT9 protocols allow for some standard messages with your full call at the expense of another piece of information such as the DX call or your locator.</p><p>Choosing message 1 omits the DX callsign which may be an issue when replying to CQ calls. Choosing message 3 also omits the DX callsign and many versions of this and other software will not extract the report. Choosing neither means that your full callsign only goes in your message 5 (73) so your QSO partner my log the wrong callsign.</p><p>None of these options are perfect, message 3 is best but be aware your QSO partner may not log the report you send them.</p></body></html> - - - 1 - - - - Full call in Tx1 - - - - - Full call in Tx3 - - - - - Full call in Tx5 only - - - - - - - Message generation for type 2 compound callsign holders: + Font... - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - type_2_msg_gen_combo_box - - - - - - - - Qt::Horizontal - - - - - - - Display - - - - + + - Show if decoded stations are new DXCC entities or worked before. + Set the font characteristics for the Band Activity and Rx Frequency areas. - Show &DXCC entity and worked before status + Decoded Text Font... - - false - - - - - Include a separator line between periods in the band activity window. - - - &Blank line between decoding periods - - - - - - - - - Set the font characteristics for the application. - - - Font... - - - - - - - Set the font characteristics for the Band Activity and Rx Frequency areas. - - - Decoded Text Font... - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Show distance to DX station in miles rather than kilometers. - - - Display dista&nce in miles - - - - - - - Show outgoing transmitted messages in the Rx frequency window. - - - &Tx messages to Rx frequency window - - - - - + + - Qt::Horizontal + Qt::Vertical - 40 - 20 + 20 + 40 - - - - - - Qt::Horizontal - - - - - - - Behavior - - - - - - Turns off automatic transmissions after sending a 73 or any other free + + + + + Show distance to DX station in miles rather than kilometers. + + + Display dista&nce in miles + + + + + + + Show outgoing transmitted messages in the Rx frequency window. + + + &Tx messages to Rx frequency window + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 9 + 351 + 643 + 16 + + + + Qt::Horizontal + + + + + + 9 + 360 + 580 + 170 + + + + Behavior + + + + + 10 + 69 + 154 + 17 + + + + Turns off automatic transmissions after sending a 73 or any other free text message. - - - Di&sable Tx after sending 73 - - - - - - - Stop transmitting automatically after five periods. - - - Runaway Tx &watchdog - - - - - - - Automatic transmission mode. - - - Doubl&e-click on call sets Tx enable - - - - - - - Don't start decoding until the monitor button is clicked. - - - Mon&itor off at startup - - - false - - - - - - - - - Send a CW ID after every 73 or free text message. - - - CW ID a&fter 73 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - Periodic CW ID Inter&val: - - - CW_id_interval_spin_box - - - - - - - - 0 - 0 - - - - Send a CW ID periodically every few minutes. + + + Di&sable Tx after sending 73 + + + + + + 10 + 92 + 133 + 17 + + + + Stop transmitting automatically after five periods. + + + Runaway Tx &watchdog + + + + + + 10 + 46 + 185 + 17 + + + + Automatic transmission mode. + + + Doubl&e-click on call sets Tx enable + + + + + + 10 + 23 + 127 + 17 + + + + Don't start decoding until the monitor button is clicked. + + + Mon&itor off at startup + + + false + + + + + + 325 + 23 + 208 + 17 + + + + <html><head/><body><p>Check this if you wish to automatically return to the last monitored frequency when monitor is enabled, leave it unchecked if you wish to have the current rig frequency maintained.</p></body></html> + + + Monitor returns to last used frequency + + + + + + 325 + 46 + 245 + 17 + + + + <html><head/><body><p>Some rigs are not able to process CAT commands while transmitting. This means that if you are operating in split mode you may have to uncheck this option.</p></body></html> + + + Allow Tx frequency changes while transmitting + + + + + + 325 + 69 + 200 + 17 + + + + Enable VHF/UHF/Microwave features + + + + + + 325 + 92 + 113 + 17 + + + + Decode at t = 52 s + + + + + + 10 + 115 + 145 + 17 + + + + <html><head/><body><p>Use RR73 in Std Msg #4 instead of RRR</p></body></html> + + + Use RR73 instead of RRR + + + + + + 11 + 139 + 571 + 22 + + + + + + + Send a CW ID after every 73 or free text message. + + + CW ID a&fter 73 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Periodic CW ID Inter&val: + + + CW_id_interval_spin_box + + + + + + + + 0 + 0 + + + + Send a CW ID periodically every few minutes. This might be required under your countries licence regulations. It will not interfere with other users as it is always sent in the quiet period when decoding is done. - - - - - - - - - <html><head/><body><p>Check this if you wish to automatically return to the last monitored frequency when monitor is enabled, leave it unchecked if you wish to have the current rig frequency maintained.</p></body></html> - - - Monitor returns to last used frequency - - - - - - - <html><head/><body><p>Some rigs are not able to process CAT commands while transmitting. This means that if you are operating in split mode you may have to uncheck this option.</p></body></html> - - - Allow Tx frequency changes while transmitting - - - - - - - Enable VHF/UHF/Microwave features - - - - - - - Decode at t = 52 s - - - - - - - + + + + + + Index: mainwindow.cpp =================================================================== --- mainwindow.cpp (revision 5329) +++ mainwindow.cpp (working copy) @@ -56,7 +56,7 @@ bool message_is_73 (int type, QStringList const& msg_parts) { return type >= 0 - && ((type < 6 && msg_parts.contains ("73")) + && ((type < 6 && (msg_parts.contains ("73") || msg_parts.contains("RR73"))) || (type == 6 && !msg_parts.filter ("73").isEmpty ())); } } @@ -2376,7 +2376,11 @@ msgtype(t, ui->tx2); t=t0 + "R" + rpt; msgtype(t, ui->tx3); - t=t0 + "RRR"; + if (m_config.useRR73()) { + t=t0 + "RR73"; + } else { + t=t0 + "RRR"; + } if(m_mode=="JT4" and m_bShMsgs) t="@1500 (RRR)"; msgtype(t, ui->tx4); t=t0 + "73";