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

Removed waterfall freeze. Pause decoder during transmit dead air

Browse Source
This commit is contained in:
Jordan Sherer 2019-11-11 09:53:32 -05:00
parent 34c6f83642
commit e4cfb820a3
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mainwindow.cpp
View File

@ -523,7 +523,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
connect (&m_audioThread, &QThread::finished, m_detector, &QObject::deleteLater); connect (&m_audioThread, &QThread::finished, m_detector, &QObject::deleteLater);
// setup the waterfall // setup the waterfall
connect(m_wideGraph.data (), SIGNAL(freezeDecode2(int)),this,SLOT(freezeDecode(int)));
connect(m_wideGraph.data (), SIGNAL(f11f12(int)),this,SLOT(bumpFqso(int))); connect(m_wideGraph.data (), SIGNAL(f11f12(int)),this,SLOT(bumpFqso(int)));
connect(m_wideGraph.data (), SIGNAL(setXIT2(int)),this,SLOT(setXIT(int))); connect(m_wideGraph.data (), SIGNAL(setXIT2(int)),this,SLOT(setXIT(int)));
@ -3951,11 +3950,6 @@ void MainWindow::on_DecodeButton_clicked (bool /* checked */) //Decode request
} }
} }
void MainWindow::freezeDecode(int n) //freezeDecode()
{
if((n%100)==2) on_DecodeButton_clicked (true);
}
void MainWindow::on_ClrAvgButton_clicked() void MainWindow::on_ClrAvgButton_clicked()
{ {
m_nclearave=1; m_nclearave=1;
@ -3964,11 +3958,6 @@ void MainWindow::on_ClrAvgButton_clicked()
} }
} }
void MainWindow::msgAvgDecode2()
{
on_DecodeButton_clicked (true);
}
bool MainWindow::isDecodeReady(int submode, qint32 k, qint32 k0, qint32 *pCurrentDecodeStart, qint32 *pNextDecodeStart, qint32 *pStart, qint32 *pSz){ bool MainWindow::isDecodeReady(int submode, qint32 k, qint32 k0, qint32 *pCurrentDecodeStart, qint32 *pNextDecodeStart, qint32 *pStart, qint32 *pSz){
if(pCurrentDecodeStart == nullptr || pNextDecodeStart == nullptr || pStart == nullptr || pSz == nullptr){ if(pCurrentDecodeStart == nullptr || pNextDecodeStart == nullptr || pStart == nullptr || pSz == nullptr){
return false; return false;
@ -4025,6 +4014,11 @@ bool MainWindow::decodeReady(int submode, int period, int *pSubmode, int *pPerio
qDebug() << "decoder checking if ready..." << "k" << k; qDebug() << "decoder checking if ready..." << "k" << k;
if(isMessageQueuedForTransmit()){
qDebug() << "--> decoder paused during transmit";
return false;
}
if(m_decoderBusy){ if(m_decoderBusy){
qDebug() << "--> decoder busy"; qDebug() << "--> decoder busy";
return false; return false;
@ -4112,24 +4106,18 @@ bool MainWindow::decodeReady(int submode, int period, int *pSubmode, int *pPerio
} }
#endif #endif
if(couldDecodeC && (multi || submode == Varicode::JS8CallTurbo)){ if(couldDecodeC && (multi || submode == Varicode::JS8CallTurbo)){
//qDebug() << "could decode C from" << cycleSampleStartC << "to" << cycleSampleStartC + framesNeededC << "--> last decode at" << lastKC;
//lastKC = k;
submode = Varicode::JS8CallTurbo; submode = Varicode::JS8CallTurbo;
period = JS8C_TX_SECONDS; period = JS8C_TX_SECONDS;
dec_data.params.nsubmodes |= (Varicode::JS8CallTurbo << 1); dec_data.params.nsubmodes |= (Varicode::JS8CallTurbo << 1);
decodes++; decodes++;
} }
if(couldDecodeB && (multi || submode == Varicode::JS8CallFast)){ if(couldDecodeB && (multi || submode == Varicode::JS8CallFast)){
//qDebug() << "could decode B from" << cycleSampleStartB << "to" << cycleSampleStartB + framesNeededB << "--> last decode at" << lastKB;
//lastKB = k;
submode = Varicode::JS8CallFast; submode = Varicode::JS8CallFast;
period = JS8B_TX_SECONDS; period = JS8B_TX_SECONDS;
dec_data.params.nsubmodes |= (Varicode::JS8CallFast << 1); dec_data.params.nsubmodes |= (Varicode::JS8CallFast << 1);
decodes++; decodes++;
} }
if(couldDecodeA && (multi || submode == Varicode::JS8CallNormal)){ if(couldDecodeA && (multi || submode == Varicode::JS8CallNormal)){
//qDebug() << "could decode A from" << cycleSampleStartA << "to" << cycleSampleStartA + framesNeededA << "--> last decode at" << lastKA;
//lastKA = k;
submode = Varicode::JS8CallNormal; submode = Varicode::JS8CallNormal;
period = JS8A_TX_SECONDS; period = JS8A_TX_SECONDS;
dec_data.params.nsubmodes |= (Varicode::JS8CallNormal + 1); dec_data.params.nsubmodes |= (Varicode::JS8CallNormal + 1);
@ -9676,7 +9664,7 @@ void MainWindow::updateModeButtonText(){
} }
void MainWindow::updateButtonDisplay(){ void MainWindow::updateButtonDisplay(){
bool isTransmitting = m_transmitting || m_txFrameCount > 0; bool isTransmitting = isMessageQueuedForTransmit();
auto selectedCallsign = callsignSelected(true); auto selectedCallsign = callsignSelected(true);
bool emptyCallsign = selectedCallsign.isEmpty(); bool emptyCallsign = selectedCallsign.isEmpty();
@ -9726,7 +9714,7 @@ void MainWindow::updateRepeatButtonDisplay(){
} }
void MainWindow::updateTextDisplay(){ void MainWindow::updateTextDisplay(){
bool isTransmitting = m_transmitting || m_txFrameCount > 0; bool isTransmitting = isMessageQueuedForTransmit();
bool emptyText = ui->extFreeTextMsgEdit->toPlainText().isEmpty(); bool emptyText = ui->extFreeTextMsgEdit->toPlainText().isEmpty();
ui->startTxButton->setDisabled(isTransmitting || emptyText); ui->startTxButton->setDisabled(isTransmitting || emptyText);
@ -9842,7 +9830,7 @@ void MainWindow::updateTextStatsDisplay(QString text, int count){
void MainWindow::updateTxButtonDisplay(){ void MainWindow::updateTxButtonDisplay(){
// update transmit button // update transmit button
if(m_tune || m_transmitting || m_txFrameCount > 0){ if(m_tune || isMessageQueuedForTransmit()){
int count = m_txFrameCount; int count = m_txFrameCount;
#if TEST_FOX_WAVE_GEN #if TEST_FOX_WAVE_GEN

2
mainwindow.h
View File

@ -120,7 +120,6 @@ public slots:
void showStatusMessage(const QString& statusMsg); void showStatusMessage(const QString& statusMsg);
void dataSink(qint64 frames); void dataSink(qint64 frames);
void diskDat(); void diskDat();
void freezeDecode(int n);
void guiUpdate(); void guiUpdate();
void readFromStdout(); void readFromStdout();
void setXIT(int n, Frequency base = 0u); void setXIT(int n, Frequency base = 0u);
@ -128,7 +127,6 @@ public slots:
void setFreqOffsetForRestore(int freq, bool shouldRestore); void setFreqOffsetForRestore(int freq, bool shouldRestore);
bool tryRestoreFreqOffset(); bool tryRestoreFreqOffset();
void setFreq4(int rxFreq, int txFreq); void setFreq4(int rxFreq, int txFreq);
void msgAvgDecode2();
void playSoundFile(const QString &path); void playSoundFile(const QString &path);
bool hasExistingMessageBufferToMe(int *pOffset); bool hasExistingMessageBufferToMe(int *pOffset);