w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaning up code that produces compiler warnings. 

Removing some disused code.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1009 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2008-09-11 15:41:05 +00:00
parent 6c0962a7ab
commit 60de355cb5
9 changed files with 19 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.CVF
View File

@ -32,10 +32,10 @@ SRCS2F77 = indexx.f gen65.f chkmsg.f \
deg2grid.f dot.f ftsky.f geocentric.f GeoDist.f grid2deg.f \
moon2.f MoonDop.f sun.f toxyz.f pfxdump.f \
ccf65.f trimlist.f chkhist.f decode1a.f \
filbig.f fil659.f fil658.f fil6521.f twkfreq.f decode65b.f \
filbig.f fil6521.f twkfreq.f decode65b.f \
afc65b.f fchisq.f ccf2.f
SRCS2C = resample.c ptt.c igray.c wrapkarn.c rfile3.c
SRCS2C = ptt.c igray.c wrapkarn.c rfile3.c
MAP65.EXE: Audio.pyd map65.spec
python c:\python23\installer\Build.py map65.spec

6
Makefile.MinGW
View File

@ -3,7 +3,7 @@
CC = /mingw/bin/gcc
FC = g95
CFLAGS = -I. -fPIC
FFLAGS = -Wall -fbounds-check -fPIC
FFLAGS = -Wall -Wno-precisiion-loss -fbounds-check -fPIC
.f.o:
${FC} ${CPPFLAGS} ${FFLAGS} -c -o ${<:.f=.o} $<
@ -33,12 +33,12 @@ SRCF77 = indexx.f gen65.f chkmsg.f \
deg2grid.f dot.f ftsky.f geocentric.f GeoDist.f grid2deg.f \
moon2.f MoonDop.f sun.f toxyz.f pfxdump.f \
ccf65.f trimlist.f chkhist.f decode1a.f \
fil659.f fil658.f fil6521.f twkfreq.f decode65b.f \
fil6521.f twkfreq.f decode65b.f \
afc65b.f fchisq.f ccf2.f
SRC2F77 = four2a.f filbig.f
SRCS2C = resample.c ptt.c igray.c wrapkarn.c cutil.c \
SRCS2C = ptt.c igray.c wrapkarn.c cutil.c \
start_portaudio.c
OBJF77 = ${SRCF77:.f=.o}

7
Makefile.in
View File

@ -11,7 +11,8 @@ CFLAGS += ${DEFS}
CPPFLAGS += ${DEFS} -I.
# WSJT specific Fortran flags
FFLAGS += -Wall -fbounds-check -fno-second-underscore -ffixed-line-length-none -fPIC
FFLAGS += -Wall -Wno-precision-loss -fbounds-check -fno-second-underscore -fPIC
#FFLAGS += -Wall -fbounds-check -fno-second-underscore -ffixed-line-length-none -fPIC
#FFLAGS += -Wall -fbounds-check -fno-second-underscore -fPIC
#FFLAGS += -cpp -fno-second-underscore
# The default rules
@ -59,10 +60,10 @@ SRCS2F77 = indexx.f gen65.f chkmsg.f \
deg2grid.f dot.f ftsky.f geocentric.f GeoDist.f grid2deg.f \
moon2.f MoonDop.f sun.f toxyz.f pfxdump.f \
ccf65.f trimlist.f chkhist.f decode1a.f \
filbig.f fil659.f fil658.f fil6521.f twkfreq.f decode65b.f \
filbig.f fil6521.f twkfreq.f decode65b.f \
afc65b.f fchisq.f ccf2.f rfile2.f
SRCS2C = resample.c ptt.c igray.c wrapkarn.c rfile3.c wfile3.c
SRCS2C = ptt.c igray.c wrapkarn.c rfile3.c wfile3.c
OBJS2F77 = ${SRCS2F77:.f=.o}

1
MoonDop.f
View File

