w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-21 19:48:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sfox5b' of bitbucket.org:k1jt/wsjtx into sfox5b

Browse Source
This commit is contained in:
Joe Taylor 2024-09-17 15:28:55 -04:00
commit 5c2d01d8b4
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
widgets/mainwindow.cpp
View File

@ -349,7 +349,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_widebandDecode {false}, m_widebandDecode {false},
m_dataAvailable {false}, m_dataAvailable {false},
m_decodedText2 {false}, m_decodedText2 {false},
m_freeText {false},
m_sentFirst73 {false}, m_sentFirst73 {false},
m_currentMessageType {-1}, m_currentMessageType {-1},
m_lastMessageType {-1}, m_lastMessageType {-1},
@ -2675,8 +2674,8 @@ void MainWindow::statusChanged()
} }
} else { } else {
ui->sbNslots->setVisible(true); ui->sbNslots->setVisible(true);
ui->pbFreeText->setVisible(false); ui->pbFreeText->setVisible(true);
ui->cbSendMsg->setVisible(false); ui->cbSendMsg->setVisible(true);
ui->sbNslots->setValue(m_Nslots0); ui->sbNslots->setValue(m_Nslots0);
} }
if (SpecOp::HOUND==m_specOp) ui->cbRxAll->setVisible(!m_config.superFox()); if (SpecOp::HOUND==m_specOp) ui->cbRxAll->setVisible(!m_config.superFox());
@ -9208,6 +9207,8 @@ void MainWindow::on_cbFast9_clicked(bool b)
void MainWindow::on_cbSendMsg_toggled(bool b) void MainWindow::on_cbSendMsg_toggled(bool b)
{ {
if (!(m_config.superFox() && m_specOp==SpecOp::FOX))
return; // don't do anything with slot values unless SuperFox mode
if(b) { if(b) {
ui->sbNslots->setValue(2); ui->sbNslots->setValue(2);
} else { } else {
@ -10636,7 +10637,7 @@ void MainWindow::foxTxSequencer()
m_tFoxTxSinceOTP++; m_tFoxTxSinceOTP++;
m_tFoxTx++; //Increment Fox Tx cycle counter m_tFoxTx++; //Increment Fox Tx cycle counter
//Is it time for a stand-alone CQ? // Is it time for a stand-alone CQ?
if(m_tFoxTxSinceCQ >= m_foxCQtime and ui->cbMoreCQs->isChecked()) { if(m_tFoxTxSinceCQ >= m_foxCQtime and ui->cbMoreCQs->isChecked()) {
fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign(); fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign();
if(!fm.contains("/")) { if(!fm.contains("/")) {
@ -10650,6 +10651,13 @@ void MainWindow::foxTxSequencer()
goto Transmit; goto Transmit;
} }
// Maybe send out the freetext message?
if (ui->cbSendMsg->isChecked() && (islot < m_Nslots)) {
fm = m_freeTextMsg;
islot++;
foxGenWaveform(islot - 1, fm);
}
#ifdef FOX_OTP #ifdef FOX_OTP
// Send OTP message maybe for regular fox mode // Send OTP message maybe for regular fox mode
if (!m_config.superFox() && m_config.OTPEnabled() && (islot < m_Nslots) && (m_tFoxTxSinceOTP >= m_config.OTPinterval())) if (!m_config.superFox() && m_config.OTPEnabled() && (islot < m_Nslots) && (m_tFoxTxSinceOTP >= m_config.OTPinterval()))

1
widgets/mainwindow.h
View File

@ -544,7 +544,6 @@ private:
bool m_bDecoded; bool m_bDecoded;
bool m_noSuffix; bool m_noSuffix;
bool m_decodedText2; bool m_decodedText2;
bool m_freeText;
bool m_sentFirst73; bool m_sentFirst73;
int m_currentMessageType; int m_currentMessageType;
QString m_currentMessage; QString m_currentMessage;