From 75a77ef34b692f2ee3d4b41f6e67281e291e3f53 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 9 Sep 2017 23:35:58 +0000 Subject: [PATCH] Merged from trunk: ------------------------------------------------------------------------ r8070 | k1jt | 2017-09-02 15:22:09 +0100 (Sat, 02 Sep 2017) | 1 line Correct another misspelling. ------------------------------------------------------------------------ r8071 | bsomervi | 2017-09-03 00:46:38 +0100 (Sun, 03 Sep 2017) | 4 lines Stop Tx rather than just disable auto Tx on failed auto_sequence Slower decodes may mean that confirmation that a called station is working another station arrives after start of Tx. ------------------------------------------------------------------------ r8072 | bsomervi | 2017-09-04 00:46:35 +0100 (Mon, 04 Sep 2017) | 4 lines Fix an issue with building in a sub-directory of a git-svn checkout Thanks to Mike NF4E for the original issue report and patch that this change was based on. ------------------------------------------------------------------------ r8073 | bsomervi | 2017-09-08 11:46:25 +0100 (Fri, 08 Sep 2017) | 1 line Fix a tool tip typo ------------------------------------------------------------------------ r8076 | k9an | 2017-09-09 19:09:18 +0100 (Sat, 09 Sep 2017) | 1 line When using click-to-decode in FT8 (nagain=.true.), the regular noise baseline estimator fails, producing erroneous and very large SNR estimates. Revert to the older signal-to-noise-plus-interference calculation for click-to-decode. ------------------------------------------------------------------------ git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@8084 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMake/Modules/FindGitSubversion.cmake | 4 ++-- lib/fsk4hf/ft8b.f90 | 4 +--- mainwindow.cpp | 2 +- mainwindow.ui | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CMake/Modules/FindGitSubversion.cmake b/CMake/Modules/FindGitSubversion.cmake index c913c37a7..3ee6b053d 100644 --- a/CMake/Modules/FindGitSubversion.cmake +++ b/CMake/Modules/FindGitSubversion.cmake @@ -43,14 +43,14 @@ if(GIT_FOUND) set(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}") set(ENV{LC_ALL} C) - execute_process(COMMAND ${GIT_EXECUTABLE} --git-dir=${dir}/.git --work-tree=${dir} svn info + execute_process(COMMAND ${GIT_EXECUTABLE} --git-dir=${dir}/.git svn info OUTPUT_VARIABLE ${prefix}_WC_INFO ERROR_VARIABLE Git_git_svn_info_error RESULT_VARIABLE Git_git_svn_info_result OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT ${Git_git_svn_info_result} EQUAL 0) - message(SEND_ERROR "Command \"${GIT_EXECUTABLE} --git-dir=${dir}/.git --work-tree=${dir} svn info\" failed with output:\n${Git_git_svn_info_error}") + message(SEND_ERROR "Command \"${GIT_EXECUTABLE} --git-dir=${dir}/.git svn info\" failed with output:\n${Git_git_svn_info_error}") else() string(REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*" diff --git a/lib/fsk4hf/ft8b.f90 b/lib/fsk4hf/ft8b.f90 index 8dc307f21..6d762cecb 100644 --- a/lib/fsk4hf/ft8b.f90 +++ b/lib/fsk4hf/ft8b.f90 @@ -337,12 +337,10 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,napwid, & xsnr=0.001 if(xnoi.gt.0 .and. xnoi.lt.xsig) xsnr=xsig/xnoi-1.0 xsnr=10.0*log10(xsnr)-27.0 -!### xsnr2=db(xsig/xbase - 1.0) - 32.0 ! write(52,3052) f1,xdt,xsig,xnoi,xbase,xsnr,xsnr2 !3052 format(7f10.2) - xsnr=xsnr2 -!### + if(.not.nagain) xsnr=xsnr2 if(xsnr .lt. -24.0) xsnr=-24.0 return endif diff --git a/mainwindow.cpp b/mainwindow.cpp index c0fb9408d..e28331ac4 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -2834,7 +2834,7 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler && !message_words.at (1).contains (QRegularExpression {"(^(CQ|QRZ))|" + m_baseCall}) && message_words.at (2).contains (Radio::base_callsign (ui->dxCallEntry->text ()))) { // auto stop to avoid accidental QRM - auto_tx_mode (false); + ui->stopTxButton->click (); // halt any transmission } else if (m_auto // transmit allowed && ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isChecked() // auto-sequencing allowed diff --git a/mainwindow.ui b/mainwindow.ui index 89b4469bd..04e01d7b8 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -828,7 +828,7 @@ QLabel[oob="true"] { - <html><head/><body><p>Tx frequency tracks Rx frequency. </p><p>Not recommeded for general use!</p></body></html> + <html><head/><body><p>Tx frequency tracks Rx frequency. </p><p>Not recommended for general use!</p></body></html> Lock Tx=Rx @@ -1249,7 +1249,7 @@ QLabel[oob="true"] { - <html><head/><body><p>Switch to this Tx message NOW</p><p>Double-click to toggle between RRR and RR73 messages in Tx4 (not allowed for type2 compound call holders)</p><p>RR73 messages should only be used when you are reasonably confident that no message repititions will be required</p></body></html> + <html><head/><body><p>Switch to this Tx message NOW</p><p>Double-click to toggle between RRR and RR73 messages in Tx4 (not allowed for type2 compound call holders)</p><p>RR73 messages should only be used when you are reasonably confident that no message repetitions will be required</p></body></html> Tx &4