From 0055222306ae7858f15a34e80db7b5d9b3bba757 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 2 Dec 2022 09:18:52 -0500 Subject: [PATCH] Write MAP65 decodes to file 'wb_q65.txt', for use by WSJT-X. --- lib/map65_mmdec.f90 | 2 +- map65/libm65/ftninit.f90 | 1 + map65/libm65/m65.f90 | 4 ++-- map65/libm65/map65a.f90 | 2 ++ map65/libm65/q65b.f90 | 4 ++++ 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/map65_mmdec.f90 b/lib/map65_mmdec.f90 index 18334ecf9..e0456b788 100644 --- a/lib/map65_mmdec.f90 +++ b/lib/map65_mmdec.f90 @@ -40,7 +40,7 @@ subroutine map65_mmdec(nutc,id2,nqd,nsubmode,nfa,nfb,nfqso,ntol,newdat, & lagain=(nagain.ne.0) bVHF=.true. emedelay=2.5 - ndepth=3 !Does this make it too slow? + ndepth=2 !Does this make it too slow? ntrperiod=60 open(17,file=trim(temp_dir)//'/red.dat',status='unknown') diff --git a/map65/libm65/ftninit.f90 b/map65/libm65/ftninit.f90 index 90468319c..f97705942 100644 --- a/map65/libm65/ftninit.f90 +++ b/map65/libm65/ftninit.f90 @@ -10,6 +10,7 @@ subroutine ftninit(appd) addpfx=' ' call pfxdump(appd//'/prefixes.txt') + open(12,file=appd//'/wb_q65.txt',status='unknown') open(13,file=appd//'/map65.log',status='unknown') open(19,file=appd//'/livecq.txt',status='unknown') open(21,file=appd//'/map65_rx.log',status='unknown',access='append',err=950) diff --git a/map65/libm65/m65.f90 b/map65/libm65/m65.f90 index d878a3b49..4c6713ab0 100644 --- a/map65/libm65/m65.f90 +++ b/map65/libm65/m65.f90 @@ -7,9 +7,9 @@ program m65 ! ! 10 binary input data, *.tf2 files ! 11 prefixes.txt -! 12 +! 12 wb_w65.txt ! 13 map65.log -! 14 +! 14 ! 15 ! 16 tquick log ! 17 saved *.tf2 files diff --git a/map65/libm65/map65a.f90 b/map65/libm65/map65a.f90 index b0f43be7c..7403d9cbb 100644 --- a/map65/libm65/map65a.f90 +++ b/map65/libm65/map65a.f90 @@ -41,6 +41,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & data nfile/0/,nutc0/-999/,nid/0/,ip000/1/,ip001/1/,mousefqso0/-999/ save + rewind 12 ndecodes=0 ! Clean start for Q65 at early decode @@ -520,6 +521,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & ndecdone=2 900 close(23) + call flush(12) ndphi=0 mcall3b=mcall3a diff --git a/map65/libm65/q65b.f90 b/map65/libm65/q65b.f90 index 15c0ea11b..7df236d8d 100644 --- a/map65/libm65/q65b.f90 +++ b/map65/libm65/q65b.f90 @@ -187,6 +187,10 @@ subroutine q65b(nutc,nqd,nxant,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, & nutc00=nutc msg00=msg0(1:28) freq1_00=freq1 + + f1=0.001*k0*df+nkhz_center-48.0+1.0 + write(12,1120) nutc,f1,xdt0,nsnr0,trim(msg0) +1120 format(i4.4,f9.3,f7.2,i5,2x,a) endif endif