diff --git a/lib/msk144d.f90 b/lib/msk144d.f90 index b5ab5d573..e277b011a 100644 --- a/lib/msk144d.f90 +++ b/lib/msk144d.f90 @@ -9,6 +9,7 @@ program msk144d character c,mode character*80 line(100) + character*512 pchk_file logical :: display_help=.false. type(wav_header) :: wav integer*2 id2(15*12000) @@ -49,6 +50,7 @@ program msk144d call init_timer ('timer.out') call timer('jt65 ',0) + pchk_file='./peg-128-80-reg3.pchk' ndecoded=0 do ifile=noffset+1,noffset+nremain call get_command_argument(ifile,optarg,narglen) @@ -62,7 +64,7 @@ program msk144d read(unit=wav%lun) id2(1:npts) close(unit=wav%lun) call timer('read ',1) - call msk144_decode(id2,npts,nutc,1,line) + call msk144_decode(id2,npts,nutc,1,pchk_file,line) enddo call timer('msk144 ',1) diff --git a/lib/msk144sim.f90 b/lib/msk144sim.f90 index 62a353959..53b8cba02 100644 --- a/lib/msk144sim.f90 +++ b/lib/msk144sim.f90 @@ -5,6 +5,7 @@ program msk144sim real pings(0:NMAX-1) real waveform(0:864-1) character arg*8,msg*22,msgsent*22,fname*40 + character*512 pchk_file character*3 rpt(0:7) real wave(0:NMAX-1) !Simulated received waveform real*8 dt,twopi,freq,phi,dphi0,dphi1,dphi @@ -15,6 +16,8 @@ program msk144sim data b11/1,1,1,0,0,0,1,0,0,1,0/ data rpt /'26 ','27 ','28 ','R26','R27','R28','RRR','73 '/ + pchk_file='./peg-128-80-reg3.pchk' + nargs=iargc() if(nargs.ne.5) then print*,'Usage: msk144sim message freq width snr nfiles' @@ -37,7 +40,7 @@ program msk144sim h=default_header(12000,NMAX) ichk=0 - call genmsk144(msg,ichk,msgsent,itone,itype) + call genmsk144(msg,ichk,msgsent,itone,itype,pchk_file) twopi=8.d0*atan(1.d0) dphi0=twopi*(freq-500)/12000.0 diff --git a/lib/syncmsk144.f90 b/lib/syncmsk144.f90 index d2eb90269..058d1a8de 100644 --- a/lib/syncmsk144.f90 +++ b/lib/syncmsk144.f90 @@ -311,9 +311,9 @@ goto 999 endif 999 continue - write(78,1001) nutc,t0,iav,ipk,is,fdiff,fest,nbadsync1,nbadsync2, & - phase0,niterations,ndither,i1hashdec,i1Dec8BitBytes(10),msgreceived -1001 format(i6,f8.2,i4,i4,i4,f8.2,f8.2,i4,i4,f8.2,i4,i4,i4,i4,2x,a22) +! write(78,1001) nutc,t0,iav,ipk,is,fdiff,fest,nbadsync1,nbadsync2, & +! phase0,niterations,ndither,i1hashdec,i1Dec8BitBytes(10),msgreceived +!1001 format(i6,f8.2,i4,i4,i4,f8.2,f8.2,i4,i4,f8.2,i4,i4,i4,i4,2x,a22) return end subroutine syncmsk144