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

Merged from trunk:

Browse Source 
------------------------------------------------------------------------
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
This commit is contained in:
Bill Somerville 2017-09-09 23:35:58 +00:00
parent 61ea1a0803
commit 75a77ef34b
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMake/Modules/FindGitSubversion.cmake
View File

@ -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]+).*"

4
lib/fsk4hf/ft8b.f90
View File

@ -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

2
mainwindow.cpp
View File

@ -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

4
mainwindow.ui
View File

@ -828,7 +828,7 @@ QLabel[oob="true"] {
<item>
<widget class="QCheckBox" name="cbTxLock">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tx frequency tracks Rx frequency. &lt;/p&gt;&lt;p&gt;Not recommeded for general use!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tx frequency tracks Rx frequency. &lt;/p&gt;&lt;p&gt;Not recommended for general use!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Lock Tx=Rx</string>
@ -1249,7 +1249,7 @@ QLabel[oob=&quot;true&quot;] {
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to this Tx message NOW&lt;/p&gt;&lt;p&gt;Double-click to toggle between RRR and RR73 messages in Tx4 (not allowed for type2 compound call holders)&lt;/p&gt;&lt;p&gt;RR73 messages should only be used when you are reasonably confident that no message repititions will be required&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to this Tx message NOW&lt;/p&gt;&lt;p&gt;Double-click to toggle between RRR and RR73 messages in Tx4 (not allowed for type2 compound call holders)&lt;/p&gt;&lt;p&gt;RR73 messages should only be used when you are reasonably confident that no message repetitions will be required&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Tx &amp;4</string>