From 789d2042bf046d0e4ccc26879643bc74dd7ff855 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 27 Jul 2018 09:45:14 -0400 Subject: [PATCH] Pass nContest value to hspec.f90. --- lib/hspec.f90 | 3 ++- mainwindow.cpp | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/hspec.f90 b/lib/hspec.f90 index 5d0499ce0..da30e0211 100644 --- a/lib/hspec.f90 +++ b/lib/hspec.f90 @@ -1,4 +1,4 @@ -subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,bmsk144, & +subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,ncontest,bmsk144, & btrain,pcoeffs,ingain,mycall,hiscall,bshmsg,bswl,datadir,green,s, & jh,pxmax,dbNoGain,line1,mygrid) @@ -8,6 +8,7 @@ subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,bmsk144, & ! ntrpdepth TR period and 1000*ndepth ! nrxfreq Rx audio center frequency ! ntol Decoding range is +/- ntol +! ncontest Contest type (0=NONE 1=NA_VHF 2=EU_VHF 3=FIELD_DAY 4=RTTY) ! bmsk144 Boolean, true if in MSK144 mode ! btrain Boolean, turns on training in MSK144 mode ! ingain Relative gain for spectra diff --git a/mainwindow.cpp b/mainwindow.cpp index 8aae87b06..e2a0c4cec 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -70,7 +70,7 @@ extern "C" { float *m_pxmax); void hspec_(short int d2[], int* k, int* nutc0, int* ntrperiod, int* nrxfreq, int* ntol, - bool* bmsk144, bool* btrain, double const pcoeffs[], int* ingain, + int* nContest, bool* bmsk144, bool* btrain, double const pcoeffs[], int* ingain, char mycall[], char hiscall[], bool* bshmsg, bool* bswl, char ddir[], float green[], float s[], int* jh, float *pxmax, float *rmsNoGain, char line[], char mygrid[], fortran_charlen_t, fortran_charlen_t, fortran_charlen_t, fortran_charlen_t, @@ -1512,7 +1512,8 @@ void MainWindow::fastSink(qint64 frames) float pxmax = 0; float rmsNoGain = 0; int ftol = ui->sbFtol->value (); - hspec_(dec_data.d2,&k,&nutc0,&nTRpDepth,&RxFreq,&ftol,&bmsk144, + int nContest=m_nContest; + hspec_(dec_data.d2,&k,&nutc0,&nTRpDepth,&RxFreq,&ftol,&nContest,&bmsk144, &m_bTrain,m_phaseEqCoefficients.constData(),&m_inGain,&dec_data.params.mycall[0], &dec_data.params.hiscall[0],&bshmsg,&bswl, &ddir[0],fast_green,fast_s,&fast_jh,&pxmax,&rmsNoGain,&line[0],&dec_data.params.mygrid[0],