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

Fix what I broke.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6891 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2016-07-07 23:18:40 +00:00
parent b0108d59be
commit 42bdbf0de7
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/detectmsk144.f90
View File

@ -246,7 +246,7 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc)
if( ibb .le. 3 ) ibb=ibb-1 if( ibb .le. 3 ) ibb=ibb-1
if( ibb .gt. 3 ) ibb=ibb-7 if( ibb .gt. 3 ) ibb=ibb-7
do id=1,1 ! slicer dither. bb is very good - may be able to remove this. do id=1,3 ! slicer dither. bb is very good - may be able to remove this.
if( id .eq. 1 ) is=0 if( id .eq. 1 ) is=0
if( id .eq. 2 ) is=-1 if( id .eq. 2 ) is=-1
if( id .eq. 3 ) is=1 if( id .eq. 3 ) is=1

40
lib/detectmsk32.f90
View File

@ -107,7 +107,7 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc)
likelymessages(irpt)=ig likelymessages(irpt)=ig
! write(*,*) irpt,hashmsg,ig,ig24(ig) ! write(*,*) irpt,hashmsg,ig,ig24(ig)
enddo enddo
qsocontext=.true. qsocontext=.false.
! Fill the detmet, detferr arrays ! Fill the detmet, detferr arrays
nstepsize=48 ! 4ms steps nstepsize=48 ! 4ms steps
@ -428,31 +428,33 @@ subroutine detectmsk32(cbig,n,mycall,partnercall,lines,nmessages,nutc)
enddo enddo
999 continue 999 continue
msgreceived=' ' msgreceived=' '
if( ( ihammd(imsgbest)+nbadsyncbest .le. 4 ) .and. ( (cdratbest .gt. 50.0) .and. (cdbest .le. 0.05) ) ) then if( imsgbest .gt. 0 ) then
if( qsocontext ) then if( ( ihammd(imsgbest)+nbadsyncbest .le. 4 ) .and. (cdratbest .gt. 50.0) .and. (cdbest .le. 0.05) ) then
nrxrpt=iand(likelymessages(imsgbest),31) if( qsocontext ) then
nrxhash=(likelymessages(imsgbest)-nrxrpt)/32 nrxrpt=iand(likelymessages(imsgbest),31)
imessage=likelymessages(imsgbest) nrxhash=(likelymessages(imsgbest)-nrxrpt)/32
else imessage=likelymessages(imsgbest)
nrxrpt=iand(imsgbest,31) else
nrxhash=(imsgbest-nrxrpt)/32 nrxrpt=iand(imsgbest,31)
imessage=imsgbest nrxhash=(imsgbest-nrxrpt)/32
endif imessage=imsgbest
endif
! See if this message has a hash that is expected for a message sent to mycall by partnercall ! See if this message has a hash that is expected for a message sent to mycall by partnercall
hashmsg=trim(mycall)//' '//trim(partnercall)//' '//rpt(nrxrpt) hashmsg=trim(mycall)//' '//trim(partnercall)//' '//rpt(nrxrpt)
call fmtmsg(hashmsg,iz) call fmtmsg(hashmsg,iz)
call hash(hashmsg,22,ihash) call hash(hashmsg,22,ihash)
ihash=iand(ihash,127) ihash=iand(ihash,127)
if( nrxhash .eq. ihash ) then if( nrxhash .eq. ihash ) then
nmessages=1 nmessages=1
write(msgreceived,'(a1,a,1x,a,a1,1x,a4)') "<",trim(mycall),trim(partnercall),">",rpt(nrxrpt) write(msgreceived,'(a1,a,1x,a,a1,1x,a4)') "<",trim(mycall),trim(partnercall),">",rpt(nrxrpt)
write(lines(nmessages),1020) nutc,nsnr,t0,nint(fest),msgreceived write(lines(nmessages),1020) nutc,nsnr,t0,nint(fest),msgreceived
1020 format(i6.6,i4,f5.1,i5,' & ',a22) 1020 format(i6.6,i4,f5.1,i5,' & ',a22)
! write(*,1022) nutc,ipbest,times(ipbest),snrs(ipbest),fest,nrxrpt,nrxhash, & ! write(*,1022) nutc,ipbest,times(ipbest),snrs(ipbest),fest,nrxrpt,nrxhash, &
! rpt(nrxrpt),imessage,ig24(imessage),ihammd(imsgbest), & ! rpt(nrxrpt),imessage,ig24(imessage),ihammd(imsgbest), &
! cdbest,cdratbest,nbadsyncbest,ipkbest,idbest,idfbest,iavbest,iphabest ! cdbest,cdratbest,nbadsyncbest,ipkbest,idbest,idfbest,iavbest,iphabest
endif
endif endif
endif endif
!1022 format(i4.4,2x,i4,f8.3,f8.2,f8.2,i6,i6,a6,i8,i10,i4,f8.2,f8.2,i5,i5,i5,i5,i5,i5) !1022 format(i4.4,2x,i4,f8.3,f8.2,f8.2,i6,i6,a6,i8,i10,i4,f8.2,f8.2,i5,i5,i5,i5,i5,i5)