w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try reading freq up to three times before complaining of failure and 

abouring CAT control.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3475 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-07-09 22:58:04 +00:00
parent f91f935a78
commit f226e4cbc8
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mainwindow.cpp
View File

@ -1782,18 +1782,21 @@ void MainWindow::guiUpdate()
} }
if(m_catEnabled and m_poll>0 and (nsec%m_poll)==0) { if(m_catEnabled and m_poll>0 and (nsec%m_poll)==0) {
double fMHz;
if(m_dontReadFreq) { if(m_dontReadFreq) {
m_dontReadFreq=false; m_dontReadFreq=false;
} else if(!m_transmitting) { } else if(!m_transmitting) {
double fMHz=rig->getFreq(RIG_VFO_CURR)/1000000.0; for(int iter=0; iter<3; iter++) {
if(fMHz<0.0) { fMHz=rig->getFreq(RIG_VFO_CURR)/1000000.0;
rt.sprintf("Rig control error %d\nFailed to read frequency.", if(fMHz<0.0 and iter>=2) {
int(1000000.0*fMHz)); rt.sprintf("Rig control error %d\nFailed to read frequency.",
msgBox(rt); int(1000000.0*fMHz));
m_catEnabled=false; msgBox(rt);
ui->readFreq->setStyleSheet("QPushButton{background-color: red; \ m_catEnabled=false;
border-width: 0px; border-radius: 5px;}"); ui->readFreq->setStyleSheet("QPushButton{background-color: red; \
border-width: 0px; border-radius: 5px;}");
} }
}
int ndiff=1000000.0*(fMHz-m_dialFreq); int ndiff=1000000.0*(fMHz-m_dialFreq);
if(ndiff!=0) dialFreqChanged2(fMHz); if(ndiff!=0) dialFreqChanged2(fMHz);
} }

2
wsjtx_opti.iss
View File

@ -1,6 +1,6 @@
[Setup] [Setup]
AppName=wsjtx AppName=wsjtx
AppVerName=wsjtx Version 1.1.0 r3471 AppVerName=wsjtx Version 1.1.0 r3474
AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
DefaultDirName=c:\wsjtx2 DefaultDirName=c:\wsjtx2
DefaultGroupName=wsjtx2 DefaultGroupName=wsjtx2