w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-16 00:51:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace some temporarily removed code in ft8b, and some general cleanup.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8443 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2018-01-30 16:57:14 +00:00
parent 910e18d042
commit 5d1df32387
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ft8/ft8b.f90
View File

@ -401,6 +401,7 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
do i=1,12 do i=1,12
i1hiscall(i)=ichar(hiscall12(i:i)) i1hiscall(i)=ichar(hiscall12(i:i))
enddo enddo
icrc10=crc10(c_loc(i1hiscall),12)
write(cbits,1001) decoded write(cbits,1001) decoded
1001 format(87i1) 1001 format(87i1)
read(cbits,1002) ncrc10,nrpt read(cbits,1002) ncrc10,nrpt
@ -410,7 +411,12 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, &
i2=index(message(i1+1:),' ') + i1 i2=index(message(i1+1:),' ') + i1
c1=message(1:i1)//' ' c1=message(1:i1)//' '
c2=message(i1+1:i2)//' ' c2=message(i1+1:i2)//' '
msg37=c1//' RR73; '//c2//' <...> '
if(ncrc10.eq.icrc10) msg37=c1//' RR73; '//c2//' <'// &
trim(hiscall12)//'> '
if(ncrc10.ne.icrc10) msg37=c1//' RR73; '//c2//' <...> '
! msg37=c1//' RR73; '//c2//' <...> '
write(msg37(35:37),1010) irpt write(msg37(35:37),1010) irpt
1010 format(i3.2) 1010 format(i3.2)
if(msg37(35:35).ne.'-') msg37(35:35)='+' if(msg37(35:35).ne.'-') msg37(35:35)='+'

10
lib/ft8/ft8sim.f90
View File

@ -80,10 +80,12 @@ program ft8sim
' BW:',f4.1,2x,a40) ' BW:',f4.1,2x,a40)
endif endif
write(*,'(28i1,1x,28i1)') msgbits(1:56) write(*,1030) msgbits(1:56)
write(*,'(16i1)') msgbits(57:72) 1030 format(/'Call1: ',28i1,' Call2: ',28i1)
write(*,'(3i1)') msgbits(73:75) write(*,1032) msgbits(57:72),msgbits(73:75),msgbits(76:87)
write(*,'(12i1)') msgbits(76:87) 1032 format('Grid: ',16i1,' 3Bit: ',3i1,' CRC12: ',12i1)
write(*,1034) itone
1034 format(/'Channel symbols:'/79i1/)
msg0=msg msg0=msg
do ifile=1,nfiles do ifile=1,nfiles

4
mainwindow.cpp
View File

@ -4967,8 +4967,8 @@ void MainWindow::on_actionFT8_triggered()
if((m_config.bFox() or m_config.bHound()) and !m_config.split_mode() and !m_bWarnSplit) { if((m_config.bFox() or m_config.bHound()) and !m_config.split_mode() and !m_bWarnSplit) {
QString errorMsg; QString errorMsg;
MessageBox::critical_message (this, MessageBox::critical_message (this,
"Operation in FT8 DXpedition strongly recommends use\n" "We strongly recommend use of *Split* when using\n"
"of Split mode. Use either ""Rig"" or ""Fake It""\n" "FT8 DXpedition mode. Use either *Rig* or *Fake It*\n"
"on the *Settings | Radio* tab.", errorMsg); "on the *Settings | Radio* tab.", errorMsg);
m_bWarnSplit=true; m_bWarnSplit=true;
} }