diff --git a/lib/fsk4hf/ft8d.f90 b/lib/fsk4hf/ft8d.f90 index a2a5bd8e6..1a8634a9f 100644 --- a/lib/fsk4hf/ft8d.f90 +++ b/lib/fsk4hf/ft8d.f90 @@ -13,7 +13,7 @@ program ft8d include 'ft8_params.f90' parameter(NRECENT=10) character*12 recent_calls(NRECENT) - character message*22,infile*80,datetime*11 + character message*22,infile*80,datetime*13 real s(NH1,NHSYM) real s1(0:7,ND) real ps(0:7) @@ -43,8 +43,8 @@ program ft8d read(10,end=999) ihdr,iwave close(10) j2=index(infile,'.wav') - read(infile(j2-4:j2-1),*) nutc - datetime=infile(j2-11:j2-1) + read(infile(j2-6:j2-1),*) nutc + datetime=infile(j2-13:j2-1) call sync8(iwave,xdt,f1,s) xsnr=0. @@ -88,7 +88,12 @@ program ft8d max_iterations=40 ifer=0 call bpdecode174(llr,apmask,max_iterations,decoded,niterations) - if(niterations.lt.0) call osd174(llr,2,decoded,niterations,cw) + if(niterations.lt.0) then + write(41,*) llr,apmask,max_iterations,decoded,niterations + call osd174(llr,2,decoded,niterations,cw) + write(42,*) llr,apmask,max_iterations,decoded,niterations +! if(niterations.lt.0) stop + endif nbadcrc=0 if(niterations.ge.0) call chkcrc12a(decoded,nbadcrc) if(niterations.lt.0 .or. nbadcrc.ne.0) ifer=1 @@ -100,8 +105,8 @@ program ft8d nsnr=nint(xsnr) write(13,1110) datetime,0,nsnr,xdt,freq,message,nfdot 1110 format(a11,2i4,f6.2,f12.7,2x,a22,i3) - write(*,1112) datetime(8:11),nsnr,xdt,nint(f1),message -1112 format(a4,i4,f5.1,i6,2x,a22) + write(*,1112) datetime(8:13),nsnr,xdt,nint(f1),message +1112 format(a6,i4,f5.1,i6,2x,a22) enddo ! ifile loop 999 end program ft8d diff --git a/lib/fsk4hf/ft8sim.f90 b/lib/fsk4hf/ft8sim.f90 index e7575c578..13479f0a2 100644 --- a/lib/fsk4hf/ft8sim.f90 +++ b/lib/fsk4hf/ft8sim.f90 @@ -6,7 +6,7 @@ program ft8sim use wavhdr include 'ft8_params.f90' !Set various constants type(hdr) h !Header for .wav file - character arg*12,fname*16 + character arg*12,fname*17 character msg*22,msgsent*22 complex c0(0:NMAX-1) complex c(0:NMAX-1) @@ -89,7 +89,7 @@ program ft8sim h=default_header(12000,NMAX) write(fname,1102) ifile -1102 format('000000_',i4.4,'.wav') +1102 format('000000_',i6.6,'.wav') open(10,file=fname,status='unknown',access='stream') write(10) h,iwave !Save to *.wav file close(10) diff --git a/lib/fsk4hf/genft8.f90 b/lib/fsk4hf/genft8.f90 index 7eec636ab..5e652cb02 100644 --- a/lib/fsk4hf/genft8.f90 +++ b/lib/fsk4hf/genft8.f90 @@ -27,10 +27,10 @@ subroutine genft8(msg,msgsent,itone) icrc12=crc12(c_loc(i1Msg8BitBytes),11) ! For reference, here's how to check the CRC - i1Msg8BitBytes(10)=icrc12/256 - i1Msg8BitBytes(11)=iand (icrc12,255) - checksumok = crc12_check(c_loc (i1Msg8BitBytes), 11) - if( checksumok ) write(*,*) 'Good checksum' +! i1Msg8BitBytes(10)=icrc12/256 +! i1Msg8BitBytes(11)=iand (icrc12,255) +! checksumok = crc12_check(c_loc (i1Msg8BitBytes), 11) +! if( checksumok ) write(*,*) 'Good checksum' write(cbits,1003) i4Msg6BitWords,i3bit,icrc12 1003 format(12b6.6,b3.3,b12.12)