More progress toward support of IQ+ XT.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@3593 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-11-03 20:28:14 +00:00
parent a01b0ddc8c
commit a035ca5772
5 changed files with 43 additions and 0 deletions

View File

@ -1401,6 +1401,9 @@ void MainWindow::guiUpdate()
sprintf(s,"Cannot open COM%d",m_pttPort);
msgBox(s);
}
if(m_bIQxt) g_pWideGraph->tx570(); // Set Si570 to Tx Freq
if(!soundOutThread.isRunning()) {
soundOutThread.start(QThread::HighPriority);
}
@ -1465,6 +1468,7 @@ void MainWindow::guiUpdate()
if(!btxok && btxok0 && iptt==1) nc0=-11; //RxDelay = 1.0 s
if(nc0 <= 0) nc0++;
if(nc0 == 0) {
if(m_bIQxt) g_pWideGraph->rx570(); // Set Si570 back to Rx Freq
int itx=0;
ptt_(&m_pttPort,&itx,&iptt); // Lower PTT
if(!m_txMute) soundOutThread.quitExecution=true;

View File

@ -757,3 +757,8 @@ void CPlotter::setLockTxRx(bool b)
update(); //trigger a new paintEvent}
}
}
double CPlotter::txFreq()
{
return m_TXfreq + 0.000001*m_TxDF;
}

View File

@ -69,6 +69,7 @@ public:
void set2Dspec(bool b);
double fGreen();
void setLockTxRx(bool b);
double txFreq();
signals:
void freezeDecode0(int n);

View File

@ -331,3 +331,34 @@ void WideGraph::on_cbLockTxRx_stateChanged(int n)
m_bLockTxRx = (n!=0);
ui->widePlot->setLockTxRx(m_bLockTxRx);
}
void WideGraph::rx570()
{
double f=m_mult570*(1.0+0.000001*m_cal570)*m_dForceCenterFreq;
qDebug() << "Set Rx Freq" << m_dForceCenterFreq << f;
#ifdef WIN32
int iret=set570(f);
if(iret != 0) {
QMessageBox mb;
if(iret==-1) mb.setText("Failed to open Si570.");
if(iret==-2) mb.setText("Frequency out of permitted range.");
mb.exec();
}
#endif
}
void WideGraph::tx570()
{
double f=floor(datcom_.fcenter) + ui->widePlot->txFreq();
double f1=m_mult570Tx*(1.0+0.000001*m_cal570) * f;
qDebug() << "Set Tx Freq" << f << f1;
#ifdef WIN32
int iret=set570(f1);
if(iret != 0) {
QMessageBox mb;
if(iret==-1) mb.setText("Failed to open Si570.");
if(iret==-2) mb.setText("Frequency out of permitted range.");
mb.exec();
}
#endif
}

View File

@ -38,6 +38,8 @@ public:
void setMode65(int n);
void setPeriod(int n);
double fGreen();
void rx570();
void tx570();
qint32 m_qsoFreq;