From 9e6d31dff313e66a46f0ae8c87f2d31c7257945c Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 18 Jul 2020 18:49:20 +0100 Subject: [PATCH 1/3] Debug print of shared memory size --- main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index b3de449f6..43543ce59 100644 --- a/main.cpp +++ b/main.cpp @@ -373,13 +373,14 @@ int main(int argc, char *argv[]) } if (!mem_jt9.attach ()) { - if (!mem_jt9.create (sizeof (struct dec_data))) + if (!mem_jt9.create (sizeof (dec_data))) { splash.hide (); MessageBox::critical_message (nullptr, a.translate ("main", "Shared memory error"), a.translate ("main", "Unable to create shared memory segment")); throw std::runtime_error {"Shared memory error"}; } + qDebug () << "shmem size:" << mem_jt9.size (); } else { From 60ddd400496c3a7775a1f21e88ecb7e42da5678b Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 18 Jul 2020 18:50:08 +0100 Subject: [PATCH 2/3] More 15 & 30 minute T.R period updates --- widgets/mainwindow.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index b315c013b..93f273f18 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1343,13 +1343,15 @@ void MainWindow::fixStop() } else if (m_mode=="FT4") { m_hsymStop=21; } else if(m_mode=="FST240" or m_mode=="FST240W") { - int stop[] = {39,85,187,387,1003}; - int stop_EME[] = {48,95,197,396,1012}; + int stop[] = {39,85,187,387,1003,3092,6233}; + int stop_EME[] = {48,95,197,396,1012,3102,6243}; int i=0; if(m_TRperiod==30) i=1; if(m_TRperiod==60) i=2; if(m_TRperiod==120) i=3; if(m_TRperiod==300) i=4; + if(m_TRperiod==900) i=5; + if(m_TRperiod==1800) i=5; if(m_config.decode_at_52s()) { m_hsymStop=stop_EME[i]; } else { From 43d6eacc4bb4039e9be37ca8da90d370f5812c06 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 18 Jul 2020 18:52:09 +0100 Subject: [PATCH 3/3] Refined stop times --- widgets/mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 93f273f18..c28870d0a 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1343,8 +1343,8 @@ void MainWindow::fixStop() } else if (m_mode=="FT4") { m_hsymStop=21; } else if(m_mode=="FST240" or m_mode=="FST240W") { - int stop[] = {39,85,187,387,1003,3092,6233}; - int stop_EME[] = {48,95,197,396,1012,3102,6243}; + int stop[] = {39,85,187,387,1003,3107,6232}; + int stop_EME[] = {48,95,197,396,1012,3107,6232}; int i=0; if(m_TRperiod==30) i=1; if(m_TRperiod==60) i=2;