From 81333e7af4fd85a9b01f2b81b5c2b81ca5178a1a Mon Sep 17 00:00:00 2001
From: phdlee <kd8cec@gmail.com>
Date: Sat, 10 Feb 2018 15:07:56 +0900
Subject: [PATCH] modified CW Key Logic for AutoKey and reduce cpu use rate,
 reduce program memory

---
 ubitx_20/ubitx_20.ino    | 22 ++--------------------
 ubitx_20/ubitx_keyer.ino |  9 +++++----
 ubitx_20/ubitx_menu.ino  |  4 ++--
 3 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/ubitx_20/ubitx_20.ino b/ubitx_20/ubitx_20.ino
index c0768e6..6f81cb2 100644
--- a/ubitx_20/ubitx_20.ino
+++ b/ubitx_20/ubitx_20.ino
@@ -1116,11 +1116,6 @@ void setup()
     factory_alignment();
 }
 
-
-//for debug
-int dbgCnt = 0;
-byte flasher = 0;
-
 //Auto save Frequency and Mode with Protected eeprom life by KD8CEC
 void checkAutoSaveFreqMode()
 {
@@ -1139,21 +1134,8 @@ void checkAutoSaveFreqMode()
     //check time for Frequency auto save
     if (millis() - saveCheckTime > saveIntervalSec * 1000)
     {
-      /*
-      if (vfoActive == VFO_A)
-      {
-        vfoA = frequency;
-        vfoA_mode = modeToByte();
-        storeFrequencyAndMode(1);
-      }
-      else
-      {
-        vfoB = frequency;
-        vfoB_mode = modeToByte();
-        storeFrequencyAndMode(2);
-      }
-      */
       FrequencyToVFO(1);
+      saveCheckTime = 0;  //for reduce cpu use rate
     }
   }
 }
@@ -1180,11 +1162,11 @@ void loop(){
 
     if (isCWAutoMode == 0 && beforeIdle_ProcessTime < millis() - 250) {
       idle_process();
+      checkAutoSaveFreqMode();  //move here form out scope for reduce cpu use rate
       beforeIdle_ProcessTime = millis();
     }
   } //end of check TX Status
 
   //we check CAT after the encoder as it might put the radio into TX
   Check_Cat(inTx? 1 : 0);
-  checkAutoSaveFreqMode();
 }
diff --git a/ubitx_20/ubitx_keyer.ino b/ubitx_20/ubitx_keyer.ino
index be8c2f6..308bf7d 100644
--- a/ubitx_20/ubitx_keyer.ino
+++ b/ubitx_20/ubitx_keyer.ino
@@ -235,13 +235,14 @@ void cwKeyer(void){
           keyDown = 0;
           stopTx();
         }
-        if (!cwTimeout)
-          return;
+        //if (!cwTimeout) //removed by KD8CEC
+        //   return;
         // got back to the beginning of the loop, if no further activity happens on straight key
         // we will time out, and return out of this routine 
         //delay(5);
-        delay_background(5, 3);
-        continue;
+        //delay_background(5, 3); //removed by KD8CEC
+        //continue;               //removed by KD8CEC
+        return;                   //Tx stop control by Main Loop
       }
 
       Check_Cat(2);
diff --git a/ubitx_20/ubitx_menu.ino b/ubitx_20/ubitx_menu.ino
index 8ae6e53..4542a0c 100644
--- a/ubitx_20/ubitx_menu.ino
+++ b/ubitx_20/ubitx_menu.ino
@@ -1345,7 +1345,7 @@ void doMenu(){
   //ADJUST TUNE STEP 
   if (btnDownTimeCount > PRESS_ADJUST_TUNE)
   {
-    printLineF1(F("Press to set step"));
+    printLineF1(F("Press to set"));
     isNeedDisplay = 1; //check to need display for display current value
     
     while (!btnDown())
@@ -1382,7 +1382,7 @@ void doMenu(){
       }
     } //end of while
 
-    printLineF2(F("Changed Step!"));
+    //printLineF2(F("Changed Step!")); //remarked for reduce program memory by KD8CEC
     //SAVE EEPROM
     EEPROM.put(TUNING_STEP, tuneStepIndex);
     delay_background(500, 0);