w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-30 05:12:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.1.0' of bitbucket.org:k1jt/wsjtx into release-2.1.0

Browse Source
This commit is contained in:
Bill Somerville 2019-04-30 15:43:01 +01:00
commit 3916316a1c
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Configuration.ui
View File

@ -2469,7 +2469,7 @@ Right click for insert and delete options.</string>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="gbSpecialOpActivity"> <widget class="QGroupBox" name="gbSpecialOpActivity">
<property name="title"> <property name="title">
<string>Special operating activity: Generation of FT8 and MSK144 messages</string> <string>Special operating activity: Generation of FT4, FT8, and MSK144 messages</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
@ -3078,13 +3078,13 @@ Right click for insert and delete options.</string>
</connection> </connection>
</connections> </connections>
<buttongroups> <buttongroups>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/> <buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="special_op_activity_button_group"/> <buttongroup name="special_op_activity_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="TX_audio_source_button_group"/> <buttongroup name="TX_audio_source_button_group"/>
</buttongroups> </buttongroups>
</ui> </ui>

2
lib/ft4/ft4_downsample.f90
View File

@ -38,7 +38,7 @@ subroutine ft4_downsample(dd,newdata,f0,c)
endif endif
i0=nint(f0/df) i0=nint(f0/df)
c1=0. c1=0.
c1(0)=cx(i0) if(i0.ge.0 .and. i0.le.NMAX/2) c1(0)=cx(i0)
do i=1,NFFT2/2 do i=1,NFFT2/2
if(i0+i.le.NMAX/2) c1(i)=cx(i0+i) if(i0+i.le.NMAX/2) c1(i)=cx(i0+i)
if(i0-i.ge.0) c1(NFFT2-i)=cx(i0-i) if(i0-i.ge.0) c1(NFFT2-i)=cx(i0-i)

1
lib/ft4/getcandidates4.f90
View File

@ -69,6 +69,7 @@ subroutine getcandidates4(dd,fa,fb,syncmin,nfqso,maxcand,savg,candidate, &
del=0. del=0.
if(den.ne.0.0) del=0.5*(savsm(i-1)-savsm(i+1))/den if(den.ne.0.0) del=0.5*(savsm(i-1)-savsm(i+1))/den
fpeak=(i+del)*df+f_offset fpeak=(i+del)*df+f_offset
if(fpeak.lt.0.0 .or. fpeak.gt.4910.0) cycle
speak=savsm(i) - 0.25*(savsm(i-1)-savsm(i+1))*del speak=savsm(i) - 0.25*(savsm(i-1)-savsm(i+1))*del
ncand=ncand+1 ncand=ncand+1
if(ncand.gt.maxcand) then if(ncand.gt.maxcand) then

5
widgets/mainwindow.cpp
View File

@ -4108,8 +4108,7 @@ void MainWindow::stopTx2()
on_stopTxButton_clicked (); on_stopTxButton_clicked ();
m_nTx73 = 0; m_nTx73 = 0;
} }
if(((m_mode.startsWith("WSPR") and m_ntr==-1) or m_mode=="FT4") and if((m_mode.startsWith("WSPR") and m_ntr==-1) and !m_tuneup) {
!m_tuneup) {
m_wideGraph->setWSPRtransmitted(); m_wideGraph->setWSPRtransmitted();
WSPR_scheduling (); WSPR_scheduling ();
m_ntr=0; m_ntr=0;
@ -4219,7 +4218,7 @@ void MainWindow::on_txrb4_doubleClicked ()
auto const& my_callsign = m_config.my_callsign (); auto const& my_callsign = m_config.my_callsign ();
auto is_compound = my_callsign != m_baseCall; auto is_compound = my_callsign != m_baseCall;
m_send_RR73 = !((is_compound && !shortList (my_callsign)) || m_send_RR73); m_send_RR73 = !((is_compound && !shortList (my_callsign)) || m_send_RR73);
if(m_mode=="FT4") m_send_RR73=true; if(m_mode=="FT4" and (m_config.special_op_id()==SpecOp::RTTY)) m_send_RR73=true;
genStdMsgs (m_rpt); genStdMsgs (m_rpt);
} }