w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-28 23:28:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop

Browse Source
This commit is contained in:
Steven Franke 2020-02-27 09:10:27 -06:00
commit 877878ea88
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ft8/subtractft8.f90
View File

@ -37,15 +37,13 @@ subroutine subtractft8(dd0,itone,f0,dt,ldt)
first=.false. first=.false.
endif endif
! Generate complex reference waveform ! Generate complex reference waveform cref
call gen_ft8wave(itone,79,1920,2.0,12000.0,f0,cref,xjunk,1,NFRAME) call gen_ft8wave(itone,79,1920,2.0,12000.0,f0,cref,xjunk,1,NFRAME)
if(ldt) then !Are we refining DT ? if(ldt) then !Are we refining DT ?
sqa=sqf(-300) sqa=sqf(-300)
sqb=sqf(300) sqb=sqf(300)
endif sq0=sqf(0) !Do the subtraction with idt=0
sq0=sqf(0) !Do the subtraction with idt=0
if(ldt) then
call peakup(sqa,sq0,sqb,dx) call peakup(sqa,sq0,sqb,dx)
if(abs(dx).gt.1.0) return !No acceptable minimum: do not subtract if(abs(dx).gt.1.0) return !No acceptable minimum: do not subtract
i1=nint(300.0*dx) !First approximation of best idt i1=nint(300.0*dx) !First approximation of best idt
@ -56,9 +54,10 @@ subroutine subtractft8(dd0,itone,f0,dt,ldt)
if(abs(dx).gt.1.0) return !No acceptable minimum: do not subtract if(abs(dx).gt.1.0) return !No acceptable minimum: do not subtract
i2=nint(60.0*dx) + i1 !Best estimate of idt i2=nint(60.0*dx) + i1 !Best estimate of idt
sq0=sqf(i2) !Do the subtraction with idt=i2 sq0=sqf(i2) !Do the subtraction with idt=i2
else
sq0=sqf(0) !Do the subtraction with idt=0
endif endif
dd0=dd !Return dd0 with this signal subtracted dd0=dd !Return dd0 with this signal subtracted
return return
contains contains

2
widgets/mainwindow.cpp
View File

@ -8746,7 +8746,7 @@ void MainWindow::write_all(QString txRx, QString message)
t.sprintf("%5d",ui->TxFreqSpinBox->value()); t.sprintf("%5d",ui->TxFreqSpinBox->value());
if (txRx=="Tx") msg=" 0 0.0" + t + " " + message; if (txRx=="Tx") msg=" 0 0.0" + t + " " + message;
auto time = QDateTime::currentDateTimeUtc (); auto time = QDateTime::currentDateTimeUtc ();
time = time.addSecs(-fmod(double(time.time().second()),m_TRperiod)); time = time.addSecs(-fmod(double(time.time().second()-0.4*m_TRperiod),m_TRperiod));
t.sprintf("%10.3f ",m_freqNominal/1.e6); t.sprintf("%10.3f ",m_freqNominal/1.e6);
if (m_diskData) { if (m_diskData) {
if (m_fileDateTime.size()==11) { if (m_fileDateTime.size()==11) {