Command line msk144sim/msk144d works. wsjt-x seems to work.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6990 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2016-08-03 16:30:53 +00:00
parent 8159e2da50
commit 2abb9dbe2a
3 changed files with 13 additions and 11 deletions

View File

@ -52,14 +52,14 @@ subroutine genmsk144(msg0,ichk,msgsent,i4tone,itype,pchk_file,ldpc_msg)
i=index(pchk_file,".pchk") i=index(pchk_file,".pchk")
gen_file=pchk_file(1:i-1)//".gen" gen_file=pchk_file(1:i-1)//".gen"
i=index(ldpc_msg,'ldpc_msg"') i=index(ldpc_msg,'ldpc_msg')
ldpc_cw=ldpc_msg(1:i-1)//'ldpc_cw"' ldpc_cw=ldpc_msg(1:i-1)//"ldpc_cw"
! fname1=trim(ldpc_msg) fname1=trim(ldpc_msg)
! fname2=trim(ldpc_cw) fname2=trim(ldpc_cw)
! print*,'A ',fname1 ! print*,'A ',fname1
fname1="ldpc_msg" ! fname1="ldpc_msg"
fname2="ldpc_cw" ! fname2="ldpc_cw"
! print*,'B ',fname1 ! print*,'B ',fname2
! call init_ldpc(trim(pchk_file)//char(0),trim(gen_file)//char(0)) ! call init_ldpc(trim(pchk_file)//char(0),trim(gen_file)//char(0))
@ -140,7 +140,7 @@ subroutine genmsk144(msg0,ichk,msgsent,i4tone,itype,pchk_file,ldpc_msg)
write(19,1010) msgbits write(19,1010) msgbits
1010 format(80i1) 1010 format(80i1)
close(19) close(19)
cmnd='encode '//trim(pchk_file)//' '//trim(gen_file)//' ' & cmnd='./encode '//trim(pchk_file)//' '//trim(gen_file)//' ' &
//trim(fname1)//' '//trim(fname2) //trim(fname1)//' '//trim(fname2)
call system(cmnd) call system(cmnd)
open(19,file=fname2,status='old') open(19,file=fname2,status='old')

View File

@ -69,10 +69,10 @@ subroutine genmsk40(msg,msgsent,ichk,itone,itype,pchk_file,fname1,fname2)
write(19,1010) message write(19,1010) message
1010 format(16i1) 1010 format(16i1)
close(19) close(19)
cmnd='encode '//trim(pchk_file)//' '//trim(gen_file)//' ' & cmnd='./encode '//trim(pchk_file40)//' '//trim(gen_file40)//' ' &
//trim(fname1)//' '//trim(fname2) //trim(fname1)//' '//trim(fname2)
call system(cmnd) call system(cmnd)
open(19,file=fname2,status='old') open(19,file=fname2,status='unknown')
read(19,1020) codeword read(19,1020) codeword
1020 format(32i1) 1020 format(32i1)
close(19) close(19)

View File

@ -6,6 +6,7 @@ program msk144sim
real waveform(0:NMAX-1) real waveform(0:NMAX-1)
character arg*8,msg*22,msgsent*22,fname*40 character arg*8,msg*22,msgsent*22,fname*40
character*512 pchk_file character*512 pchk_file
character*512 ldpc_msg_file
real wave(0:NMAX-1) !Simulated received waveform real wave(0:NMAX-1) !Simulated received waveform
real*8 twopi,freq,phi,dphi0,dphi1,dphi real*8 twopi,freq,phi,dphi0,dphi1,dphi
type(hdr) h !Header for .wav file type(hdr) h !Header for .wav file
@ -13,6 +14,7 @@ program msk144sim
integer itone(144) !Message bits integer itone(144) !Message bits
pchk_file='./peg-128-80-reg3.pchk' pchk_file='./peg-128-80-reg3.pchk'
ldpc_msg_file='./ldpc_msg'
nargs=iargc() nargs=iargc()
if(nargs.ne.5) then if(nargs.ne.5) then
@ -36,7 +38,7 @@ program msk144sim
h=default_header(12000,NMAX) h=default_header(12000,NMAX)
ichk=0 ichk=0
call genmsk144(msg,ichk,msgsent,itone,itype,pchk_file) call genmsk144(msg,ichk,msgsent,itone,itype,pchk_file,ldpc_msg_file)
twopi=8.d0*atan(1.d0) twopi=8.d0*atan(1.d0)
nsym=144 nsym=144