chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved experiment into own function

Browse Source
This commit is contained in:
Jordan Sherer 2020-05-11 14:17:55 -04:00
parent 22911e332a
commit a6647c548b
7 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/js8a_decode.f90
View File

@ -93,6 +93,11 @@ contains
lsubtract=.false.
endif
if(NWRITELOG.eq.1) then
write(*,*) '<DecodeDebug> pass', ipass, 'of', npass, 'subtract', lsubtract
flush(6)
endif
call timer('syncjs8 ',0)
call syncjs8(dd,icos,ifa,ifb,syncmin,nfqso,s,candidate,ncand,sbase)
call timer('syncjs8 ',1)
@ -103,7 +108,7 @@ contains
xdt=candidate(2,icand)
xbase=10.0**(0.1*(sbase(nint(f1/(12000.0/NFFT1)))-40.0)) ! 3.125Hz
if(NWRITELOG.eq.1) then
if(NWRITELOG.eq.0) then
write(*,*) '<DecodeDebug> candidate', icand, 'f1', f1, 'sync', sync, 'xdt', xdt, 'xbase', xbase
flush(6)
endif

5
lib/js8b_decode.f90
View File

@ -93,6 +93,11 @@ contains
lsubtract=.false.
endif
if(NWRITELOG.eq.1) then
write(*,*) '<DecodeDebug> pass', ipass, 'of', npass, 'subtract', lsubtract
flush(6)
endif
call timer('syncjs8 ',0)
call syncjs8(dd,icos,ifa,ifb,syncmin,nfqso,s,candidate,ncand,sbase)
call timer('syncjs8 ',1)

5
lib/js8c_decode.f90
View File

@ -93,6 +93,11 @@ contains
lsubtract=.false.
endif
if(NWRITELOG.eq.1) then
write(*,*) '<DecodeDebug> pass', ipass, 'of', npass, 'subtract', lsubtract
flush(6)
endif
call timer('syncjs8 ',0)
call syncjs8(dd,icos,ifa,ifb,syncmin,nfqso,s,candidate,ncand,sbase)
call timer('syncjs8 ',1)

5
lib/js8e_decode.f90
View File

@ -93,6 +93,11 @@ contains
lsubtract=.false.
endif
if(NWRITELOG.eq.1) then
write(*,*) '<DecodeDebug> pass', ipass, 'of', npass, 'subtract', lsubtract
flush(6)
endif
call timer('syncjs8 ',0)
call syncjs8(dd,icos,ifa,ifb,syncmin,nfqso,s,candidate,ncand,sbase)
call timer('syncjs8 ',1)

5
lib/js8i_decode.f90
View File

@ -93,6 +93,11 @@ contains
lsubtract=.false.
endif
if(NWRITELOG.eq.1) then
write(*,*) '<DecodeDebug> pass', ipass, 'of', npass, 'subtract', lsubtract
flush(6)
endif
call timer('syncjs8 ',0)
call syncjs8(dd,icos,ifa,ifb,syncmin,nfqso,s,candidate,ncand,sbase)
call timer('syncjs8 ',1)

2
lib/jt9.f90
View File

@ -294,10 +294,12 @@ program jt9
shared_data%params%kposB=0
shared_data%params%kposC=0
shared_data%params%kposE=0
shared_data%params%kposI=0
shared_data%params%kszA=NMAX-1
shared_data%params%kszB=NMAX-1
shared_data%params%kszC=NMAX-1
shared_data%params%kszE=NMAX-1
shared_data%params%kszI=NMAX-1
call multimode_decoder(shared_data%ss,shared_data%id2,shared_data%params,nfsample)
enddo

9
mainwindow.cpp
View File

@ -4418,17 +4418,14 @@ bool MainWindow::decodeEnqueueReady(qint32 k, qint32 k0){
* @param k0 - the previous frame count
* @return true if decoder ranges were queued, false otherwise
*/
bool MainWindow::decodeEnqueueReadyExperiment(qint32 k, qint32 k0){
//unsigned msInPeriod ((QDateTime::currentMSecsSinceEpoch() % 86400000LL) % (15 * 1000));
// k - (msInPeriod*RX_SAMPLE_RATE/1000) <- samples since beginning of period
//static qint32 lastDecodeStartK = -1;
bool MainWindow::decodeEnqueueReadyExperiment(qint32 k, qint32 /*k0*/){
static qint32 lastDecodeStartK = -1;
//if(lastDecodeStartK == -1){
// qint32 cycleStartK = computeCycleForDecode(Varicode::JS8CallNormal, k) * computeFramesPerCycleForDecode(Varicode::JS8CallNormal);
// qint32 secondStartK = ((k - cycleStartK) / RX_SAMPLE_RATE) * RX_SAMPLE_RATE;
// lastDecodeStartK = secondStartK;
//}
static qint32 lastDecodeStartK = -1;
static qint32 lastDecodeStartSec = -1;
int decodes = 0;
@ -4460,7 +4457,7 @@ bool MainWindow::decodeEnqueueReadyExperiment(qint32 k, qint32 k0){
// for normal mode this allows us to look through the last 15 seconds of data
// + the amount that we've just incremented (say if we were caught in a decode)
// to search for decodable signals... and we do this _every_ second!
//szA = computeFramesPerCycleForDecode(submode) + incrementedBy;
// szA = computeFramesPerCycleForDecode(submode) + incrementedBy;
szA = computeFramesNeededForDecode(submode);
startA = k - szA;