w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-06 11:55:15 -04: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:
Joe Taylor 2020-07-18 13:57:08 -04:00
commit 7fa7b0dda9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
main.cpp
View File

@ -373,13 +373,14 @@ int main(int argc, char *argv[])
} }
if (!mem_jt9.attach ()) if (!mem_jt9.attach ())
{ {
if (!mem_jt9.create (sizeof (struct dec_data))) if (!mem_jt9.create (sizeof (dec_data)))
{ {
splash.hide (); splash.hide ();
MessageBox::critical_message (nullptr, a.translate ("main", "Shared memory error"), MessageBox::critical_message (nullptr, a.translate ("main", "Shared memory error"),
a.translate ("main", "Unable to create shared memory segment")); a.translate ("main", "Unable to create shared memory segment"));
throw std::runtime_error {"Shared memory error"}; throw std::runtime_error {"Shared memory error"};
} }
qDebug () << "shmem size:" << mem_jt9.size ();
} }
else else
{ {

6
widgets/mainwindow.cpp
View File

@ -1343,13 +1343,15 @@ 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[] = {39,85,187,387,1003}; int stop[] = {39,85,187,387,1003,3107,6232};
int stop_EME[] = {48,95,197,396,1012}; int stop_EME[] = {48,95,197,396,1012,3107,6232};
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;
if(m_TRperiod==120) i=3; if(m_TRperiod==120) i=3;
if(m_TRperiod==300) i=4; if(m_TRperiod==300) i=4;
if(m_TRperiod==900) i=5;
if(m_TRperiod==1800) i=5;
if(m_config.decode_at_52s()) { if(m_config.decode_at_52s()) {
m_hsymStop=stop_EME[i]; m_hsymStop=stop_EME[i];
} else { } else {