Merge pull request #17 from phdlee/version0.33

Version0.33

README.md

@@ -1,7 +1,11 @@
 #IMPORTANT INFORMATION
 ----------------------------------------------------------------------------
-- Beta 0.26 and Beta 0.261, Beta 0.262, Beta 0.27 is complete test
-- You can download and use it.
+- 0.30 Version Test only download. almost complete
+- Beta 0.26 and Beta 0.261, Beta 0.262,0.27 is complete test, 0.28 is tested.
+- You can download and use it (Release section).
+
+# Current work list (for Version 0.31)
+  1 Testing CAT Control with Software using hamlib on Linux
 
 #NOTICE
 ----------------------------------------------------------------------------
@@ -46,6 +50,24 @@ Prepared or finished tasks for the next version
                   
 ----------------------------------------------------------------------------
 ## REVISION RECORD
+0.30
+ - implemented the function to monitor the value of all analog inputs. This allows you to monitor the status of the CW keys connected to your uBITX. 
+ - possible to set the ADC range for CW Keying. If no setting is made, it will have the same range as the original code. If you set the CW Keying ADC Values using uBITX Manager 0.3, you can reduce the key error.
+ - Added the function to select Straight Key, IAMBICA, IAMBICB key from the menu.
+ - default Band select is Ham Band mode, if you want common type, long press function key at band select menu, uBITX Manager can be used to modify frequencies to suit your country.
+
+0.29
+ - Remove the use of initialization values in BFO settings - using crruent value, if factory reset
+ - Select Tune Step, default 0, 20, 50, 100, 200, Use the uBITX Manager to set the steps value you want. You can select Step by pressing and holding the Function Key (1sec ~ 2sec).
+ - Modify Dial Lock Function, Press the Function key for more than 3 seconds to toggle dial lock.
+ - created a new frequency tune method. remove original source codes, Threshold has been applied to reduce malfunction. checked the continuity of the user operating to make natural tune possible.
+ - stabilize and remove many warning messages - by Pullrequest and merge
+ - Changed cw keying method. removed the original code and applied Ron's code and Improved compatibility with original hardware and CAT commnication. It can be used without modification of hardware.
+ 
+0.28
+ - Fixed CAT problem with hamlib on Linux
+ - restore Protocol autorecovery logic
+
 0.27 
    (First alpha test version, This will be renamed to the major version 1.0)
  - Dual VFO Dial Lock (vfoA Dial lock)

ubitx_20/cw_autokey.ino

