w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-18 22:48:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix an egregious bug and another not-so-egregious bug. The egregious bug prevented decodes of most signals with negative DT.

Browse Source
This commit is contained in:
Steve Franke 2018-12-03 07:18:52 -06:00
parent 42d68ff84e
commit 6fc27d550d
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ft8/ft8_params.f90
View File

@ -1,5 +1,5 @@
! LDPC (174,87) code ! LDPC (174,91) code
parameter (KK=87) !Information bits (75 + CRC12) parameter (KK=91) !Information bits (77 + CRC14)
parameter (ND=58) !Data symbols parameter (ND=58) !Data symbols
parameter (NS=21) !Sync symbols (3 @ Costas 7x7) parameter (NS=21) !Sync symbols (3 @ Costas 7x7)
parameter (NN=NS+ND) !Total channel symbols (79) parameter (NN=NS+ND) !Total channel symbols (79)

2
lib/ft8/ft8apset.f90
View File

@ -30,10 +30,10 @@ subroutine ft8apset(mycall12,hiscall12,apsym)
apsym(1)=99 apsym(1)=99
apsym(30)=99 apsym(30)=99
return return
endif endif
read(c77,'(58i1)',err=1) apsym(1:58) read(c77,'(58i1)',err=1) apsym(1:58)
apsym=2*apsym-1
if(nohiscall) apsym(30)=99 if(nohiscall) apsym(30)=99
return return

1
lib/ft8/ft8b.f90
View File

@ -275,7 +275,6 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
if(ncontest.eq.6.and.f1.gt.950.0) cycle ! Hounds use AP only for signals below 950 Hz if(ncontest.eq.6.and.f1.gt.950.0) cycle ! Hounds use AP only for signals below 950 Hz
if(iaptype.ge.2 .and. apsym(1).gt.1) cycle ! No, or nonstandard, mycall if(iaptype.ge.2 .and. apsym(1).gt.1) cycle ! No, or nonstandard, mycall
if(iaptype.ge.3 .and. apsym(30).gt.1) cycle ! No, or nonstandard, dxcall if(iaptype.ge.3 .and. apsym(30).gt.1) cycle ! No, or nonstandard, dxcall
apsym=2*apsym-1 ! Change from [0,1] to antipodal
if(iaptype.eq.1) then ! CQ or CQ RU or CQ TEST or CQ FD if(iaptype.eq.1) then ! CQ or CQ RU or CQ TEST or CQ FD
apmask=0 apmask=0

4
lib/ft8/sync8.f90
View File

@ -44,7 +44,6 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,maxcand,s,candidate, &
nssy=NSPS/NSTEP ! # steps per symbol nssy=NSPS/NSTEP ! # steps per symbol
nfos=NFFT1/NSPS ! # frequency bin oversampling factor nfos=NFFT1/NSPS ! # frequency bin oversampling factor
jstrt=0.5/tstep jstrt=0.5/tstep
candidate0=0. candidate0=0.
k=0 k=0
@ -133,7 +132,8 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,maxcand,s,candidate, &
j=indx(i) j=indx(i)
! if( candidate0(3,j) .ge. syncmin .and. candidate0(2,j).ge.-1.5 ) then ! if( candidate0(3,j) .ge. syncmin .and. candidate0(2,j).ge.-1.5 ) then
if( candidate0(3,j) .ge. syncmin ) then if( candidate0(3,j) .ge. syncmin ) then
candidate(1:3,k)=abs(candidate0(1:3,j)) candidate(2:3,k)=candidate0(2:3,j)
candidate(1,k)=abs(candidate0(1,j))
k=k+1 k=k+1
endif endif
enddo enddo

2
lib/ft8_decode.f90
View File

@ -52,7 +52,7 @@ contains
character*12 mycall12,hiscall12,mycall12_0 character*12 mycall12,hiscall12,mycall12_0
character*6 hisgrid6 character*6 hisgrid6
integer*2 iwave(15*12000) integer*2 iwave(15*12000)
integer apsym1(KK),apsym2(58) integer apsym2(58)
character datetime*13,msg37*37 character datetime*13,msg37*37
! character message*22 ! character message*22
character*37 allmessages(100) character*37 allmessages(100)