w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-28 20:32:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

FT8 mode: Add suggested default freqs; start Tx audio at t=0.5 s rather than 1.0 s; Correct the displayed value of DT.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7747 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-06-28 18:23:56 +00:00
parent f6af18bff4
commit 7195f121dd
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
FrequencyList.cpp
View File

@ -38,21 +38,25 @@ namespace
{1836600, Modes::WSPR}, {1836600, Modes::WSPR},
{1838000, Modes::JT65}, {1838000, Modes::JT65},
{1840000, Modes::JT9}, {1840000, Modes::JT9},
{1841000, Modes::FT8},
{2500000, Modes::FreqCal}, {2500000, Modes::FreqCal},
{3330000, Modes::FreqCal}, {3330000, Modes::FreqCal},
{3576000, Modes::JT65}, {3576000, Modes::JT65},
{3578000, Modes::JT9}, {3578000, Modes::JT9},
{3579000, Modes::FT8},
{3592600, Modes::WSPR}, {3592600, Modes::WSPR},
{5357000, Modes::JT65}, {5357000, Modes::JT65},
{5000000, Modes::FreqCal}, {5000000, Modes::FreqCal},
{7038600, Modes::WSPR}, {7038600, Modes::WSPR},
{7076000, Modes::JT65}, {7076000, Modes::JT65},
{7078000, Modes::JT9}, {7078000, Modes::JT9},
{7079000, Modes::FT8},
{7850000, Modes::FreqCal}, {7850000, Modes::FreqCal},
{10000000, Modes::FreqCal}, {10000000, Modes::FreqCal},
{10138000, Modes::JT65}, {10138000, Modes::JT65},
{10138700, Modes::WSPR}, {10138700, Modes::WSPR},
{10140000, Modes::JT9}, {10140000, Modes::JT9},
{10141000, Modes::FT8},
{14095600, Modes::WSPR}, {14095600, Modes::WSPR},
{14076000, Modes::JT65}, {14076000, Modes::JT65},
{14078000, Modes::JT9}, {14078000, Modes::JT9},
@ -61,23 +65,29 @@ namespace
{15000000, Modes::FreqCal}, {15000000, Modes::FreqCal},
{18102000, Modes::JT65}, {18102000, Modes::JT65},
{18104000, Modes::JT9}, {18104000, Modes::JT9},
{18104100, Modes::FT8},
{18104600, Modes::WSPR}, {18104600, Modes::WSPR},
{20000000, Modes::FreqCal}, {20000000, Modes::FreqCal},
{21076000, Modes::JT65}, {21076000, Modes::JT65},
{21078000, Modes::JT9}, {21078000, Modes::JT9},
{21079000, Modes::FT8},
{21094600, Modes::WSPR}, {21094600, Modes::WSPR},
{24917000, Modes::JT65}, {24917000, Modes::JT65},
{24919000, Modes::JT9}, {24919000, Modes::JT9},
{24920000, Modes::FT8},
{24924600, Modes::WSPR}, {24924600, Modes::WSPR},
{28076000, Modes::JT65}, {28076000, Modes::JT65},
{28078000, Modes::JT9}, {28078000, Modes::JT9},
{28079000, Modes::FT8},
{28124600, Modes::WSPR}, {28124600, Modes::WSPR},
{50000000, Modes::Echo}, {50000000, Modes::Echo},
{50276000, Modes::JT65}, {50276000, Modes::JT65},
{50280000, Modes::MSK144}, {50280000, Modes::MSK144},
{50293000, Modes::WSPR}, {50293000, Modes::WSPR},
{50301000, Modes::FT8}, {50310000, Modes::JT65},
{50313000, Modes::FT8},
{70091000, Modes::JT65}, {70091000, Modes::JT65},
{70094000, Modes::JT65},
{70091000, Modes::WSPR}, {70091000, Modes::WSPR},
{144000000, Modes::Echo}, {144000000, Modes::Echo},
{144120000, Modes::JT65}, {144120000, Modes::JT65},

5
Modulator.cpp
View File

@ -86,6 +86,11 @@ void Modulator::start (unsigned symbolsLength, double framesPerSymbol,
if (synchronize && !m_tuning && !m_bFastMode) { if (synchronize && !m_tuning && !m_bFastMode) {
m_silentFrames = m_ic + m_frameRate - (mstr * m_frameRate / 1000); m_silentFrames = m_ic + m_frameRate - (mstr * m_frameRate / 1000);
} }
if(m_ic==0 and (m_silentFrames/48000.0 > 0.6) and m_nsps==2048 and m_period==15) {
// FT8 mode: Start audio at t=0.5 s rather than t=1.0 s.
m_silentFrames=m_silentFrames-24000;
}
initialize (QIODevice::ReadOnly, channel); initialize (QIODevice::ReadOnly, channel);
Q_EMIT stateChanged ((m_state = (synchronize && m_silentFrames) ? Q_EMIT stateChanged ((m_state = (synchronize && m_silentFrames) ?
Synchronizing : Active)); Synchronizing : Active));

5
lib/ft8_decode.f90
View File

@ -55,15 +55,16 @@ contains
nsnr=min(99,nint(10.0*log10(sync) - 25.5)) !### empirical ### nsnr=min(99,nint(10.0*log10(sync) - 25.5)) !### empirical ###
call timer('ft8b ',0) call timer('ft8b ',0)
call ft8b(s,nfqso,f1,xdt,nharderrors,dmin,nbadcrc,message) call ft8b(s,nfqso,f1,xdt,nharderrors,dmin,nbadcrc,message)
xdt=xdt-0.6
call timer('ft8b ',1) call timer('ft8b ',1)
if (associated(this%callback)) call this%callback(sync,nsnr,xdt, & if (associated(this%callback)) call this%callback(sync,nsnr,xdt, &
f1,nbadcrc,message) f1,nbadcrc,message)
! write(13,1110) datetime,0,nsnr,xdt,f1,nharderrors,dmin,message ! write(13,1110) datetime,0,nsnr,xdt,f1,nharderrors,dmin,message
!1110 format(a13,2i4,f6.2,f7.1,i4,' ~ ',f6.2,2x,a22,' FT8') !1110 format(a13,2i4,f6.2,f7.1,i4,' ~ ',f6.2,2x,a22,' FT8')
write(51,3051) xdt,f1,sync,dmin,nsnr,nharderrors,nbadcrc,message write(51,3051) xdt,f1,sync,dmin,nsnr,nharderrors,nbadcrc,message
3051 format(4f9.1,3i5,2x,a22) 3051 format(4f9.1,3i5,2x,a22)
flush(51)
enddo enddo
flush(51)
return return
end subroutine decode end subroutine decode