From 542f85694cad34e413f24b09eeb097f844669f86 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Wed, 11 Jul 2018 14:42:48 -0400
Subject: [PATCH] Remove some bcontest stuff associated with MSK144.

---
 lib/genmsk_128_90.f90       | 3 +--
 lib/msk144code.f90          | 5 ++---
 lib/msk144signalquality.f90 | 4 +---
 lib/msk144sim.f90           | 7 +------
 mainwindow.cpp              | 9 ++++-----
 5 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/lib/genmsk_128_90.f90 b/lib/genmsk_128_90.f90
index c6e1062db..a0979cc50 100644
--- a/lib/genmsk_128_90.f90
+++ b/lib/genmsk_128_90.f90
@@ -1,4 +1,4 @@
-subroutine genmsk_128_90(msg0,mygrid,ichk,msgsent,i4tone,itype)
+subroutine genmsk_128_90(msg0,ichk,msgsent,i4tone,itype)
 ! s8 + 48bits + s8 + 80 bits = 144 bits (72ms message duration)
 !
 ! Encode an MSK144 message
@@ -23,7 +23,6 @@ subroutine genmsk_128_90(msg0,mygrid,ichk,msgsent,i4tone,itype)
   character*37 message                    !Message to be generated
   character*37 msgsent                    !Message as it will be received
   character*77 c77
-  character*6 mygrid
   integer*4 i4tone(144)
   integer*1 codeword(128)
   integer*1 msgbits(77) 
diff --git a/lib/msk144code.f90 b/lib/msk144code.f90
index e6860edcd..d92fee082 100644
--- a/lib/msk144code.f90
+++ b/lib/msk144code.f90
@@ -4,11 +4,10 @@ program msk144code
 ! LDPC encoding, and other necessary details of the MSK144 protocol.
 
   use packjt
-  character msg*37,msgsent*37,decoded,bad*1,msgtype*13,mygrid*6
+  character msg*37,msgsent*37,decoded,bad*1,msgtype*13
   integer*4 i4tone(144)
   logical*1 bcontest
   include 'testmsg.f90'
-  data mygrid/'FN20qi'/
 
   nargs=iargc()
   if(nargs.ne.1) then
@@ -43,7 +42,7 @@ program msk144code
      bcontest=.false.
      if(msg(i1:i1+1).eq.'R ') bcontest=.true.
      ichk=0
-     call genmsk_128_90(msg,mygrid,ichk,bcontest,msgsent,i4tone,itype)
+     call genmsk_128_90(msg,ichk,bcontest,msgsent,i4tone,itype)
 
      msgtype=""
      if(itype.eq.1) msgtype="Std Msg"
diff --git a/lib/msk144signalquality.f90 b/lib/msk144signalquality.f90
index d5aa000f5..417328a35 100644
--- a/lib/msk144signalquality.f90
+++ b/lib/msk144signalquality.f90
@@ -5,7 +5,6 @@ subroutine msk144signalquality(cframe,snr,freq,t0,softbits,msg,dxcall,       &
   character*12 dxcall
   character*12 training_dxcall
   character*12 trained_dxcall
-  character*6 mygrid
   character*512 pcoeff_filename
   character*8 date
   character*10 time
@@ -91,10 +90,9 @@ subroutine msk144signalquality(cframe,snr,freq,t0,softbits,msg,dxcall,       &
   enddo
 
 ! generate tones from decoded message
-  mygrid="EN50"
   ichk=0
   bcontest=.false.
-  call genmsk_128_90(msg,mygrid,ichk,bcontest,msgsent,i4tone,itype)
+  call genmsk_128_90(msg,ichk,msgsent,i4tone,itype)
 
 ! reconstruct message bits from tones
   msgbits(1)=0
diff --git a/lib/msk144sim.f90 b/lib/msk144sim.f90
index 48257e705..32da98f72 100644
--- a/lib/msk144sim.f90
+++ b/lib/msk144sim.f90
@@ -4,7 +4,6 @@ program msk144sim
   parameter (NMAX=15*12000)
   real pings(0:NMAX-1)
   real waveform(0:NMAX-1)
-  character*6 mygrid
   character arg*8,msg*37,msgsent*37,fname*40
   character*77 c77
   real wave(0:NMAX-1)              !Simulated received waveform
@@ -12,8 +11,6 @@ program msk144sim
   type(hdr) h                          !Header for .wav file
   integer*2 iwave(0:NMAX-1)
   integer itone(144)                   !Message bits
-  logical*1 bcontest
-  data mygrid/"EN50wc"/
 
   nargs=iargc()
   if(nargs.ne.6) then
@@ -38,11 +35,9 @@ program msk144sim
   sig=sqrt(2.0)*10.0**(0.05*snrdb)
   h=default_header(12000,NMAX)
   i1=len(trim(msg))-5
-  bcontest=.false.
-  if(msg(i1:i1+1).eq.'R ') bcontest=.true.
   ichk=0
   itype=1
-  call genmsk_128_90(msg,mygrid,ichk,bcontest,msgsent,itone,itype) 
+  call genmsk_128_90(msg,ichk,msgsent,itone,itype) 
   twopi=8.d0*atan(1.d0)
 
   nsym=144
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 507e81e21..a82fa7a1a 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -88,9 +88,8 @@ extern "C" {
   void gen9_(char* msg, int* ichk, char* msgsent, int itone[],
                int* itext, fortran_charlen_t, fortran_charlen_t);
 
-  void genmsk_128_90_(char* msg, char* MyGrid, int* ichk,
-                  char* msgsent, int itone[], int* itext, fortran_charlen_t,
-                  fortran_charlen_t, fortran_charlen_t);
+  void genmsk_128_90_(char* msg, int* ichk, char* msgsent, int itone[], int* itext,
+                      fortran_charlen_t, fortran_charlen_t);
 
   void gen65_(char* msg, int* ichk, char* msgsent, int itone[],
               int* itext, fortran_charlen_t, fortran_charlen_t);
@@ -3466,8 +3465,8 @@ void MainWindow::guiUpdate()
           strncpy(MyCall, (m_config.my_callsign()+"      ").toLatin1(),6);
           strncpy(MyGrid, (m_config.my_grid()+"      ").toLatin1(),6);
           if(m_modeTx=="MSK144") {
-            genmsk_128_90_(message, MyGrid, &ichk, msgsent, const_cast<int *> (itone),
-                       &m_currentMessageType, 37, 6, 37);
+            genmsk_128_90_(message, &ichk, msgsent, const_cast<int *> (itone),
+                       &m_currentMessageType, 37, 37);
             if(m_restart) {
               int nsym=144;
               if(itone[40]==-40) nsym=40;