chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue with QSY during message sending

Browse Source
This commit is contained in:
Jordan Sherer 2018-08-15 20:57:30 -04:00
parent 43574b10b1
commit ee44e2e5d7
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mainwindow.cpp
View File

@ -1251,6 +1251,9 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
qDebug() << "packing" << Varicode::pack72bits((((quint64)1)<<62)-1, (1<<7)-1) << v << r; qDebug() << "packing" << Varicode::pack72bits((((quint64)1)<<62)-1, (1<<7)-1) << v << r;
#endif #endif
// this must be the last statement of constructor // this must be the last statement of constructor
if (!m_valid) throw std::runtime_error {"Fatal initialization exception"}; if (!m_valid) throw std::runtime_error {"Fatal initialization exception"};
} }
@ -1272,6 +1275,14 @@ void MainWindow::not_GA_warning_message ()
"and carry a responsiblity to report any problems to:\n" "and carry a responsiblity to report any problems to:\n"
"Jordan Sherer (KN4CRD) kn4crd@gmail.com\n\n").arg(QApplication::applicationName()).arg(eol.toString())); "Jordan Sherer (KN4CRD) kn4crd@gmail.com\n\n").arg(QApplication::applicationName()).arg(eol.toString()));
CallDetail cd;
cd.call = "KN4CRD";
cd.freq = 1200;
cd.bits = Varicode::FT8CallLast;
cd.utcTimestamp = QDateTime::currentDateTimeUtc();
logCallActivity(cd, false);
m_rxDirty = true;
} }
void MainWindow::initialize_fonts () void MainWindow::initialize_fonts ()
@ -5724,7 +5735,16 @@ int MainWindow::writeMessageTextToUI(QDateTime date, QString text, int freq, boo
return c.blockNumber(); return c.blockNumber();
} }
bool MainWindow::isMessageQueuedForTransmit(){
return m_transmitting || m_txFrameCount > 0;
}
void MainWindow::addMessageText(QString text, bool clear){ void MainWindow::addMessageText(QString text, bool clear){
// don't add message text if we already have a transmission queued...
if(isMessageQueuedForTransmit()){
return;
}
if(clear){ if(clear){
ui->extFreeTextMsgEdit->clear(); ui->extFreeTextMsgEdit->clear();
} }
@ -7591,6 +7611,11 @@ bool MainWindow::tryRestoreFreqOffset(){
void MainWindow::setFreq4(int rxFreq, int txFreq) void MainWindow::setFreq4(int rxFreq, int txFreq)
{ {
// don't allow QSY if we've already queued a transmission
if(isMessageQueuedForTransmit()){
return;
}
if(rxFreq != txFreq){ if(rxFreq != txFreq){
txFreq = rxFreq; txFreq = rxFreq;
} }

1
mainwindow.h
View File

@ -135,6 +135,7 @@ public slots:
void clearActivity(); void clearActivity();
void displayTextForFreq(QString text, int freq, QDateTime date, bool isTx, bool isNewLine, bool isLast); void displayTextForFreq(QString text, int freq, QDateTime date, bool isTx, bool isNewLine, bool isLast);
int writeMessageTextToUI(QDateTime date, QString text, int freq, bool bold, int block=-1); int writeMessageTextToUI(QDateTime date, QString text, int freq, bool bold, int block=-1);
bool isMessageQueuedForTransmit();
void addMessageText(QString text, bool clear=false); void addMessageText(QString text, bool clear=false);
void enqueueMessage(int priority, QString message, int freq, Callback c); void enqueueMessage(int priority, QString message, int freq, Callback c);
void resetMessage(); void resetMessage();