diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90 index 879e840f7..f3366b61c 100644 --- a/lib/q65_decode.f90 +++ b/lib/q65_decode.f90 @@ -86,7 +86,7 @@ contains complex, allocatable :: c00(:) !Analytic signal, 6000 Sa/s complex, allocatable :: c0(:) !Analytic signal, 6000 Sa/s type(q3list) callers(MAX_CALLERS) - + ! Start by setting some parameters and allocating storage for large arrays call sec0(0,tdecode) stageno=0 @@ -113,17 +113,14 @@ contains mycall13=mycall nhist2=0 if(ncontest.eq.1) then -! NA VHF Contest or ARRL Digi Contest -! open(24,file=trim(data_dir)//'/q3list.bin',status='unknown', & -! form='unformatted') -! read(24,end=2) nhist2,callers(1:nhist2) - open(24,file=trim(data_dir)//'/q3list.bin',status='unknown') - read(24,3024,end=2) nhist2,callers(1:nhist2) -3024 format(i5/(a6,2x,a4,2x,i10)) +! NA VHF, WW-Digi, or ARRL Digi Contest + open(24,file=trim(data_dir)//'/tsil.3q',status='unknown', & + form='unformatted') + read(24,end=2) nhist2,callers(1:nhist2) now=time() do i=1,nhist2 hours=(now - callers(i)%nsec)/3600.0 - if(hours.gt.18.0) then + if(hours.gt.24.0) then callers(i:nhist2-1)=callers(i+1:nhist2) nhist2=nhist2-1 endif diff --git a/lib/qra/q65/q65.f90 b/lib/qra/q65/q65.f90 index 922370b64..6d180edbc 100644 --- a/lib/qra/q65/q65.f90 +++ b/lib/qra/q65/q65.f90 @@ -905,8 +905,7 @@ subroutine q65_hist2(msg0,callers,nhist2) callers(nhist2)%grid=g4 callers(nhist2)%nsec=time() rewind(24) - write(24,3024) nhist2,callers(1:nhist2) -3024 format(i5/(a6,2x,a4,2x,i10)) + write(24) nhist2,callers(1:nhist2) rewind(24) endif diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 76a900c46..c2bbc7128 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -3373,7 +3373,8 @@ void MainWindow::decode() //decode() if(m_config.decode_at_52s()) dec_data.params.emedelay=2.5; dec_data.params.minSync=ui->syncSpinBox->isVisible () ? m_minSync : 0; dec_data.params.nexp_decode=int(m_specOp); - if(dec_data.params.nexp_decode==8) dec_data.params.nexp_decode=1; //NA VHF and ARRL Digi are same + if(dec_data.params.nexp_decode==5) dec_data.params.nexp_decode=1; //NA VHF, WW Digi, and ARRL Digi + if(dec_data.params.nexp_decode==8) dec_data.params.nexp_decode=1; //contests all use grid exchange if(m_config.single_decode()) dec_data.params.nexp_decode += 32; if(m_config.enable_VHF_features()) dec_data.params.nexp_decode += 64; if(m_mode.startsWith("FST4")) dec_data.params.nexp_decode += 256*(ui->sbNB->value()+3);