diff --git a/Makefile.CVF b/Makefile.CVF index 29ceb3445..0a6b09c73 100644 --- a/Makefile.CVF +++ b/Makefile.CVF @@ -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 diff --git a/Makefile.MinGW b/Makefile.MinGW index f7fc8321c..3fc89c3a7 100644 --- a/Makefile.MinGW +++ b/Makefile.MinGW @@ -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} diff --git a/Makefile.in b/Makefile.in index 85384979a..9263e7a5d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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} diff --git a/MoonDop.f b/MoonDop.f index e9959b1ca..a0004e82e 100644 --- a/MoonDop.f +++ b/MoonDop.f @@ -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 diff --git a/cutil.c b/cutil.c index ccdb22d37..69a526b07 100644 --- a/cutil.c +++ b/cutil.c @@ -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) { diff --git a/decode1a.f b/decode1a.f index 71fa17488..c17a8aca5 100644 --- a/decode1a.f +++ b/decode1a.f @@ -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 diff --git a/loc.c b/loc.c index 638e2c0e0..47fd5e777 100644 --- a/loc.c +++ b/loc.c @@ -1,4 +1,4 @@ int loc_(void *a) { - return a; + return (int)a; } diff --git a/map65.py b/map65.py index 8f1a50f49..521ab23fe 100644 --- a/map65.py +++ b/map65.py @@ -1,4 +1,4 @@ -#--------------------------------------------------------------------- MAP65 +#---------------------------------------------------------------------- MAP65 # $Date$ $Revision$ # from Tkinter import * diff --git a/map65a.F90 b/map65a.F90 index 3361bb3c8..38eb7d4e3 100644 --- a/map65a.F90 +++ b/map65a.F90 @@ -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)