From c3b724a37743f302bc5390c30d7fea1d55ab8d78 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 22 Apr 2021 14:04:08 -0400 Subject: [PATCH] More cleanup of compiler warnings. --- map65/libm65/extract.f90 | 4 ++-- map65/libm65/gen_q65_wave.f90 | 3 +-- map65/libm65/map65a.f90 | 2 +- map65/mainwindow.cpp | 4 +--- map65/mainwindow.h | 4 ++-- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/map65/libm65/extract.f90 b/map65/libm65/extract.f90 index 389962359..a7c1b2284 100644 --- a/map65/libm65/extract.f90 +++ b/map65/libm65/extract.f90 @@ -3,12 +3,12 @@ subroutine extract(s3,nadd,ncount,nhist,decoded,ltext) use packjt real s3(64,63) character decoded*22 - integer era(51),dat4(12),indx(64) + integer dat4(12) integer mrsym(63),mr2sym(63),mrprob(63),mr2prob(63) logical first,ltext integer correct(63),itmp(63) integer param(0:8) - integer h0(0:11),d0(0:11),ne(0:11) + integer h0(0:11),d0(0:11) real r0(0:11) common/test001/s3a(64,63),mrs(63),mrs2(63) !### TEST ONLY ### diff --git a/map65/libm65/gen_q65_wave.f90 b/map65/libm65/gen_q65_wave.f90 index e84ec2641..746bf12ef 100644 --- a/map65/libm65/gen_q65_wave.f90 +++ b/map65/libm65/gen_q65_wave.f90 @@ -1,4 +1,4 @@ -subroutine gen_q65_wave(msg,ichk,ntxfreq,mode65,itype,msgsent,iwave,nwave) +subroutine gen_q65_wave(msg,ntxfreq,mode65,msgsent,iwave,nwave) ! Encodes a QRA64 message to yield complex iwave() at fsample = 11025 Hz @@ -11,7 +11,6 @@ subroutine gen_q65_wave(msg,ichk,ntxfreq,mode65,itype,msgsent,iwave,nwave) character*16 cjunk real*8 t,dt,phi,f,f0,dfgen,dphi,twopi,tsym integer itone(85) - integer dgen(13) integer sent(63) integer*2 iwave(NMAX) integer icos7(0:6) diff --git a/map65/libm65/map65a.f90 b/map65/libm65/map65a.f90 index cd62ba392..cf25204d2 100644 --- a/map65/libm65/map65a.f90 +++ b/map65/libm65/map65a.f90 @@ -226,7 +226,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & call timer('decode1a',1) if(nqd.eq.2) then call timer('q65 ',0) - call q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz, & + call q65b(nutc,fcenter,nfcal,nfsample,ikhz, & mousedf,ntol,xpol,mycall,hiscall,hisgrid,mode_q65) call timer('q65 ',1) cycle diff --git a/map65/mainwindow.cpp b/map65/mainwindow.cpp index b7da9cbc4..451618287 100644 --- a/map65/mainwindow.cpp +++ b/map65/mainwindow.cpp @@ -1503,9 +1503,7 @@ void MainWindow::guiUpdate() ba2msg(ba,message); int len1=22; int mode65=m_mode65; - int ichk=0; int ntxFreq=1000; - int itype=0; double samfac=1.0; if(m_modeTx=="JT65") { @@ -1513,7 +1511,7 @@ void MainWindow::guiUpdate() &nwave,len1,len1); } else { if(m_modeQ65==5) ntxFreq=700; - gen_q65_wave_(message,&ichk,&ntxFreq,&m_modeQ65,&itype,msgsent,iwave, + gen_q65_wave_(message,&ntxFreq,&m_modeQ65,msgsent,iwave, &nwave,len1,len1); } msgsent[22]=0; diff --git a/map65/mainwindow.h b/map65/mainwindow.h index 90a38811f..862623f45 100644 --- a/map65/mainwindow.h +++ b/map65/mainwindow.h @@ -299,8 +299,8 @@ extern "C" { int* nsendingsh, char* msgsent, short iwave[], int* nwave, int len1, int len2); - void gen_q65_wave_(char* msg, int* ichk, int* ntxFreq, int* mode64, - int* itype, char* msgsent, short iwave[], int* nwave, + void gen_q65_wave_(char* msg, int* ntxFreq, int* mode64, + char* msgsent, short iwave[], int* nwave, int len1, int len2); int ptt_(int* nport, int* itx, int* iptt);