diff --git a/devsetup.cpp b/devsetup.cpp index 0898fc62f..1c3155136 100644 --- a/devsetup.cpp +++ b/devsetup.cpp @@ -527,6 +527,6 @@ void DevSetup::enableWidgets() 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); +// ui.testPTTButton->setEnabled(b1 or b2); + ui.testPTTButton->setEnabled(b1 or b2 or b3); //Include PTT via HRD } diff --git a/mainwindow.cpp b/mainwindow.cpp index 67714781a..471655c59 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 4e54fe2f3..36b9da83d 100644 --- a/rigclass.cpp +++ b/rigclass.cpp @@ -178,21 +178,26 @@ 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(); + wchar_t* cmnd; + if(ptt==0) { + cmnd = (wchar_t*) (m_context + + "Set Button-Select TX 0").utf16(); + } else { + cmnd = (wchar_t*) (m_context + + "Set Button-Select TX 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); }