From add31e211e6124af8c6f79655f02d96fcb0b15ef Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Sun, 15 Jan 2017 18:39:18 +0000 Subject: [PATCH] Only train on DX Call when Rx Equalization is checked. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7502 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/msk144signalquality.f90 | 14 ++++++++------ lib/mskrtd.f90 | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/msk144signalquality.f90 b/lib/msk144signalquality.f90 index f17215fcf..7dbae94a0 100644 --- a/lib/msk144signalquality.f90 +++ b/lib/msk144signalquality.f90 @@ -1,5 +1,5 @@ - subroutine msk144signalquality(cframe,snr,freq,t0,softbits,msg,dxcall, & - nbiterrors,eyeopening,trained,pcoeffs) + subroutine msk144signalquality(cframe,snr,freq,t0,softbits,msg,dxcall, & + brxequal,nbiterrors,eyeopening,trained,pcoeffs) character*22 msg,msgsent character*12 dxcall @@ -23,6 +23,7 @@ integer values(8) logical*1 bcontest + logical*1 brxequal logical*1 first logical*1 currently_training logical*1 trained @@ -76,7 +77,8 @@ write(*,*) 'reset to untrained state ' indx_dxcall=index(msg,trim(dxcall)) msg_has_dxcall = indx_dxcall .ge. 4 - if( msg_has_dxcall .and. (.not. trained) .and. .not. currently_training ) then + if( brxequal .and. msg_has_dxcall .and. (.not. trained) .and. & + .not. currently_training ) then currently_training=.true. training_dxcall=trim(dxcall) trained_dxcall(1:12)=' ' @@ -139,9 +141,9 @@ write(*,*) 'start training on call ',training_dxcall enddo eyeopening=eyetop-eyebot - is_training_frame = & - (snr.gt.5.0 .and.(nbiterrors.lt.7)) .and. & - (abs(t0-tlast) .gt. 0.072) .and. & + is_training_frame = & + (snr.gt.5.0 .and.(nbiterrors.lt.7)) .and. & + (abs(t0-tlast) .gt. 0.072) .and. & msg_has_dxcall if( currently_training .and. is_training_frame ) then twopi=8.0*atan(1.0) diff --git a/lib/mskrtd.f90 b/lib/mskrtd.f90 index 651871638..014a4cfbf 100644 --- a/lib/mskrtd.f90 +++ b/lib/mskrtd.f90 @@ -186,7 +186,7 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,mygrid,hiscall, & if(.not. bshdecode) then call msk144signalquality(ct,snr0,fest,tdec,softbits,msgreceived,hiscall, & - ncorrected,eyeopening,trained,pcoeffs) + brxequal,ncorrected,eyeopening,trained,pcoeffs) endif decsym=' & '