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

Make 72-bit "contest mode" available in FT8 as well as MSK144.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7969 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-07-28 15:50:13 +00:00
parent a7b7c19f88
commit e6635624f5
9 changed files with 127 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Configuration.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>521</width> <width>536</width>
<height>507</height> <height>507</height>
</rect> </rect>
</property> </property>
@ -188,6 +188,12 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer> </spacer>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
@ -237,6 +243,12 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer> </spacer>
</item> </item>
</layout> </layout>
@ -301,6 +313,12 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer> </spacer>
</item> </item>
<item> <item>
@ -390,6 +408,12 @@ quiet period when decoding is done.</string>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer> </spacer>
</item> </item>
</layout> </layout>
@ -1882,6 +1906,12 @@ for assessing propagation and system performance.</string>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer> </spacer>
</item> </item>
</layout> </layout>
@ -2178,6 +2208,12 @@ Right click for insert and delete options.</string>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer> </spacer>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
@ -2198,6 +2234,12 @@ Right click for insert and delete options.</string>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer> </spacer>
</item> </item>
</layout> </layout>
@ -2300,7 +2342,7 @@ Right click for insert and delete options.</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Exchange 4-character grid locators instead of reports. See User Guide for details.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Exchange 4-character grid locators instead of reports. See User Guide for details.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>MSK144 Contest Mode</string> <string>FT8 and MSK144 Contest Mode</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -2595,9 +2637,9 @@ soundcard changes</string>
<buttongroup name="CAT_data_bits_button_group"/> <buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="split_mode_button_group"/> <buttongroup name="split_mode_button_group"/>
<buttongroup name="CAT_handshake_button_group"/> <buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="PTT_method_button_group"/> <buttongroup name="PTT_method_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="TX_audio_source_button_group"/> <buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="TX_mode_button_group"/>
</buttongroups> </buttongroups>
</ui> </ui>

10
lib/decoder.f90
View File

@ -70,11 +70,11 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
! We're in FT8 mode ! We're in FT8 mode
call timer('decft8 ',0) call timer('decft8 ',0)
newdat=params%newdat newdat=params%newdat
call my_ft8%decode(ft8_decoded,id2,params%nQSOProgress,params%nfqso, & call my_ft8%decode(ft8_decoded,id2,params%nQSOProgress,params%nfqso, &
params%nftx,newdat,params%nutc,params%nfa, & params%nftx,newdat,params%nutc,params%nfa,params%nfb, &
params%nfb,logical(params%nagain), & params%nexp_decode,params%ndepth,logical(params%lapon), &
params%ndepth,logical(params%lapon),params%napwid,params%nsubmode, & params%napwid,params%mycall,params%mygrid,params%hiscall, &
params%mycall,params%hiscall,params%hisgrid) params%hisgrid)
call timer('decft8 ',1) call timer('decft8 ',1)
go to 800 go to 800
endif endif

12
lib/fsk4hf/ft8apset.f90
View File

@ -1,10 +1,11 @@
subroutine ft8apset(mycall12,hiscall12,hisgrid6,apsym,iaptype) subroutine ft8apset(mycall12,mygrid6,hiscall12,hisgrid6,bcontest,apsym,iaptype)
parameter(NAPM=4,KK=87) parameter(NAPM=4,KK=87)
character*12 mycall12,hiscall12 character*12 mycall12,hiscall12
character*22 msg,msgsent character*22 msg,msgsent
character*6 mycall,hiscall character*6 mycall,hiscall
character*6 hisgrid6 character*6 mygrid6,hisgrid6
character*4 hisgrid character*4 hisgrid
logical bcontest
integer apsym(KK) integer apsym(KK)
integer*1 msgbits(KK) integer*1 msgbits(KK)
integer itone(KK) integer itone(KK)
@ -22,7 +23,8 @@ subroutine ft8apset(mycall12,hiscall12,hisgrid6,apsym,iaptype)
! if(len_trim(hisgrid).eq.0) hisgrid="EN50" ! if(len_trim(hisgrid).eq.0) hisgrid="EN50"
if(index(hisgrid," ").eq.0) hisgrid="EN50" if(index(hisgrid," ").eq.0) hisgrid="EN50"
msg=mycall//' '//hiscall//' '//hisgrid msg=mycall//' '//hiscall//' '//hisgrid
call genft8(msg,msgsent,msgbits,itone) call genft8(msg,mygrid6,bcontest,msgsent,msgbits,itone)
apsym=2*msgbits-1 apsym=2*msgbits-1
return return
end subroutine ft8apset end subroutine ft8apset

