From 60889230ed9d1964783f327f2f98daf6a2858385 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 12 Jan 2006 22:10:21 +0000 Subject: [PATCH] Added Makefile.in.joe (temporary, for information). Fixed array bounds for ccfblue in wsjt65.f, sync65.f, xcor.f. Edited README_592.TXT git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@90 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- Makefile.in.joe | 126 ++++++++++++++++++++++++++++++++++++++++++++++++ README_592.TXT | 25 +++++----- sync65.f | 2 +- wsjt65.f | 2 +- xcor.f | 2 +- 5 files changed, 141 insertions(+), 16 deletions(-) create mode 100644 Makefile.in.joe diff --git a/Makefile.in.joe b/Makefile.in.joe new file mode 100644 index 000000000..b67622399 --- /dev/null +++ b/Makefile.in.joe @@ -0,0 +1,126 @@ +CC ?= @CC@ +FFLAGS = @FFLAGS@ +LDFLAGS = @LDFLAGS@ +CPPFLAGS = @CPPFLAGS@ +CFLAGS = @CFLAGS@ +CFLAGS += -DBIGSYM + +# WSJT specific Fortran flags +#FFLAGS += -Wall -fbounds-check -cpp -fno-second-underscore +FFLAGS = -O2 -cpp -w -fno-second-underscore + +OS=@OS@ +G95=@G95@ +COMPILER=@G95_LIB_PATH@ +FC=@G95@ + +LDFLAGS += -L${COMPILER} +LDFLAGS += -lg2c + +PYTHON ?= @PYTHON@ +RM ?= @RM@ +F2PY = @F2PY@ +F2PY_PY = "f2py.py" + +%.o : %.f90 + $(FC) -c $(FFLAGS) $< -o $@ + +OBJS1 = JT65code.o nchar.o grid2deg.o packmsg.o packtext.o \ + packcall.o packgrid.o unpackmsg.o unpacktext.o unpackcall.o \ + unpackgrid.o deg2grid.o packdxcc.o chkmsg.o getpfx1.o \ + getpfx2.o k2grid.o grid2k.o interleave63.o graycode.o set.o \ + igray.o init_rs.o encode_rs.o decode_rs.o \ + wrapkarn.o + +F2PYONLY = ftn_init ftn_quit audio_init spec getfile azdist0 astro0 + +SRCS2F90 = a2d.f90 abc441.f90 astro0.f90 audio_init.f90 azdist0.f90 \ + blanker.f90 decode1.f90 decode2.f90 decode3.f90 ftn_init.f90 \ + ftn_quit.f90 get_fname.f90 getfile.f90 horizspec.f90 hscroll.f90 \ + i1tor4.f90 pix2d.f90 pix2d65.f90 rfile.f90 savedata.f90 spec.f90 \ + wsjtgen.f90 runqqq.f90 fivehz.f90 + +OBJS2F90 = a2d.o abc441.o astro0.o audio_init.o azdist0.o \ + blanker.o decode1.o decode2.o decode3.o ftn_init.o \ + ftn_quit.o get_fname.o getfile.o horizspec.o hscroll.o \ + i1tor4.o pix2d.o pix2d65.o rfile.o savedata.o spec.o \ + wsjtgen.o runqqq.o fivehz.o + +SRCS2F77 = wsjt1.f astro.f astropak.f \ + avesp2.f bzap.f spec441.f spec2d.f mtdecode.f stdecode.f \ + indexx.f s2shape.f flat2.f gen65.f chkmsg.f gen6m.f gentone.f \ + syncf0.f syncf1.f synct.f decode6m.f avemsg6m.f \ + set.f flatten.f db.f pctile.f sort.f ssort.f ps.f smooth.f \ + ping.f longx.f peakup.f sync.f detect.f avemsg65.f decode65.f \ + demod64a.f encode65.f extract.f flat1.f four2.f rfile2.f \ + gencw.f getpfx1.f getpfx2.f getsnr.f graycode.f grid2k.f \ + interleave63.f k2grid.f limit.f lpf1.f deep65.f morse.f \ + nchar.f packcall.f packgrid.f packmsg.f packtext.f setup65.f \ + short65.f slope.f spec2d65.f sync65.f unpackcall.f \ + unpackgrid.f unpackmsg.f unpacktext.f xcor.f xfft.f wsjt65.f + +OBJS2F77 = wsjt1.o astro.o astropak.o \ + avesp2.o bzap.o spec441.o spec2d.o mtdecode.o stdecode.o \ + indexx.o s2shape.o flat2.o gen65.o chkmsg.o gen6m.o gentone.o \ + syncf0.o syncf1.o synct.o decode6m.o avemsg6m.o \ + set.o flatten.o db.o pctile.o sort.o ssort.o ps.o smooth.o \ + ping.o longx.o peakup.o sync.o detect.o avemsg65.o decode65.o \ + demod64a.o encode65.o extract.o flat1.o four2.o rfile2.o \ + gencw.o getpfx1.o getpfx2.o getsnr.o graycode.o grid2k.o \ + interleave63.o k2grid.o limit.o lpf1.o deep65.o morse.o \ + nchar.o packcall.o packgrid.o packmsg.o packtext.o setup65.o \ + short65.o slope.o spec2d65.o sync65.o unpackcall.o \ + unpackgrid.o unpackmsg.o unpacktext.o xcor.o xfft.o wsjt65.o + +#OBJS2F90 = a2d.o abc441.o astro0.o audio_init.o azdist0.o \ +# blanker.o decode1.o decode2.o decode3.o ftn_init.o \ +# ftn_quit.o get_fname.o getfile.o horizspec.o hscroll.o \ +# i1tor4.o pix2d.o pix2d65.o rfile.o savedata.o spec.o \ +# wsjtgen.o runqqq.o fivehz.o + +# +# ok, so far for now +# Windows @AUDIO@ will be jtaudio.c since it uses portaudio +# for *nix @AUDIO@ will also be jtaudio.c and start_threads.c +# for portaudio +# for *nix @AUDIO@ will be start_threads.c for alsa +# for *nix @AUDIO@ will be ?? for oss +# +# ptt_unix.c vs. ptt.c I'll sort out later. +# ditto for cutil.c (only used on *nix) +# --db +# jtaudio.c/start_threads.c mess will have to be sorted out later +# to minimise #ifdef's +# --db +# +OBJS2C = init_rs.o encode_rs.o decode_rs.o +SRCS3C = ptt_unix.c igray.c wrapkarn.c cutil.c +SRCS3C += @AUDIO@ + +all: JT65code wsjt6 + +JT65code: $(OBJS1) + $(FC) -o JT65code $(OBJS1) + +wsjt6: Audio.so #wsjt.spec +# ${PYTHON} c:\python23\installer\Build.py wsjt.spec +# ${RM} wsjt6 + +Audio.so: $(OBJS2C) $(OBJS2F77) $(SRCS2F90) ${SRCS3C} + ${PYTHON} ${F2PY_PY} -c --quiet --opt="-O -cpp -D${CFLAGS} \ + -fno-second-underscore" $(OBJS2C) $(OBJS2F77) -m Audio \ + --f77exec=${G95} --f90exec=${G95} ${CPPFLAGS} ${LDFLAGS} \ + only: $(F2PYONLY) : \ + $(SRCS2F90) \ + ${SRCS3C} + +wsjt.spec: wsjt.py astro.py g.py options.py palettes.py smeter.py specjt.py +# ${PYTHON} c:\python23\installer\makespec.py --icon wsjt.ico \ +# --tk --onefile wsjt.py + +four2.o: four2.f + $(FC) -c -O2 four2.f + +.PHONY : clean +clean: + ${RM} -f *.o *.so JT65code wsjt6 diff --git a/README_592.TXT b/README_592.TXT index 3f1ca9d8a..ee9577e34 100755 --- a/README_592.TXT +++ b/README_592.TXT @@ -17,11 +17,11 @@ Enhancements 4. The JT6M decoder now makes better use of Freeze and Tol. You can set the value of "Freeze DF" by using the Right/Left arrow keys. -5. On-screen font sizes can be set by using Windows Notepad to edit - the file wsjtrc.win. If your screen has resolution greater than - 1024 x 768, or if you have old eyes (like mine), you may want to - increase the sizes from 8 and 9 (first three lines of the file) to - 9 and 10, say. +5. On-screen font sizes can be set by using Windows Notepad (or + another text editor) to edit the file wsjtrc.win. If your screen + has resolution greater than 1024 x 768, or if you have old eyes + like mine, you may want to increase the sizes from 8 and 9 (first + three lines of the file) to 9 and 10, say. 6. Dividing lines are now provided on the waterfall display between spectra corresponding to wave files read from disk. @@ -29,13 +29,13 @@ Enhancements 7. The PTT line is explicitly set low on program startup. 8. The F10 key brings up the SpecJT screen (if it was hidden) and - toggles focus between the WSJT and SpecJT screens. + toggles foreground and focus between the WSJT and SpecJT screens. -9. Use the Alt-F keyboard shortcut to toggle "Freeze", and Alt-Z to - toggle "Zap". +9. You can use the Alt-F keyboard shortcut to toggle "Freeze", and + Alt-Z to toggle "Zap". -10. "Accelerated decoding" HAS BEEN removed from the Setup menu. - In effect, it is now always ON. +10. "Accelerated decoding" has been removed from the Setup menu. In + effect, it is now always ON. Bug Fixes: @@ -56,8 +56,8 @@ Information for Programmers WSJT is no longer a one-person effort. It has become a full-fledged Open Source project, with an active working group making contributions to future development. Source code is now stored in a public -repository under control of the Subversion (SVN) version control -system. You can learn more at +repository under control of a version control system called +Subversion, or SVN. You can learn more at http://developer.berlios.de/projects/wsjt/. The first significant result of the group effort has been to create @@ -73,7 +73,6 @@ The present WSJT working group consists of: Diane Bruce, VA3DB James Courtier-Dutton Bob McGwier, N4HY - Jonathan Naylor, ON/G4KLX Stewart Nelson, KK7A Joe Taylor, K1JT Kaj Wiik, OH6EH diff --git a/sync65.f b/sync65.f index 6fb2f08b6..b122af494 100644 --- a/sync65.f +++ b/sync65.f @@ -12,7 +12,7 @@ C NB: at this stage, submodes ABC are processed in the same way. real dat(jz) real psavg(NHMAX) !Average spectrum of whole record real s2(NHMAX,NSMAX) !2d spectrum, stepped by half-symbols - real ccfblue(-5:28) !CCF with pseudorandom sequence + real ccfblue(-5:540) !CCF with pseudorandom sequence real ccfred(-224:224) !Peak of ccfblue, as function of freq real tmp(450) integer itry(100) diff --git a/wsjt65.f b/wsjt65.f index 3505b4cbb..cbd34f559 100644 --- a/wsjt65.f +++ b/wsjt65.f @@ -19,7 +19,7 @@ C already been done. character*12 mycall character*12 hiscall character*6 hisgrid - real ccfblue(-5:28),ccfred(-224:224) + real ccfblue(-5:540),ccfred(-224:224) real ftrack(126) logical lmid integer itf(2,9) diff --git a/xcor.f b/xcor.f index 8742f8285..b33b391ac 100644 --- a/xcor.f +++ b/xcor.f @@ -10,7 +10,7 @@ C the "OOO" message. parameter (NSMAX=320) !Max number of half-symbol steps real s2(NHMAX,NSMAX) !2d spectrum, stepped by half-symbols real a(NSMAX),a2(NSMAX) - real ccf(-5:28) + real ccf(-5:540) include 'prcom.h' common/clipcom/ nclip data lagmin/0/ !Silence g77 warning