diff --git a/g1 b/g1 index c7dbc86d1..8f46b5cfb 100755 --- a/g1 +++ b/g1 @@ -1 +1 @@ -python f2py.py -c --quiet --opt="-O -cpp -DLinux -fno-second-underscore" init_rs.o encode_rs.o decode_rs.o -m Audio --"f77exec=/home/joe/bin/g95" --f90exec="/home/joe/bin/g95" -L//usr/lib/gcc-lib/i386-redhat-linux/3.2.2/ -lpthread -lg2c only: ftn_init ftn_quit audio_init spec getfile azdist0 astro0 : a2d.f90 abc441.f90 astro0.f90 audio_init.f90 azdist0.f90 decode1.f90 decode2.f90 decode3.f90 ftn_init.f90 ftn_quit.f90 get_fname.f90 getfile.f90 horizspec.f90 hscroll.f90 i1tor4.f90 makedate_sub.f90 rfile.f90 savedata.f90 spec.f90 wsjtgen.f90 runqqq.f90 wsjt1.f fsubs1.f fsubs.f astro.f astropak.f jtaudio.c ptt_linux.c wrapkarn.c start_threads.c cutil.c fivehz.f90 +python f2py.py -c --quiet --opt="-O -cpp -DLinux -fno-second-underscore" init_rs.o encode_rs.o decode_rs.o -m Audio --"f77exec=/home/joe/bin/g95" --f90exec="/home/joe/bin/g95" -L//usr/lib/gcc-lib/i386-redhat-linux/3.2.2/ -lpthread -lg2c only: ftn_init ftn_quit audio_init spec getfile azdist0 astro0 : 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 wsjt1.f fsubs1.f fsubs.f astro.f astropak.f jtaudio.c ptt_linux.c wrapkarn.c start_threads.c cutil.c fivehz.f90 diff --git a/g1.bat b/g1.bat index dd75846bf..06d4ecf90 100644 --- a/g1.bat +++ b/g1.bat @@ -1,2 +1,2 @@ cl /c /DWin32 /Fojtaudio.o jtaudio.c -f2py.py -c --quiet --opt="/traceback /fast /fpp /define:Win32" init_rs.o encode_rs.o decode_rs.o jtaudio.o -lwinmm -lpa -llibsamplerate -m Audio --"fcompiler=compaqv" only: ftn_init ftn_quit audio_init spec getfile azdist0 astro0 : a2d.f90 abc441.f90 astro0.f90 audio_init.f90 azdist0.f90 decode1.f90 decode2.f90 decode3.f90 ftn_init.f90 ftn_quit.f90 get_fname.f90 getfile.f90 horizspec.f90 hscroll.f90 i1tor4.f90 makedate_sub.f90 rfile.f90 savedata.f90 spec.f90 wsjtgen.f90 runqqq.f90 wsjt1.f fsubs1.f fsubs.f astro.f astropak.f resample.c ptt.c wrapkarn.c fivehz.f90 +f2py.py -c --quiet --opt="/traceback /fast /fpp /define:Win32" init_rs.o encode_rs.o decode_rs.o jtaudio.o -lwinmm -lpa -llibsamplerate -m Audio --"fcompiler=compaqv" only: ftn_init ftn_quit audio_init spec getfile azdist0 astro0 : a2d.f90 abc441.f90 astro0.f90 audio_init.f90 azdist0.f90 blanker65.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 wsjt1.f fsubs1.f fsubs.f astro.f astropak.f resample.c ptt.c wrapkarn.c fivehz.f90 diff --git a/gcom1.f90 b/gcom1.f90 index 8c66e5a40..d5d86bdb2 100644 --- a/gcom1.f90 +++ b/gcom1.f90 @@ -6,7 +6,7 @@ parameter(NTxMax=150*11025) real*8 Tsec !Present time SoundIn, SoundOut real*8 tbuf !Tsec at time of input callback SoundIn real*8 rxdelay !Delay between PTT=1 and Tx audio SoundIn -real*8 txdelay !Delay from end of Tx Audio and PTT=0 SOundOut +real*8 txdelay !Delay from end of Tx Audio and PTT=0 SoundOut real*8 samfacin !(Input sample rate)/11025 GUI real*8 samfacout !(Output sample rate)/11025 GUI integer*2 y1 !Ring buffer for audio channel 0 SoundIn diff --git a/gcom2.f90 b/gcom2.f90 index e2bbf6721..4c55ea399 100644 --- a/gcom2.f90 +++ b/gcom2.f90 @@ -1,15 +1,29 @@ -! Variable Purpose Set by +! Variable Purpose Set in Thread !------------------------------------------------------------------------- -real ps0 !Spectrum of best ping, FSK441/JT6m wsjt1 -real psavg !Average spectrum wsjt1 -integer*2 d2a,d2b,b -integer shok,sendingsh -integer dftolerance -logical LDecoded,rxdone -character mycall*12,hisgrid*6 -character hiscall*12,txmsg*28,sending*28,mode*6,utcdate*12 -character*24 fname0,fnamea,fnameb,decodedfile -character*80 AppDir,filetokilla,filetokillb +real ps0 !Spectrum of best ping, FSK441/JT6m Decoder +real psavg !Average spectrum Decoder +integer*2 d2a !Rx data, extracted from y1 Decoder +integer*2 d2b !Rx data, selected by mouse-pick Decoder +integer*2 b !Pixel values for waterfall spectrum GUI +integer shok !Shorthand messages OK? GUI +integer sendingsh !Sending a shorthand message? SoundIn +integer dftolerance !DF tolerance (Hz) GUI +logical LDecoded !Was a message decoded? Decoder +logical rxdone !Has the Rx sequence finished? SoundIn,Decoder +character mycall*12 !My call sign GUI +character hiscall*12 !His call sign GUI +character hisgrid*6 !His grid locator GUI +character txmsg*28 !Message to be transmitted GUI +character sending*28 !Message being sent SoundIn +character mode*6 !WSJT operating mode GUI +character utcdate*12 !UTC date GUI +character*24 fname0 !Filenames to be recorded, read, ... Decoder +character*24 fnamea +character*24 fnameb +character*24 decodedfile +character*80 AppDir !WSJT installation directory GUI +character*80 filetokilla !Filenames (full path) Decoder +character*80 filetokillb common/gcom2/ps0(431),psavg(450),s2(64,3100),ccf(-5:540), & green(500),ngreen,dgain,iter,ndecoding,ndecoding0,mousebutton, & diff --git a/makedate.f90 b/makedate.f90 deleted file mode 100644 index 262d69df5..000000000 --- a/makedate.f90 +++ /dev/null @@ -1,15 +0,0 @@ -program makedate - -#ifdef Win32 - use dfport -#endif - - open(10,file='makedate_sub.f90',status='unknown') - write(10,*) 'subroutine makedate_sub(isec)' - write(10,*) '!f2py intent(out) isec' - write(10,*) ' isec=',time() - write(10,*) ' return' - write(10,*) 'end subroutine makedate_sub' - -end program makedate - diff --git a/savedata.f90 b/savedata.f90 index 1d5711c6d..c6006b97d 100644 --- a/savedata.f90 +++ b/savedata.f90 @@ -1,8 +1,3 @@ - -include 'pix2d.f90' -include 'pix2d65.f90' -include 'blanker.f90' - !----------------------------------------------------------- savedata subroutine savedata