10
lib/fsk4hf/ft8b.f90
View File

@ -1,12 +1,14 @@
subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,napwid, & subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,napwid, &
lsubtract,iaptype,icand,sync0,f1,xdt,apsym,nharderrors,dmin, & lsubtract,iaptype,mygrid6,bcontest,sync0,f1,xdt,apsym,nharderrors,dmin, &
nbadcrc,ipass,iera,message,xsnr) nbadcrc,ipass,iera,message,xsnr)
use timer_module, only: timer use timer_module, only: timer
include 'ft8_params.f90' include 'ft8_params.f90'
parameter(NRECENT=10,NP2=2812) parameter(NRECENT=10,NP2=2812)
character message*22,msgsent*22 character message*22,msgsent*22
character*12 recent_calls(NRECENT) character*12 recent_calls(NRECENT)
character*6 mygrid6
logical bcontest
real a(5) real a(5)
real s1(0:7,ND),s2(0:7,NN) real s1(0:7,ND),s2(0:7,NN)
real ps(0:7) real ps(0:7)
@ -336,7 +338,7 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,napwid, &
endif endif
if(nbadcrc.eq.0) then if(nbadcrc.eq.0) then
call extractmessage174(decoded,message,ncrcflag,recent_calls,nrecent) call extractmessage174(decoded,message,ncrcflag,recent_calls,nrecent)
call genft8(message,msgsent,msgbits,itone) call genft8(message,mygrid6,bcontest,msgsent,msgbits,itone)
if(lsubtract) call subtractft8(dd0,itone,f1,xdt2) if(lsubtract) call subtractft8(dd0,itone,f1,xdt2)
xsig=0.0 xsig=0.0
xnoi=0.0 xnoi=0.0

15
lib/fsk4hf/ft8sim.f90
View File

@ -8,19 +8,23 @@ program ft8sim
type(hdr) h !Header for .wav file type(hdr) h !Header for .wav file
character arg*12,fname*17,sorm*1 character arg*12,fname*17,sorm*1
character msg*22,msgsent*22 character msg*22,msgsent*22
character*6 mygrid6
logical bcontest
complex c0(0:NMAX-1) complex c0(0:NMAX-1)
complex c(0:NMAX-1) complex c(0:NMAX-1)
integer itone(NN) integer itone(NN)
integer*1 msgbits(KK) integer*1 msgbits(KK)
integer*2 iwave(NMAX) !Generated full-length waveform integer*2 iwave(NMAX) !Generated full-length waveform
data mygrid6/'EM48 '/
! Get command-line argument(s) ! Get command-line argument(s)
nargs=iargc() nargs=iargc()
if(nargs.ne.8) then if(nargs.ne.8) then
print*,'Usage: ft8sim "message" sorm f0 DT fdop del nfiles snr' print*,'Usage: ft8sim "message" s|m f0 DT fdop del nfiles snr'
print*,'Example: ft8sim "K1ABC W9XYZ EN37" m 1500.0 0.0 0.1 1.0 10 -18' print*,'Example: ft8sim "K1ABC W9XYZ EN37" m 1500.0 0.0 0.1 1.0 10 -18'
print*,'sorm: "s" for single signal at 1500 Hz, "m" for 25 signals' print*,'s|m: "s" for single signal at 1500 Hz, "m" for 25 signals'
print*,'f0 is ignored when sorm = m' print*,'f0 is ignored when sorm = m'
print*,'Make nfiles negative to invoke 72-bit contest mode.'
go to 999 go to 999
endif endif
call getarg(1,msg) !Message to be transmitted call getarg(1,msg) !Message to be transmitted
@ -48,6 +52,8 @@ program ft8sim
call getarg(8,arg) call getarg(8,arg)
read(arg,*) snrdb !SNR_2500 read(arg,*) snrdb !SNR_2500
bcontest=nfiles.lt.0
nfiles=abs(nfiles)
twopi=8.0*atan(1.0) twopi=8.0*atan(1.0)
fs=12000.0 !Sample rate (Hz) fs=12000.0 !Sample rate (Hz)
dt=1.0/fs !Sample interval (s) dt=1.0/fs !Sample interval (s)
@ -60,7 +66,8 @@ program ft8sim
if(snrdb.gt.90.0) sig=1.0 if(snrdb.gt.90.0) sig=1.0
txt=NN*NSPS/12000.0 txt=NN*NSPS/12000.0
call genft8(msg,msgsent,msgbits,itone) !Source-encode, then get itone() ! Source-encode, then get itone()
call genft8(msg,mygrid6,bcontest,msgsent,msgbits,itone)
write(*,1000) f0,xdt,txt,snrdb,bw,msgsent write(*,1000) f0,xdt,txt,snrdb,bw,msgsent
1000 format('f0:',f9.3,' DT:',f6.2,' TxT:',f6.1,' SNR:',f6.1, & 1000 format('f0:',f9.3,' DT:',f6.2,' TxT:',f6.1,' SNR:',f6.1, &
' BW:',f4.1,2x,a22) ' BW:',f4.1,2x,a22)

