User-defined params nt1, nt2 to set timing of state machine.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@503 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

gcom2.f90

@@ -49,6 +49,8 @@ integer nfullspec      !Set to 1 to display full spectrum       GUI
 integer ndebug         !Write debugging info?                   GUI
 integer ndphi          !Set to 1 to compute dphi             GUI,Decoder
 integer nhispol        !Pol angle matching HisCall or HisGrid Decoder
+integer nt1            !Time to start FFTs                      GUI
+integer nt2            !Time to start quick decode              GUI
 integer nblank         !Is NB checked?                          GUI
 integer nfmid          !Center frequency of main display        GUI
 integer nfrange        !Frequency range of main display         GUI
@@ -106,7 +108,7 @@ common/gcom2/ps0(431),psavg(450),s2(64,3100),ccf(-5:540),                   &
      ndecdone,npingtime,ierr,lauto,mantx,nrestart,ntr,nmsg,nsave,nadd5,     &
      dftolerance,LDecoded,rxdone,monitoring,nzap,minsigdb,                  &
      nclearave,nfreeze,nafc,ncsmin,newspec,nfa,nfb,nfcal,idphi,nkeep,       &
-     nmode,mode65,nbpp,nfullspec,ndebug,ndphi,nhispol,                      &
+     nmode,mode65,nbpp,nfullspec,ndebug,ndphi,nhispol,nt1,nt2,              &
      nblank,nport,mousedf,mousefqso,neme,nrw26,naggressive,ntx2,nagain,     &
      shok,sendingsh,d2a(661500),d2b(661500),b(60000),jza,jzb,ntime,         &
      idinterval,msmax,lenappdir,idf,ndiskdat,nlines,nflat,ntxreq,ntxnow,    &

map65.py

@@ -1224,7 +1224,6 @@ def update():
     Audio.gcom2.dftolerance=ntol[itol]
     Audio.gcom2.neme=neme.get()
     Audio.gcom2.ndepth=ndepth.get()
-    Audio.gcom2.ncsmin=options.ncsmin.get()
     try:
         Audio.gcom2.idinterval=options.IDinterval.get()
     except:
@@ -1250,6 +1249,19 @@ def update():
         Audio.gcom2.nfcal=options.fcal.get()
     except:
         Audio.gcom2.nfcal=0
+    try:
+        Audio.gcom2.ncsmin=options.ncsmin.get()
+    except:
+        Audio.gcom2.ncsmin=20
+    try:
+        Audio.gcom2.nt1=options.nt1.get()
+    except:
+        Audio.gcom2.nt1=48
+    try:
+        Audio.gcom2.nt2=options.nt2.get()
+    except:
+        Audio.gcom2.nt2=52
+
     t=options.savedir.get() + \
         '                                        ' + \
         '                                        '
@@ -1738,6 +1750,8 @@ try:
         elif key == 'fb': options.fb.set(value)
         elif key == 'fcal': options.fcal.set(value)
         elif key == 'CSmin': options.ncsmin.set(value)
+        elif key == 'Nt1': options.nt1.set(value)
+        elif key == 'Nt2': options.nt2.set(value)
         elif key == 'dphi': options.dphi.set(value)
         elif key == 'SaveDir': options.savedir.set(value)
         
@@ -1831,6 +1845,8 @@ f.write("fa " + str(options.fa.get()) + "\n")
 f.write("fb " + str(options.fb.get()) + "\n")
 f.write("fcal " + str(options.fcal.get()) + "\n")
 f.write("CSmin " + str(options.ncsmin.get()) + "\n")
+f.write("Nt1 " + str(options.nt1.get()) + "\n")
+f.write("Nt2 " + str(options.nt2.get()) + "\n")
 f.write("SaveDir " + str(options.savedir.get()) + "\n")
 f.write("TxFirst " + str(TxFirst.get()) + "\n")
 f.write("KB8RQ " + str(kb8rq.get()) + "\n")

options.py

@@ -47,6 +47,8 @@ fa=IntVar()
 fb=IntVar()
 fcal=IntVar()
 ncsmin=IntVar()
+nt1=IntVar()
+nt2=IntVar()
 savedir=StringVar()
 
 mycall=Pmw.EntryField(g1.interior(),labelpos=W,label_text='My Call:',
@@ -104,10 +106,15 @@ fcal_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='Fcal (Hz):',
     entry_width=9,entry_textvariable=fcal)
 min_callsign_entry=Pmw.EntryField(g3.interior(),labelpos=W, \
     label_text='CSmin:',entry_width=9,value=4,entry_textvariable=ncsmin)
+nt1_entry=Pmw.EntryField(g3.interior(),labelpos=W, \
+    label_text='Rx t1:',entry_width=9,value=48,entry_textvariable=nt1)
+nt2_entry=Pmw.EntryField(g3.interior(),labelpos=W, \
+    label_text='Rx t2:',entry_width=9,value=52,entry_textvariable=nt2)
 savedir_entry=Pmw.EntryField(g3.interior(),labelpos=W,label_text='SaveDir:',
     entry_width=23,value=g.appdir+'\save',entry_textvariable=savedir)
 widgets = (temp_prefix,aux_ra,aux_dec,nkeep_entry,dphi_entry, \
-           fa_entry,fb_entry,fcal_entry,min_callsign_entry,savedir_entry,)
+           fa_entry,fb_entry,fcal_entry,min_callsign_entry, \
+           nt1_entry,nt2_entry,savedir_entry,)
 for widget in widgets:
     widget.pack(padx=2,pady=2)
 Pmw.alignlabels(widgets)

recvpkt.F90

@@ -110,7 +110,7 @@ subroutine recvpkt(iarg)
      nsec0=nsec
      ntx=ntx+transmitting
 
-     if(ns.eq.48) then
+     if(ns.eq.nt1) then
         nutc=mutc
         fcenter=center_freq
         kbuf=kb
@@ -119,7 +119,7 @@ subroutine recvpkt(iarg)
         if(ndebug.eq.2) write(*,3001) nutc,mod(int(sec_midn()),60),ns
 3001    format('recvpkt 1:',i5.4,2i3.2)
      endif
-     if(ns.eq.52) then
+     if(ns.eq.nt2) then
         kk=k
         if(ndebug.eq.2) write(*,3002) nutc,mod(int(sec_midn()),60),ns
 3002    format('recvpkt 2:',i5.4,2i3.2)