More work on HRD interface.

*** Beware: some code in this revision will surely fail in Linux! ***
*** Some "#ifdef Win32" statements are still to be included.      ***



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3289 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor
2013-05-21 20:49:40 +00:00
parent 08fb25a57c
commit f838ee13b0
3 changed files with 16 additions and 21 deletions
+15 -14
View File
@@ -641,7 +641,7 @@ void MainWindow::on_actionDeviceSetup_triggered() //Setup Dialog
rig->close();
ui->readFreq->setStyleSheet("");
ui->readFreq->setEnabled(false);
delete rig;
if(m_rig!=9999) delete rig;
m_bRigOpen=false;
m_catEnabled=false;
}
@@ -2775,26 +2775,27 @@ void MainWindow::rigOpen()
QString t;
int ret;
rig = new Rig();
if(m_rig != 9999) {
if (!rig->init(m_rig)) {
msgBox("Rig init failure");
return;
}
rig->setConf("rig_pathname", m_catPort.toAscii().data());
char buf[80];
sprintf(buf,"%d",m_serialRate);
rig->setConf("serial_speed",buf);
sprintf(buf,"%d",m_dataBits);
rig->setConf("data_bits",buf);
sprintf(buf,"%d",m_stopBits);
rig->setConf("stop_bits",buf);
rig->setConf("serial_handshake",m_handshake.toAscii().data());
if(m_bDTRoff) {
rig->setConf("rts_state","OFF");
rig->setConf("dtr_state","OFF");
}
}
rig->setConf("rig_pathname", m_catPort.toAscii().data());
char buf[80];
sprintf(buf,"%d",m_serialRate);
rig->setConf("serial_speed",buf);
sprintf(buf,"%d",m_dataBits);
rig->setConf("data_bits",buf);
sprintf(buf,"%d",m_stopBits);
rig->setConf("stop_bits",buf);
rig->setConf("serial_handshake",m_handshake.toAscii().data());
if(m_bDTRoff) {
rig->setConf("rts_state","OFF");
rig->setConf("dtr_state","OFF");
}
ret=rig->open(m_rig);
if(ret==RIG_OK) {
m_bRigOpen=true;