23
lib/fsk4hf/genft8.f90
View File

@ -1,4 +1,4 @@
subroutine genft8(msg,msgsent,msgbits,itone) subroutine genft8(msg,mygrid,bcontest,msgsent,msgbits,itone)
! Encode an FT8 message, producing array itone(). ! Encode an FT8 message, producing array itone().
@ -6,8 +6,10 @@ subroutine genft8(msg,msgsent,msgbits,itone)
use packjt use packjt
include 'ft8_params.f90' include 'ft8_params.f90'
character*22 msg,msgsent character*22 msg,msgsent
character*6 mygrid,g1,g2
character*87 cbits character*87 cbits
! logical checksumok logical*1 bcontest
logical isgrid
integer*4 i4Msg6BitWords(12) !72-bit message as 6-bit words integer*4 i4Msg6BitWords(12) !72-bit message as 6-bit words
integer*1 msgbits(KK),codeword(3*ND) integer*1 msgbits(KK),codeword(3*ND)
integer*1, target:: i1Msg8BitBytes(11) integer*1, target:: i1Msg8BitBytes(11)
@ -15,6 +17,23 @@ subroutine genft8(msg,msgsent,msgbits,itone)
integer icos7(0:6) integer icos7(0:6)
data icos7/2,5,6,0,4,1,3/ !Costas 7x7 tone pattern data icos7/2,5,6,0,4,1,3/ !Costas 7x7 tone pattern
isgrid(g1)=g1(1:1).ge.'A' .and. g1(1:1).le.'R' .and. g1(2:2).ge.'A' .and. &
g1(2:2).le.'R' .and. g1(3:3).ge.'0' .and. g1(3:3).le.'9' .and. &
g1(4:4).ge.'0' .and. g1(4:4).le.'9' .and. g1(1:4).ne.'RR73'
if(bcontest) then
i0=index(msg,' R ') + 3 !Check for ' R ' in message
g1=msg(i0:i0+3)//' '
if(isgrid(g1)) then !Check for ' R grid'
call grid2deg(g1,dlong,dlat)
dlong=dlong+180.0
if(dlong.gt.180.0) dlong=dlong-360.0
dlat=-dlat
call deg2grid(dlong,dlat,g2) !g2=antipodes grid
msg=msg(1:i0-3)//g2(1:4) !Send message with g2
endif
endif
call packmsg(msg,i4Msg6BitWords,itype) !Pack into 12 6-bit bytes call packmsg(msg,i4Msg6BitWords,itype) !Pack into 12 6-bit bytes
call unpackmsg(i4Msg6BitWords,msgsent) !Unpack to get msgsent call unpackmsg(i4Msg6BitWords,msgsent) !Unpack to get msgsent
i3bit=0 !### temporary ### i3bit=0 !### temporary ###

19
lib/ft8_decode.f90
View File

