mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-23 20:58:55 -05:00
Don't poll radio while decoder is busy.
Dont allow SplitTx operation with Ham Radio Deluxe. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3478 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
600c3e228c
commit
53fc967440
@ -551,6 +551,10 @@ void DevSetup::enableWidgets()
|
||||
ui.label_4->setEnabled(m_catEnabled);
|
||||
ui.label_47->setEnabled(m_catEnabled);
|
||||
ui.cbSplit->setEnabled(m_catEnabled);
|
||||
if(m_rig==9999) { //No Split Tx with HRD
|
||||
ui.cbSplit->setChecked(false);
|
||||
ui.cbSplit->setEnabled(false);
|
||||
}
|
||||
ui.cbXIT->setEnabled(m_catEnabled);
|
||||
|
||||
bool bSerial=m_catEnabled and (m_rig<9900);
|
||||
@ -576,10 +580,6 @@ void DevSetup::enableWidgets()
|
||||
(m_catEnabled and m_pttMethodIndex==2 and m_rig<9900);
|
||||
bool b3 = (m_catEnabled and m_pttMethodIndex==0);
|
||||
ui.testPTTButton->setEnabled(b1 or b2 or b3); //Include PTT via HRD or Commander
|
||||
|
||||
// bool b2=m_pttMethodIndex==0 and m_catEnabled;
|
||||
// b2=b2 or ((m_pttMethodIndex==1 or m_pttMethodIndex==2) and m_pttPort!=0);
|
||||
// ui.testPTTButton->setEnabled(b2);
|
||||
}
|
||||
|
||||
void DevSetup::on_cbSplit_toggled(bool checked)
|
||||
|
@ -1782,7 +1782,7 @@ void MainWindow::guiUpdate()
|
||||
ui->xThermo->setValue(0.0);
|
||||
}
|
||||
|
||||
if(m_catEnabled and m_poll>0 and (nsec%m_poll)==0) {
|
||||
if(m_catEnabled and m_poll>0 and (nsec%m_poll)==0 and !m_decoderBusy) {
|
||||
double fMHz;
|
||||
if(m_dontReadFreq) {
|
||||
m_dontReadFreq=false;
|
||||
@ -2694,9 +2694,7 @@ void MainWindow::on_bandComboBox_activated(int index)
|
||||
if(m_bRigOpen) {
|
||||
m_dontReadFreq=true;
|
||||
ret=rig->setFreq(MHz(m_dialFreq));
|
||||
// ret=rig->setSplitFreq(MHz(m_dialFreq),RIG_VFO_B);
|
||||
if(m_bSplit or m_bXIT) setXIT(m_txFreq);
|
||||
// ret=rig->setSplitFreq(MHz(m_dialFreq)+xit,RIG_VFO_B);
|
||||
|
||||
bumpFqso(11);
|
||||
bumpFqso(12);
|
||||
@ -2988,7 +2986,6 @@ void MainWindow::setXIT(int n)
|
||||
if(n>4000) xit=3000;
|
||||
if(m_bXIT) {
|
||||
ret=rig->setXit((shortfreq_t)xit,RIG_VFO_TX);
|
||||
// ret=rig->setSplitFreq(MHz(m_dialFreq),RIG_VFO_A);
|
||||
if(ret!=RIG_OK) {
|
||||
QString rt;
|
||||
rt.sprintf("Setting RIG_VFO_TX failed: %d",ret);
|
||||
|
Loading…
Reference in New Issue
Block a user