@@ -365,11 +365,6 @@ void controlAutoCW(){
         //check interval time, if you want adjust interval between chars, modify below
         if (isAutoCWHold == 0 && (millis() - autoCWbeforeTime > cwSpeed * 3))
         {
-          if (!inTx){                                           //if not TX Status, change RX -> TX
-            keyDown = 0;
-            startTx(TX_CW, 0);  //disable updateDisplay Command for reduce latency time
-          }
-          
           sendCWChar(EEPROM.read(CW_AUTO_DATA + autoCWSendCharIndex++));
 
           if (autoCWSendCharIndex > autoCWSendCharEndIndex) {          //finish auto cw send

ubitx_20/ubitx_20.ino

@@ -160,8 +160,7 @@ int count = 0;          //to generally count ticks, loops, etc
 #define TX_TUNE_TYPE 261  //
 #define HAM_BAND_RANGE 262 //FROM (2BYTE) TO (2BYTE) * 10 = 40byte
 #define HAM_BAND_FREQS 302 //40, 1 BAND = 4Byte most bit is mode
-#define TUNING_STEP    342   //TUNING STEP * 6 (index 1 + STEPS 5)  //1STEP : 
-  
+#define TUNING_STEP    342   //TUNING STEP * 6 (index 1 + STEPS 5)
 
 //for reduce cw key error, eeprom address
 #define CW_ADC_MOST_BIT1 348   //most 2bits of  DOT_TO , DOT_FROM, ST_TO, ST_FROM
@@ -261,7 +260,7 @@ byte sideToneSub = 0;
 //DialLock
 byte isDialLock = 0;  //000000[0]vfoB [0]vfoA 0Bit : A, 1Bit : B
 byte isTxType = 0;    //000000[0 - isSplit] [0 - isTXStop]
-long arTuneStep[5];
+byte arTuneStep[5];
 byte tuneStepIndex; //default Value 0, start Offset is 0 because of check new user
 
 byte displayOption1 = 0;
@@ -382,7 +381,7 @@ void setNextHamBandFreq(unsigned long f, char moveDirection)
     resultFreq = (unsigned long)(hamBandRange[(unsigned char)findedIndex][0]) * 1000;
 
   setFrequency(resultFreq);
-  byteToMode(loadMode, 1);
+  byteWithFreqToMode(loadMode);
 }
 
 void saveBandFreqByIndex(unsigned long f, unsigned long mode, char bandIndex) {
@@ -537,12 +536,12 @@ void startTx(byte txMode, byte isDisplayUpdate){
       if (vfoActive == VFO_B) {
         vfoActive = VFO_A;
         frequency = vfoA;
-        byteToMode(vfoA_mode, 0);
+        byteToMode(vfoA_mode);
       }
       else if (vfoActive == VFO_A){
         vfoActive = VFO_B;
         frequency = vfoB;
-        byteToMode(vfoB_mode, 0);
+        byteToMode(vfoB_mode);
       }
 
       setFrequency(frequency);
@@ -597,12 +596,12 @@ void stopTx(){
       if (vfoActive == VFO_B){
         vfoActive = VFO_A;
         frequency = vfoA;
-        byteToMode(vfoA_mode, 0);
+        byteToMode(vfoA_mode);
       }
       else if (vfoActive == VFO_A){
         vfoActive = VFO_B;
         frequency = vfoB;
-        byteToMode(vfoB_mode, 0);
+        byteToMode(vfoB_mode);
       }
       setFrequency(frequency);
   } //end of else
@@ -755,8 +754,27 @@ void doRIT(){
     updateDisplay();
   }
 }
+
 /*
- save Frequency and mode to eeprom for Auto Save with protected eeprom cycle, by kd8cec
+void doIFShift(){
+  int knob = enc_read();
+  unsigned long old_freq = frequency;
+
+  if (knob != 0)
+  {
+    if (knob < 0)
+      ifShiftValue -= 1l;
+    else if (knob > 0)
+      ifShiftValue += 1;
+
+    updateLine2Buffer(1);
+    setFrequency(frequency);
+  }
+}
+*/
+
+/**
+ save Frequency and mode to eeprom
  */
 void storeFrequencyAndMode(byte saveType)
 {
@@ -788,22 +806,6 @@ void storeFrequencyAndMode(byte saveType)
   }
 }
 
-//calculate step size from 1 byte, compatible uBITX Manager, by KD8CEC
-unsigned int byteToSteps(byte srcByte) {
-    byte powerVal = (byte)(srcByte >> 6);
-    unsigned int baseVal = srcByte & 0x3F;
-
-    if (powerVal == 1)
-        return baseVal * 10;
-    else if (powerVal == 2)
-        return baseVal * 100;
-    else if (powerVal == 3)
-        return baseVal * 1000;
-    else
-        return baseVal;
-}
-
-
 /**
  * The settings are read from EEPROM. The first time around, the values may not be 
  * present or out of range, in this case, some intelligent defaults are copied into the 
@@ -924,8 +926,8 @@ void initSettings(){
   findedValidValueCount = 0;
   EEPROM.get(TUNING_STEP, tuneStepIndex);
   for (byte i = 0; i < 5; i++) {
-    arTuneStep[i] = byteToSteps(EEPROM.read(TUNING_STEP + i + 1));
-    if (arTuneStep[i] >= 1 && arTuneStep[i] <= 60000) //Maximum 650 for check valid Value
+    arTuneStep[i] = EEPROM.read(TUNING_STEP + i + 1);
+    if (arTuneStep[i] >= 1 && arTuneStep[i] < 251) //Maximum 250 for check valid Value
        findedValidValueCount++;
   }
 
@@ -1001,12 +1003,12 @@ void initSettings(){
     
   if (vfoA > 35000000l || 3500000l > vfoA) {
      vfoA = 7150000l;
-     vfoA_mode = 2; //LSB
+     vfoA_mode = 2;
   }
   
   if (vfoB > 35000000l || 3500000l > vfoB) {
      vfoB = 14150000l;  
-     vfoB_mode = 3; //USB
+     vfoB_mode = 3;
   }
   //end of original code section
 
@@ -1082,7 +1084,7 @@ void setup()
   
   //Serial.begin(9600);
   lcd.begin(16, 2);
-  printLineF(1, F("CECBT v0.35")); 
+  printLineF(1, F("CECBT v0.33")); 
 
   Init_Cat(38400, SERIAL_8N1);
   initMeter(); //not used in this build
@@ -1101,7 +1103,7 @@ void setup()
   
   initPorts();     
 
-  byteToMode(vfoA_mode, 0);
+  byteToMode(vfoA_mode);
   initOscillators();
 
   frequency = vfoA;
@@ -1114,11 +1116,13 @@ void setup()
 }
 
 
+/**
+ * The loop checks for keydown, ptt, function button and tuning.
+ */
 //for debug
 int dbgCnt = 0;
 byte flasher = 0;
 
-//Auto save Frequency and Mode with Protected eeprom life by KD8CEC
 void checkAutoSaveFreqMode()
 {
   //when tx or ritOn, disable auto save

ubitx_20/ubitx_idle.ino

@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 **************************************************************************/
-char line2Buffer[16];
+byte line2Buffer[16];
 //KD8CEC 200Hz ST
 //L14.150 200Hz ST
 //U14.150 +150khz
@@ -53,11 +53,8 @@ void updateLine2Buffer(char isDirectCall)
       }
   
       return;
-    } //end of ritOn display
-
-    //======================================================
-    //other VFO display
-    //======================================================
+    }
+    
     if (vfoActive == VFO_B)
     {
       tmpFreq = vfoA;
@@ -85,23 +82,23 @@ void updateLine2Buffer(char isDirectCall)
     }
   
     //EXAMPLE #1
