From f226e4cbc81f2e6a148a48a683be2fc49f1a7625 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Tue, 9 Jul 2013 22:58:04 +0000
Subject: [PATCH] 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
---
mainwindow.cpp | 19 +++++++++++--------
wsjtx_opti.iss | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 2df1d3b63..88cc3168e 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1782,18 +1782,21 @@ void MainWindow::guiUpdate()
}
if(m_catEnabled and m_poll>0 and (nsec%m_poll)==0) {
+ double fMHz;
if(m_dontReadFreq) {
m_dontReadFreq=false;
} else if(!m_transmitting) {
- double fMHz=rig->getFreq(RIG_VFO_CURR)/1000000.0;
- if(fMHz<0.0) {
- rt.sprintf("Rig control error %d\nFailed to read frequency.",
- int(1000000.0*fMHz));
- msgBox(rt);
- m_catEnabled=false;
- ui->readFreq->setStyleSheet("QPushButton{background-color: red; \
- border-width: 0px; border-radius: 5px;}");
+ for(int iter=0; iter<3; iter++) {
+ fMHz=rig->getFreq(RIG_VFO_CURR)/1000000.0;
+ if(fMHz<0.0 and iter>=2) {
+ rt.sprintf("Rig control error %d\nFailed to read frequency.",
+ int(1000000.0*fMHz));
+ msgBox(rt);
+ m_catEnabled=false;
+ ui->readFreq->setStyleSheet("QPushButton{background-color: red; \
+ border-width: 0px; border-radius: 5px;}");
}
+ }
int ndiff=1000000.0*(fMHz-m_dialFreq);
if(ndiff!=0) dialFreqChanged2(fMHz);
}
diff --git a/wsjtx_opti.iss b/wsjtx_opti.iss
index 4e7b32d3b..c7611e305 100644
--- a/wsjtx_opti.iss
+++ b/wsjtx_opti.iss
@@ -1,6 +1,6 @@
[Setup]
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
DefaultDirName=c:\wsjtx2
DefaultGroupName=wsjtx2