w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 13:48:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove residual WSPR_LF that was causing build errors. Build ldpcsim240_74.

Browse Source
This commit is contained in:
Steven Franke 2020-07-01 14:40:37 -05:00
parent 94f5e2925c
commit 6ebb487cd5
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -1371,6 +1371,9 @@ target_link_libraries (fst240sim wsjt_fort wsjt_cxx)
add_executable (ldpcsim240_101 lib/fst240/ldpcsim240_101.f90 wsjtx.rc) add_executable (ldpcsim240_101 lib/fst240/ldpcsim240_101.f90 wsjtx.rc)
target_link_libraries (ldpcsim240_101 wsjt_fort wsjt_cxx) 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) endif(WSJT_BUILD_UTILS)
# build the main application # build the main application

5
lib/fst240/fst240sim.f90
View File

@ -75,9 +75,8 @@ program fst240sim
n3=-1 n3=-1
call pack77(msg37,i3,n3,c77) call pack77(msg37,i3,n3,c77)
call genfst240(msg37,0,msgsent37,msgbits,itone,iwspr) call genfst240(msg37,0,msgsent37,msgbits,itone,iwspr)
write(*,*) write(*,*)
write(*,'(a9,a37)') 'Message: ',msgsent37 write(*,'(a9,a37,a7,i2)') 'Message: ',msgsent37,' iwspr:',iwspr
write(*,1000) f00,xdt,hmod,txt,snrdb write(*,1000) f00,xdt,hmod,txt,snrdb
1000 format('f0:',f9.3,' DT:',f6.2,' hmod:',i6,' TxT:',f6.1,' SNR:',f6.1) 1000 format('f0:',f9.3,' DT:',f6.2,' hmod:',i6,' TxT:',f6.1,' SNR:',f6.1)
write(*,*) write(*,*)
@ -86,7 +85,7 @@ program fst240sim
write(*,'(28i1,1x,i1,1x,28i1,1x,i1,1x,i1,1x,15i1,1x,3i1)') msgbits(1:77) write(*,'(28i1,1x,i1,1x,28i1,1x,i1,1x,i1,1x,15i1,1x,3i1)') msgbits(1:77)
else else
write(*,'(a14)') 'Message bits: ' write(*,'(a14)') 'Message bits: '
write(*,'(50i1,1x,24i1)') msgbits write(*,'(77i1,1x,24i1)') msgbits
endif endif
write(*,*) write(*,*)
write(*,'(a17)') 'Channel symbols: ' write(*,'(a17)') 'Channel symbols: '

6
lib/fst240/ldpcsim240_74.f90
View File

@ -52,9 +52,9 @@ program ldpcsim240_74
write(*,*) "K : ",Keff write(*,*) "K : ",Keff
msgbits=0 msgbits=0
read(c77,'(77i1)') msgbits(1:77) read(c77,'(50i1)') msgbits(1:50)
write(*,*) 'message' write(*,*) 'message'
write(*,'(77i1)') msgbits(1:77) write(*,'(50i1)') msgbits(1:50)
call get_crc24(msgbits,74,ncrc24) call get_crc24(msgbits,74,ncrc24)
write(c24,'(b24.24)') 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) ! snr2500=db+10*log10(200.0/116.0/2500.0)
esn0=db+10*log10(rate) esn0=db+10*log10(rate)
pberr=real(nberr)/(real(ntrials*N)) 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 enddo

2
lib/fst240_decode.f90
View File

@ -553,7 +553,7 @@ contains
nsnr=nint(xsnr) nsnr=nint(xsnr)
qual=0. qual=0.
fsig=fc_synced - 1.5*hmod*baud 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 ! nutc,icand,itry,iaptype,ijitter,ntype,nsync_qual,nharderrors,dmin,sync,xsnr,xdt,fsig,msg
call this%callback(nutc,smax1,nsnr,xdt,fsig,msg, & call this%callback(nutc,smax1,nsnr,xdt,fsig,msg, &
iaptype,qual,ntrperiod,lwspr) iaptype,qual,ntrperiod,lwspr)

2
widgets/mainwindow.cpp
View File

@ -589,7 +589,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
ui->actionJT9_JT65->setActionGroup(modeGroup); ui->actionJT9_JT65->setActionGroup(modeGroup);
ui->actionJT4->setActionGroup(modeGroup); ui->actionJT4->setActionGroup(modeGroup);
ui->actionWSPR->setActionGroup(modeGroup); ui->actionWSPR->setActionGroup(modeGroup);
ui->actionWSPR_LF->setActionGroup(modeGroup); ui->actionWSPR->setActionGroup(modeGroup);
ui->actionEcho->setActionGroup(modeGroup); ui->actionEcho->setActionGroup(modeGroup);
ui->actionISCAT->setActionGroup(modeGroup); ui->actionISCAT->setActionGroup(modeGroup);
ui->actionMSK144->setActionGroup(modeGroup); ui->actionMSK144->setActionGroup(modeGroup);