@ -23,8 +23,9 @@ module ft8_decode
contains contains
subroutine decode(this,callback,iwave,nQSOProgress,nfqso,nftx,newdat,nutc, & subroutine decode(this,callback,iwave,nQSOProgress,nfqso,nftx,newdat, &
nfa,nfb,nagain,ndepth,lapon,napwid,nsubmode,mycall12,hiscall12,hisgrid6) nutc,nfa,nfb,nexp_decode,ndepth,lapon,napwid,mycall12,mygrid6, &
hiscall12,hisgrid6)
! use wavhdr ! use wavhdr
use timer_module, only: timer use timer_module, only: timer
include 'fsk4hf/ft8_params.f90' include 'fsk4hf/ft8_params.f90'
@ -35,10 +36,10 @@ contains
real s(NH1,NHSYM) real s(NH1,NHSYM)
real candidate(3,200) real candidate(3,200)
real dd(15*12000) real dd(15*12000)
logical, intent(in) :: nagain,lapon logical, intent(in) :: lapon
logical newdat,lsubtract,ldupe logical newdat,lsubtract,ldupe,bcontest
character*12 mycall12, hiscall12 character*12 mycall12, hiscall12
character*6 hisgrid6 character*6 mygrid6,hisgrid6
integer*2 iwave(15*12000) integer*2 iwave(15*12000)
integer apsym(KK) integer apsym(KK)
character datetime*13,message*22 character datetime*13,message*22
@ -46,11 +47,12 @@ contains
integer allsnrs(100) integer allsnrs(100)
save s,dd save s,dd
bcontest=iand(nexp_decode,128).ne.0
this%callback => callback this%callback => callback
write(datetime,1001) nutc !### TEMPORARY ### write(datetime,1001) nutc !### TEMPORARY ###
1001 format("000000_",i6.6) 1001 format("000000_",i6.6)
call ft8apset(mycall12,hiscall12,hisgrid6,apsym,iaptype) call ft8apset(mycall12,mygrid6,hiscall12,hisgrid6,bcontest,apsym,iaptype)
dd=iwave dd=iwave
@ -84,14 +86,15 @@ contains
nsnr0=min(99,nint(10.0*log10(sync) - 25.5)) !### empirical ### nsnr0=min(99,nint(10.0*log10(sync) - 25.5)) !### empirical ###
call timer('ft8b ',0) call timer('ft8b ',0)
call ft8b(dd,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,napwid, & call ft8b(dd,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,napwid, &
lsubtract,iaptype,icand,sync,f1,xdt,apsym,nharderrors,dmin, & lsubtract,iaptype,mygrid6,bcontest,sync,f1,xdt,apsym, &
nbadcrc,iappass,iera,message,xsnr) nharderrors,dmin,nbadcrc,iappass,iera,message,xsnr)
nsnr=nint(xsnr) nsnr=nint(xsnr)
xdt=xdt-0.5 xdt=xdt-0.5
hd=nharderrors+dmin hd=nharderrors+dmin
call timer('ft8b ',1) call timer('ft8b ',1)
if(nbadcrc.eq.0) then if(nbadcrc.eq.0) then
call jtmsg(message,iflag) call jtmsg(message,iflag)
if(bcontest) call fix_contest_msg(mygrid6,message)
if(iand(iflag,16).ne.0) message(22:22)='?' if(iand(iflag,16).ne.0) message(22:22)='?'
if(iand(iflag,15).eq.0) then if(iand(iflag,15).eq.0) then
ldupe=.false. ldupe=.false.

8
lib/genmsk144.f90
View File

@ -41,17 +41,17 @@ subroutine genmsk144(msg0,mygrid,ichk,bcontest,msgsent,i4tone,itype)
data first/.true./ data first/.true./
save save
isgrid(g1)=g1(1:1).ge.'A' .and. g1(1:1).le.'R' .and. g1(2:2).ge.'A' .and. & isgrid(g1)=g1(1:1).ge.'A' .and. g1(1:1).le.'R' .and. g1(2:2).ge.'A' .and. &
g1(2:2).le.'R' .and. g1(3:3).ge.'0' .and. g1(3:3).le.'9' .and. & g1(2:2).le.'R' .and. g1(3:3).ge.'0' .and. g1(3:3).le.'9' .and. &
g1(4:4).ge.'0' .and. g1(4:4).le.'9' .and. g1(1:4).ne.'RR73' g1(4:4).ge.'0' .and. g1(4:4).le.'9' .and. g1(1:4).ne.'RR73'
if( first ) then if(first) then
first=.false. first=.false.
nsym=128 nsym=128
pi=4.*atan(1.0) pi=4.0*atan(1.0)
twopi=8.*atan(1.0) twopi=8.*atan(1.0)
do i=1,12 do i=1,12
pp(i)=sin( (i-1)*pi/12 ) pp(i)=sin((i-1)*pi/12)
enddo enddo
endif endif

