Merge branch 'develop' into map65

This commit is contained in:
Joe Taylor 2023-01-28 10:23:54 -05:00
commit 1816e80707
6 changed files with 559 additions and 549 deletions

View File

@ -206,18 +206,15 @@ void DXLabSuiteCommanderTransceiver::do_frequency (Frequency f, MODE m, bool /*n
{ {
CAT_TRACE (f << ' ' << state ()); CAT_TRACE (f << ' ' << state ());
auto f_string = frequency_to_string (f); auto f_string = frequency_to_string (f);
if (UNK != m && m != get_mode ()) auto params = ("<xcvrfreq:%1>" + f_string).arg (f_string.size ());
simple_command (("<command:10>CmdSetFreq<parameters:%1>" + params).arg (params.size ()));
if (UNK != m)
{ {
auto m_string = map_mode (m); auto m_string = map_mode (m);
auto params = ("<xcvrfreq:%1>" + f_string + "<xcvrmode:%2>" + m_string + "<preservesplitanddual:1>Y").arg (f_string.size ()).arg (m_string.size ()); auto params = ("<xcvrfreq:%1>" + f_string + "<xcvrmode:%2>" + m_string + "<preservesplitanddual:1>Y").arg (f_string.size ()).arg (m_string.size ());
simple_command (("<command:14>CmdSetFreqMode<parameters:%1>" + params).arg (params.size ())); simple_command (("<command:14>CmdSetFreqMode<parameters:%1>" + params).arg (params.size ()));
update_mode (m); update_mode (m);
} }
else
{
auto params = ("<xcvrfreq:%1>" + f_string).arg (f_string.size ());
simple_command (("<command:10>CmdSetFreq<parameters:%1>" + params).arg (params.size ()));
}
update_rx_frequency (f); update_rx_frequency (f);
} }

View File

@ -659,7 +659,7 @@ int HamlibTransceiver::do_start ()
rmode_t mb; rmode_t mb;
pbwidth_t w {RIG_PASSBAND_NORMAL}; pbwidth_t w {RIG_PASSBAND_NORMAL};
pbwidth_t wb; pbwidth_t wb;
if (m_->freq_query_works_ if (m_->freq_query_works_ && m_->mode_query_works_
&& (!m_->get_vfo_works_ || !rig_get_function_ptr (m_->model_, RIG_FUNCTION_GET_VFO))) && (!m_->get_vfo_works_ || !rig_get_function_ptr (m_->model_, RIG_FUNCTION_GET_VFO)))
{ {
// Icom have deficient CAT protocol with no way of reading which // Icom have deficient CAT protocol with no way of reading which

View File

@ -35,7 +35,7 @@ Rx frequency along with any decodes addressed to *My Call* (K1JT in this case).
The red marker on the waterfall scale indicates your The red marker on the waterfall scale indicates your
Tx frequency. Tx frequency.
Twenty one FT8 signals are decoded from the example file. The number Twenty-one FT8 signals are decoded from the example file. The number
of decodes is shown in a box at the bottom of the main window. of decodes is shown in a box at the bottom of the main window.
When this file was recorded HA5WA was finishing a QSO with K1JT, and When this file was recorded HA5WA was finishing a QSO with K1JT, and
his 73 message is shown in red because it is addressed to *My Call* (in this case K1JT). his 73 message is shown in red because it is addressed to *My Call* (in this case K1JT).

View File

@ -34,7 +34,7 @@ frequency control on the main window will be updated accordingly.
frequency marker and its associated control on the main window will frequency marker and its associated control on the main window will
follow your frequency selections. follow your frequency selections.
- Do the same thing with the *Ctrl* key held down. Now the both colored - Do the same thing with the *Ctrl* key held down. Now both colored
markers and both spinner controls will follow your selections. markers and both spinner controls will follow your selections.
- Now double-click on any of the lines of decoded text in the Band - Now double-click on any of the lines of decoded text in the Band

File diff suppressed because it is too large Load Diff

View File

@ -4181,7 +4181,7 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
|| message_words.contains (ui->dxCallEntry->text ()) || message_words.contains (ui->dxCallEntry->text ())
|| message_words.contains (Radio::base_callsign (ui->dxCallEntry->text ())) || message_words.contains (Radio::base_callsign (ui->dxCallEntry->text ()))
|| message_words.contains ("DE"))) || message_words.contains ("DE")))
|| !message.isStandardMessage ()); // free text 73/RR73 || (!message.isStandardMessage () && m_mode != "MSK144")); // free text 73/RR73 except for MSK
auto const& w = msg_no_hash.split(" ",SkipEmptyParts); auto const& w = msg_no_hash.split(" ",SkipEmptyParts);
QString w2; QString w2;
@ -4884,7 +4884,10 @@ void MainWindow::guiUpdate()
if( SpecOp::HOUND == m_specOp ) { if( SpecOp::HOUND == m_specOp ) {
qint32 tHound=QDateTime::currentMSecsSinceEpoch()/1000 - m_tAutoOn; qint32 tHound=QDateTime::currentMSecsSinceEpoch()/1000 - m_tAutoOn;
//To keep calling Fox, Hound must reactivate Enable Tx at least once every 2 minutes //To keep calling Fox, Hound must reactivate Enable Tx at least once every 2 minutes
if(tHound >= 120 and m_ntx==1) auto_tx_mode(false); if(tHound >= 120 and m_ntx==1) {
auto_tx_mode(false);
statusUpdate ();
}
} }
progressBar.setVisible(true); progressBar.setVisible(true);