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

Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280

Browse Source
This commit is contained in:
Steven Franke 2020-06-30 08:42:59 -05:00
commit f0efd881ca
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modulator/Modulator.cpp
View File

@ -69,7 +69,7 @@ void Modulator::start (QString mode, unsigned symbolsLength, double framesPerSym
m_bFastMode=fastMode; m_bFastMode=fastMode;
m_TRperiod=TRperiod; m_TRperiod=TRperiod;
unsigned delay_ms=1000; unsigned delay_ms=1000;
if(mode=="FT8" or (mode=="FST240" and m_nsps==800)) delay_ms=500; //FT8, FST240-15 if(mode=="FT8" or (mode=="FST240" and m_nsps==720)) delay_ms=500; //FT8, FST240-15
if(mode=="FT4") delay_ms=300; //FT4 if(mode=="FT4") delay_ms=300; //FT4
// noise generator parameters // noise generator parameters

2
lib/jt9.f90
View File

@ -54,7 +54,7 @@ program jt9
option ('jt4', .false., '4', 'JT4 mode', ''), & option ('jt4', .false., '4', 'JT4 mode', ''), &
option ('ft4', .false., '5', 'FT4 mode', ''), & option ('ft4', .false., '5', 'FT4 mode', ''), &
option ('jt65', .false.,'6', 'JT65 mode', ''), & option ('jt65', .false.,'6', 'JT65 mode', ''), &
option ('fst240', .false., '7', 'FT8 mode', ''), & option ('fst240', .false., '7', 'FST240 mode', ''), &
option ('ft8', .false., '8', 'FT8 mode', ''), & option ('ft8', .false., '8', 'FT8 mode', ''), &
option ('jt9', .false., '9', 'JT9 mode', ''), & option ('jt9', .false., '9', 'JT9 mode', ''), &
option ('qra64', .false., 'q', 'QRA64 mode', ''), & option ('qra64', .false., 'q', 'QRA64 mode', ''), &

10
widgets/mainwindow.cpp
View File

@ -1342,8 +1342,8 @@ void MainWindow::fixStop()
} else if (m_mode=="FT4") { } else if (m_mode=="FT4") {
m_hsymStop=21; m_hsymStop=21;
} else if(m_mode=="FST240" or m_mode=="FST240W") { } else if(m_mode=="FST240" or m_mode=="FST240W") {
int stop[] = {44,85,187,387,1003}; int stop[] = {39,85,187,387,1003};
int stop_EME[] = {51,95,197,396,1012}; int stop_EME[] = {48,95,197,396,1012};
int i=0; int i=0;
if(m_TRperiod==30) i=1; if(m_TRperiod==30) i=1;
if(m_TRperiod==60) i=2; if(m_TRperiod==60) i=2;
@ -3538,7 +3538,7 @@ void MainWindow::guiUpdate()
if(m_modeTx=="QRA64") txDuration=1.0 + 84*6912/12000.0; // QRA64 if(m_modeTx=="QRA64") txDuration=1.0 + 84*6912/12000.0; // QRA64
if(m_modeTx=="WSPR") txDuration=2.0 + 162*8192/12000.0; // WSPR if(m_modeTx=="WSPR") txDuration=2.0 + 162*8192/12000.0; // WSPR
if(m_modeTx=="FST240" or m_mode=="FST240W") { //FST240, FST240W if(m_modeTx=="FST240" or m_mode=="FST240W") { //FST240, FST240W
if(m_TRperiod==15) txDuration=1.0 + 160*800/12000.0; if(m_TRperiod==15) txDuration=1.0 + 160*720/12000.0;
if(m_TRperiod==30) txDuration=1.0 + 160*1680/12000.0; if(m_TRperiod==30) txDuration=1.0 + 160*1680/12000.0;
if(m_TRperiod==60) txDuration=1.0 + 160*3888/12000.0; if(m_TRperiod==60) txDuration=1.0 + 160*3888/12000.0;
if(m_TRperiod==120) txDuration=1.0 + 160*8200/12000.0; if(m_TRperiod==120) txDuration=1.0 + 160*8200/12000.0;
@ -3882,7 +3882,7 @@ void MainWindow::guiUpdate()
genfst240_(message,&ichk,msgsent,const_cast<char *> (fst240msgbits), genfst240_(message,&ichk,msgsent,const_cast<char *> (fst240msgbits),
const_cast<int *>(itone), &iwspr, 37, 37); const_cast<int *>(itone), &iwspr, 37, 37);
int hmod=int(pow(2.0,double(m_nSubMode))); int hmod=int(pow(2.0,double(m_nSubMode)));
int nsps=800; int nsps=720;
if(m_TRperiod==30) nsps=1680; if(m_TRperiod==30) nsps=1680;
if(m_TRperiod==60) nsps=3888; if(m_TRperiod==60) nsps=3888;
if(m_TRperiod==120) nsps=8200; if(m_TRperiod==120) nsps=8200;
@ -7163,7 +7163,7 @@ void MainWindow::transmit (double snr)
if (m_modeTx == "FST240" or m_modeTx == "FST240W") { if (m_modeTx == "FST240" or m_modeTx == "FST240W") {
m_dateTimeSentTx3=QDateTime::currentDateTimeUtc(); m_dateTimeSentTx3=QDateTime::currentDateTimeUtc();
toneSpacing=-2.0; //Transmit a pre-computed, filtered waveform. toneSpacing=-2.0; //Transmit a pre-computed, filtered waveform.
int nsps=800; int nsps=720;
if(m_TRperiod==30) nsps=1680; if(m_TRperiod==30) nsps=1680;
if(m_TRperiod==60) nsps=3888; if(m_TRperiod==60) nsps=3888;
if(m_TRperiod==120) nsps=8200; if(m_TRperiod==120) nsps=8200;