mirror of https://github.com/saitohirga/WSJT-X.git
Change the displayed "drift" to FFT bins per transmission length.
Re-activate "killbyname" on program startup. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2782 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
288c2a69d8
commit
7626c13977
|
@ -35,28 +35,28 @@ subroutine decoder(ss,c0)
|
||||||
if(ntrMinutes.eq.1) then
|
if(ntrMinutes.eq.1) then
|
||||||
nsps=6912
|
nsps=6912
|
||||||
df3=1500.0/2048.0
|
df3=1500.0/2048.0
|
||||||
fmt='(i4.4,i4,i5,f6.1,f8.0,f6.1,3x,a22)'
|
fmt='(i4.4,i4,i5,f6.1,f8.0,i4,3x,a22)'
|
||||||
fmt14='(i4.4,i4,i5,f6.1,f8.0,f6.1,i3,i8,3x,a22)'
|
fmt14='(i4.4,i4,i5,f6.1,f8.0,i4,3x,a22,i8,i3)'
|
||||||
else if(ntrMinutes.eq.2) then
|
else if(ntrMinutes.eq.2) then
|
||||||
nsps=15360
|
nsps=15360
|
||||||
df3=1500.0/2048.0
|
df3=1500.0/2048.0
|
||||||
fmt='(i4.4,i4,i5,f6.1,f8.1,f6.2,3x,a22)'
|
fmt='(i4.4,i4,i5,f6.1,f8.1,i4,3x,a22)'
|
||||||
fmt14='(i4.4,i4,i5,f6.1,f8.1,f6.2,i3,i8,3x,a22)'
|
fmt14='(i4.4,i4,i5,f6.1,f8.1,i4,3x,a22,i8,i3)'
|
||||||
else if(ntrMinutes.eq.5) then
|
else if(ntrMinutes.eq.5) then
|
||||||
nsps=40960
|
nsps=40960
|
||||||
df3=1500.0/6144.0
|
df3=1500.0/6144.0
|
||||||
fmt='(i4.4,i4,i5,f6.1,f8.1,f6.2,3x,a22)'
|
fmt='(i4.4,i4,i5,f6.1,f8.1,i4,3x,a22)'
|
||||||
fmt14='(i4.4,i4,i5,f6.1,f8.1,f6.2,i3,i8,3x,a22)'
|
fmt14='(i4.4,i4,i5,f6.1,f8.1,i4,3x,a22,i8,i3)'
|
||||||
else if(ntrMinutes.eq.10) then
|
else if(ntrMinutes.eq.10) then
|
||||||
nsps=82944
|
nsps=82944
|
||||||
df3=1500.0/12288.0
|
df3=1500.0/12288.0
|
||||||
fmt='(i4.4,i4,i5,f6.1,f8.2,f6.2,3x,a22)'
|
fmt='(i4.4,i4,i5,f6.1,f8.2,i4,3x,a22)'
|
||||||
fmt14='(i4.4,i4,i5,f6.1,f8.2,f6.2,i3,i8,3x,a22)'
|
fmt14='(i4.4,i4,i5,f6.1,f8.2,i4,3x,a22,i8,i3)'
|
||||||
else if(ntrMinutes.eq.30) then
|
else if(ntrMinutes.eq.30) then
|
||||||
nsps=252000
|
nsps=252000
|
||||||
df3=1500.0/32768.0
|
df3=1500.0/32768.0
|
||||||
fmt='(i4.4,i4,i5,f6.1,f8.2,f6.2,3x,a22)'
|
fmt='(i4.4,i4,i5,f6.1,f8.2,i4,3x,a22)'
|
||||||
fmt14='(i4.4,i4,i5,f6.1,f8.2,f6.2,i3,i8,3x,a22)'
|
fmt14='(i4.4,i4,i5,f6.1,f8.2,i4,3x,a22,i8,i3)'
|
||||||
endif
|
endif
|
||||||
if(nsps.eq.0) stop 'Error: bad TRperiod' !Better: return an error code###
|
if(nsps.eq.0) stop 'Error: bad TRperiod' !Better: return an error code###
|
||||||
|
|
||||||
|
@ -101,16 +101,17 @@ subroutine decoder(ss,c0)
|
||||||
nsync=sync
|
nsync=sync
|
||||||
if(nsync.gt.10) nsync=10
|
if(nsync.gt.10) nsync=10
|
||||||
nsnr=nint(snrdb)
|
nsnr=nint(snrdb)
|
||||||
|
ndrift=nint(drift/df3)
|
||||||
|
|
||||||
if(sync.gt.sbest .and. fgood.eq.0.0) then
|
if(sync.gt.sbest .and. fgood.eq.0.0) then
|
||||||
sbest=sync
|
sbest=sync
|
||||||
write(line,fmt) nutc,nsync,nsnr,xdt,freq,drift
|
write(line,fmt) nutc,nsync,nsnr,xdt,freq,ndrift
|
||||||
if(nsync.gt.0) nsynced=1
|
if(nsync.gt.0) nsynced=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if(msg.ne.' ') then
|
if(msg.ne.' ') then
|
||||||
write(*,fmt) nutc,nsync,nsnr,xdt,freq,drift,msg
|
write(*,fmt) nutc,nsync,nsnr,xdt,freq,ndrift,msg
|
||||||
write(14,fmt14) nutc,nsync,nsnr,xdt,freq,drift,ntrMinutes,nlim,msg
|
write(14,fmt14) nutc,nsync,nsnr,xdt,freq,ndrift,msg,nlim,ntrMinutes
|
||||||
fgood=f
|
fgood=f
|
||||||
nsynced=1
|
nsynced=1
|
||||||
ndecoded=1
|
ndecoded=1
|
||||||
|
|
|
@ -102,6 +102,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||||
btxok=false;
|
btxok=false;
|
||||||
m_restart=false;
|
m_restart=false;
|
||||||
m_transmitting=false;
|
m_transmitting=false;
|
||||||
|
m_killAll=false;
|
||||||
m_widebandDecode=false;
|
m_widebandDecode=false;
|
||||||
m_ntx=1;
|
m_ntx=1;
|
||||||
m_myCall="K1JT";
|
m_myCall="K1JT";
|
||||||
|
@ -128,6 +129,14 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||||
|
|
||||||
ui->xThermo->setFillBrush(Qt::green);
|
ui->xThermo->setFillBrush(Qt::green);
|
||||||
|
|
||||||
|
#ifdef WIN32
|
||||||
|
while(true) {
|
||||||
|
int iret=killbyname("jt9.exe");
|
||||||
|
if(iret == 603) break;
|
||||||
|
if(iret != 0) msgBox("KillByName return code: " +
|
||||||
|
QString::number(iret));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
if(!mem_jt9.attach()) {
|
if(!mem_jt9.attach()) {
|
||||||
if (!mem_jt9.create(sizeof(jt9com_))) {
|
if (!mem_jt9.create(sizeof(jt9com_))) {
|
||||||
msgBox("Unable to create shared memory segment.");
|
msgBox("Unable to create shared memory segment.");
|
||||||
|
|
Loading…
Reference in New Issue