w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-03 09:44:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix problem with "Tune" at startup. status

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3174 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-04-15 23:42:42 +00:00
parent 3ed5f2ec35
commit 94645ac24c
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/decoder.f90
View File

@ -12,6 +12,7 @@ subroutine decoder(ss,c0)
character*20 datetime character*20 datetime
real*4 ccfred(NSMAX) real*4 ccfred(NSMAX)
logical ccfok(NSMAX) logical ccfok(NSMAX)
logical done(NSMAX)
integer*1 i1SoftSymbols(207) integer*1 i1SoftSymbols(207)
integer*2 id2 integer*2 id2
integer ii(1) integer ii(1)
@ -56,8 +57,9 @@ subroutine decoder(ss,c0)
kstep=nsps/2 kstep=nsps/2
tstep=kstep/12000.0 tstep=kstep/12000.0
tstep=0.5*tstep ! tstep=0.5*tstep
idf=ntol/df3 + 0.999 idf=ntol/df3 + 0.999
done=.false.
do nqd=1,0,-1 do nqd=1,0,-1
limit=5000 limit=5000
@ -110,9 +112,9 @@ subroutine decoder(ss,c0)
do i=ia,ib do i=ia,ib
f=(i-1)*df3 f=(i-1)*df3
if(.not.ccfok(i) .or. ccfred(i).lt.ccflim-1.0 .or. & if(done(i) .or. (.not.ccfok(i)) .or. (ccfred(i).lt.ccflim-1.0) .or. &
ccfred(i).lt.ccfred(i+1)) cycle (ccfred(i).lt.ccfred(i+1))) cycle
if(nqd.eq.1 .or. & if(nqd.eq.1 .or. &
(ccfred(i).ge.3.0 .and. abs(f-fgood).gt.10.0*df8)) then (ccfred(i).ge.3.0 .and. abs(f-fgood).gt.10.0*df8)) then
call timer('decode9a',0) call timer('decode9a',0)
fpk=1000.0 + df3*(i-1) fpk=1000.0 + df3*(i-1)
@ -136,10 +138,13 @@ subroutine decoder(ss,c0)
write(13,fmt) nutc,nsync,nsnr,xdt,freq,ndrift,msg write(13,fmt) nutc,nsync,nsnr,xdt,freq,ndrift,msg
! write(14,1014) nutc,nsync,nsnr,xdt,freq,ndrift,ccfred(i),nlim,msg ! write(14,1014) nutc,nsync,nsnr,xdt,freq,ndrift,ccfred(i),nlim,msg
!1014 format(i4.4,i4,i5,f6.1,f8.0,i4,f9.1,i9,3x,a22) !1014 format(i4.4,i4,i5,f6.1,f8.0,i4,f9.1,i9,3x,a22)
iaa=max(1,i-3)
ibb=min(NSMAX,i+11)
fgood=f fgood=f
nsynced=1 nsynced=1
ndecoded=1 ndecoded=1
ccfok(max(ia,i-3):min(ib,i+11))=.false. ccfok(iaa:ibb)=.false.
done(iaa:ibb)=.true.
call flush(6) call flush(6)
endif endif
endif endif

3
mainwindow.cpp
View File

@ -1,4 +1,4 @@
//-------------------------------------------------------------- MainWindow //--------------------------------------------------------------- MainWindow
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "devsetup.h" #include "devsetup.h"
@ -244,6 +244,7 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QWidget *parent) :
soundInThread.start(QThread::HighestPriority); soundInThread.start(QThread::HighestPriority);
soundOutThread.setOutputDevice(m_paOutDevice); soundOutThread.setOutputDevice(m_paOutDevice);
soundOutThread.setTxFreq(m_txFreq); soundOutThread.setTxFreq(m_txFreq);
soundOutThread.setTune(false);
m_monitoring=!m_monitorStartOFF; // Start with Monitoring ON/OFF m_monitoring=!m_monitorStartOFF; // Start with Monitoring ON/OFF
soundInThread.setMonitoring(m_monitoring); soundInThread.setMonitoring(m_monitoring);
m_diskData=false; m_diskData=false;

1
soundout.cpp
View File

@ -191,6 +191,7 @@ void SoundOutThread::run()
udata.ntrperiod=m_TRperiod; udata.ntrperiod=m_TRperiod;
udata.ntxfreq=m_txFreq; udata.ntxfreq=m_txFreq;
udata.txMute=m_txMute; udata.txMute=m_txMute;
udata.btune=m_tune;
m_SamFacOut=1.0; m_SamFacOut=1.0;
if(udata.ncall>400) { if(udata.ncall>400) {