From e26d6d87156884f6bcfa537f0174b36a32b0c516 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Tue, 16 Jun 2020 19:34:14 +0100 Subject: [PATCH 1/4] Typos in source file names --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 04776905e..ef9e4dec7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -603,9 +603,9 @@ set (wsjt_FSRCS lib/fst280/encode280_74.f90 lib/fst280/fst280d.f90 lib/fst280/fst280sim.f90 - lib/fst280/genfst280_wave.f90 + lib/fst280/gen_fst280wave.f90 lib/fst280/genfst280.f90 - lib/fst280/get_ft280_bitmetrics.f90 + lib/fst280/get_fst280_bitmetrics.f90 lib/fst280/ldpcsim280_101.f90 lib/fst280/ldpcsim280_74.f90 lib/fst280/osd280_101.f90 From 27e7b7b17b27a1d3b7aad2559ed80940f2fc1749 Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Tue, 16 Jun 2020 13:38:34 -0500 Subject: [PATCH 2/4] Remove unused variables. --- lib/fst280/encode280_101.f90 | 6 ------ lib/fst280/encode280_74.f90 | 6 ------ 2 files changed, 12 deletions(-) diff --git a/lib/fst280/encode280_101.f90 b/lib/fst280/encode280_101.f90 index 704816355..e908bb607 100644 --- a/lib/fst280/encode280_101.f90 +++ b/lib/fst280/encode280_101.f90 @@ -1,15 +1,9 @@ subroutine encode280_101(message,codeword) - use, intrinsic :: iso_c_binding - use iso_c_binding, only: c_loc,c_size_t - use crc - integer, parameter:: N=280, K=101, M=N-K - character*24 c24 integer*1 codeword(N) integer*1 gen(M,K) integer*1 message(K) integer*1 pchecks(M) - integer*4 ncrc24 include "ldpc_280_101_generator.f90" logical first data first/.true./ diff --git a/lib/fst280/encode280_74.f90 b/lib/fst280/encode280_74.f90 index e923d46f7..a64a57815 100644 --- a/lib/fst280/encode280_74.f90 +++ b/lib/fst280/encode280_74.f90 @@ -1,15 +1,9 @@ subroutine encode280_74(message,codeword) - use, intrinsic :: iso_c_binding - use iso_c_binding, only: c_loc,c_size_t - use crc - integer, parameter:: N=280, K=74, M=N-K - character*24 c24 integer*1 codeword(N) integer*1 gen(M,K) integer*1 message(K) integer*1 pchecks(M) - integer*4 ncrc24 include "ldpc_280_74_generator.f90" logical first data first/.true./ From 18776df8667b9983d8e437b069d7df28cb74fb2a Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Tue, 16 Jun 2020 13:40:52 -0500 Subject: [PATCH 3/4] Add missing get_crc24.f90 --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef9e4dec7..74289b285 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -603,6 +603,7 @@ set (wsjt_FSRCS lib/fst280/encode280_74.f90 lib/fst280/fst280d.f90 lib/fst280/fst280sim.f90 + lib/fst280/get_crc24.f90 lib/fst280/gen_fst280wave.f90 lib/fst280/genfst280.f90 lib/fst280/get_fst280_bitmetrics.f90 From ed021dadfaed012d27dbfd648d229c339666463e Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Tue, 16 Jun 2020 14:30:00 -0500 Subject: [PATCH 4/4] fix what I broke in the last commit. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bd3a1352c..95ef7d9c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -603,7 +603,7 @@ set (wsjt_FSRCS lib/fst280/encode280_74.f90 lib/fst280/fst280d.f90 lib/fst280/fst280sim.f90 - lib/fst280/gen_fst280_wave.f90 + lib/fst280/gen_fst280wave.f90 lib/fst280/genfst280.f90 lib/fst280/get_fst280_bitmetrics.f90 lib/fst280/ldpcsim280_101.f90