diff --git a/devsetup.cpp b/devsetup.cpp index 2fa896729..0898fc62f 100644 --- a/devsetup.cpp +++ b/devsetup.cpp @@ -522,8 +522,11 @@ void DevSetup::enableWidgets() ui.label_25->setEnabled(bSerial); ui.pollSpinBox->setEnabled(m_catEnabled); - bool b=(m_pttMethodIndex==1 or m_pttMethodIndex==2) and m_rig!=9999; - ui.pttComboBox->setEnabled(b); - b=b or (m_catEnabled and m_pttMethodIndex==0); - ui.testPTTButton->setEnabled(b); + bool b1=(m_pttMethodIndex==1 or m_pttMethodIndex==2); + ui.pttComboBox->setEnabled(b1); + bool b2 = (m_catEnabled and m_pttMethodIndex==1 and m_rig!=9999) or + (m_catEnabled and m_pttMethodIndex==2 and m_rig!=9999); + bool b3 = (m_catEnabled and m_pttMethodIndex==0 and m_rig==9999); + ui.testPTTButton->setEnabled(b1 or b2); +// ui.testPTTButton->setEnabled(b1 or b2 or b3); } diff --git a/mainwindow.cpp b/mainwindow.cpp index 471655c59..67714781a 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//------------------------------------------------------------- MainWindow +//-------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h" diff --git a/rigclass.cpp b/rigclass.cpp index 7bec45de3..4e54fe2f3 100644 --- a/rigclass.cpp +++ b/rigclass.cpp @@ -178,18 +178,21 @@ vfo_t Rig::getVFO() int Rig::setPTT(ptt_t ptt, vfo_t vfo) { if(m_hrd) { +/* #ifdef WIN32 const wchar_t* cmnd = (const wchar_t*) (m_context + "Set Button-Select Send 1").utf16(); const wchar_t* result=HRDInterfaceSendMessage(cmnd); QString t2=QString::fromWCharArray (result,-1); HRDInterfaceFreeString(result); + qDebug() << t2; if(t2=="OK") { return 0; } else { return -1; } #endif +*/ } else { return rig_set_ptt(theRig, vfo, ptt); }