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

Include WW-Digi contest for q3 decodes. Make LU 24 binary again. Set q3list timeout to 24 h.

Browse Source
This commit is contained in:
Joe Taylor 2023-02-15 11:49:12 -05:00
parent 7bf6a6123d
commit 7513a63ac5
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/q65_decode.f90
View File

@ -86,7 +86,7 @@ contains
complex, allocatable :: c00(:) !Analytic signal, 6000 Sa/s complex, allocatable :: c00(:) !Analytic signal, 6000 Sa/s
complex, allocatable :: c0(:) !Analytic signal, 6000 Sa/s complex, allocatable :: c0(:) !Analytic signal, 6000 Sa/s
type(q3list) callers(MAX_CALLERS) type(q3list) callers(MAX_CALLERS)
! Start by setting some parameters and allocating storage for large arrays ! Start by setting some parameters and allocating storage for large arrays
call sec0(0,tdecode) call sec0(0,tdecode)
stageno=0 stageno=0
@ -113,17 +113,14 @@ contains
mycall13=mycall mycall13=mycall
nhist2=0 nhist2=0
if(ncontest.eq.1) then if(ncontest.eq.1) then
! NA VHF Contest or ARRL Digi Contest ! NA VHF, WW-Digi, or ARRL Digi Contest
! open(24,file=trim(data_dir)//'/q3list.bin',status='unknown', & open(24,file=trim(data_dir)//'/tsil.3q',status='unknown', &
! form='unformatted') form='unformatted')
! read(24,end=2) nhist2,callers(1:nhist2) 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))
now=time() now=time()
do i=1,nhist2 do i=1,nhist2
hours=(now - callers(i)%nsec)/3600.0 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) callers(i:nhist2-1)=callers(i+1:nhist2)
nhist2=nhist2-1 nhist2=nhist2-1
endif endif

3
lib/qra/q65/q65.f90
View File

@ -905,8 +905,7 @@ subroutine q65_hist2(msg0,callers,nhist2)
callers(nhist2)%grid=g4 callers(nhist2)%grid=g4
callers(nhist2)%nsec=time() callers(nhist2)%nsec=time()
rewind(24) rewind(24)
write(24,3024) nhist2,callers(1:nhist2) write(24) nhist2,callers(1:nhist2)
3024 format(i5/(a6,2x,a4,2x,i10))
rewind(24) rewind(24)
endif endif

3
widgets/mainwindow.cpp
View File

@ -3373,7 +3373,8 @@ void MainWindow::decode() //decode()
if(m_config.decode_at_52s()) dec_data.params.emedelay=2.5; 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.minSync=ui->syncSpinBox->isVisible () ? m_minSync : 0;
dec_data.params.nexp_decode=int(m_specOp); 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.single_decode()) dec_data.params.nexp_decode += 32;
if(m_config.enable_VHF_features()) dec_data.params.nexp_decode += 64; 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); if(m_mode.startsWith("FST4")) dec_data.params.nexp_decode += 256*(ui->sbNB->value()+3);