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

Add encodeExeFile to genmsk40 call, and use it therein.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7003 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2016-08-04 21:57:42 +00:00
parent ddf76deede
commit 632682ff1e
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/genmsk144.f90
View File

@ -91,7 +91,7 @@ subroutine genmsk144(msg0,ichk,msgsent,i4tone,itype,pchk_file,ldpc_msg, &
if(message(1:1).eq.'<') then if(message(1:1).eq.'<') then
call genmsk40(message,msgsent,ichk,i4tone,itype,pchk_file, & call genmsk40(message,msgsent,ichk,i4tone,itype,pchk_file, &
fname1,fname2) fname1,fname2,encodeExeFile)
if(itype.lt.0) go to 999 if(itype.lt.0) go to 999
i4tone(41)=-40 i4tone(41)=-40
go to 999 go to 999

5
lib/genmsk40.f90
View File

@ -1,10 +1,11 @@
subroutine genmsk40(msg,msgsent,ichk,itone,itype,pchk_file,fname1,fname2) subroutine genmsk40(msg,msgsent,ichk,itone,itype,pchk_file,fname1,fname2,encodeExeFile)
use hashing use hashing
character*22 msg,msgsent,hashmsg character*22 msg,msgsent,hashmsg
character*32 cwstring character*32 cwstring
character*2 cwstrbit character*2 cwstrbit
character*4 crpt,rpt(0:15) character*4 crpt,rpt(0:15)
character*512 encodeExeFile
character*512 pchk_file,gen_file character*512 pchk_file,gen_file
character*512 pchk_file40,gen_file40 character*512 pchk_file40,gen_file40
character*120 fname1,fname2 character*120 fname1,fname2
@ -57,7 +58,7 @@ subroutine genmsk40(msg,msgsent,ichk,itone,itype,pchk_file,fname1,fname2)
write(24,1010) message write(24,1010) message
1010 format(16i1) 1010 format(16i1)
close(24) close(24)
cmnd='encode "'//trim(pchk_file40)//'" "'//trim(gen_file40)//'" "' & cmnd=trim(encodeExeFile)//' "'//trim(pchk_file40)//'" "'//trim(gen_file40)//'" "' &
//trim(fname1)//'" "'//trim(fname2)//'"' //trim(fname1)//'" "'//trim(fname2)//'"'
call system(cmnd) call system(cmnd)
open(24,file=fname2,status='old') open(24,file=fname2,status='old')

4
lib/msk144sim.f90
View File

@ -5,6 +5,7 @@ program msk144sim
real pings(0:NMAX-1) real pings(0:NMAX-1)
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 encode_exe_file
character*512 pchk_file character*512 pchk_file
character*512 ldpc_msg_file character*512 ldpc_msg_file
real wave(0:NMAX-1) !Simulated received waveform real wave(0:NMAX-1) !Simulated received waveform
@ -38,7 +39,8 @@ 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,ldpc_msg_file) encode_exe_file="./encode "
call genmsk144(msg,ichk,msgsent,itone,itype,pchk_file,ldpc_msg_file,encode_exe_file)
twopi=8.d0*atan(1.d0) twopi=8.d0*atan(1.d0)
nsym=144 nsym=144