From ea1510d837d4aee5b35c879a729d5c15d51886f2 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 5 Jan 2021 12:01:20 -0500 Subject: [PATCH 1/7] Don't display DT on waterfall when orange sync curve is used. --- widgets/plotter.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/widgets/plotter.cpp b/widgets/plotter.cpp index fd7cb173c..52bb97be7 100644 --- a/widgets/plotter.cpp +++ b/widgets/plotter.cpp @@ -293,12 +293,14 @@ void CPlotter::draw(float swide[], bool bScroll, bool bRed) if(m_bQ65_MultiSync) pen0.setColor("orange"); painter2D.setPen(pen0); painter2D.drawPolyline(LineBuf2,k); - QString t; - t = t.asprintf("DT = %6.2f",xdt); - painter2D.setPen(Qt::white); - Font.setWeight(QFont::Bold); - painter2D.setFont(Font); - painter2D.drawText(m_w-100,m_h2/2,t); + if(m_bQ65_Sync) { + QString t; + t = t.asprintf("DT = %6.2f",xdt); + painter2D.setPen(Qt::white); + Font.setWeight(QFont::Bold); + painter2D.setFont(Font); + painter2D.drawText(m_w-100,m_h2/2,t); + } } } update(); //trigger a new paintEvent From 47c8286db80416f9318763a895cfb09cf7d0ee27 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 5 Jan 2021 19:45:00 -0500 Subject: [PATCH 2/7] Disallow Q65 decodes with sum(dat4)=0: all 78 bita are zero. --- lib/qra/q65/q65_sync.f90 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/qra/q65/q65_sync.f90 b/lib/qra/q65/q65_sync.f90 index 2c1d2e8f0..616c7ba86 100644 --- a/lib/qra/q65/q65_sync.f90 +++ b/lib/qra/q65/q65_sync.f90 @@ -308,6 +308,7 @@ subroutine q65_dec1(s3,nsubmode,b90ts,codewords,ncw,esnodb,irc,dat4,decoded) decoded=' ' call q65_intrinsics_ff(s3,nsubmode,b90ts,nFadingModel,s3prob) call q65_dec_fullaplist(s3,s3prob,codewords,ncw,esnodb,dat4,plog,irc) + if(sum(dat4).le.0) irc=-2 if(irc.ge.0 .and. plog.gt.PLOG_MIN) then write(c77,1000) dat4(1:12),dat4(13)/2 1000 format(12b6.6,b5.5) @@ -332,6 +333,7 @@ subroutine q65_dec2(s3,nsubmode,b90ts,esnodb,irc,dat4,decoded) decoded=' ' call q65_intrinsics_ff(s3,nsubmode,b90ts,nFadingModel,s3prob) call q65_dec(s3,s3prob,APmask,APsymbols,esnodb,dat4,irc) + if(sum(dat4).le.0) irc=-2 if(irc.ge.0) then write(c77,1000) dat4(1:12),dat4(13)/2 1000 format(12b6.6,b5.5) From fb6fcdf35e5db16893a850c9e1641e80b934a5e5 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 6 Jan 2021 10:24:08 -0500 Subject: [PATCH 3/7] Mostly(?) temporary diagnostic tests. --- lib/q65_decode.f90 | 4 ++-- lib/qra/q65/q65_set_list.f90 | 1 + lib/qra/q65/q65_sync.f90 | 12 ++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90 index 6068e3ef3..193ba6afc 100644 --- a/lib/q65_decode.f90 +++ b/lib/q65_decode.f90 @@ -89,10 +89,10 @@ contains df1=12000.0/nfft1 this%callback => callback nFadingModel=1 -! Set up the codewords for full-AP list decoding - call q65_set_list(mycall,hiscall,hisgrid,codewords,ncw) dgen=0 call q65_enc(dgen,codewords) !Initialize the Q65 codec +! Set up the codewords for full-AP list decoding + call q65_set_list(mycall,hiscall,hisgrid,codewords,ncw) call timer('sync_q65',0) call q65_sync(nutc,iwave,ntrperiod,mode65,codewords,ncw,nsps, & nfqso,ntol,ndepth,lclearave,emedelay,xdt,f0,snr1,width,dat4, & diff --git a/lib/qra/q65/q65_set_list.f90 b/lib/qra/q65/q65_set_list.f90 index 44b2e12cb..266659d60 100644 --- a/lib/qra/q65/q65_set_list.f90 +++ b/lib/qra/q65/q65_set_list.f90 @@ -10,6 +10,7 @@ subroutine q65_set_list(mycall,hiscall,hisgrid,codewords,ncw) data isync/1,9,12,13,15,22,23,26,27,33,35,38,46,50,55,60,62,66,69,74,76,85/ ncw=0 + codewords=0 if(hiscall(1:1).eq. ' ') return ncw=MAX_NCW diff --git a/lib/qra/q65/q65_sync.f90 b/lib/qra/q65/q65_sync.f90 index 616c7ba86..1ed8fdbe6 100644 --- a/lib/qra/q65/q65_sync.f90 +++ b/lib/qra/q65/q65_sync.f90 @@ -53,6 +53,11 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps, & nsmo=int(0.7*mode_q65*mode_q65) if(nsmo.lt.1) nsmo=1 +!### TEMPORARY + f0=-99 + xdt=-99 +!### + allocate(s1(iz,jz)) allocate(s3(-64:LL-65,63)) allocate(c0(0:nfft-1)) @@ -158,6 +163,13 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps, & endif enddo ! imsg +!### TEMPORARY + if(f0.le.0.0 .or. xdt.lt.-90.) then + write(71) iz,jz,ia2,ccf_best,ipk,jpk,nfqso,mode_q65,df,xdt,f0, & + imsg_best,ccf,ccf1 + endif +!### + i1=i0+ipk-64 i2=i1+LL-1 j=j0+jpk-7 From 5fe0bd350855f8a435c1ae3efa9ea7380ab87b86 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 6 Jan 2021 10:30:05 -0500 Subject: [PATCH 4/7] Add s1 to the diagnostic output. --- lib/qra/q65/q65_sync.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/qra/q65/q65_sync.f90 b/lib/qra/q65/q65_sync.f90 index 1ed8fdbe6..07f7a7d97 100644 --- a/lib/qra/q65/q65_sync.f90 +++ b/lib/qra/q65/q65_sync.f90 @@ -166,7 +166,7 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps, & !### TEMPORARY if(f0.le.0.0 .or. xdt.lt.-90.) then write(71) iz,jz,ia2,ccf_best,ipk,jpk,nfqso,mode_q65,df,xdt,f0, & - imsg_best,ccf,ccf1 + imsg_best,ccf,ccf1,s1 endif !### From 9b35eeaeadf68189fa2764427b8b4684000dd4f7 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Wed, 6 Jan 2021 15:48:07 +0000 Subject: [PATCH 5/7] Revert "Add s1 to the diagnostic output." This reverts commit 5fe0bd350855f8a435c1ae3efa9ea7380ab87b86. --- lib/qra/q65/q65_sync.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/qra/q65/q65_sync.f90 b/lib/qra/q65/q65_sync.f90 index 07f7a7d97..1ed8fdbe6 100644 --- a/lib/qra/q65/q65_sync.f90 +++ b/lib/qra/q65/q65_sync.f90 @@ -166,7 +166,7 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps, & !### TEMPORARY if(f0.le.0.0 .or. xdt.lt.-90.) then write(71) iz,jz,ia2,ccf_best,ipk,jpk,nfqso,mode_q65,df,xdt,f0, & - imsg_best,ccf,ccf1,s1 + imsg_best,ccf,ccf1 endif !### From c407bc00f92eacb2ac69e92a56256a0cf15d047e Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Wed, 6 Jan 2021 15:48:21 +0000 Subject: [PATCH 6/7] Revert "Mostly(?) temporary diagnostic tests." This reverts commit fb6fcdf35e5db16893a850c9e1641e80b934a5e5. --- lib/q65_decode.f90 | 4 ++-- lib/qra/q65/q65_set_list.f90 | 1 - lib/qra/q65/q65_sync.f90 | 12 ------------ 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90 index 193ba6afc..6068e3ef3 100644 --- a/lib/q65_decode.f90 +++ b/lib/q65_decode.f90 @@ -89,10 +89,10 @@ contains df1=12000.0/nfft1 this%callback => callback nFadingModel=1 +! Set up the codewords for full-AP list decoding + call q65_set_list(mycall,hiscall,hisgrid,codewords,ncw) dgen=0 call q65_enc(dgen,codewords) !Initialize the Q65 codec -! Set up the codewords for full-AP list decoding - call q65_set_list(mycall,hiscall,hisgrid,codewords,ncw) call timer('sync_q65',0) call q65_sync(nutc,iwave,ntrperiod,mode65,codewords,ncw,nsps, & nfqso,ntol,ndepth,lclearave,emedelay,xdt,f0,snr1,width,dat4, & diff --git a/lib/qra/q65/q65_set_list.f90 b/lib/qra/q65/q65_set_list.f90 index 266659d60..44b2e12cb 100644 --- a/lib/qra/q65/q65_set_list.f90 +++ b/lib/qra/q65/q65_set_list.f90 @@ -10,7 +10,6 @@ subroutine q65_set_list(mycall,hiscall,hisgrid,codewords,ncw) data isync/1,9,12,13,15,22,23,26,27,33,35,38,46,50,55,60,62,66,69,74,76,85/ ncw=0 - codewords=0 if(hiscall(1:1).eq. ' ') return ncw=MAX_NCW diff --git a/lib/qra/q65/q65_sync.f90 b/lib/qra/q65/q65_sync.f90 index 1ed8fdbe6..616c7ba86 100644 --- a/lib/qra/q65/q65_sync.f90 +++ b/lib/qra/q65/q65_sync.f90 @@ -53,11 +53,6 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps, & nsmo=int(0.7*mode_q65*mode_q65) if(nsmo.lt.1) nsmo=1 -!### TEMPORARY - f0=-99 - xdt=-99 -!### - allocate(s1(iz,jz)) allocate(s3(-64:LL-65,63)) allocate(c0(0:nfft-1)) @@ -163,13 +158,6 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps, & endif enddo ! imsg -!### TEMPORARY - if(f0.le.0.0 .or. xdt.lt.-90.) then - write(71) iz,jz,ia2,ccf_best,ipk,jpk,nfqso,mode_q65,df,xdt,f0, & - imsg_best,ccf,ccf1 - endif -!### - i1=i0+ipk-64 i2=i1+LL-1 j=j0+jpk-7 From c7f2be4ba73900c63be4ddc2116cbf3d56226e18 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Wed, 6 Jan 2021 15:49:51 +0000 Subject: [PATCH 7/7] Initialize a variable --- lib/qra/q65/q65_sync.f90 | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/qra/q65/q65_sync.f90 b/lib/qra/q65/q65_sync.f90 index 616c7ba86..892f60c78 100644 --- a/lib/qra/q65/q65_sync.f90 +++ b/lib/qra/q65/q65_sync.f90 @@ -37,6 +37,7 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps, & data sync(1)/99.0/ save sync + irc=-2 idec=-1 snr1=0. dat4=0