From d0ad300a65e892f11689cd6a71a9a5e1840df0a0 Mon Sep 17 00:00:00 2001 From: Steven Franke Date: Fri, 14 Jul 2017 19:22:53 +0000 Subject: [PATCH] Move ft8apset to a separate file. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7882 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 1 + lib/fsk4hf/osd174.f90 | 2 +- lib/ft8_decode.f90 | 20 -------------------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bc71750bc..07d6f4391 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -433,6 +433,7 @@ set (wsjt_FSRCS lib/fqso_first.f90 lib/freqcal.f90 lib/fsk4hf/fsk4hf.f90 + lib/fsk4hf/ft8apset.f90 lib/fsk4hf/ft8b.f90 lib/fsk4hf/ft8_downsample.f90 lib/fsk4hf/ft8sim.f90 diff --git a/lib/fsk4hf/osd174.f90 b/lib/fsk4hf/osd174.f90 index 538da351d..a54a48cf7 100644 --- a/lib/fsk4hf/osd174.f90 +++ b/lib/fsk4hf/osd174.f90 @@ -74,7 +74,7 @@ do id=1,K ! diagonal element indices endif do ii=1,K if( ii .ne. id .and. genmrb(ii,id) .eq. 1 ) then - genmrb(ii,1:N)=mod(genmrb(ii,1:N)+genmrb(id,1:N),2) + genmrb(ii,1:N)=ieor(genmrb(ii,1:N),genmrb(id,1:N)) endif enddo exit diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90 index db04f652e..f9ee1d90d 100644 --- a/lib/ft8_decode.f90 +++ b/lib/ft8_decode.f90 @@ -98,23 +98,3 @@ contains end subroutine decode end module ft8_decode - -subroutine ft8apset(mycall12,hiscall12,hisgrid6,apsym) - parameter(NAPM=4,KK=87) - character*12 mycall12,hiscall12 - character*22 msg,msgsent - character*6 mycall,hiscall - character*6 hisgrid6 - character*4 hisgrid - integer apsym(KK) - integer*1 msgbits(KK) - integer itone(KK) - - mycall=mycall12(1:6) - hiscall=hiscall12(1:6) - hisgrid=hisgrid6(1:4) - msg=mycall//' '//hiscall//' '//hisgrid - call genft8(msg,msgsent,msgbits,itone) - apsym=2*msgbits-1 - return - end subroutine ft8apset