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

Fixed waterfall affecting decode range when filter is disabled

Browse Source
This commit is contained in:
Jordan Sherer 2020-05-25 20:30:08 -04:00
parent 5fd8ff3857
commit f611072967
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
commons.h
View File

@ -95,7 +95,6 @@ extern struct dec_data {
bool newdat; // true ==> new data, must do long FFT bool newdat; // true ==> new data, must do long FFT
int npts8; // npts for c0() array int npts8; // npts for c0() array
int nfa; // Low decode limit (Hz) (filter min) int nfa; // Low decode limit (Hz) (filter min)
int nfSplit; // JT65 | JT9 split frequency
int nfb; // High decode limit (Hz) (filter max) int nfb; // High decode limit (Hz) (filter max)
int ntol; // +/- decoding range around fQSO (Hz) int ntol; // +/- decoding range around fQSO (Hz)
bool syncStats; // only compute sync candidates bool syncStats; // only compute sync candidates

6
lib/jt9.f90
View File

@ -19,7 +19,7 @@ program jt9
character(len=500) optarg, infile character(len=500) optarg, infile
character wisfile*80 character wisfile*80
!### ndepth was defined as 60001. Why??? !### ndepth was defined as 60001. Why???
integer :: arglen,stat,offset,remain,mode=0,flow=200,fsplit=2700, & integer :: arglen,stat,offset,remain,mode=0,flow=200, &
fhigh=4000,nrxfreq=1500,ntrperiod=1,ndepth=1,nexp_decode=0 fhigh=4000,nrxfreq=1500,ntrperiod=1,ndepth=1,nexp_decode=0
logical :: read_files = .true., tx9 = .false., display_help = .false., syncStats = .false. logical :: read_files = .true., tx9 = .false., display_help = .false., syncStats = .false.
type (option) :: long_options(22) = [ & type (option) :: long_options(22) = [ &
@ -105,8 +105,6 @@ program jt9
read (optarg(:arglen), *) nrxfreq read (optarg(:arglen), *) nrxfreq
case ('L') case ('L')
read (optarg(:arglen), *) flow read (optarg(:arglen), *) flow
case ('S')
read (optarg(:arglen), *) fsplit
case ('H') case ('H')
read (optarg(:arglen), *) fhigh read (optarg(:arglen), *) fhigh
!case ('q') !case ('q')
@ -247,7 +245,6 @@ program jt9
shared_data%params%newdat=.true. shared_data%params%newdat=.true.
shared_data%params%npts8=74736 shared_data%params%npts8=74736
shared_data%params%nfa=flow shared_data%params%nfa=flow
shared_data%params%nfsplit=fsplit
shared_data%params%nfb=fhigh shared_data%params%nfb=fhigh
shared_data%params%ntol=20 shared_data%params%ntol=20
shared_data%params%kin=64800 shared_data%params%kin=64800
@ -289,7 +286,6 @@ program jt9
shared_data%params%nsubmode=nsubmode shared_data%params%nsubmode=nsubmode
datetime="2013-Apr-16 15:13" !### Temp datetime="2013-Apr-16 15:13" !### Temp
shared_data%params%datetime=transfer(datetime,shared_data%params%datetime) shared_data%params%datetime=transfer(datetime,shared_data%params%datetime)
if(mode.eq.9 .and. fsplit.ne.2700) shared_data%params%nfa=fsplit
shared_data%params%kposA=0 shared_data%params%kposA=0
shared_data%params%kposB=0 shared_data%params%kposB=0
shared_data%params%kposC=0 shared_data%params%kposC=0

1
lib/jt9com.f90
View File

@ -15,7 +15,6 @@
logical(c_bool) :: newdat logical(c_bool) :: newdat
integer(c_int) :: npts8 integer(c_int) :: npts8
integer(c_int) :: nfa integer(c_int) :: nfa
integer(c_int) :: nfsplit
integer(c_int) :: nfb integer(c_int) :: nfb
integer(c_int) :: ntol integer(c_int) :: ntol
logical(c_bool) :: syncStats logical(c_bool) :: syncStats

5
mainwindow.cpp
View File

@ -4731,9 +4731,8 @@ bool MainWindow::decodeProcessQueue(qint32 *pSubmode){
dec_data.params.ndiskdat=0; dec_data.params.ndiskdat=0;
if(m_diskData) dec_data.params.ndiskdat=1; if(m_diskData) dec_data.params.ndiskdat=1;
dec_data.params.nfa=m_wideGraph->nStartFreq(); dec_data.params.nfa=0;
dec_data.params.nfSplit=m_wideGraph->Fmin(); dec_data.params.nfb=5000;
dec_data.params.nfb=m_wideGraph->Fmax();
if(m_wideGraph->filterEnabled()){ if(m_wideGraph->filterEnabled()){
int low = max(0, m_wideGraph->filterMinimum()); int low = max(0, m_wideGraph->filterMinimum());