From 94a3e5ca1bf4426ba20895395e760a6c1418b718 Mon Sep 17 00:00:00 2001
From: phdlee <kd8cec@gmail.com>
Date: Tue, 13 Mar 2018 01:17:06 +0900
Subject: [PATCH] Test and some mod about WSPR Calibration

---
 ubitx_20/ubitx.h        |  1 +
 ubitx_20/ubitx_20.ino   |  6 +++---
 ubitx_20/ubitx_wspr.cpp | 11 +++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ubitx_20/ubitx.h b/ubitx_20/ubitx.h
index 0729320..64fcd3f 100644
--- a/ubitx_20/ubitx.h
+++ b/ubitx_20/ubitx.h
@@ -72,6 +72,7 @@ extern void TXSubFreq(unsigned long P2);
 
 extern void startTx(byte txMode, byte isDisplayUpdate);
 extern void stopTx(void);
+extern void setTXFilters(unsigned long freq);
 
 extern void SendWSPRManage(void);
 extern byte WsprMSGCount;
diff --git a/ubitx_20/ubitx_20.ino b/ubitx_20/ubitx_20.ino
index 48d2746..5e7d797 100644
--- a/ubitx_20/ubitx_20.ino
+++ b/ubitx_20/ubitx_20.ino
@@ -1023,10 +1023,10 @@ void initSettings(){
 
   //original code with modified by kd8cec
   if (usbCarrier > 12010000l || usbCarrier < 11990000l)
-    usbCarrier = 11995000l;
+    usbCarrier = 11997000l;
 
   if (cwmCarrier > 12010000l || cwmCarrier < 11990000l)
-    cwmCarrier = 11995000l;
+    cwmCarrier = 11997000l;
     
   if (vfoA > 35000000l || 3500000l > vfoA) {
      vfoA = 7150000l;
@@ -1111,7 +1111,7 @@ void setup()
   //Serial.begin(9600);
   lcd.begin(16, 2);
   //printLineF(1, F("CECBT v1.05")); 
-  printLineF(1, F("CE v1.05_W")); 
+  printLineF(1, F("CE v1.051W")); 
 
   Init_Cat(38400, SERIAL_8N1);
   initMeter(); //not used in this build
diff --git a/ubitx_20/ubitx_wspr.cpp b/ubitx_20/ubitx_wspr.cpp
index 2568378..c87c1a7 100644
--- a/ubitx_20/ubitx_wspr.cpp
+++ b/ubitx_20/ubitx_wspr.cpp
@@ -151,8 +151,11 @@ void SendWSPRManage()
       {
         //printLineF1(F("Transmitting"));
         //SEND WSPR
-        prevFreq = frequency;
-        frequency = WsprTXFreq;
+        //If you need to consider the Rit and Sprite modes, uncomment them below.
+        //remark = To reduce the size of the program
+        //prevFreq = frequency;
+        //frequency = WsprTXFreq;
+        setTXFilters(WsprTXFreq);
         startTx(TX_CW, 0);
         
         //Start WSPR
@@ -172,8 +175,8 @@ void SendWSPRManage()
         }
         
         digitalWrite(CW_KEY, 0);
-        stopTx();
-        frequency = prevFreq;
+        stopTx(); //call setFrequency -> recovery TX Filter
+        //frequency = prevFreq;
         
         selectedWsprBandIndex = -1;
       }     //end of PTT Check