diff --git a/gcom1.f90 b/gcom1.f90 index d5d86bdb2..0ffc26b0c 100644 --- a/gcom1.f90 +++ b/gcom1.f90 @@ -1,34 +1,47 @@ -parameter(NRxMax=2048*1024) -parameter(NTxMax=150*11025) - ! Variable Purpose Set in Thread !--------------------------------------------------------------------------- -real*8 Tsec !Present time SoundIn, SoundOut +integer NRXMAX !Max length of Rx ring buffers +integer NTXMAX !Max length of Tx waveform in samples +parameter(NRXMAX=2048*1024) +parameter(NTXMAX=150*11025) real*8 tbuf !Tsec at time of input callback SoundIn +integer ntrbuf !(obsolete?) +real*8 Tsec !Present time SoundIn,SoundOut 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 samfacin !(Input sample rate)/11025 GUI real*8 samfacout !(Output sample rate)/11025 GUI integer*2 y1 !Ring buffer for audio channel 0 SoundIn integer*2 y2 !Ring buffer for audio channel 1 SoundIn -integer iwrite !Write pointer to ring buffer SoundIn +integer nmax !Actual length of Rx ring buffers GUI +integer iwrite !Write pointer to Rx ring buffer SoundIn +integer iread !Read pointer to Rx ring buffer GUI integer*2 iwave !Data for audio output SoundIn integer nwave !Number of samples in iwave SoundIn integer TxOK !OK to transmit? SoundIn ! NB: TxOK=1 only in SoundIn; TxOK=0 also in GUI -integer TxFirst !Transmit first? GUI integer Receiving !Actually receiving? SoundIn integer Transmitting !Actually transmitting? SoundOut +integer TxFirst !Transmit first? GUI integer TRPeriod !Tx or Rx period in seconds GUI +integer ibuf !Most recent input buffer# SoundIn +integer ibuf0 !Buffer# at start of Rx sequence SoundIn +real ave !(why is this here?) GUI +real rms !(why is this here?) GUI +integer ngo !Set to 0 to terminate audio streams GUI integer level !S-meter level, 0-100 GUI integer mute !True means "don't transmit" GUI -integer ndsec !Dsec in units of 0.1 s GUI integer newdat !New data available for waterfall? GUI +integer ndsec !Dsec in units of 0.1 s GUI +integer ndevin !Device# for audio input GUI +integer ndevout !Device# for audio output GUI +integer nx !x coordinate for waterfall pixmap GUI integer mfsample !Measured sample rate, input SoundIn integer mfsample2 !Measured sample rate, output SoundOut +integer ns0 !Time at last ALL.TXT date entry Decoder common/gcom1/Tbuf(1024),ntrbuf(1024),Tsec,rxdelay,txdelay, & - samfacin,samfacout,y1(NRxMax),y2(NRxMax), & + samfacin,samfacout,y1(NRXMAX),y2(NRXMAX), & nmax,iwrite,iread,iwave(NTXMAX),nwave,TxOK,Receiving,Transmitting, & TxFirst,TRPeriod,ibuf,ibuf0,ave,rms,ngo,level,mute,newdat,ndsec, & ndevin,ndevout,nx,mfsample,mfsample2,ns0 diff --git a/gcom2.f90 b/gcom2.f90 index 4c55ea399..109858b64 100644 --- a/gcom2.f90 +++ b/gcom2.f90 @@ -2,14 +2,69 @@ !------------------------------------------------------------------------- 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 +real s2 !2d spectrum for horizontal waterfall GUI +real ccf !CCF in time (blue curve) Decoder +real green !Data for green line GUI +integer ngreen !Length of green GUI +real dgain !Digital audio gain setting GUI +integer iter !(why is this here??) +integer ndecoding !Decoder status (see decode2.f90) GUI,Decoder +integer ndecoding0 !Status on previous decode GUI,Decoder +integer mousebutton !Which button was clicked? GUI +integer ndecdone !Is decoder finished? GUI,Decoder +integer npingtime !Time in file of mouse-selected ping GUI,Decoder +integer ierr !(why is this here?) +integer lauto !Are we in Auto mode? GUI +integer mantx !Manual transmission requested? GUI,SoundIn +integer nrestart !True if transmission should restart GUI,SoundIn +integer ntr !Are we in 2nd sequence? SoundIn +integer nmsg !Length of Tx message SoundIn +integer nsave !Which files to save? GUI integer dftolerance !DF tolerance (Hz) GUI logical LDecoded !Was a message decoded? Decoder logical rxdone !Has the Rx sequence finished? SoundIn,Decoder +integer monitoring !Are we monitoring? GUI +integer nzap !Is Zap checked? GUI +integer nsavecum !(why is this here?) +integer minsigdb !Decoder threshold setting GUI +integer nclearave !Set to 1 to clear JT65 avg GUI,Decoder +integer nfreeze !Is Freeze checked? GUI +integer nafc !Is AFC checked? GUI +integer nmode !Which WSJT mode? GUI,Decoder +integer mode65 !JT65 sub-mode (A/B/C ==> 1/2/4) GUI,SoundIn,Decoder +integer nclip !Clipping level GUI +integer ndebug !Write debugging info? GUI +integer nblank !Is NB checked? GUI +integer nport !Requested COM port number GUI +integer mousedf !Mouse-selected freq offset, DF GUI +integer neme !EME calls only in deep search? GUI +integer nsked !Sked mode for deep search? GUI +integer naggressive !Is "Aggressive decoding" checked? GUI +integer ntx2 !Is "No shorthands if Tx1" checked? GUI +integer nslim2 !2nd Decoder threshold for FSK441. JT6M GUI +integer nagain !Decode same file again? GUI +integer nsavelast !Save last file? GUI +integer shok !Shorthand messages OK? GUI +integer sendingsh !Sending a shorthand message? SoundIn +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 jza !Length of data in d2a GUI,Decoder +integer jzb !(why is this here?) +integer ntime !Integer Unix time (now) SoundIn +integer idinterval !Interval between CWIDs, minutes GUI +integer msmax !(why is this here?) +integer lenappdir !Length of Appdir string GUI +integer ndiskdat !1 if data read from disk, 0 otherwise GUI +integer nlines !Available lines of waterfall data GUI +integer nflat !Is waterfall to be flattened? GUI +integer ntxreq !Tx msg# requested GUI +integer ntxnow !Tx msg# being sent now GUI +integer ndepth !Requested "depth" of JT65 decoding GUI +integer nspecial !JT65 shorthand msg#: RO=2 RRR=3 73=4 Decoder +integer ndf !Measured DF in Hz Decoder +real ss1 !Magenta curve for JT65 shorthand msg Decoder +real ss2 !Orange curve for JT65 shorthand msg Decoder character mycall*12 !My call sign GUI character hiscall*12 !His call sign GUI character hisgrid*6 !His grid locator GUI diff --git a/gcom3.f90 b/gcom3.f90 index e6c89b072..223cf5748 100644 --- a/gcom3.f90 +++ b/gcom3.f90 @@ -1,5 +1,18 @@ -integer*2 nfmt2,nchan2,nbitsam2,nbytesam2 -character*4 ariff,awave,afmt,adata +! Variable Purpose Set in Thread +!------------------------------------------------------------------------- +integer*2 nfmt2 !Standard header for *.WAV file Decoder +integer*2 nchan2 +integer*2 nbitsam2 +integer*2 nbytesam2 +integer*4 nchunk +integer*4 lenfmt +integer*4 nsamrate +integer*4 nbytesec +integer*4 ndata +character*4 ariff +character*4 awave +character*4 afmt +character*4 adata common/gcom3/ariff,nchunk,awave,afmt,lenfmt,nfmt2,nchan2,nsamrate, & nbytesec,nbytesam2,nbitsam2,adata,ndata diff --git a/gcom4.f90 b/gcom4.f90 index 07d8c5a6e..d9f0e70d8 100644 --- a/gcom4.f90 +++ b/gcom4.f90 @@ -1,6 +1,9 @@ -integer*2 d2c -character filename*24 -character addpfx*4 +! Variable Purpose Set in Thread +!------------------------------------------------------------------------- +character addpfx*4 !Add-on prefix, as in ZA/PA2CHR GUI +integer*2 d2c !Rx data recovered from recorded file GUI +integer jzc !Length of data available in d2c GUI +character filename*24 !Name of wave file read from disk GUI common/gcom4/addpfx,d2c(661500),jzc,filename diff --git a/spec.f90 b/spec.f90 index cfd6f3bb0..cd07c1e84 100644 --- a/spec.f90 +++ b/spec.f90 @@ -1,6 +1,3 @@ - -!---------------------------------------------------- End Module Audio1 - !---------------------------------------------------- spec subroutine spec(brightness,contrast,logmap,ngain,nspeed,a) diff --git a/wsjt.py b/wsjt.py index 0f681ad22..561f1f7a8 100644 --- a/wsjt.py +++ b/wsjt.py @@ -1,4 +1,4 @@ -#---------------------------------------------------------- WSJT +#--------------------------------------------------------- WSJT from Tkinter import * from tkFileDialog import * import Pmw diff --git a/wsjt1.f b/wsjt1.f index 011a6cffc..783e4c765 100644 --- a/wsjt1.f +++ b/wsjt1.f @@ -35,8 +35,8 @@ real s2(64,3100) !2D spectral array real ccf(-5:540) !X-cor function in JT65 mode (blue line) real red(512) - real ss1(-224:224) !Lower magenta curve (for JT65 shorthands) - real ss2(-224:224) !Upper magenta curve (for JT65 shorthands) + real ss1(-224:224) !Magenta curve (for JT65 shorthands) + real ss2(-224:224) !Orange curve (for JT65 shorthands) real yellow(216) real yellow0(216) real fzap(200)