From dae04d7a39d0f04153b5953f288aa19ad747ecf4 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 7 Jun 2016 14:54:53 +0000 Subject: [PATCH] For now (and maybe longer?), install the LDPC code-definition files in the .../bin/data directory. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6739 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 2 ++ contrib/LDPC/peg-128-80-reg3.gen | Bin 0 -> 2069 bytes contrib/LDPC/peg-128-80-reg3.pchk | Bin 0 -> 1744 bytes lib/genmsk144.f90 | 4 ++-- lib/syncmsk144.f90 | 4 ++-- 5 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 contrib/LDPC/peg-128-80-reg3.gen create mode 100644 contrib/LDPC/peg-128-80-reg3.pchk diff --git a/CMakeLists.txt b/CMakeLists.txt index c7a28fdb4..222baaf84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1203,6 +1203,8 @@ install (FILES install (FILES contrib/Ephemeris/JPLEPH + contrib/LDPC/peg-128-80-reg3.gen + contrib/LDPC/peg-128-80-reg3.pchk DESTINATION ${WSJT_SHARE_DESTINATION}/${WSJT_DATA_DESTINATION} #COMPONENT runtime ) diff --git a/contrib/LDPC/peg-128-80-reg3.gen b/contrib/LDPC/peg-128-80-reg3.gen new file mode 100644 index 0000000000000000000000000000000000000000..30414fdb5b941d08e4fa0a5a3635c892f89e9fb9 GIT binary patch literal 2069 zcmaLW^|MuF6vpv$F9H_~?2cm>Di$h&hyf~!SQsb>Dkh3zi*o-&yA`{;Tfd)~b7u4x z_snw>{xFdd$Wn2Z^*Q_PH6F*~MWPRxy+W0%-9c8htje;gQx z#Gx^a6Jvgy5{u)CxH2}x9q~Zi8pp)>ac0~SN5r|YE-s6k;=Xt)u8VVGc^nWI$9bWS zQ{%KaJ3V_}>XXU9IVD2|HVV@d26OJna?78k^YaZ#Kc`$jqqE{RLyuvi(F$4Rj& z_K4MSRa_m{#I7#o2ibk~3L)wi!wxBWo?or2IMYa4{ zbk-lEcW3?HSdG6GXBK}g&MN*=oL&66I92?qIH&kyac=R4QIy;Fjn(*F(Rph7wlRIa zDbnNXQKZpVqkpvcvay`#^+jW68`FxGG#G}uX{FBj@p*G;|5;If*3iT}b3X0+yy7QC zdE4*f(OjB+)L2hG97VnQps||euW!Sk>HB@Bkv;V0z25CTjCV(4I?&TPIp~Srz0-er z^2d(RSY2;7wx{puk>xQs6X>KUaX_WAzvjl7;~%scj@>$APSTeu4} zT^!58ebA$&A&2$hUZ|hv`Cw)6JzezI``X}nIG&HT`p$3W@|w9k=1k8&W)Z*} literal 0 HcmV?d00001 diff --git a/contrib/LDPC/peg-128-80-reg3.pchk b/contrib/LDPC/peg-128-80-reg3.pchk new file mode 100644 index 0000000000000000000000000000000000000000..e257b2cfe6992b4cf64af7bcce264dbcc373d7d2 GIT binary patch literal 1744 zcmXZc_czy39LMo54TXvpnxsf6r9xH;sbrNFWn{Hbk*xUsiS51j-g`fv=X{*=IPdQd zuXFGF-uL|o*M>rCLZMI?|M-ib#$yTAVGHWehEw=UCXzZ6smMktcA*`o@rTR=>MSh9 zdX<2m0_kSZ6lB&A3-NcB2#h_(f(S)peF(1MH_BT{wfEWF}GPAPqU#iaj_8`}sj; zGIcJ}kqg%`(}DqfClf_YKr-@BfxU3Av-n143e}#M!*#a7%n=OYE19WOd(OZ{Y{xzv z#Sp%biKZsPv%A+0?8h+-<8zR47AeR=B@W;??B^4i7^-Jq0q<}p-0K8J@R5u&O@ck= z!@a!2Zj9msnOLg#<2q|mg$DG%e%_OrMxBS1D1bAyAJ6XFco$?`ClecC&yDb0=kPYz zD}mq6bTz8s+3m-5-jMPA%*PTGVlzBfFUIhij59T}3Pq@a{TzmKe??|Gbpc$b7|zRg z;T_t~OEOcauH)GY;M~oe#2LIGGlS~f?bma;*CBMk%yTl%eIe|}y}aipIE!&S3-(&X zZ{O-B_%@o+1N(VOCXVVlStvm{T3{xOCqc$L^xJivop7&S4B;^u-*Xbuu^xUGt+1bd zJR;-w#&vwF`EXwD)roQ3C*v#@!*khB z73$zU+Vj02lgMx1MiDCD|BW`-^IbCb>^i>Z9Mqx_&U6@e$V{RpBLnv1UcL+OXArl^ zIIo%Tz1wdM{GZ@^9>Fa#(NyQfEN_aO%5ymw#kG6(hkIQi z6GKfwDmK9Hq6OV>rk8_^@5jA7do>#1I$>NQ<2UFmTqh5{G5c}uzMqR^VyW@)?KrP8 qG{OG~&f)@@X;j~Q8tlitTH)C}*LgBgRA=G5d>bY3{d8a){{06%8XYJA literal 0 HcmV?d00001 diff --git a/lib/genmsk144.f90 b/lib/genmsk144.f90 index 4a4e998c2..f5b4f8545 100644 --- a/lib/genmsk144.f90 +++ b/lib/genmsk144.f90 @@ -56,8 +56,8 @@ subroutine genmsk144(msg0,ichk,msgsent,i4tone,itype) !! Fix this ! pchk_file="/Users/sfranke/Builds/wsjtx_install/peg-128-80-reg3.pchk" ! gen_file="/Users/sfranke/Builds/wsjtx_install/peg-128-80-reg3.gen" - pchk_file="peg-128-80-reg3.pchk" - gen_file="peg-128-80-reg3.gen" + pchk_file="./data/peg-128-80-reg3.pchk" + gen_file="./data/peg-128-80-reg3.gen" call init_ldpc(trim(pchk_file)//char(0),trim(gen_file)//char(0)) pi=4.*atan(1.0) twopi=8.*atan(1.0) diff --git a/lib/syncmsk144.f90 b/lib/syncmsk144.f90 index 33b5d4b9a..1fe40b24f 100644 --- a/lib/syncmsk144.f90 +++ b/lib/syncmsk144.f90 @@ -44,8 +44,8 @@ subroutine syncmsk144(cdat,npts,msgreceived,fest) if(first) then ! These files can be found in /lib/ldpc/jtmode_codes directory - pchk_file="peg-128-80-reg3.pchk" - gen_file="peg-128-80-reg3.gen" + pchk_file="./data/peg-128-80-reg3.pchk" + gen_file="./data/peg-128-80-reg3.gen" call init_ldpc(trim(pchk_file)//char(0),trim(gen_file)//char(0)) ! define half-sine pulse and raised-cosine edge window pi=4d0*datan(1d0)