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

Remove some bcontest stuff associated with MSK144.

Browse Source
This commit is contained in:
Joe Taylor 2018-07-11 14:42:48 -04:00
parent 316e78133c
commit 542f85694c
5 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/genmsk_128_90.f90
View File

@ -1,4 +1,4 @@
subroutine genmsk_128_90(msg0,mygrid,ichk,msgsent,i4tone,itype) subroutine genmsk_128_90(msg0,ichk,msgsent,i4tone,itype)
! s8 + 48bits + s8 + 80 bits = 144 bits (72ms message duration) ! s8 + 48bits + s8 + 80 bits = 144 bits (72ms message duration)
! !
! Encode an MSK144 message ! Encode an MSK144 message
@ -23,7 +23,6 @@ subroutine genmsk_128_90(msg0,mygrid,ichk,msgsent,i4tone,itype)
character*37 message !Message to be generated character*37 message !Message to be generated
character*37 msgsent !Message as it will be received character*37 msgsent !Message as it will be received
character*77 c77 character*77 c77
character*6 mygrid
integer*4 i4tone(144) integer*4 i4tone(144)
integer*1 codeword(128) integer*1 codeword(128)
integer*1 msgbits(77) integer*1 msgbits(77)

5
lib/msk144code.f90
View File

@ -4,11 +4,10 @@ program msk144code
! LDPC encoding, and other necessary details of the MSK144 protocol. ! LDPC encoding, and other necessary details of the MSK144 protocol.
use packjt use packjt
character msg*37,msgsent*37,decoded,bad*1,msgtype*13,mygrid*6 character msg*37,msgsent*37,decoded,bad*1,msgtype*13
integer*4 i4tone(144) integer*4 i4tone(144)
logical*1 bcontest logical*1 bcontest
include 'testmsg.f90' include 'testmsg.f90'
data mygrid/'FN20qi'/
nargs=iargc() nargs=iargc()
if(nargs.ne.1) then if(nargs.ne.1) then
@ -43,7 +42,7 @@ program msk144code
bcontest=.false. bcontest=.false.
if(msg(i1:i1+1).eq.'R ') bcontest=.true. if(msg(i1:i1+1).eq.'R ') bcontest=.true.
ichk=0 ichk=0
call genmsk_128_90(msg,mygrid,ichk,bcontest,msgsent,i4tone,itype) call genmsk_128_90(msg,ichk,bcontest,msgsent,i4tone,itype)
msgtype="" msgtype=""
if(itype.eq.1) msgtype="Std Msg" if(itype.eq.1) msgtype="Std Msg"

4
lib/msk144signalquality.f90
View File

@ -5,7 +5,6 @@ subroutine msk144signalquality(cframe,snr,freq,t0,softbits,msg,dxcall, &
character*12 dxcall character*12 dxcall
character*12 training_dxcall character*12 training_dxcall
character*12 trained_dxcall character*12 trained_dxcall
character*6 mygrid
character*512 pcoeff_filename character*512 pcoeff_filename
character*8 date character*8 date
character*10 time character*10 time
@ -91,10 +90,9 @@ subroutine msk144signalquality(cframe,snr,freq,t0,softbits,msg,dxcall, &
enddo enddo
! generate tones from decoded message ! generate tones from decoded message
mygrid="EN50"
ichk=0 ichk=0
bcontest=.false. bcontest=.false.
call genmsk_128_90(msg,mygrid,ichk,bcontest,msgsent,i4tone,itype) call genmsk_128_90(msg,ichk,msgsent,i4tone,itype)
! reconstruct message bits from tones ! reconstruct message bits from tones
msgbits(1)=0 msgbits(1)=0

7
lib/msk144sim.f90
View File

@ -4,7 +4,6 @@ program msk144sim
parameter (NMAX=15*12000) parameter (NMAX=15*12000)
real pings(0:NMAX-1) real pings(0:NMAX-1)
real waveform(0:NMAX-1) real waveform(0:NMAX-1)
character*6 mygrid
character arg*8,msg*37,msgsent*37,fname*40 character arg*8,msg*37,msgsent*37,fname*40
character*77 c77 character*77 c77
real wave(0:NMAX-1) !Simulated received waveform real wave(0:NMAX-1) !Simulated received waveform
@ -12,8 +11,6 @@ program msk144sim
type(hdr) h !Header for .wav file type(hdr) h !Header for .wav file
integer*2 iwave(0:NMAX-1) integer*2 iwave(0:NMAX-1)
integer itone(144) !Message bits integer itone(144) !Message bits
logical*1 bcontest
data mygrid/"EN50wc"/
nargs=iargc() nargs=iargc()
if(nargs.ne.6) then if(nargs.ne.6) then
@ -38,11 +35,9 @@ program msk144sim
sig=sqrt(2.0)*10.0**(0.05*snrdb) sig=sqrt(2.0)*10.0**(0.05*snrdb)
h=default_header(12000,NMAX) h=default_header(12000,NMAX)
i1=len(trim(msg))-5 i1=len(trim(msg))-5
bcontest=.false.
if(msg(i1:i1+1).eq.'R ') bcontest=.true.
ichk=0 ichk=0
itype=1 itype=1
call genmsk_128_90(msg,mygrid,ichk,bcontest,msgsent,itone,itype) call genmsk_128_90(msg,ichk,msgsent,itone,itype)
twopi=8.d0*atan(1.d0) twopi=8.d0*atan(1.d0)
nsym=144 nsym=144

9
mainwindow.cpp
View File

@ -88,9 +88,8 @@ extern "C" {
void gen9_(char* msg, int* ichk, char* msgsent, int itone[], void gen9_(char* msg, int* ichk, char* msgsent, int itone[],
int* itext, fortran_charlen_t, fortran_charlen_t); int* itext, fortran_charlen_t, fortran_charlen_t);
void genmsk_128_90_(char* msg, char* MyGrid, int* ichk, void genmsk_128_90_(char* msg, int* ichk, char* msgsent, int itone[], int* itext,
char* msgsent, int itone[], int* itext, fortran_charlen_t, fortran_charlen_t, fortran_charlen_t);
fortran_charlen_t, fortran_charlen_t);
void gen65_(char* msg, int* ichk, char* msgsent, int itone[], void gen65_(char* msg, int* ichk, char* msgsent, int itone[],
int* itext, fortran_charlen_t, fortran_charlen_t); int* itext, fortran_charlen_t, fortran_charlen_t);
@ -3466,8 +3465,8 @@ void MainWindow::guiUpdate()
strncpy(MyCall, (m_config.my_callsign()+" ").toLatin1(),6); strncpy(MyCall, (m_config.my_callsign()+" ").toLatin1(),6);
strncpy(MyGrid, (m_config.my_grid()+" ").toLatin1(),6); strncpy(MyGrid, (m_config.my_grid()+" ").toLatin1(),6);
if(m_modeTx=="MSK144") { if(m_modeTx=="MSK144") {
genmsk_128_90_(message, MyGrid, &ichk, msgsent, const_cast<int *> (itone), genmsk_128_90_(message, &ichk, msgsent, const_cast<int *> (itone),
&m_currentMessageType, 37, 6, 37); &m_currentMessageType, 37, 37);
if(m_restart) { if(m_restart) {
int nsym=144; int nsym=144;
if(itone[40]==-40) nsym=40; if(itone[40]==-40) nsym=40;