From 2ba4865d848ceea6b4901124cfabcdef73677a09 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 30 Sep 2016 15:55:53 +0000 Subject: [PATCH] This should have been committed with r7121. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7125 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 81f1db66f..f09931ae8 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -77,8 +77,9 @@ extern "C" { void gen9_(char* msg, int* ichk, char* msgsent, int itone[], int* itext, int len1, int len2); - void genmsk144_(char* msg, int* ichk, char* msgsent, int itone[], - int* itext, int len1, int len2); + void genmsk144_(char* msg, char* MyGrid, int* ichk, bool* bcontest, + char* msgsent, int itone[], int* itext, int len1, + int len2, int len3); void gen65_(char* msg, int* ichk, char* msgsent, int itone[], int* itext, int len1, int len2); @@ -1313,9 +1314,10 @@ void MainWindow::fastSink(qint64 frames) float fracTR=float(k)/(12000.0*m_TRperiod); decodeNow=false; if(fracTR>0.98) { - m_bFastDone=true; +// m_bFastDone=true; m_dataAvailable=true; fast_decode_done(); + m_bFastDone=true; } //### @@ -1359,6 +1361,7 @@ void MainWindow::fastSink(qint64 frames) , m_hisGrid))); killFileTimer.start (3*1000*m_TRperiod/4); //Kill 3/4 period from now } + m_bFastDone=false; } } @@ -2831,8 +2834,11 @@ void MainWindow::guiUpdate() if(m_mode.startsWith ("WSPR")) genwspr_(message, msgsent, const_cast (itone), len1, len1); if(m_modeTx=="MSK144") { - genmsk144_(message, &ichk, msgsent, const_cast (itone), - &m_currentMessageType, len1, len1); + bool bcontest=m_config.contestMode(); + char MyGrid[6]; + strncpy(MyGrid, (m_config.my_grid()+" ").toLatin1(),6); + genmsk144_(message, MyGrid, &ichk, &bcontest, msgsent, const_cast (itone), + &m_currentMessageType, len1, 6, len1); if(m_restart) { int nsym=144; if(itone[40]==-40) nsym=40;