w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 13:48:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix an inforrect constant in ft4_rx() that skipped over first 0.208 s of Rx data.

Browse Source
This commit is contained in:
Joe Taylor 2019-03-13 10:31:23 -04:00
parent e9a999cda1
commit e150d003d6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ft4/ft4_decode.f90
View File

@ -34,7 +34,7 @@ subroutine ft4_decode(cdatetime0,tbuf,nfa,nfb,nQSOProgress,ncontest,nfqso, &
integer apbits(2*ND) integer apbits(2*ND)
integer apmy_ru(28),aphis_fd(28) integer apmy_ru(28),aphis_fd(28)
integer icos4a(0:3),icos4b(0:3),icos4c(0:3),icos4d(0:3) integer icos4a(0:3),icos4b(0:3),icos4c(0:3),icos4d(0:3)
integer*2 iwave(NMAX) !Generated full-length waveform integer*2 iwave(NMAX) !Raw received data
integer*1 message77(77),rvec(77),apmask(2*ND),cw(2*ND) integer*1 message77(77),rvec(77),apmask(2*ND),cw(2*ND)
integer*1 hbits(2*NN) integer*1 hbits(2*NN)
integer graymap(0:3) integer graymap(0:3)

9
widgets/mainwindow.cpp
View File

@ -8671,18 +8671,17 @@ void MainWindow::ft4_rx(int k)
static bool wrapped=false; static bool wrapped=false;
short id[60000]; short id[60000];
const int istep=3456; const int istep=3456;
const int k_enough=55296; //4.608 s
if(k<m_kin0) m_kin0=0; if(k<m_kin0) m_kin0=0;
int nhsec=k/istep; int nhsec=k/istep;
if(nhsec0>nhsec) nhsec0=-1; if(nhsec0>nhsec) nhsec0=-1;
if(nhsec==nhsec0) return; if(nhsec==nhsec0) return;
if(k<k_enough and !wrapped) return;
// if(k<60000 and !wrapped) return; //Process FT4 data at intervals of istep/12000.0 = 0.288 seconds
if(k<52800 and !wrapped) return;
//Process FT4 data at intervals of istep/12000.0 seconds
int j=k/istep; int j=k/istep;
j=istep*j-52800; j=istep*j-k_enough;
if(j<0) j+=NRING; if(j<0) j+=NRING;
float tbuf=j/12000.0; float tbuf=j/12000.0;
for(int i=0; i<60000; i++) { for(int i=0; i<60000; i++) {