mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-09-08 22:36:40 -04:00
Fixed freq selection for high-res waterfall.
Corrected mouse DF readout at top of SpecJT. Added AGC based on rxnoise. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@413 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
7fac2b6019
commit
648d63e207
2
map65.py
2
map65.py
@ -1086,7 +1086,7 @@ def update():
|
|||||||
t=time.strftime('%Y %b %d\n%H:%M:%S',utc)
|
t=time.strftime('%Y %b %d\n%H:%M:%S',utc)
|
||||||
Audio.gcom2.utcdate=t[:12]
|
Audio.gcom2.utcdate=t[:12]
|
||||||
ldate.configure(text=t)
|
ldate.configure(text=t)
|
||||||
t="Rx noise: %.1f" % (Audio.gcom2.rxnoise - 16.0)
|
t="Rx noise: %.1f" % Audio.gcom2.rxnoise
|
||||||
msg5.configure(text=t)
|
msg5.configure(text=t)
|
||||||
root_geom=root.geometry()
|
root_geom=root.geometry()
|
||||||
try:
|
try:
|
||||||
|
11
map65a.f90
11
map65a.f90
@ -39,14 +39,15 @@ subroutine map65a
|
|||||||
1002 format(i4.4)
|
1002 format(i4.4)
|
||||||
utcdata=utcdata(1:2)//':'//utcdata(3:4)
|
utcdata=utcdata(1:2)//':'//utcdata(3:4)
|
||||||
|
|
||||||
|
fselect=mousefqso + 1.6
|
||||||
|
|
||||||
! fselect=126.0 + 1.6 + 0.290 ! K6MYC (NG??)
|
! fselect=126.0 + 1.6 + 0.290 ! K6MYC (NG??)
|
||||||
! nflip=-1
|
! nflip=-1
|
||||||
! ip0=1
|
! ip0=1
|
||||||
|
|
||||||
! fselect=128.0 + 1.6 + 0.220 ! AA1YN (OK)
|
! fselect=128.0 + 1.6 + 0.220 ! AA1YN (OK)
|
||||||
fselect=mousefqso + 0.001*mousedf + 1.6
|
! nflip=1
|
||||||
nflip=1
|
! ip0=3
|
||||||
ip0=3
|
|
||||||
|
|
||||||
! fselect=155.0 + 1.6 + 0.454 ! N0AKC (OK)
|
! fselect=155.0 + 1.6 + 0.454 ! N0AKC (OK)
|
||||||
! nflip=1
|
! nflip=1
|
||||||
@ -73,7 +74,7 @@ subroutine map65a
|
|||||||
! nfilt=2 should be faster (but doesn't work right?)
|
! nfilt=2 should be faster (but doesn't work right?)
|
||||||
nfilt=2 !nfilt=2 is faster for selected freq
|
nfilt=2 !nfilt=2 is faster for selected freq
|
||||||
do kpol=0,3
|
do kpol=0,3
|
||||||
freq=fselect
|
freq=fselect + 0.001*mousedf
|
||||||
ip0=ip00+kpol
|
ip0=ip00+kpol
|
||||||
if(ip0.gt.4) ip0=ip0-4
|
if(ip0.gt.4) ip0=ip0-4
|
||||||
dt00=2.314240
|
dt00=2.314240
|
||||||
@ -117,7 +118,7 @@ subroutine map65a
|
|||||||
short(3,i)=0.
|
short(3,i)=0.
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
call symspec(id(1,1,kbuf),nz,savg)
|
call symspec(id(1,1,kbuf),nz,rxnoise,savg)
|
||||||
newspec=1
|
newspec=1
|
||||||
|
|
||||||
freq0=-999.
|
freq0=-999.
|
||||||
|
@ -67,7 +67,7 @@ subroutine recvpkt(iarg)
|
|||||||
float(id(1,k,1))**2 + float(id(1,k,1))**2
|
float(id(1,k,1))**2 + float(id(1,k,1))**2
|
||||||
enddo
|
enddo
|
||||||
sqave=sqave + u*(sq-sqave)
|
sqave=sqave + u*(sq-sqave)
|
||||||
rxnoise=10.0*log10(sqave) - 32.0
|
rxnoise=10.0*log10(sqave) - 48.0
|
||||||
else
|
else
|
||||||
do i=1,174
|
do i=1,174
|
||||||
k=k+1
|
k=k+1
|
||||||
@ -84,7 +84,7 @@ subroutine recvpkt(iarg)
|
|||||||
mutcm=mod(nsec/60,60)
|
mutcm=mod(nsec/60,60)
|
||||||
mutc=100*mutch + mutcm
|
mutc=100*mutch + mutcm
|
||||||
ns=mod(nsec,60)
|
ns=mod(nsec,60)
|
||||||
! write(*,1010) mutc,ns,0.001*msec,k
|
! write(*,1010) mutc,ns,0.001*msec,k,rxnoise
|
||||||
!1010 format('UTC:',i5.4,' ns:',i3,' t:',f10.3,' k:',i8)
|
!1010 format('UTC:',i5.4,' ns:',i3,' t:',f10.3,' k:',i8)
|
||||||
nsec0=nsec
|
nsec0=nsec
|
||||||
ntx=ntx+transmitting
|
ntx=ntx+transmitting
|
||||||
|
@ -116,7 +116,7 @@ def fdf_change(event):
|
|||||||
|
|
||||||
def fdf_change2(event):
|
def fdf_change2(event):
|
||||||
g.DFreq=(2200.0/750.0)*(event.x-375)
|
g.DFreq=(2200.0/750.0)*(event.x-375)
|
||||||
t="Freq: %5.1f kHz" % (g.DFreq,)
|
t="DF: %d Hz" % int(g.DFreq)
|
||||||
fdf2.configure(text=t)
|
fdf2.configure(text=t)
|
||||||
|
|
||||||
#---------------------------------------------------- set_fqso
|
#---------------------------------------------------- set_fqso
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
subroutine symspec(id,nz,savg)
|
subroutine symspec(id,nz,rxnoise,savg)
|
||||||
|
|
||||||
C Compute spectra at four polarizations, using half-symbol steps.
|
C Compute spectra at four polarizations, using half-symbol steps.
|
||||||
|
|
||||||
@ -12,7 +12,9 @@ C Compute spectra at four polarizations, using half-symbol steps.
|
|||||||
common/spcom/ip0,ss(4,322,NFFT),ss5(322,NFFT)
|
common/spcom/ip0,ss(4,322,NFFT),ss5(322,NFFT)
|
||||||
|
|
||||||
! fac=1.e-4
|
! fac=1.e-4
|
||||||
fac=1.7e-4
|
! fac=1.7e-4
|
||||||
|
fac=0.0002 * 10.0**(0.1*(-rxnoise))
|
||||||
|
|
||||||
hsym=2048.d0*96000.d0/11025.d0 !Samples per half symbol
|
hsym=2048.d0*96000.d0/11025.d0 !Samples per half symbol
|
||||||
npts=hsym !Integral samples per half symbol
|
npts=hsym !Integral samples per half symbol
|
||||||
nsteps=322 !Half symbols per transmission
|
nsteps=322 !Half symbols per transmission
|
||||||
|
Loading…
Reference in New Issue
Block a user