w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-20 02:25:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

This should have been committed with r7121.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7125 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-09-30 15:55:53 +00:00
parent 23aead0b8d
commit 2ba4865d84
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mainwindow.cpp
View File

@ -77,8 +77,9 @@ extern "C" {
void gen9_(char* msg, int* ichk, char* msgsent, int itone[], void gen9_(char* msg, int* ichk, char* msgsent, int itone[],
int* itext, int len1, int len2); int* itext, int len1, int len2);
void genmsk144_(char* msg, int* ichk, char* msgsent, int itone[], void genmsk144_(char* msg, char* MyGrid, int* ichk, bool* bcontest,
int* itext, int len1, int len2); char* msgsent, int itone[], int* itext, int len1,
int len2, int len3);
void gen65_(char* msg, int* ichk, char* msgsent, int itone[], void gen65_(char* msg, int* ichk, char* msgsent, int itone[],
int* itext, int len1, int len2); int* itext, int len1, int len2);
@ -1313,9 +1314,10 @@ void MainWindow::fastSink(qint64 frames)
float fracTR=float(k)/(12000.0*m_TRperiod); float fracTR=float(k)/(12000.0*m_TRperiod);
decodeNow=false; decodeNow=false;
if(fracTR>0.98) { if(fracTR>0.98) {
m_bFastDone=true; // m_bFastDone=true;
m_dataAvailable=true; m_dataAvailable=true;
fast_decode_done(); fast_decode_done();
m_bFastDone=true;
} }
//### //###
@ -1359,6 +1361,7 @@ void MainWindow::fastSink(qint64 frames)
, m_hisGrid))); , m_hisGrid)));
killFileTimer.start (3*1000*m_TRperiod/4); //Kill 3/4 period from now 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<int *> (itone), if(m_mode.startsWith ("WSPR")) genwspr_(message, msgsent, const_cast<int *> (itone),
len1, len1); len1, len1);
if(m_modeTx=="MSK144") { if(m_modeTx=="MSK144") {
genmsk144_(message, &ichk, msgsent, const_cast<int *> (itone), bool bcontest=m_config.contestMode();
&m_currentMessageType, len1, len1); char MyGrid[6];
strncpy(MyGrid, (m_config.my_grid()+" ").toLatin1(),6);
genmsk144_(message, MyGrid, &ichk, &bcontest, msgsent, const_cast<int *> (itone),
&m_currentMessageType, len1, 6, len1);
if(m_restart) { if(m_restart) {
int nsym=144; int nsym=144;
if(itone[40]==-40) nsym=40; if(itone[40]==-40) nsym=40;