From 45dd4b1f29c222e585a9a5e29e8d263dab0eb4a4 Mon Sep 17 00:00:00 2001
From: Steven Franke <s.j.franke@icloud.com>
Date: Wed, 3 Aug 2016 16:30:53 +0000
Subject: [PATCH] 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
---
 lib/genmsk144.f90 | 16 ++++++++--------
 lib/genmsk40.f90  |  4 ++--
 lib/msk144sim.f90 |  4 +++-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/genmsk144.f90 b/lib/genmsk144.f90
index 49f5faeda..c4bbf3f0d 100644
--- a/lib/genmsk144.f90
+++ b/lib/genmsk144.f90
@@ -52,14 +52,14 @@ subroutine genmsk144(msg0,ichk,msgsent,i4tone,itype,pchk_file,ldpc_msg)
 
   i=index(pchk_file,".pchk")
   gen_file=pchk_file(1:i-1)//".gen"
-  i=index(ldpc_msg,'ldpc_msg"')
-  ldpc_cw=ldpc_msg(1:i-1)//'ldpc_cw"'
-!  fname1=trim(ldpc_msg)
-!  fname2=trim(ldpc_cw)
+  i=index(ldpc_msg,'ldpc_msg')
+  ldpc_cw=ldpc_msg(1:i-1)//"ldpc_cw"
+  fname1=trim(ldpc_msg)
+  fname2=trim(ldpc_cw)
 !  print*,'A ',fname1
-  fname1="ldpc_msg"
-  fname2="ldpc_cw"
-!  print*,'B ',fname1
+!  fname1="ldpc_msg"
+!  fname2="ldpc_cw"
+!  print*,'B ',fname2
 
 !  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
 1010 format(80i1)
      close(19)
-     cmnd='encode '//trim(pchk_file)//' '//trim(gen_file)//' '        &
+     cmnd='./encode '//trim(pchk_file)//' '//trim(gen_file)//' '        &
           //trim(fname1)//' '//trim(fname2)
      call system(cmnd)
      open(19,file=fname2,status='old')
diff --git a/lib/genmsk40.f90 b/lib/genmsk40.f90
index 354feadee..2a94299e3 100644
--- a/lib/genmsk40.f90
+++ b/lib/genmsk40.f90
@@ -69,10 +69,10 @@ subroutine genmsk40(msg,msgsent,ichk,itone,itype,pchk_file,fname1,fname2)
   write(19,1010) message
 1010 format(16i1)
   close(19)
-  cmnd='encode '//trim(pchk_file)//' '//trim(gen_file)//' '        &
+  cmnd='./encode '//trim(pchk_file40)//' '//trim(gen_file40)//' '        &
        //trim(fname1)//' '//trim(fname2)
   call system(cmnd)
-  open(19,file=fname2,status='old')
+  open(19,file=fname2,status='unknown')
   read(19,1020) codeword
 1020 format(32i1)
   close(19)
diff --git a/lib/msk144sim.f90 b/lib/msk144sim.f90
index 05f311103..bcae4c3a7 100644
--- a/lib/msk144sim.f90
+++ b/lib/msk144sim.f90
@@ -6,6 +6,7 @@ program msk144sim
   real waveform(0:NMAX-1)
   character arg*8,msg*22,msgsent*22,fname*40
   character*512 pchk_file
+  character*512 ldpc_msg_file
   real wave(0:NMAX-1)              !Simulated received waveform
   real*8 twopi,freq,phi,dphi0,dphi1,dphi
   type(hdr) h                          !Header for .wav file
@@ -13,6 +14,7 @@ program msk144sim
   integer itone(144)                   !Message bits
 
   pchk_file='./peg-128-80-reg3.pchk'
+  ldpc_msg_file='./ldpc_msg'
 
   nargs=iargc()
   if(nargs.ne.5) then
@@ -36,7 +38,7 @@ program msk144sim
   h=default_header(12000,NMAX)
 
   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)
 
   nsym=144