From aeee9b62bb10ff709ee9133d9163589f696e08ea Mon Sep 17 00:00:00 2001 From: Steve Franke Date: Tue, 22 May 2018 11:06:39 -0500 Subject: [PATCH] Hack CMakeLists.txt so that repo will build. Modify CMakeLists.txt so that wspr5sim, wspr5d build. --- CMakeLists.txt | 37 ++++++++++++++++++++++++++++++++++ lib/fsk4hf/wsprdpsk_params.f90 | 14 +++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 lib/fsk4hf/wsprdpsk_params.f90 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a7f0b58b..2a9803202 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -313,11 +313,13 @@ set (wsjtx_CXXSRCS set (wsjt_CXXSRCS lib/crc10.cpp lib/crc12.cpp + lib/crc14.cpp ) # deal with a GCC v6 UB error message set_source_files_properties ( lib/crc10.cpp lib/crc12.cpp + lib/crc14.cpp PROPERTIES COMPILE_FLAGS -fpermissive) if (WIN32) @@ -373,6 +375,7 @@ set (wsjt_FSRCS lib/fsk4hf/bpdecode168.f90 lib/ft8/bpdecode174.f90 lib/fsk4hf/bpdecode300.f90 + lib/fsk4hf/bpdecode204.f90 lib/baddata.f90 lib/calibrate.f90 lib/ccf2.f90 @@ -408,6 +411,7 @@ set (wsjt_FSRCS lib/fsk4hf/encode168.f90 lib/ft8/encode174.f90 lib/fsk4hf/encode300.f90 + lib/fsk4hf/encode204.f90 lib/entail.f90 lib/ephem.f90 lib/extract.f90 @@ -460,6 +464,8 @@ set (wsjt_FSRCS lib/fsk4hf/genmskhf.f90 lib/fsk4hf/genwsprlf.f90 lib/fsk4hf/genwspr_fsk8.f90 + lib/fsk4hf/genwsprcpm.f90 + lib/fsk4hf/genwspr5.f90 lib/fsk4hf/getfc1.f90 lib/fsk4hf/getfc2.f90 lib/fsk4hf/getfc1w.f90 @@ -493,6 +499,7 @@ set (wsjt_FSRCS lib/fsk4hf/ldpcsim168.f90 lib/ft8/ldpcsim174.f90 lib/fsk4hf/ldpcsim300.f90 + lib/fsk4hf/ldpcsim204.f90 lib/ldpcsim40.f90 lib/libration.f90 lib/lorentzian.f90 @@ -521,6 +528,7 @@ set (wsjt_FSRCS lib/fsk4hf/msksoftsymw.f90 lib/ft8/osd174.f90 lib/fsk4hf/osd300.f90 + lib/fsk4hf/osd204.f90 lib/pctile.f90 lib/peakdt9.f90 lib/peakup.f90 @@ -585,7 +593,11 @@ set (wsjt_FSRCS lib/fsk4hf/wspr_fsk8_sim.f90 lib/fsk4hf/wspr_fsk8_wav.f90 lib/fsk4hf/wspr_fsk8_downsample.f90 + lib/fsk4hf/wspr_wav.f90 lib/fsk4hf/wsprlfsim.f90 + lib/fsk4hf/wsprcpm_wav.f90 + lib/fsk4hf/wspr5_wav.f90 + lib/fsk4hf/wspr5_downsample.f90 lib/wspr_downsample.f90 lib/zplot9.f90 ) @@ -1193,6 +1205,10 @@ add_executable (wsprcode lib/wsprcode/wsprcode.f90 lib/wsprcode/nhash.c wsjtx.rc) target_link_libraries (wsprcode wsjt_fort wsjt_cxx) +add_executable (wsprsimf lib/fsk4hf/wsprsimf.f90 lib/wsprcode/nhash.c + wsjtx.rc) +target_link_libraries (wsprsimf wsjt_fort wsjt_cxx) + add_executable (wsprd ${wsprd_CSRCS}) target_include_directories (wsprd PRIVATE ${FFTW3_INCLUDE_DIRS}) target_link_libraries (wsprd ${FFTW3_LIBRARIES}) @@ -1223,6 +1239,12 @@ target_link_libraries (ldpcsim144 wsjt_fort wsjt_cxx) add_executable (ldpcsim168 lib/fsk4hf/ldpcsim168.f90 wsjtx.rc) target_link_libraries (ldpcsim168 wsjt_fort wsjt_cxx) +add_executable (ldpcsim300 lib/fsk4hf/ldpcsim300.f90 wsjtx.rc) +target_link_libraries (ldpcsim300 wsjt_fort wsjt_cxx) + +add_executable (ldpcsim204 lib/fsk4hf/ldpcsim204.f90 wsjtx.rc) +target_link_libraries (ldpcsim204 wsjt_fort wsjt_cxx) + add_executable (fsk4hf lib/fsk4hf/fsk4hf.f90 wsjtx.rc) target_link_libraries (fsk4hf wsjt_fort wsjt_cxx) @@ -1241,6 +1263,21 @@ target_link_libraries (wspr_fsk8d wsjt_fort wsjt_cxx) add_executable (wspr_fsk8_sim lib/fsk4hf/wspr_fsk8_sim.f90 wsjtx.rc) target_link_libraries (wspr_fsk8_sim wsjt_fort wsjt_cxx) +add_executable (wsprcpmsim lib/fsk4hf/wsprcpmsim.f90 wsjtx.rc) +target_link_libraries (wsprcpmsim wsjt_fort wsjt_cxx) + +add_executable (wsprcpmd lib/fsk4hf/wsprcpmd.f90 wsjtx.rc) +target_link_libraries (wsprcpmd wsjt_fort wsjt_cxx) + +add_executable (wspr5d lib/fsk4hf/wspr5d.f90 wsjtx.rc) +target_link_libraries (wspr5d wsjt_fort wsjt_cxx) + +add_executable (wspr5d_exp lib/fsk4hf/wspr5d_exp.f90 wsjtx.rc) +target_link_libraries (wspr5d_exp wsjt_fort wsjt_cxx) + +add_executable (wspr5sim lib/fsk4hf/wspr5sim.f90 wsjtx.rc) +target_link_libraries (wspr5sim wsjt_fort wsjt_cxx) + add_executable (mskhfsim lib/fsk4hf/mskhfsim.f90 wsjtx.rc) target_link_libraries (mskhfsim wsjt_fort wsjt_cxx) diff --git a/lib/fsk4hf/wsprdpsk_params.f90 b/lib/fsk4hf/wsprdpsk_params.f90 new file mode 100644 index 000000000..8c473cf20 --- /dev/null +++ b/lib/fsk4hf/wsprdpsk_params.f90 @@ -0,0 +1,14 @@ +parameter (KK=64) !Information bits (50 + CRC14) ? +parameter (ND=200) !Data symbols: LDPC (204,68), r=1/3, don't send last 4 bits +parameter (NS=32) !Sync symbols (32) +parameter (NN=NS+ND) !Total symbols (232) + +parameter (NSPS0=6000) !Samples per symbol at 12000 S/s + +parameter (NDOWN=30) !Downsample to 200 sa/symbol (400 Hz) for candidate selection +parameter (NSPS=NSPS0/NDOWN) !Samples per symbol (200) +parameter (NZ=NSPS*NN) !Samples in baseband waveform + +parameter (NZ0=NSPS0*NN) !Samples in waveform at 12000 S/s +parameter (NFFT1=4*NSPS,NH1=NFFT1/2) +