@ -28,7 +28,6 @@
common/stcomx/km,bary,pvsun
data rad/57.2957795130823d0/,twopi/6.28310530717959d0/
pi=0.5d0*twopi
km=.true.
dlat=lat4/rad
dlong1=lon4/rad

6
cutil.c
View File

@ -54,7 +54,7 @@ int lseek_(int *fd,int *offset, int *origin)
//}
/* usleep(3) */
int usleep_(unsigned long *microsec)
void usleep_(unsigned long *microsec)
{
usleep(*microsec);
}
@ -71,11 +71,13 @@ int exit_(int *n)
exit(*n);
}
/*
struct tm *
gmtime_r_(const time_t *clock, struct tm *result)
{
// gmtime_r(clock, result);
gmtime_r(clock, result);
}
*/
time_t time_(void)
{

29
decode1a.f
View File

@ -1,4 +1,4 @@
subroutine decode1a(id,newdat,nfilt,freq,nflip,
subroutine decode1a(id,newdat,freq,nflip,
+ mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi,ndphi,
+ ipol,sync2,a,dt,pol,nkv,nhist,qual,decoded)
@ -19,7 +19,6 @@ C to decode it.
real s2(256,126)
real a(5)
real*8 samratio
integer resample
logical first
character decoded*22
character mycall*12,hiscall*12,hisgrid*6
@ -30,30 +29,8 @@ C Mix sync tone to baseband, low-pass filter, and decimate by 64
dt00=dt
C If freq=125.0 kHz, f0=48000 Hz.
f0=1000*(freq-77.0) !Freq of sync tone (0-96000 Hz)
if(nfilt.eq.1) then
call filbig(id,NMAX,f0,newdat,cx,cy,n5)
joff=0
else
call fil659(id,NMAX,f0,c2x,c2y,n2) !Pass 1: mix and filter both pol'ns
call fil658(c2x,n2,c3x,n3) !Pass 2
call fil658(c2y,n2,c3y,n3)
call fil658(c3x,n3,c4x,n4) !Pass 3
call fil658(c3y,n3,c4y,n4)
joff=-8
C Resample from 96000/64 = 1500 Hz to 1378.125 Hz
C Converter type: 0=Best quality sinc (band limited), BW=97%
C 1=medium quality sinc, BW=90%
C 2=fastest sinc, BW=80%
C 3=stepwise (very fast)
C 4=linear (very fast)
nconv_type=2 !### test! ###
nchans=2
samratio=1378.125d0/1500.d0
i1=resample(c4x,n4,nconv_type,nchans,samratio,cx,n5)
i2=resample(c4y,n4,nconv_type,nchans,samratio,cy,n5)
endif
call filbig(id,NMAX,f0,newdat,cx,cy,n5)
joff=0
sqa=0.
sqb=0.
do i=1,n5

2
loc.c
View File

@ -1,4 +1,4 @@
int loc_(void *a)
{
return a;
return (int)a;
}

2
map65.py
View File

@ -1,4 +1,4 @@
#--------------------------------------------------------------------- MAP65
#---------------------------------------------------------------------- MAP65
# $Date$ $Revision$
#
from Tkinter import *

3
map65a.F90
View File

@ -49,7 +49,6 @@ subroutine map65a(newdat)
ftol=0.020 !Frequency tolerance (kHz)
foffset=0.001*(1270 + nfcal)
fselect=mfqso + foffset
nfilt=1
dphi=idphi/57.2957795
do i=12,3,-1
@ -191,7 +190,7 @@ subroutine map65a(newdat)
nkm.eq.1) km=km-1
if(freq-freq0.gt.ftol .or. sync1.gt.sync10) then
nflip=nint(flipk)
call decode1a(id(1,1,kbuf),newdat,nfilt,freq,nflip, &
call decode1a(id(1,1,kbuf),newdat,freq,nflip, &
mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi,ndphi, &
ipol,sync2,a,dt,pol,nkv,nhist,qual,decoded)