From 02d410d4f7d5c3d29e381060488ca9869428d579 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Thu, 14 Jan 2021 13:23:09 -0500
Subject: [PATCH] Send both idec and navg to the q65 callback routine.

---
 lib/decoder.f90    | 15 +++++----------
 lib/q65_decode.f90 | 12 +++++-------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/lib/decoder.f90 b/lib/decoder.f90
index ced405b29..582865a4e 100644
--- a/lib/decoder.f90
+++ b/lib/decoder.f90
@@ -758,7 +758,8 @@ contains
    return
  end subroutine fst4_decoded
 
- subroutine q65_decoded (this,nutc,snr1,nsnr,dt,freq,decoded,idec,ntrperiod)
+ subroutine q65_decoded (this,nutc,snr1,nsnr,dt,freq,decoded,idec,   &
+      navg,ntrperiod)
 
     use q65_decode
     implicit none
@@ -771,20 +772,14 @@ contains
     real, intent(in) :: freq
     character(len=37), intent(in) :: decoded
     integer, intent(in) :: idec
+    integer, intent(in) :: navg
     integer, intent(in) :: ntrperiod
-    integer iaptype,navg
     character*3 cflags
-    
+  
     cflags='   '
     if(idec.ge.0) then
-       iaptype=idec
-       navg=0
-       if(idec.ge.100) then
-          iaptype=idec/100
-          navg=mod(idec,100)
-       endif
        cflags='q  '
-       write(cflags(2:2),'(i1)') iaptype
+       write(cflags(2:2),'(i1)') idec
        if(navg.ge.2) write(cflags(3:3),'(i1)') navg
     endif
 
diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90
index 26115a086..45d2c1798 100644
--- a/lib/q65_decode.f90
+++ b/lib/q65_decode.f90
@@ -8,7 +8,7 @@ module q65_decode
 
   abstract interface
      subroutine q65_decode_callback (this,nutc,snr1,nsnr,dt,freq,    &
-          decoded,nap,ntrperiod)
+          decoded,idec,navg,ntrperiod)
        import q65_decoder
        implicit none
        class(q65_decoder), intent(inout) :: this
@@ -18,7 +18,8 @@ module q65_decode
        real, intent(in) :: dt
        real, intent(in) :: freq
        character(len=37), intent(in) :: decoded
-       integer, intent(in) :: nap
+       integer, intent(in) :: idec
+       integer, intent(in) :: navg
        integer, intent(in) :: ntrperiod
      end subroutine q65_decode_callback
   end interface
@@ -112,8 +113,6 @@ contains
          emedelay,xdt,f0,snr1,width,dat4,snr2,idec)
     call timer('q65_dec0',1)
 
-    print*,'AAA',idec
-
     if(idec.ge.0) then
        xdt1=xdt                          !We have a list-decode result
        f1=f0
@@ -175,7 +174,6 @@ contains
     endif
     
 100 decoded='                                     '
-    print*,'BBB',idec
     if(idec.ge.0) then
 
 ! ------------------------------------------------------
@@ -195,14 +193,14 @@ contains
 1000   format(12b6.6,b5.5)
        call unpack77(c77,0,decoded,unpk77_success) !Unpack to get msgsent
        nsnr=nint(snr2)
-       call this%callback(nutc,snr1,nsnr,xdt1,f1,decoded,idec,ntrperiod)
+       call this%callback(nutc,snr1,nsnr,xdt1,f1,decoded,idec,navg,ntrperiod)
        call q65_clravg
     else
 ! Report snr1, even if no decode.
        nsnr=db(snr1) - 35.0
        idec=-1
        call this%callback(nutc,snr1,nsnr,xdt1,f1,decoded,              &
-            idec,ntrperiod)
+            idec,navg,ntrperiod)
     endif
 
     return