-    if ((displayOption1 & 0x04) == 0x00)  //none scroll display
+    if ((displayOption1 & 0x04) == 0x00)
       line2Buffer[6] = 'k';
     else
     {
       //example #2
-      if (freqScrollPosition++ > 18)    //none scroll display time
+      if (freqScrollPosition++ > 18)
       {
         line2Buffer[6] = 'k';
         if (freqScrollPosition > 25)
           freqScrollPosition = -1;
       }
-      else                              //scroll frequency 
+      else
       {
         line2Buffer[10] = 'H';
         line2Buffer[11] = 'z';
     
-        if (freqScrollPosition < 7)   
+        if (freqScrollPosition < 7)
         {
           for (int i = 11; i >= 0; i--)
             if (i - (7 - freqScrollPosition) >= 0)
@@ -118,10 +115,10 @@ void updateLine2Buffer(char isDirectCall)
               line2Buffer[i] = ' ';
         }
       }
-    } //scroll
-    
+    }
     line2Buffer[7] = ' ';
   } //check direct call by encoder
+
   
   if (isIFShift)
   {
@@ -155,38 +152,24 @@ void updateLine2Buffer(char isDirectCall)
     
     if (isDirectCall == 1)  //if call by encoder (not scheduler), immediate print value
         printLine2(line2Buffer);    
-  }       // end of display IF
-  else    // step display
+  }
+  else
   {
     if (isDirectCall != 0)
       return;
-
-    memset(&line2Buffer[8], ' ', 8);
-    //Step
-    long tmpStep = arTuneStep[tuneStepIndex -1];
-    
-    byte isStepKhz = 0;
-    if (tmpStep >= 1000)
-    {
-      isStepKhz = 2;
-    }
       
-    for (int i = 10; i >= 8 - isStepKhz; i--) {
+    //Step
+    byte tmpStep = arTuneStep[tuneStepIndex -1];
+    for (int i = 10; i >= 8; i--) {
       if (tmpStep > 0) {
-          line2Buffer[i + isStepKhz] = tmpStep % 10 + 0x30;
+          line2Buffer[i] = tmpStep % 10 + 0x30;
           tmpStep /= 10;
       }
       else
-        line2Buffer[i +isStepKhz] = ' ';
-    }
-    //if (isStepKhz == 1)
-    //  line2Buffer[10] = 'k';
-
-    if (isStepKhz == 0)
-    {
-      line2Buffer[11] = 'H';
-      line2Buffer[12] = 'z';
+        line2Buffer[i] = ' ';
     }
+    line2Buffer[11] = 'H';
+    line2Buffer[12] = 'z';
   
     line2Buffer[13] = ' ';
     //if (
@@ -232,9 +215,6 @@ void idle_process()
   //space for user graphic display
   if (menuOn == 0)
   {
-    if ((displayOption1 & 0x10) == 0x10)    //always empty topline
-      return;
-      
     //if line2DisplayStatus == 0 <-- this condition is clear Line, you can display any message
     if (line2DisplayStatus == 0 || (((displayOption1 & 0x04) == 0x04) && line2DisplayStatus == 2)) {
       if (checkCount++ > 1)

ubitx_20/ubitx_menu.ino

@@ -13,36 +13,6 @@
 #define printLineF1(x) (printLineF(1, x))
 #define printLineF2(x) (printLineF(0, x))
 
-void FrequencyToVFO(byte isSaveFreq)
-{
-  //Save Frequency & Mode Information
-  if (vfoActive == VFO_A)
-  {
-    vfoA = frequency;
-    vfoA_mode = modeToByte();
-
-    if (isSaveFreq)
-      storeFrequencyAndMode(1);
-  }
-  else
-  {
-    vfoB = frequency;
-    vfoB_mode = modeToByte();
-    
-    if (isSaveFreq)
-      storeFrequencyAndMode(2);
-  }
-}
-
-void menuClearExit(int delayTime)
-{
-  if (delayTime > 0)
-    delay_background(delayTime, 0);
-    
-  printLine2ClearAndUpdate();
-  menuOn = 0;
-}
-
 //Ham band move by KD8CEC
 void menuBand(int btn){
   int knob = 0;
@@ -57,7 +27,8 @@ void menuBand(int btn){
   printLineF2(F("Press to confirm"));
   //wait for the button menu select button to be lifted)
   while (btnDown()) {
-     delay_background(50, 0);
+    delay(50);
+    Check_Cat(0);  //To prevent disconnections
     if (btnPressCount++ > 20) {
       btnPressCount = 0;
       if (tuneTXType > 0) { //Just toggle 0 <-> 2, if tuneTXType is 100, 100 -> 0 -> 2
@@ -86,13 +57,23 @@ void menuBand(int btn){
     }
   }
   
-  //delay(50);    
+  delay(50);    
   ritDisable();
 
   while(!btnDown()){
 
     knob = enc_read();
     if (knob != 0){
+      /*
+      if (band > 3 && knob < 0)
+        band--;
+      if (band < 30 && knob > 0)
+        band++; 
+      if (band > 10)
+        isUSB = true;
+      else
+        isUSB = false;
+      setFrequency(((unsigned long)band * 1000000l) + offset); */
       if (tuneTXType == 2 || tuneTXType == 3 || tuneTXType == 102 || tuneTXType == 103) { //only ham band move
         if (knob < 0) {
           if (stepChangeCount-- < -3) {
@@ -106,7 +87,9 @@ void menuBand(int btn){
             stepChangeCount = 0;
           }
         }
-      }       //end of only ham band move
+
+      //setFrequency(frequency + 200000l);
+      }
       else {  //original source
         if (knob < 0 && frequency > 3000000l)
           setFrequency(frequency - 200000l);
@@ -122,21 +105,19 @@ void menuBand(int btn){
       updateDisplay();
     }
     
-    delay_background(20, 0);
+    delay(20);
+    Check_Cat(0);  //To prevent disconnections
   }
 
-/*
   while(btnDown()) {
     delay(50);
     Check_Cat(0);  //To prevent disconnections
   }
-*/  
-  FrequencyToVFO(1);
-
-  //printLine2ClearAndUpdate();
-  //delay_background(500, 0);
-  //menuOn = 0;
-  menuClearExit(500);
+  
+  delay(50);
+  
+  printLine2ClearAndUpdate();
+  menuOn = 0;
 }
 
 //Convert Mode, Number by KD8CEC
@@ -160,9 +141,7 @@ byte modeToByte(){
 }
 
 //Convert Number to Mode by KD8CEC
-//autoSetModebyFreq : 0
-//autoSetModebyFreq : 1, if (modValue is not set, set mode by frequency)
-void byteToMode(byte modeValue, byte autoSetModebyFreq){
+void byteToMode(byte modeValue){
   if (modeValue == 4)
     cwMode = 1;
   else if (modeValue == 5)
@@ -172,14 +151,11 @@ void byteToMode(byte modeValue, byte autoSetModebyFreq){
     cwMode = 0;
     if (modeValue == 3)
       isUSB = 1;
-    else if (autoSetModebyFreq == 1 && (modeValue == 0))
-      isUSB = (frequency > 10000000l) ? true : false;
     else
       isUSB = 0;
   }
 }
 
-/*
 //Convert Number to Mode by KD8CEC
 void byteWithFreqToMode(byte modeValue){
   if (modeValue == 4)
@@ -196,9 +172,99 @@ void byteWithFreqToMode(byte modeValue){
       isUSB = 0;
   }
 }
-*/
 
-void menuIFSSetup(int btn){
+//VFO Toggle and save VFO Information, modified by KD8CEC
+void menuVfoToggle(int btn, char isUseDelayTime)
+{
+  if (!btn){
+    if (vfoActive == VFO_A)
+      printLineF2(F("Select VFO B?"));
+    else
+      printLineF2(F("Select VFO A?"));    
+  }
+  else {
+      if (vfoActive == VFO_B){
+        vfoB = frequency;
+        vfoB_mode = modeToByte();
+        storeFrequencyAndMode(2); //vfoB -> eeprom
+        
+        vfoActive = VFO_A;
+        frequency = vfoA;
+        saveCheckFreq = frequency;
+        byteToMode(vfoA_mode);
+        printLineF2(F("Selected VFO A"));
+      }
+      else {
+        vfoA = frequency;
+        vfoA_mode = modeToByte();
+        storeFrequencyAndMode(1); //vfoA -> eeprom
+        
+        vfoActive = VFO_B;
+        frequency = vfoB;
+        saveCheckFreq = frequency;
+        byteToMode(vfoB_mode);
+        printLineF2(F("Selected VFO B"));
+      }
+
+      ritDisable();
+      setFrequency(frequency);
+
+      if (isUseDelayTime == 1)        //Found Issue in wsjt-x Linux 32bit 
+        delay_background(500, 0);
+
+      printLine2ClearAndUpdate();
+      //exit the menu
+      menuOn = 0;
+  }
+}
+
+void menuRitToggle(int btn){
+  if (!btn){
+    if (ritOn == 1)
+      printLineF2(F("RIT:On, Off?"));
+    else
+      printLineF2(F("RIT:Off, On?"));
+  }
+  else {
+      if (ritOn == 0){
+        printLineF2(F("RIT is ON"));
+        //enable RIT so the current frequency is used at transmit
+        ritEnable(frequency);
+      }
+      else{
+        printLineF2(F("RIT is OFF"));
+        ritDisable();
+      }
+      menuOn = 0;
+      delay_background(500, 0);
+      printLine2ClearAndUpdate();
+  }
+}
+
+/*
+void menuIFSToggle(int btn){
+  if (!btn){
+    if (isIFShift == 1)
+      printLineF2(F("IF Shift:On, Off?"));
+    else
+      printLineF2(F("IF Shift:Off, On?"));
+  }
+  else {
+      if (isIFShift == 0){
+        printLineF2(F("IF Shift is ON"));
+        isIFShift = 1;
+      }
+      else{
+        printLineF2(F("IF Shift is OFF"));
+        isIFShift = 0;
+      }
+      menuOn = 0;
+      delay_background(500, 0);
+      printLine2ClearAndUpdate();
+  }
+}
+*/
+void menuIFSToggle(int btn){
   int knob = 0;
   char needApplyChangeValue = 1;
   
@@ -209,18 +275,18 @@ void menuIFSSetup(int btn){
       printLineF2(F("IF Shift:Off, On?"));
   }
   else {
-      //if (isIFShift == 0){
-        //printLineF2(F("IF Shift is ON"));
-        //delay_background(500, 0);
-      isIFShift = 1;
-      //}
+      if (isIFShift == 0){
+        printLineF2(F("IF Shift is ON"));
+        delay_background(500, 0);
+        isIFShift = 1;
+      }
 
       delay_background(500, 0);
       updateLine2Buffer(1);
       setFrequency(frequency);
 
       //Off or Change Value
-      while(!btnDown() ){
+      while(!btnDown() && digitalRead(PTT) == HIGH){
         if (needApplyChangeValue ==1)
         {
           updateLine2Buffer(1);
@@ -237,9 +303,9 @@ void menuIFSSetup(int btn){
         knob = enc_read();
         if (knob != 0){
           if (knob < 0)
-            ifShiftValue -= 50l;
+            ifShiftValue -= 1l;
           else if (knob > 0)
-            ifShiftValue += 50;
+            ifShiftValue += 1;
 
           needApplyChangeValue = 1;
         }
@@ -247,7 +313,7 @@ void menuIFSSetup(int btn){
 
       delay_background(500, 0); //for check Long Press function key
       
-      if (btnDown() || ifShiftValue == 0)
+      if (btnDown() || digitalRead(PTT) == LOW || ifShiftValue == 0)
       {
         isIFShift = 0;
         printLineF2(F("IF Shift is OFF"));
@@ -255,12 +321,38 @@ void menuIFSSetup(int btn){
         delay_background(500, 0);
       }
       
-      //menuOn = 0;
-      //printLine2ClearAndUpdate();
-      menuClearExit(0);
+      menuOn = 0;
+      //delay_background(500, 0);
+      printLine2ClearAndUpdate();
   }
 }
 
+
+/* 
+void menuSidebandToggle(int btn){
+  if (!btn){
+    if (isUSB == true)
+      printLineF2(F("Select LSB?"));
+    else
+      printLineF2(F("Select USB?"));
+  }
+  else {
+      cwMode = 0;
+      if (isUSB == true){
+        isUSB = false;
+        printLineF2(F("LSB Selected"));
+      }
+      else {
+        isUSB = true;
+        printLineF2(F("USB Selected"));
+      }
+    setFrequency(frequency);
+    delay_background(500, 0);
+    printLine2ClearAndUpdate();
+    menuOn = 0;
+  }
+}
+*/
 void menuSelectMode(int btn){
   int knob = 0;
   int selectModeType = 0;
@@ -320,7 +412,8 @@ void menuSelectMode(int btn){
     }
 
     if (beforeMode != selectModeType) {
-      //printLineF1(F("Changed Mode"));
+      printLineF1(F("Changed Mode"));
+      
       if (selectModeType == 0) {
         cwMode = 0; isUSB = 0;
       }
@@ -334,7 +427,19 @@ void menuSelectMode(int btn){
         cwMode = 2;
       }
 
-      FrequencyToVFO(1);
+      //Save Frequency & Mode Information
+      if (vfoActive == VFO_A)
+      {
+        vfoA = frequency;
+        vfoA_mode = modeToByte();
+        storeFrequencyAndMode(1);
+      }
+      else
+      {
+        vfoB = frequency;
+        vfoB_mode = modeToByte();
+        storeFrequencyAndMode(2);
+      }
     }
 
   if (cwMode == 0)
@@ -343,14 +448,73 @@ void menuSelectMode(int btn){
     si5351bx_setfreq(0, cwmCarrier + (isIFShift ? ifShiftValue : 0));  //set back the carrier oscillator anyway, cw tx switches it off
     
     setFrequency(frequency);
-
-    //delay_background(500, 0);
-    //printLine2ClearAndUpdate();
-    //menuOn = 0;
-    menuClearExit(500);
+    delay_background(500, 0);
+    printLine2ClearAndUpdate();
+    menuOn = 0;
   }
 }
 
+void menuSplitOnOff(int btn){
+  if (!btn){
+    if (splitOn == 0)
+      printLineF2(F("Split On?"));
+    else
+      printLineF2(F("Split Off?"));
+  }
+  else {
+      if (splitOn == 1){
+        splitOn = 0;
+        printLineF2(F("Split Off!"));
+      }
+      else {
+        splitOn = 1;
+        if (ritOn == 1)
+          ritOn = 0;
+        printLineF2(F("Split On!"));
+      }
+    delay_background(500, 0);
+    printLine2ClearAndUpdate();
+    menuOn = 0;
+  }
+}
+
+/*
+//Select CW Key Type by KD8CEC
+void menuSetupKeyType(int btn){
+  if (!btn && digitalRead(PTT) == HIGH){
+      if (Iambic_Key)
+        printLineF2(F("Key: Straight?"));
+      else
+        printLineF2(F("Key: Fn=A, PTT=B"));
+  }
+  else {
+      if (Iambic_Key)
+      {
+        printLineF2(F("Straight Key!"));
+        Iambic_Key = false;
+      }
+      else
+      {
+        Iambic_Key = true;
+        if (btn)
+        {
+          keyerControl &= ~IAMBICB;
+          printLineF2(F("IAMBICA Key!"));
+        }
+        else
+        {
+          keyerControl |= IAMBICB;
+          printLineF2(F("IAMBICB Key!"));
+        }
+      }
+      
+    delay_background(500, 0);
+    printLine2ClearAndUpdate();
+    menuOn = 0;
+  }
+}
+*/
+
 //Select CW Key Type by KD8CEC
 void menuSetupKeyType(int btn){
   int knob = 0;
@@ -408,11 +572,10 @@ void menuSetupKeyType(int btn){
       else
         keyerControl |= IAMBICB;
     }
-
-    //delay_background(2000, 0);
-    //printLine2ClearAndUpdate();
-    //menuOn = 0;
-    menuClearExit(1000);
+    delay_background(2000, 0);
+    
+    printLine2ClearAndUpdate();
+    menuOn = 0;
   }
 }
 
@@ -492,109 +655,10 @@ void menuADCMonitor(int btn){
     delay_background(200, 0);
   } //end of while
       
-  //printLine2ClearAndUpdate();
-  //menuOn = 0;
-  menuClearExit(0);
+  printLine2ClearAndUpdate();
+  menuOn = 0;
 }
 
-//VFO Toggle and save VFO Information, modified by KD8CEC
-void menuVfoToggle(int btn, char isUseDelayTime)
-{
-  if (!btn){
-    if (vfoActive == VFO_A)
-      printLineF2(F("Select VFO B?"));
-    else
-      printLineF2(F("Select VFO A?"));    
-  }
-  else {
-      FrequencyToVFO(1);
-    
-      if (vfoActive == VFO_B){
-        //vfoB = frequency;
-        //vfoB_mode = modeToByte();
-        //storeFrequencyAndMode(2); //vfoB -> eeprom
-        
-        vfoActive = VFO_A;
-        frequency = vfoA;
-        saveCheckFreq = frequency;
-        byteToMode(vfoA_mode, 0);
-        //printLineF2(F("Selected VFO A"));
-      }
-      else {
-        //vfoA = frequency;
-        //vfoA_mode = modeToByte();
-        //storeFrequencyAndMode(1); //vfoA -> eeprom
-        
-        vfoActive = VFO_B;
-        frequency = vfoB;
-        saveCheckFreq = frequency;
-        byteToMode(vfoB_mode, 0);
-        //printLineF2(F("Selected VFO B"));
-      }
-
-      ritDisable();
-      setFrequency(frequency);
-
-      //if (isUseDelayTime == 1)        //Found Issue in wsjt-x Linux 32bit 
-      //  delay_background(500, 0);
-
-      //printLine2ClearAndUpdate();
-      //menuOn = 0;
-      menuClearExit(0);
-  }
-}
-
-void menuRitToggle(int btn){
-  if (!btn){
-    if (ritOn == 1)
-      printLineF2(F("RIT:On, Off?"));
-    else
-      printLineF2(F("RIT:Off, On?"));
-  }
-  else {
-      if (ritOn == 0){
-        printLineF2(F("RIT is ON"));
-        //enable RIT so the current frequency is used at transmit
-        ritEnable(frequency);
-      }
-      else{
-        printLineF2(F("RIT is OFF"));
-        ritDisable();
-      }
-      //delay_background(500, 0);
-      //printLine2ClearAndUpdate();
-      //menuOn = 0;
-      menuClearExit(500);
-  }
-}
-
-void menuSplitOnOff(int btn){
-  if (!btn){
-    if (splitOn == 0)
-      printLineF2(F("Split On?"));
-    else
-      printLineF2(F("Split Off?"));
-  }
-  else {
-      if (splitOn == 1){
-        splitOn = 0;
-        printLineF2(F("Split Off!"));
-      }
-      else {
-        splitOn = 1;
-        if (ritOn == 1)
-          ritOn = 0;
-        printLineF2(F("Split On!"));
-      }
-      
-    //delay_background(500, 0);
-    //printLine2ClearAndUpdate();
-    //menuOn = 0;
-    menuClearExit(500);
-  }
-}
-
-
 //Function to disbled transmission
 //by KD8CEC
 void menuTxOnOff(int btn, byte optionType){
@@ -613,11 +677,9 @@ void menuTxOnOff(int btn, byte optionType){
         isTxType &= ~(optionType);
         printLineF2(F("TX ON!"));
       }
-      
-    //delay_background(500, 0);
-    //printLine2ClearAndUpdate();
-    //menuOn = 0;
-    menuClearExit(500);
+    delay_background(500, 0);
+    printLine2ClearAndUpdate();
+    menuOn = 0;
   }
 }
 
@@ -640,19 +702,21 @@ void menuSetup(int btn){
       modeCalibrate = false;
       printLineF2(F("Setup:Off"));
     }
-   //delay_background(2000, 0);
-   //printLine2Clear();
-   //menuOn = 0;
-   menuClearExit(1000);
+   delay_background(2000, 0);
+   printLine2Clear();
+   menuOn = 0;
   }
 }
 
 void menuExit(int btn){
+
   if (!btn){
       printLineF2(F("Exit Menu?"));
   }
-  else
-   menuClearExit(0);
+  else{
+      printLine2ClearAndUpdate();
+      menuOn = 0;
+  }
 }
 
 void menuCWSpeed(int btn){
@@ -704,11 +768,10 @@ void menuCWSpeed(int btn){
       printLineF2(F("CW Speed set!"));
       cwSpeed = 1200/wpm;
       EEPROM.put(CW_SPEED, cwSpeed);
+      delay_background(2000, 0);
     //}
-    //delay_background(2000, 0);
-    //printLine2ClearAndUpdate();
-    //menuOn = 0;
-   menuClearExit(1000);
+    printLine2ClearAndUpdate();
+    menuOn = 0;
 }
 
 //Builtin CW Keyer Logic by KD8CEC
@@ -778,11 +841,10 @@ void menuSetupCwDelay(int btn){
       printLineF2(F("CW Delay set!"));
       cwDelayTime = tmpCWDelay / 10;
       EEPROM.put(CW_DELAY, cwDelayTime);
-      //delay_background(2000, 0);
+      delay_background(2000, 0);
     //}
-    //printLine2ClearAndUpdate();
-    //menuOn = 0;
-   menuClearExit(1000);
+    printLine2ClearAndUpdate();
+    menuOn = 0;
 }
 
 //CW Time delay by KD8CEC
@@ -828,11 +890,10 @@ void menuSetupTXCWInterval(int btn){
       printLineF2(F("CW Start set!"));
       delayBeforeCWStartTime = tmpTXCWInterval / 2;
       EEPROM.put(CW_START, delayBeforeCWStartTime);
-      //delay_background(2000, 0);
+      delay_background(2000, 0);
     //}
-    //printLine2ClearAndUpdate();
-    //menuOn = 0;
-   menuClearExit(1000);
+    printLine2ClearAndUpdate();
+    menuOn = 0;
 }
 
 
@@ -915,8 +976,7 @@ void factoryCalibration(int btn){
 
   while(btnDown())
     delay(50);
-
-  menuClearExit(100);
+  delay(100);
 }
 
 void menuSetupCalibration(int btn){
@@ -980,9 +1040,8 @@ void menuSetupCalibration(int btn){
   initOscillators();
   //si5351_set_calibration(calibration);
   setFrequency(frequency);    
-  //printLine2ClearAndUpdate();
-  //menuOn = 0;
-  menuClearExit(0);
+  printLine2ClearAndUpdate();
+  menuOn = 0;
 }
 
 void printCarrierFreq(unsigned long freq){
@@ -1055,9 +1114,8 @@ void menuSetupCarrier(int btn){
     si5351bx_setfreq(0, cwmCarrier);  //set back the carrier oscillator anyway, cw tx switches it off
   
   setFrequency(frequency);    
-  //printLine2ClearAndUpdate();
-  //menuOn = 0; 
-  menuClearExit(0);
+  printLine2ClearAndUpdate();
+  menuOn = 0; 
 }
 
 //Append by KD8CEC
@@ -1092,9 +1150,8 @@ void menuSetupCWCarrier(int btn){
     si5351bx_setfreq(0, cwmCarrier);
     printCarrierFreq(cwmCarrier);
 
-    //Check_Cat(0);  //To prevent disconnections
-    //delay(100);
-    delay_background(100, 0);
+    Check_Cat(0);  //To prevent disconnections
+    delay(100);
   }
 
   //save the setting
@@ -1111,12 +1168,10 @@ void menuSetupCWCarrier(int btn){
   else
     si5351bx_setfreq(0, cwmCarrier);  //set back the carrier oscillator anyway, cw tx switches it off
   
-  setFrequency(frequency);
-  //printLine2ClearAndUpdate();
-  //menuOn = 0; 
-  menuClearExit(0);
+  setFrequency(frequency);    
+  printLine2ClearAndUpdate();
+  menuOn = 0; 
 }
-
 //Modified by KD8CEC
 void menuSetupCwTone(int btn){
     int knob = 0;
@@ -1149,23 +1204,21 @@ void menuSetupCwTone(int btn){
       itoa(sideTone, b, 10);
       printLine2(b);
 
-      //delay(100);
-      //Check_Cat(0);  //To prevent disconnections
-      delay_background(100, 0);
+      delay(100);
+      Check_Cat(0);  //To prevent disconnections
     }
     noTone(CW_TONE);
     //save the setting
     if (digitalRead(PTT) == LOW){
       printLineF2(F("Sidetone set!"));
-      EEPROM.put(CW_SIDETONE, sideTone);
+      EEPROM.put(CW_SIDETONE, usbCarrier);
       delay_background(2000, 0);
     }
     else
       sideTone = prev_sideTone;
     
-    //printLine2ClearAndUpdate();
-    //menuOn = 0; 
-  menuClearExit(0);
+    printLine2ClearAndUpdate();
+    menuOn = 0; 
  }
 
 //Lock Dial move by KD8CEC
@@ -1203,9 +1256,8 @@ void doMenu(){
 
   //Appened Lines by KD8CEC for Adjust Tune step and Set Dial lock
   while(btnDown()){
-    //delay(50);
-    //Check_Cat(0);  //To prevent disconnections
-    delay_background(50, 0);
+    delay(50);
+    Check_Cat(0);  //To prevent disconnections
     
     if (btnDownTimeCount++ == (PRESS_ADJUST_TUNE / 50)) { //Set Tune Step 
       printLineF2(F("Set Tune Step?"));
@@ -1228,9 +1280,8 @@ void doMenu(){
     
     while (digitalRead(PTT) == HIGH && !btnDown())
     {
-      //Check_Cat(0);  //To prevent disconnections
-      //delay(50);  //debounce    
-      delay_background(50, 0);
+      Check_Cat(0);  //To prevent disconnections
+      delay(50);  //debounce    
 
       if (isNeedDisplay) {
         strcpy(b, "Tune Step:");
@@ -1297,7 +1348,7 @@ void doMenu(){
     else if (select < 40)
       menuRitToggle(btnState);
     else if (select < 50)
-      menuIFSSetup(btnState);
+      menuIFSToggle(btnState);
     else if (select < 60)
       menuCWSpeed(btnState);
     else if (select < 70)
@@ -1334,8 +1385,9 @@ void doMenu(){
 
   //debounce the button
   while(btnDown()){
-    delay_background(50, 0);  //To prevent disconnections
+    delay(50);
+    Check_Cat(0);  //To prevent disconnections
   }
-  //delay(50);
+  delay(50);
 }
 

ubitx_20/ubitx_ui.ino

@@ -235,6 +235,7 @@ char byteToChar(byte srcByte){
 void updateDisplay() {
   // tks Jack Purdum W8TEE
   // replaced fsprint commmands by str commands for code size reduction
+  
   // replace code for Frequency numbering error (alignment, point...) by KD8CEC
   int i;
   unsigned long tmpFreq = frequency; //