From 72005888ac835586105853627e562204a9409b45 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 18 Jun 2020 13:37:49 -0400 Subject: [PATCH] Starting to implement callback routine fst280_decoded. Not yet functional! --- lib/decoder.f90 | 42 +++++++++++++++++++++++++++++++++++++++++- lib/fst280_decode.f90 | 8 +++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/lib/decoder.f90 b/lib/decoder.f90 index b79e77ccd..c2247d6d0 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -315,7 +315,7 @@ subroutine multimode_decoder(ss,id2,params,nfsample) ! JT65 is not yet producing info for nsynced, ndecoded. 800 ndecoded = my_jt4%decoded + my_jt65%decoded + my_jt9%decoded + & - my_ft8%decoded + my_ft4%decoded + my_ft8%decoded + my_ft4%decoded + my_fst280%decoded if(params%nmode.eq.8 .and. params%nzhsym.eq.41) ndec41=ndecoded if(params%nmode.eq.8 .and. params%nzhsym.eq.47) ndec47=ndecoded if(params%nmode.eq.8 .and. params%nzhsym.eq.50) then @@ -676,4 +676,44 @@ contains return end subroutine ft4_decoded + +! subroutine fst280_decoded (this,sync,nsnr,dt,freq,decoded,nap,qual) + +! use fst280_decode +! implicit none + +! class(fst280_decoder), intent(inout) :: this +! real, intent(in) :: sync +! integer, intent(in) :: nsnr +! real, intent(in) :: dt +! real, intent(in) :: freq +! character(len=37), intent(in) :: decoded +! integer, intent(in) :: nap +! real, intent(in) :: qual +! character*2 annot +! character*37 decoded0 + +! decoded0=decoded +! annot=' ' +! if(nap.ne.0) then +! write(annot,'(a1,i1)') 'a',nap +! if(qual.lt.0.17) decoded0(37:37)='?' +! endif + +! write(*,1001) params%nutc,nsnr,dt,nint(freq),decoded0,annot +!1001 format(i6.6,i4,f5.1,i5,' + ',1x,a37,1x,a2) +! write(13,1002) params%nutc,nint(sync),nsnr,dt,freq,0,decoded0 +!1002 format(i6.6,i4,i5,f6.1,f8.0,i4,3x,a37,' FST280') + +! call flush(6) +! call flush(13) + +! select type(this) +! type is (counting_fst280_decoder) +! this%decoded = this%decoded + 1 +! end select + +! return +! end subroutine fst280_decoded + end subroutine multimode_decoder diff --git a/lib/fst280_decode.f90 b/lib/fst280_decode.f90 index 326e81f2d..bc4247efd 100644 --- a/lib/fst280_decode.f90 +++ b/lib/fst280_decode.f90 @@ -264,8 +264,14 @@ contains endif if(nharderrors .ge.0 .and. unpk77_success) then ngood=ngood+1 - write(*,1100) 0,nint(xsnr),dt_synced,nint(fc_synced),msg(1:22) + write(*,1100) 0,nint(xsnr),dt_synced,nint(fc_synced), & + msg(1:22) 1100 format(i6.6,i5,f5.1,i5,' `',1x,a22) + +! nsnr=nint(xsnr) +! iaptype=0 +! qual=0. +! call this%callback(smax1,nsnr,xdt,fc_synced,msg,iaptype,qual) goto 2002 else cycle