27
mainwindow.cpp
View File

@ -75,7 +75,8 @@ extern "C" {
int len1, int len2, int len3, int len4, int len5); int len1, int len2, int len3, int len4, int len5);
// float s[], int* jh, char line[], char mygrid[], // float s[], int* jh, char line[], char mygrid[],
void genft8_(char* msg, char* msgsent, char ft8msgbits[], int itone[], int len1, int len2); void genft8_(char* msg, char* MyGrid, bool* bcontest, char* msgsent,
char ft8msgbits[], int itone[], int len1, int len2);
void gen4_(char* msg, int* ichk, char* msgsent, int itone[], void gen4_(char* msg, int* ichk, char* msgsent, int itone[],
int* itext, int len1, int len2); int* itext, int len1, int len2);
@ -2490,7 +2491,7 @@ void MainWindow::decode() //decode()
dec_data.params.nexp_decode=0; dec_data.params.nexp_decode=0;
if(m_config.single_decode()) dec_data.params.nexp_decode += 32; if(m_config.single_decode()) dec_data.params.nexp_decode += 32;
if(m_config.enable_VHF_features()) dec_data.params.nexp_decode += 64; if(m_config.enable_VHF_features()) dec_data.params.nexp_decode += 64;
if(m_config.contestMode()) dec_data.params.nexp_decode += 128;
strncpy(dec_data.params.datetime, m_dateTime.toLatin1(), 20); strncpy(dec_data.params.datetime, m_dateTime.toLatin1(), 20);
strncpy(dec_data.params.mycall, (m_config.my_callsign()+" ").toLatin1(),12); strncpy(dec_data.params.mycall, (m_config.my_callsign()+" ").toLatin1(),12);
@ -3103,18 +3104,22 @@ void MainWindow::guiUpdate()
len1, len1); len1, len1);
if(m_modeTx=="WSPR-LF") genwspr_fsk8_(message, msgsent, const_cast<int *> (itone), if(m_modeTx=="WSPR-LF") genwspr_fsk8_(message, msgsent, const_cast<int *> (itone),
len1, len1); len1, len1);
if(m_modeTx=="FT8") genft8_(message, msgsent, const_cast<char *> (ft8msgbits), if(m_modeTx=="MSK144" or m_modeTx=="FT8") {
const_cast<int *> (itone), len1, len1);
if(m_modeTx=="MSK144") {
bool bcontest=m_config.contestMode(); bool bcontest=m_config.contestMode();
char MyGrid[6]; char MyGrid[6];
strncpy(MyGrid, (m_config.my_grid()+" ").toLatin1(),6); strncpy(MyGrid, (m_config.my_grid()+" ").toLatin1(),6);
genmsk144_(message, MyGrid, &ichk, &bcontest, msgsent, const_cast<int *> (itone), if(m_modeTx=="MSK144") {
&m_currentMessageType, len1, 6, len1); genmsk144_(message, MyGrid, &ichk, &bcontest, msgsent, const_cast<int *> (itone),
if(m_restart) { &m_currentMessageType, len1, 6, len1);
int nsym=144; if(m_restart) {
if(itone[40]==-40) nsym=40; int nsym=144;
m_modulator->set_nsym(nsym); if(itone[40]==-40) nsym=40;
m_modulator->set_nsym(nsym);
}
}
if(m_modeTx=="FT8") {
genft8_(message, MyGrid, &bcontest, msgsent, const_cast<char *> (ft8msgbits),
const_cast<int *> (itone), len1, len1);
} }
} }
msgsent[22]=0; msgsent[22]=0;