From 521ea99991e51217a814c3ee3bdc11e1f9a5dc10 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Mon, 27 Nov 2017 21:23:24 +0000
Subject: [PATCH] Pass mycall and mygrid to foxgen().

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8263 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/ft8/foxgen.f90 | 9 ++++-----
 mainwindow.cpp     | 8 +++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/ft8/foxgen.f90 b/lib/ft8/foxgen.f90
index dbbe5ba58..b2f82af0d 100644
--- a/lib/ft8/foxgen.f90
+++ b/lib/ft8/foxgen.f90
@@ -1,11 +1,11 @@
-subroutine foxgen(nslots,t)
+subroutine foxgen(mycall,mygrid6,nslots,t)
 
   parameter (NN=79,KK=87,NSPS=4*1920)
   parameter (NWAVE=NN*NSPS,NFFT=614400,NH=NFFT/2)
   character*(*) t
   character*22 msg,msgsent
   character*12 t1
-  character*6 MyCall,MyGrid,call1,call2
+  character*6 mycall,mygrid6,mygrid,call1,call2
   logical bcontest
   integer itone(NN)
   integer*1 msgbits(KK)
@@ -17,10 +17,9 @@ subroutine foxgen(nslots,t)
   common/foxcom/wave
   equivalence (x,cx),(y,cy)
 
-!  print*,'cc',nslots,len(t),t
+  mygrid=mygrid6(1:4)//'  '
+  print*,mycall,' ',mygrid6,' ',nslots,len(t),t
   call system_clock(count0,clkfreq)
-  MyCall='KH1DX'
-  MyGrid='AJ10  '
   bcontest=.false.
   i3bit=0
   fstep=60.d0
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5d27448b6..9541850be 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -135,7 +135,7 @@ extern "C" {
   void calibrate_(char data_dir[], int* iz, double* a, double* b, double* rms,
                   double* sigmaa, double* sigmab, int* irc, int len1);
 
-  void foxgen_(int* nslots, char* tb3, int len);
+  void foxgen_(char* mycall, char* mygrid, int* nslots, char* tb3, int len1, int len2, int len3);
 }
 
 int volatile itone[NUM_ISCAT_SYMBOLS];  //Audio tones for all Tx symbols
@@ -3311,7 +3311,9 @@ void MainWindow::guiUpdate()
                                     22, 22);
         if(m_modeTx=="MSK144" or m_modeTx=="FT8") {
           bool bcontest=ui->cbVHFcontest->isChecked();
+          char MyCall[6];
           char MyGrid[6];
+          strncpy(MyCall, (m_config.my_callsign()+"      ").toLatin1(),6);
           strncpy(MyGrid, (m_config.my_grid()+"      ").toLatin1(),6);
           if(m_modeTx=="MSK144") {
             genmsk144_(message, MyGrid, &ichk, &bcontest, msgsent, const_cast<int *> (itone),
@@ -3336,8 +3338,8 @@ void MainWindow::guiUpdate()
                 if(t0.length()==10) t0 += " ";
                 t1 += t0;
               }
-              int len1=t1.length();
-              foxgen_(&nslots, const_cast <char *> (t1.toLatin1().constData()),len1);
+              int len3=t1.length();
+              foxgen_(MyCall, MyGrid, &nslots, const_cast <char *> (t1.toLatin1().constData()),6,6,len3);
             } else {
               genft8_(message, MyGrid, &bcontest, &m_i3bit, msgsent, const_cast<char *> (ft8msgbits),
                       const_cast<int *> (itone), 22, 6, 22);