Tx now works, more or less, in FT2 mode. Needs testing!

Modulator.cpp

@@ -47,14 +47,13 @@ void Modulator::start (unsigned symbolsLength, double framesPerSymbol,
                        SoundOutput * stream, Channel channel,
                        bool synchronize, bool fastMode, double dBSNR, int TRperiod)
 {
+//  qDebug() << "Mod AA" << symbolsLength << framesPerSymbol << frequency
+//           << toneSpacing << synchronize << fastMode << dBSNR << TRperiod;
   Q_ASSERT (stream);
 // Time according to this computer which becomes our base time
   qint64 ms0 = QDateTime::currentMSecsSinceEpoch() % 86400000;
 
-  if (m_state != Idle)
+  if(m_state != Idle) stop ();
-    {
-      stop ();
-    }
 
   m_quickClose = false;
 
@@ -92,6 +91,14 @@ void Modulator::start (unsigned symbolsLength, double framesPerSymbol,
   if (synchronize && !m_tuning && !m_bFastMode)	{
     m_silentFrames = m_ic + m_frameRate / (1000 / delay_ms) - (mstr * (m_frameRate / 1000));
   }
+  if(symbolsLength==144 and framesPerSymbol==160 and toneSpacing==60) {
+    //### FT2 params
+    delay_ms=100;
+    mstr=1947;
+    m_ic=0;
+    m_silentFrames=0;
+  }
+//  qDebug() << "Mod AB" << delay_ms << mstr << m_ic << m_silentFrames;
 
   initialize (QIODevice::ReadOnly, channel);
   Q_EMIT stateChanged ((m_state = (synchronize && m_silentFrames) ?
@@ -170,7 +177,8 @@ qint64 Modulator::readData (char * data, qint64 maxSize)
     case Active:
       {
         unsigned int isym=0;
-//        qDebug() << "Mod A" << m_toneSpacing << m_ic;
+//        qDebug() << "Mod A" << m_toneSpacing << m_frequency << m_nsps
+//                 << m_ic << m_symbolsLength << icw[0];
         if(!m_tuning) isym=m_ic/(4.0*m_nsps);            // Actual fsample=48000
         bool slowCwId=((isym >= m_symbolsLength) && (icw[0] > 0)) && (!m_bFastMode);
         if(m_TRperiod==3) slowCwId=false;
@@ -289,6 +297,8 @@ qint64 Modulator::readData (char * data, qint64 maxSize)
           if (m_ic > i1) m_amp = 0.0;
 
           sample=qRound(m_amp*qSin(m_phi));
+
+//Here's where we transmit from a precomputed wave[] array:
           if(m_toneSpacing < 0) sample=qRound(m_amp*foxcom_.wave[m_ic]);
 
 //          if(m_ic < 100) qDebug() << "Mod C" << m_ic << m_amp << foxcom_.wave[m_ic] << sample;

lib/ft2/ft2_decode.f90

@@ -31,12 +31,7 @@ subroutine ft2_decode(cdatetime0,nfqso,iwave,ndecodes,mycall,hiscall,nrx,line)
   logical unpk77_success
   data s16/0,0,0,0,1,1,1,1,1,1,1,1,0,0,0,0/
 
-  hhmmss='      '
+  hhmmss=cdatetime0(8:13)
-  if(cdatetime0=='                 ') then
-     cdatetime0=cdatetime()
-     hhmmss=cdatetime0(8:13)
-  endif
-  
   fs=12000.0/NDOWN                       !Sample rate
   dt=1/fs                                !Sample interval after downsample (s)
   tt=NSPS*dt                             !Duration of "itone" symbols (s)

widgets/displaytext.cpp

@@ -455,6 +455,7 @@ void DisplayText::displayDecodedText(DecodedText const& decodedText, QString con
 void DisplayText::displayTransmittedText(QString text, QString modeTx, qint32 txFreq,bool bFastMode)
 {
     QString t1=" @  ";
+    if(modeTx=="FT2") t1=" +  ";
     if(modeTx=="FT8") t1=" ~  ";
     if(modeTx=="JT4") t1=" $  ";
     if(modeTx=="JT65") t1=" #  ";

widgets/mainwindow.cpp

@@ -99,6 +99,9 @@ extern "C" {
   void genft8_(char* msg, int* i3, int* n3, char* msgsent, char ft8msgbits[],
                int itone[], fortran_charlen_t, fortran_charlen_t);
 
+  void genft2_(char* msg, int* ichk, char* msgsent, int itone[], int* itype,
+               fortran_charlen_t, fortran_charlen_t);
+
   void gen4_(char* msg, int* ichk, char* msgsent, int itone[],
                int* itext, fortran_charlen_t, fortran_charlen_t);
 
@@ -1883,6 +1886,10 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
       break;
     case Qt::Key_F1:
       if(bAltF1F5) {
+        if(m_mode=="FT2") {
+          ft2_tx(6);
+          return;
+        }
         auto_tx_mode(true);
         on_txb6_clicked();
         return;
@@ -1892,6 +1899,10 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
       }
     case Qt::Key_F2:
       if(bAltF1F5) {
+        if(m_mode=="FT2") {
+          ft2_tx(2);
+          return;
+        }
         auto_tx_mode(true);
         on_txb2_clicked();
         return;
@@ -1901,6 +1912,10 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
       }
     case Qt::Key_F3:
       if(bAltF1F5) {
+        if(m_mode=="FT2") {
+          ft2_tx(3);
+          return;
+        }
         auto_tx_mode(true);
         on_txb3_clicked();
         return;
@@ -1910,6 +1925,10 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
       }
     case Qt::Key_F4:
       if(bAltF1F5) {
+        if(m_mode=="FT2") {
+          ft2_tx(4);
+          return;
+        }
         auto_tx_mode(true);
         on_txb4_clicked();
         return;
@@ -1920,6 +1939,10 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
       }
     case Qt::Key_F5:
       if(bAltF1F5) {
+        if(m_mode=="FT2") {
+          ft2_tx(5);
+          return;
+        }
         auto_tx_mode(true);
         on_txb5_clicked();
         return;
@@ -3372,7 +3395,7 @@ void MainWindow::guiUpdate()
 
   double tx1=0.0;
   double tx2=txDuration;
-  if(m_mode=="FT8") icw[0]=0;                                   //No CW ID in FT8 mode
+  if(m_mode=="FT8" or m_mode=="FT2") icw[0]=0;              //No CW ID in FT2 or FT8 mode
   if((icw[0]>0) and (!m_bFast9)) tx2 += icw[0]*2560.0/48000.0;  //Full length including CW ID
   if(tx2>m_TRperiod) tx2=m_TRperiod;
 
@@ -3782,21 +3805,22 @@ void MainWindow::guiUpdate()
     }
   }
 
-  if (g_iptt == 1 && m_iptt0 == 0)
+  if (g_iptt == 1 && m_iptt0 == 0) {
-    {
+    auto const& current_message = QString::fromLatin1 (msgsent);
-      auto const& current_message = QString::fromLatin1 (msgsent);
+    if(m_config.watchdog () && !m_mode.startsWith ("WSPR")
-      if(m_config.watchdog () && !m_mode.startsWith ("WSPR")
+       && current_message != m_msgSent0) {
-         && current_message != m_msgSent0) {
+      tx_watchdog (false);  // in case we are auto sequencing
-        tx_watchdog (false);  // in case we are auto sequencing
+      m_msgSent0 = current_message;
-        m_msgSent0 = current_message;
+    }
-      }
 
+    if(m_mode!="FT2") {
       if(!m_tune) write_all("Tx",m_currentMessage);
 
       if (m_config.TX_messages () && !m_tune && SpecOp::FOX!=m_config.special_op_id()) {
         ui->decodedTextBrowser2->displayTransmittedText(current_message, m_modeTx,
-              ui->TxFreqSpinBox->value(),m_bFastMode);
+             ui->TxFreqSpinBox->value(),m_bFastMode);
       }
+    }
 
       switch (m_ntx)
         {
@@ -3842,7 +3866,7 @@ void MainWindow::guiUpdate()
 
 //Once per second:
   if(nsec != m_sec0) {
-//    qDebug() << "cc oneSec" << dec_data.params.kin << m_ihsym;
+//    qDebug() << "cc onesec" << g_iptt << m_iptt0;
     // if((!m_msgAvgWidget or (m_msgAvgWidget and !m_msgAvgWidget->isVisible()))
     //    and (SpecOp::NONE < m_config.special_op_id()) and (SpecOp::HOUND > m_config.special_op_id())) on_actionFox_Log_triggered();
     if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) {
@@ -5519,7 +5543,7 @@ void MainWindow::on_actionFT2_triggered()
   Q_EMIT FFTSize (m_FFTSize);
   m_hsymStop=50;
   setup_status_bar (bVHF);
-  m_toneSpacing=0.0;                   //???
+  m_toneSpacing=0.8*75.0;                   //???
   ui->actionFT2->setChecked(true);     //???
   m_wideGraph->setMode(m_mode);
   m_wideGraph->setModeTx(m_modeTx);
@@ -6815,6 +6839,15 @@ void MainWindow::transmit (double snr)
            true, false, snr, m_TRperiod);
   }
 
+  if (m_modeTx == "FT2") {
+    toneSpacing=0.8*12000.0/160.0;
+//    if(SpecOp::FOX==m_config.special_op_id() and !m_tune) toneSpacing=-1;
+    Q_EMIT sendMessage (NUM_FT2_SYMBOLS,
+           160.0, ui->TxFreqSpinBox->value() - m_XIT,
+           toneSpacing, m_soundOutput, m_config.audio_output_channel (),
+           true, false, snr, 2);
+  }
+
   if (m_modeTx == "QRA64") {
     if(m_nSubMode==0) toneSpacing=12000.0/6912.0;
     if(m_nSubMode==1) toneSpacing=2*12000.0/6912.0;
@@ -8555,36 +8588,104 @@ void MainWindow::ft2Data(int k)
 {
   static int nhsec0=-1;
   short id[30000];
+
   int nhsec=k/6000;
-  if(nhsec!=nhsec0) {
+  if(nhsec==nhsec0) return;
-    //Process FT2 data at 0.5 s intervals
+
-    int j=k-30000;
+//Process FT2 data at 0.5 s intervals
-    if(j<0) j+=NRING;
+  int j=k/6000;
-    for(int i=0; i<30000; i++) {
+  j=6000*j-30000;
-      id[i]=dec_data.d2[j];
+  if(j<0) j+=NRING;
-      j++;
+  for(int i=0; i<30000; i++) {
-      if(j>=NRING) j=j-NRING;
+    id[i]=dec_data.d2[j];
-    }
+    j++;
-    if(k>=NRING) {
+    if(j>=NRING) j=j-NRING;
-      k=k-NRING;
-      dec_data.params.kin=k;
-    }
-    char cdatetime[]="                 ";
-    char mycall6[] ="K1JT  ";
-    char hiscall6[]="K9AN  ";
-    char line[61];
-    int nfqso=1500;
-    int ndecodes=0;
-    int nrx=-1;
-    ft2_decode_(cdatetime,&nfqso,id,&ndecodes,mycall6,hiscall6,&nrx,&line[0],
-        17,6,6,61);
-    line[60]=0;
-    if(ndecodes>0) {
-      QString sline{QString::fromLatin1(line)};
-      DecodedText decodedtext {sline.replace(QChar::LineFeed,"")};
-      ui->decodedTextBrowser->displayDecodedText (decodedtext,m_baseCall,m_mode,
-           m_config.DXCC(),m_logBook,m_currentBand,m_config.ppfx());
-    }
-    nhsec0=nhsec;
   }
+
+  if(k>=NRING) {
+//Wrap the ring buffer pointer
+    k=k-NRING;
+    dec_data.params.kin=k;
+  }
+
+  auto time = QDateTime::currentDateTimeUtc ();
+  QString t=time.toString("yyMMdd_hhmmss.sss");
+  QByteArray ba=time.toString("yyMMdd_hhmmss.sss").toLatin1();
+  char* cdatetime=ba.data();
+  char mycall6[] ="K1JT  ";
+  char hiscall6[]="K9AN  ";
+  char line[61];
+  int nfqso=1500;
+  int ndecodes=0;
+  int nrx=-1;
+  ft2_decode_(cdatetime,&nfqso,id,&ndecodes,mycall6,hiscall6,&nrx,&line[0],
+      17,6,6,61);
+  line[60]=0;
+  if(ndecodes>0) {
+    QString sline{QString::fromLatin1(line)};
+    DecodedText decodedtext {sline.replace(QChar::LineFeed,"")};
+    ui->decodedTextBrowser->displayDecodedText (decodedtext,m_baseCall,m_mode,
+                   m_config.DXCC(),m_logBook,m_currentBand,m_config.ppfx());
+  }
+  nhsec0=nhsec;
+}
+
+void MainWindow::ft2_tx(int ntx)
+{
+  if(g_iptt!=0) return;             //Alreadt transmitting?
+  static char message[38];
+  static char msgsent[38];
+  QByteArray ba;
+  m_ntx=ntx;
+  if(m_ntx == 1) ba=ui->tx1->text().toLocal8Bit();
+  if(m_ntx == 2) ba=ui->tx2->text().toLocal8Bit();
+  if(m_ntx == 3) ba=ui->tx3->text().toLocal8Bit();
+  if(m_ntx == 4) ba=ui->tx4->text().toLocal8Bit();
+  if(m_ntx == 5) ba=ui->tx5->currentText().toLocal8Bit();
+  if(m_ntx == 6) ba=ui->tx6->text().toLocal8Bit();
+  if(m_ntx == 7) ba=ui->genMsg->text().toLocal8Bit();
+  if(m_ntx == 8) ba=ui->freeTextMsg->currentText().toLocal8Bit();
+  ba2msg(ba,message);
+  int ichk=0;
+  int itype=-1;
+  genft2_(message, &ichk, msgsent, const_cast<int *>(itone), &itype, 37, 37);
+  msgsent[37]=0;
+  m_currentMessage = QString::fromLatin1(msgsent);
+  on_txb6_clicked();
+  auto_tx_mode(true);
+
+  icw[0]=0;
+  g_iptt = 1;
+  setRig ();
+  setXIT (ui->TxFreqSpinBox->value ());
+  Q_EMIT m_config.transceiver_ptt (true);            //Assert the PTT
+  m_tx_when_ready = true;
+
+  if (g_iptt == 1 && m_iptt0 == 0) {
+    auto const& current_message = QString::fromLatin1 (msgsent);
+    write_all("Tx",m_currentMessage);
+
+    if (m_config.TX_messages () && !m_tune && SpecOp::FOX!=m_config.special_op_id()) {
+      ui->decodedTextBrowser2->displayTransmittedText(current_message, m_modeTx,
+           ui->TxFreqSpinBox->value(),m_bFastMode);
+    }
+
+    switch (m_ntx)
+    {
+    case 1: m_QSOProgress = REPLYING; break;
+    case 2: m_QSOProgress = REPORT; break;
+    case 3: m_QSOProgress = ROGER_REPORT; break;
+    case 4: m_QSOProgress = ROGERS; break;
+    case 5: m_QSOProgress = SIGNOFF; break;
+    case 6: m_QSOProgress = CALLING; break;
+    default: break;             // determined elsewhere
+    }
+    m_transmitting = true;
+    transmitDisplay (true);
+    statusUpdate ();
+  }
+
+  if(!m_btxok && m_btxok0 && g_iptt==1) stopTx();
+
+//  if(!m_bTxTime and !m_tune) m_btxok=false;       //Time to stop transmitting
 }

widgets/mainwindow.h

@@ -46,10 +46,11 @@
 #define NUM_MSK144_SYMBOLS 144             //s8 + d48 + s8 + d80
 #define NUM_QRA64_SYMBOLS 84               //63 data + 21 sync
 #define NUM_FT8_SYMBOLS 79
+#define NUM_FT2_SYMBOLS 144
 #define NUM_CW_SYMBOLS 250
 #define TX_SAMPLE_RATE 48000
 #define N_WIDGETS 33
-#define NRING 432000
+#define NRING 3456000
 
 extern int volatile itone[NUM_ISCAT_SYMBOLS];   //Audio tones for all Tx symbols
 extern int volatile icw[NUM_CW_SYMBOLS];	    //Dits for CW ID
@@ -312,6 +313,7 @@ private slots:
   void not_GA_warning_message ();
   void checkMSK144ContestType();
   void ft2Data(int k);
+  void ft2_tx(int ntx);
   int  setTxMsg(int n);
   bool stdCall(QString const& w);