From 1c30b9722857157e6a9bb24f9f82f12bedc91861 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 29 Oct 2020 10:53:30 -0400 Subject: [PATCH] More adjustments for adding AP decoding to Q65. --- lib/decoder.f90 | 5 +++-- lib/q65_decode.f90 | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/decoder.f90 b/lib/decoder.f90 index 4c3b58c84..49dca917b 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -202,8 +202,9 @@ subroutine multimode_decoder(ss,id2,params,nfsample) ! We're in Q65 mode call timer('dec_q65 ',0) call my_q65%decode(q65_decoded,id2,params%nutc,params%ntr, & - params%nsubmode,params%nfqso,params%ntol,params%ndepth, & - mycall,hiscall,hisgrid,ncontest,logical(params%lapcqonly)) + params%nsubmode,params%nfqso,params%ntol,params%ndepth, & + mycall,hiscall,hisgrid,params%nQSOProgress,ncontest, & + logical(params%lapcqonly)) call timer('dec_q65 ',1) go to 800 endif diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90 index bcd280b71..1a973dd7c 100644 --- a/lib/q65_decode.f90 +++ b/lib/q65_decode.f90 @@ -29,7 +29,7 @@ module q65_decode contains subroutine decode(this,callback,iwave,nutc,ntrperiod,nsubmode,nfqso, & - ntol,ndepth,mycall,hiscall,hisgrid,ncontest,lapcqonly) + ntol,ndepth,mycall,hiscall,hisgrid,nQSOprogress,ncontest,lapcqonly) ! Decodes Q65 signals ! Input: iwave Raw data, i*2 @@ -83,9 +83,8 @@ contains npts=ntrperiod*12000 baud=12000.0/nsps df1=12000.0/nfft1 - this%callback => callback + this%callback => callback if(nutc.eq.-999) print*,lapdx,nfa,nfb,nfqso !Silence warning - b90=20.0 !8 to 25 is OK; not very critical nFadingModel=1 ! AP control could be done differently, but this works well: