w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-01 08:07:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

1. Protect against wrong ID of f0 being fit by lorentzian(), when Ftol is large.

Browse Source 
2. When switching to JT65 mode, go through JT9 first.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6621 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-04-14 13:22:05 +00:00
parent ce1a1e8a8e
commit c297e1e23b
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/decoder.f90
View File

@ -247,7 +247,8 @@ contains
n=max(2,nsum+1) n=max(2,nsum+1)
n=min(n,36) n=min(n,36)
ctail(2:2)=c(n:n) ctail(2:2)=c(n:n)
if(nsubmode.gt.0) ctail(3:3)=c(nsmo+1:nsmo+1) n=min(nsmo+1,36)
if(nsubmode.gt.0) ctail(3:3)=c(n:n)
if(ft.eq.2) then if(ft.eq.2) then
ctail(5:5)='*' ctail(5:5)='*'
if(qual.le.9) ctail(5:5)=char(48+qual) if(qual.le.9) ctail(5:5)=char(48+qual)

7
lib/jt65_decode.f90
View File

@ -135,7 +135,7 @@ contains
f0=(a(3)+ia-1)*df f0=(a(3)+ia-1)*df
width=a(4)*df width=a(4)*df
! write(*,3001) baseline,amp,f0,width ! write(*,3001) baseline,amp,f0,width
!3001 format(4f10.3) !3001 format('A',4f10.3)
endif endif
! robust = .false.: use float ccf. Only if ncand>50 fall back to robust (1-bit) ccf ! robust = .false.: use float ccf. Only if ncand>50 fall back to robust (1-bit) ccf
@ -159,7 +159,10 @@ contains
! If a candidate was found within +/- ntol of nfqso, move it into ca(1). ! If a candidate was found within +/- ntol of nfqso, move it into ca(1).
call fqso_first(nfqso,ntol,ca,ncand) call fqso_first(nfqso,ntol,ca,ncand)
if(single_decode) ncand=1 if(single_decode) then
ncand=1
if(abs(ca(1)%freq - f0).gt.width) width=2*df
endif
nvec=ntrials nvec=ntrials
if(ncand.gt.75) then if(ncand.gt.75) then
! write(*,*) 'Pass ',ipass,' ncandidates too large ',ncand ! write(*,*) 'Pass ',ipass,' ncandidates too large ',ncand

1
mainwindow.cpp
View File

@ -3607,6 +3607,7 @@ void MainWindow::on_actionJT65_triggered()
m_modeTx="JT9"; m_modeTx="JT9";
on_pbTxMode_clicked(); on_pbTxMode_clicked();
} }
on_actionJT9_triggered();
m_mode="JT65"; m_mode="JT65";
WSPR_config(false); WSPR_config(false);
switch_mode (Modes::JT65); switch_mode (Modes::JT65);