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

Connect the FLow and FHigh limits for FST4 decoding.

Browse Source
This commit is contained in:
Joe Taylor 2020-09-16 17:23:59 -04:00
parent 2266e8dbb7
commit 21dc6a5c59
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/fst4_decode.f90
View File

@ -64,7 +64,7 @@ contains
integer naptypes(0:5,4) ! (nQSOProgress,decoding pass) integer naptypes(0:5,4) ! (nQSOProgress,decoding pass)
integer mcq(29),mrrr(19),m73(19),mrr73(19) integer mcq(29),mrrr(19),m73(19),mrr73(19)
logical badsync,unpk77_success logical badsync,unpk77_success,single_decode
logical first,nohiscall,lwspr,ex logical first,nohiscall,lwspr,ex
integer*2 iwave(30*60*12000) integer*2 iwave(30*60*12000)
@ -232,8 +232,13 @@ contains
nhicoh=1 nhicoh=1
nsyncoh=8 nsyncoh=8
fa=max(100,nint(nfqso+1.5*baud-ntol)) fa=nfa
fb=min(4800,nint(nfqso+1.5*baud+ntol)) fb=nfb
single_decode=iand(nexp_decode,32).ne.0
if(single_decode) then
fa=max(100,nint(nfqso+1.5*baud-ntol))
fb=min(4800,nint(nfqso+1.5*baud+ntol))
endif
minsync=1.20 minsync=1.20
if(ntrperiod.eq.15) minsync=1.15 if(ntrperiod.eq.15) minsync=1.15

6
widgets/mainwindow.cpp
View File

@ -3075,7 +3075,11 @@ void MainWindow::decode() //decode()
dec_data.params.ntol=20; dec_data.params.ntol=20;
dec_data.params.naggressive=0; dec_data.params.naggressive=0;
} }
if(m_mode=="FST4") dec_data.params.ntol=ui->sbFtol->value(); if(m_mode=="FST4") {
dec_data.params.ntol=ui->sbFtol->value();
dec_data.params.nfa=ui->sbF_Low->value();
dec_data.params.nfb=ui->sbF_High->value();
}
if(m_mode=="FST4W") dec_data.params.ntol=ui->sbFST4W_FTol->value(); if(m_mode=="FST4W") dec_data.params.ntol=ui->sbFST4W_FTol->value();
if(dec_data.params.nutc < m_nutc0) m_RxLog = 1; //Date and Time to file "ALL.TXT". if(dec_data.params.nutc < m_nutc0) m_RxLog = 1; //Date and Time to file "ALL.TXT".
if(dec_data.params.newdat==1 and !m_diskData) m_nutc0=dec_data.params.nutc; if(dec_data.params.newdat==1 and !m_diskData) m_nutc0=dec_data.params.nutc;