diff --git a/CMakeLists.txt b/CMakeLists.txt index 87b8509ff..99e160a4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1371,6 +1371,9 @@ target_link_libraries (fst240sim wsjt_fort wsjt_cxx) add_executable (ldpcsim240_101 lib/fst240/ldpcsim240_101.f90 wsjtx.rc) target_link_libraries (ldpcsim240_101 wsjt_fort wsjt_cxx) +add_executable (ldpcsim240_74 lib/fst240/ldpcsim240_74.f90 wsjtx.rc) +target_link_libraries (ldpcsim240_74 wsjt_fort wsjt_cxx) + endif(WSJT_BUILD_UTILS) # build the main application diff --git a/lib/fst240/fst240sim.f90 b/lib/fst240/fst240sim.f90 index ceefa00e8..b0790a768 100644 --- a/lib/fst240/fst240sim.f90 +++ b/lib/fst240/fst240sim.f90 @@ -75,9 +75,8 @@ program fst240sim n3=-1 call pack77(msg37,i3,n3,c77) call genfst240(msg37,0,msgsent37,msgbits,itone,iwspr) - write(*,*) - write(*,'(a9,a37)') 'Message: ',msgsent37 + write(*,'(a9,a37,a7,i2)') 'Message: ',msgsent37,' iwspr:',iwspr write(*,1000) f00,xdt,hmod,txt,snrdb 1000 format('f0:',f9.3,' DT:',f6.2,' hmod:',i6,' TxT:',f6.1,' SNR:',f6.1) write(*,*) @@ -86,7 +85,7 @@ program fst240sim write(*,'(28i1,1x,i1,1x,28i1,1x,i1,1x,i1,1x,15i1,1x,3i1)') msgbits(1:77) else write(*,'(a14)') 'Message bits: ' - write(*,'(50i1,1x,24i1)') msgbits + write(*,'(77i1,1x,24i1)') msgbits endif write(*,*) write(*,'(a17)') 'Channel symbols: ' diff --git a/lib/fst240/ldpcsim240_74.f90 b/lib/fst240/ldpcsim240_74.f90 index 743dff34b..78e8e6b5f 100644 --- a/lib/fst240/ldpcsim240_74.f90 +++ b/lib/fst240/ldpcsim240_74.f90 @@ -52,9 +52,9 @@ program ldpcsim240_74 write(*,*) "K : ",Keff msgbits=0 - read(c77,'(77i1)') msgbits(1:77) + read(c77,'(50i1)') msgbits(1:50) write(*,*) 'message' - write(*,'(77i1)') msgbits(1:77) + write(*,'(50i1)') msgbits(1:50) call get_crc24(msgbits,74,ncrc24) write(c24,'(b24.24)') ncrc24 @@ -118,7 +118,7 @@ write(*,'(24i1)') msgbits(51:74) ! snr2500=db+10*log10(200.0/116.0/2500.0) esn0=db+10*log10(rate) pberr=real(nberr)/(real(ntrials*N)) - write(*,"(f4.1,4x,f5.1,1x,i8,1x,i8,8x,f5.2,8x,e10.3)") db,esn0,ngood,nue,ss,pberr + write(*,"(f4.1,4x,f5.1,1x,i8,1x,i8,8x,e10.3)") db,esn0,ngood,nue,pberr enddo diff --git a/lib/fst240_decode.f90 b/lib/fst240_decode.f90 index 09b16c2ef..2cb182b38 100644 --- a/lib/fst240_decode.f90 +++ b/lib/fst240_decode.f90 @@ -553,7 +553,7 @@ contains nsnr=nint(xsnr) qual=0. fsig=fc_synced - 1.5*hmod*baud -!write(21,'(i6,7i6,f7.1,f9.2,3f7.1,1x,a37)') & +!write(21,'(i6,7i6,f7.1,f9.2,f7.1,1x,f7.2,1x,f7.1,1x,a37)') & ! nutc,icand,itry,iaptype,ijitter,ntype,nsync_qual,nharderrors,dmin,sync,xsnr,xdt,fsig,msg call this%callback(nutc,smax1,nsnr,xdt,fsig,msg, & iaptype,qual,ntrperiod,lwspr)