From d38ddd8b85fdfa63895c33f371864103349a2b64 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Thu, 11 Jul 2013 19:37:01 +0000
Subject: [PATCH] 1. New startup default frequencies for 40, 30, and 6m. 2.
 Don'l knowingly allow transmitting in the 30m WSPR band.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3479 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 mainwindow.cpp | 19 +++++++++++++++++--
 wsjtx_opti.iss |  2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index d6eabdc81..c92b2cdf9 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -26,8 +26,8 @@ wchar_t buffer[256];
 bool btxok;                           //True if OK to transmit
 bool btxMute;
 double outputLatency;                 //Latency in seconds
-double dFreq[]={0.13613,0.4742,1.838,3.576,5.357,7.036,10.136,14.076,
-           18.102,21.076,24.917,28.076,50.293,70.091,144.489,432.178};
+double dFreq[]={0.13613,0.4742,1.838,3.576,5.357,7.076,10.138,14.076,
+           18.102,21.076,24.917,28.076,50.276,70.091,144.489,432.178};
 
 WideGraph* g_pWideGraph = NULL;
 LogQSO* logDlg = NULL;
@@ -1563,6 +1563,7 @@ void MainWindow::guiUpdate()
   static int nsendingsh=0;
   static int giptt00=-1;
   static int gcomport00=-1;
+  static double onAirFreq0=0.0;
   int ret=0;
   QString rt;
 
@@ -1586,6 +1587,20 @@ void MainWindow::guiUpdate()
       bTxTime=true;
     }
 
+    double onAirFreq=m_dialFreq+1.e-6*m_txFreq;
+    if(onAirFreq>10.139900 and onAirFreq<10.140320) {
+      bTxTime=false;
+      if(onAirFreq!=onAirFreq0) {
+        onAirFreq0=onAirFreq;
+        on_autoButton_clicked();
+        QString t="Please choose another Tx frequency.\nWSJT-X will not ";
+        t+="knowingly transmit\nbetween 10.139 900 and 10.140 320 MHz,\n";
+        t+="the 30 m sub-band for WSPR transmissions.";
+        msgBox0.setText(t);
+        msgBox0.show();
+      }
+    }
+
     float fTR=float((nsec%m_TRperiod))/m_TRperiod;
     if(g_iptt==0 and ((bTxTime and !btxMute and fTR<0.4) or m_tune )) {
       icw[0]=m_ncw;
diff --git a/wsjtx_opti.iss b/wsjtx_opti.iss
index 29c791667..1fbfedc18 100644
--- a/wsjtx_opti.iss
+++ b/wsjtx_opti.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=wsjtx
-AppVerName=wsjtx Version 1.1.0 r3477
+AppVerName=wsjtx Version 1.1.0 r3478
 AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
 DefaultDirName=c:\wsjtx2
 DefaultGroupName=wsjtx2