w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-31 04:50:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Optional q65 decoding params from q65_params.txt. Maybe temporary!"

Browse Source 
This reverts commit 31bedb8528db02de2504f2ec157f4d6164b787e7.
This commit is contained in:
Joe Taylor 2023-01-23 11:38:15 -05:00
parent 4ea595eea1
commit 18e8c89a43
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/q65_decode.f90
View File

@ -73,9 +73,8 @@ contains
real f0decodes(100) real f0decodes(100)
integer dat4(13) !Decoded message as 12 6-bit integers integer dat4(13) !Decoded message as 12 6-bit integers
integer dgen(13) integer dgen(13)
integer nq65param(0:7)
logical lclearave,lnewdat0,lapcqonly,unpk77_success logical lclearave,lnewdat0,lapcqonly,unpk77_success
logical single_decode,lagain,ex logical single_decode,lagain
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
integer stageno !Added by W3SZ integer stageno !Added by W3SZ
@ -148,18 +147,6 @@ contains
ibwb=min(10,ibwb+1) ibwb=min(10,ibwb+1)
maxiters=60 maxiters=60
endif endif
inquire(file='q65_params.txt',exist=ex)
if(ex) then
open(28,file='q65_params.txt',status='old')
read(28,*) nq65param
ibwa=max(1,nq65param(nsubmode))
ibwa=min(40,ibwa)
ibwb=ibwa
maxiters=nq65param(4+iand(ndepth,3))
close(28)
endif
! write(*,3001) iand(ndepth,3),nsubmode,ibwa,ibwb,maxiters
!3001 format(5i5)
! Generate codewords for full-AP list decoding ! Generate codewords for full-AP list decoding
if(ichar(hiscall(1:1)).eq.0) hiscall=' ' if(ichar(hiscall(1:1)).eq.0) hiscall=' '
if(ichar(hisgrid(1:1)).eq.0) hisgrid=' ' if(ichar(hisgrid(1:1)).eq.0) hisgrid=' '

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

@ -396,18 +396,7 @@ subroutine q65_dec_q012(s3,LL,snr2,dat4,idec,decoded)
read(c78,1060) apsymbols read(c78,1060) apsymbols
endif endif
! do ibw=ibwa,ibwb do ibw=ibwa,ibwb
!###
ibw_mid=(ibwa+ibwb)/2
iimax=3
if(maxiters.eq.40) iimax=5
if(maxiters.eq.60) iimax=7
! print*,'a',maxiters,ibwa,ibwb,ibw_mid,iimax
do ii=1,iimax
n=ii/2
if(iand(ii,1).eq.0) n=-n
ibw=ibw_mid + n
!###
b90=1.72**ibw b90=1.72**ibw
b90ts=b90/baud b90ts=b90/baud
call q65_dec2(s3,nsubmode,b90ts,esnodb,irc,dat4,decoded) call q65_dec2(s3,nsubmode,b90ts,esnodb,irc,dat4,decoded)