w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-30 05:12:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Send ndepth (value = 1, 2, or 3) to hspec(). MSK144 click-to-decode now calls

Browse Source 
the old fast_decode(); probably it should call hspec() instead?


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7113 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-09-28 20:41:41 +00:00
parent 6579b93690
commit 57a5ad188d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/hspec.f90
View File

@ -1,4 +1,5 @@
subroutine hspec(id2,k,nutc0,ntrperiod,nrxfreq,ntol,bmsk144,ingain,green,s,jh,line1) subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,bmsk144,ingain, &
green,s,jh,line1)
! Input: ! Input:
! k pointer to the most recent new data ! k pointer to the most recent new data
@ -20,6 +21,8 @@ subroutine hspec(id2,k,nutc0,ntrperiod,nrxfreq,ntol,bmsk144,ingain,green,s,jh,li
equivalence (x,cx) equivalence (x,cx)
save ja,rms0 save ja,rms0
ndepth=ntrpdepth/1000
ntrperiod=ntrpdepth - 1000*ndepth
gain=10.0**(0.1*ingain) gain=10.0**(0.1*ingain)
nfft=512 nfft=512
nstep=nfft nstep=nfft

10
mainwindow.cpp
View File

@ -1277,8 +1277,9 @@ void MainWindow::fastSink(qint64 frames)
//### //###
m_RxFreq=ui->RxFreqSpinBox->value (); m_RxFreq=ui->RxFreqSpinBox->value ();
hspec_(dec_data.d2,&k,&nutc0,&m_TRperiod,&m_RxFreq,&m_Ftol,&bmsk144,&m_inGain,fast_green, int nTRpDepth=m_TRperiod + 1000*(m_ndepth & 3);
fast_s,&fast_jh, &line[0],80); hspec_(dec_data.d2,&k,&nutc0,&nTRpDepth,&m_RxFreq,&m_Ftol,&bmsk144,&m_inGain,
fast_green,fast_s,&fast_jh, &line[0],80);
float px = fast_green[fast_jh]; float px = fast_green[fast_jh];
QString t; QString t;
t.sprintf(" Rx noise: %5.1f ",px); t.sprintf(" Rx noise: %5.1f ",px);
@ -1309,6 +1310,7 @@ void MainWindow::fastSink(qint64 frames)
decodeNow=false; decodeNow=false;
if(fracTR>0.98) { if(fracTR>0.98) {
m_bFastDone=true; m_bFastDone=true;
m_dataAvailable=true;
fast_decode_done(); fast_decode_done();
} }
//### //###
@ -2145,7 +2147,6 @@ void MainWindow::decode() //decode()
if(!dec_data.params.nagain && m_diskData && !m_bFastMode) { if(!dec_data.params.nagain && m_diskData && !m_bFastMode) {
dec_data.params.nutc=dec_data.params.nutc/100; dec_data.params.nutc=dec_data.params.nutc/100;
} }
// qDebug() << "a" << m_diskData << m_nPick << m_nutc0 << dec_data.params.nutc;
if(dec_data.params.nagain==0 && dec_data.params.newdat==1 && (!m_diskData)) { if(dec_data.params.nagain==0 && dec_data.params.newdat==1 && (!m_diskData)) {
qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000; qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000;
int imin=ms/60000; int imin=ms/60000;
@ -2174,7 +2175,6 @@ void MainWindow::decode() //decode()
if(m_nPick==1 and m_diskData) if(m_nPick==1 and m_diskData)
if(m_nPick==2) dec_data.params.nutc=m_nutc0; if(m_nPick==2) dec_data.params.nutc=m_nutc0;
// qDebug() << "b" << m_diskData << m_nPick << m_nutc0 << dec_data.params.nutc;
dec_data.params.nfqso=m_wideGraph->rxFreq(); dec_data.params.nfqso=m_wideGraph->rxFreq();
qint32 depth {m_ndepth}; qint32 depth {m_ndepth};
if (!ui->actionInclude_averaging->isEnabled ()) depth &= ~16; if (!ui->actionInclude_averaging->isEnabled ()) depth &= ~16;
@ -2254,7 +2254,7 @@ void MainWindow::decode() //decode()
if(m_nPick > 0) { if(m_nPick > 0) {
t0=m_t0Pick; t0=m_t0Pick;
t1=m_t1Pick; t1=m_t1Pick;
if(t1 > m_kdone/12000.0) t1=m_kdone/12000.0; if(t1 > m_kdone/12000.0 and !m_config.realTimeDecode()) t1=m_kdone/12000.0;
} }
static short int d2b[360000]; static short int d2b[360000];
narg[0]=dec_data.params.nutc; narg[0]=dec_data.params.nutc;