Merge pull request #15 from phdlee/version0.31

Fixed Bug CW Key Range
Append Feature : Display Line Toggle, (Between line1 and line2)
 Append function : for other users / using s.meter, p.meter ... (when idle time execute function)

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/cat_libs.ino

@@ -130,21 +130,10 @@ void CatGetFreqMode(unsigned long freq, byte fromType)
   }
 
   //Mode Check
-  if (cwMode == 0)
-  {
   if (isUSB)
     CAT_BUFF[4] = CAT_MODE_USB;
   else
     CAT_BUFF[4] = CAT_MODE_LSB;
-  }
-  else if (cwMode == 1)
-  {
-      CAT_BUFF[4] = CAT_MODE_CW;
-  }
-  else
-  {
-      CAT_BUFF[4] = CAT_MODE_CW;
-  }
 
   SendCatData(5);
 }
@@ -209,18 +198,12 @@ void CatSetMode(byte tmpMode, byte fromType)
   
   if (!inTx)
   {
-    if (tmpMode == CAT_MODE_CW)
+    if (tmpMode == CAT_MODE_USB)
     {
-      cwMode = 1;
-    }
-    else if (tmpMode == CAT_MODE_USB)
-    {
-      cwMode = 0;
       isUSB = true;
     }
     else
     {
-      cwMode = 0;
       isUSB = false;
     }
 
@@ -375,21 +358,10 @@ void ReadEEPRom_FT817(byte fromType)
       CAT_BUFF[1] = 0xB2;
       break;      case 0x69 : //FM Mic (#29)  Contains 0-100 (decimal) as displayed
     case 0x78 :
-      if (cwMode == 0)
-      {
       if (isUSB)
         CAT_BUFF[0] = CAT_MODE_USB;
       else
         CAT_BUFF[0] = CAT_MODE_LSB;
-      }
-      else if (cwMode == 1)
-      {
-          CAT_BUFF[0] = CAT_MODE_CW;
-      }
-      else if (cwMode == 2)
-      {
-          CAT_BUFF[0] = CAT_MODE_CW;
-      }
         
       if (CAT_BUFF[0] != 0) CAT_BUFF[0] = 1 << 5;
       break;
@@ -412,7 +384,7 @@ void ReadEEPRom_FT817(byte fromType)
       //7A  6 ? ?
       //7A  7 SPL On/Off  0 = Off, 1 = On
 
-      CAT_BUFF[0] = (splitOn ? 0xFF : 0x7F);
+      CAT_BUFF[0] = (isSplitOn ? 0xFF : 0x7F);
       break;
     case 0xB3 : //
       CAT_BUFF[0] = 0x00;

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

@@ -151,7 +151,6 @@ int count = 0;          //to generally count ticks, loops, etc
 #define CW_SPEED 28
 
 //AT328 has 1KBytes EEPROM
-#define CW_CAL 252
 #define VFO_A_MODE 256
 #define VFO_B_MODE 257
 #define CW_DELAY 258
@@ -160,8 +159,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
@@ -234,7 +232,7 @@ int count = 0;          //to generally count ticks, loops, etc
 char ritOn = 0;
 char vfoActive = VFO_A;
 int8_t meter_reading = 0; // a -1 on meter makes it invisible
-unsigned long vfoA=7150000L, vfoB=14200000L, sideTone=800, usbCarrier, cwmCarrier;
+unsigned long vfoA=7150000L, vfoB=14200000L, sideTone=800, usbCarrier;
 unsigned long vfoA_eeprom, vfoB_eeprom; //for protect eeprom life
 unsigned long frequency, ritRxFrequency, ritTxFrequency;  //frequency is the current frequency on the dial
 
@@ -251,6 +249,7 @@ byte saveIntervalSec = 10;  //second
 unsigned long saveCheckTime = 0;
 unsigned long saveCheckFreq = 0;
 
+bool isSplitOn = false;
 byte cwDelayTime = 60;
 byte delayBeforeCWStartTime = 50;
 
@@ -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;
@@ -299,13 +298,9 @@ byte userCallsignLength = 0;    //7 : display callsign at system startup, 6~0 :
  */
 boolean txCAT = false;        //turned on if the transmitting due to a CAT command
 char inTx = 0;                //it is set to 1 if in transmit mode (whatever the reason : cw, ptt or cat)
-char splitOn = 0;             //working split, uses VFO B as the transmit frequency
+char splitOn = 0;             //working split, uses VFO B as the transmit frequency, (NOT IMPLEMENTED YET)
 char keyDown = 0;             //in cw mode, denotes the carrier is being transmitted
 char isUSB = 0;               //upper sideband was selected, this is reset to the default for the 
-
-char cwMode = 0;              //compatible original source, and extend mode //if cwMode == 0, mode check : isUSB, cwMode > 0, mode Check : cwMode
-                              //iscwMode = 0 : ssbmode, 1 :cwl, 2 : cwu, 3 : cwn (none tx)
-                              
                               //frequency when it crosses the frequency border of 10 MHz
 byte menuOn = 0;              //set to 1 when the menu is being displayed, if a menu item sets it to zero, the menu is exited
 unsigned long cwTimeout = 0;  //milliseconds to go before the cw transmit line is released and the radio goes back to rx mode
@@ -316,10 +311,6 @@ boolean modeCalibrate = false;//this mode of menus shows extended menus to calib
 
 unsigned long beforeIdle_ProcessTime = 0; //for check Idle time
 byte line2DisplayStatus = 0;  //0:Clear, 1 : menu, 1: DisplayFrom Idle, 
-char lcdMeter[17];
-
-byte isIFShift = 0;     //1 = ifShift, 2 extend
-long ifShiftValue = 0;  //
                               
 /**
  * Below are the basic functions that control the uBitx. Understanding the functions before 
@@ -373,24 +364,22 @@ void setNextHamBandFreq(unsigned long f, char moveDirection)
 
   EEPROM.get(HAM_BAND_FREQS + 4 * findedIndex, resultFreq);
   
-  //loadMode = (byte)(resultFreq >> 30);
-  //resultFreq = resultFreq & 0x3FFFFFFF;
-  loadMode = (byte)(resultFreq >> 29);
-  resultFreq = resultFreq & 0x1FFFFFFF;
+  loadMode = (byte)(resultFreq >> 30);
+  resultFreq = resultFreq & 0x3FFFFFFF;
   
   if ((resultFreq / 1000) < hamBandRange[(unsigned char)findedIndex][0] || (resultFreq / 1000) > hamBandRange[(unsigned char)findedIndex][1])
     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) {
   if (bandIndex >= 0)
-    //EEPROM.put(HAM_BAND_FREQS + 4 * bandIndex, (f & 0x3FFFFFFF) | (mode << 30) );
-    EEPROM.put(HAM_BAND_FREQS + 4 * bandIndex, (f & 0x1FFFFFFF) | (mode << 29) );
+    EEPROM.put(HAM_BAND_FREQS + 4 * bandIndex, (f & 0x3FFFFFFF) | (mode << 30) );
 }
 
+
 /*
   KD8CEC
   When using the basic delay of the Arduino, the program freezes.
@@ -484,28 +473,14 @@ void setFrequency(unsigned long f){
   
   setTXFilters(f);
 
-  if (cwMode == 0)
-  {
   if (isUSB){
-      si5351bx_setfreq(2, SECOND_OSC_USB - usbCarrier + f  + (isIFShift ? ifShiftValue : 0));
+    si5351bx_setfreq(2, SECOND_OSC_USB - usbCarrier + f);
     si5351bx_setfreq(1, SECOND_OSC_USB);
   }
   else{
-      si5351bx_setfreq(2, SECOND_OSC_LSB + usbCarrier + f + (isIFShift ? ifShiftValue : 0));
+    si5351bx_setfreq(2, SECOND_OSC_LSB + usbCarrier + f);
     si5351bx_setfreq(1, SECOND_OSC_LSB);
   }
-  }
-  else
-  {
-    if (cwMode == 1){ //CWL
-      si5351bx_setfreq(2, SECOND_OSC_LSB + cwmCarrier + f + (isIFShift ? ifShiftValue : 0));
-      si5351bx_setfreq(1, SECOND_OSC_LSB);
-    }
-    else{             //CWU
-      si5351bx_setfreq(2, SECOND_OSC_USB - cwmCarrier + f + (isIFShift ? ifShiftValue : 0));
-      si5351bx_setfreq(1, SECOND_OSC_USB);
-    }
-  }
   
   frequency = f;
 }
@@ -533,21 +508,6 @@ void startTx(byte txMode, byte isDisplayUpdate){
     ritRxFrequency = frequency;
     setFrequency(ritTxFrequency);
   }
-  else if (splitOn == 1) {
-      if (vfoActive == VFO_B) {
-        vfoActive = VFO_A;
-        frequency = vfoA;
-        byteToMode(vfoA_mode, 0);
-      }
-      else if (vfoActive == VFO_A){
-        vfoActive = VFO_B;
-        frequency = vfoB;
-        byteToMode(vfoB_mode, 0);
-      }
-
-      setFrequency(frequency);
-  } //end of else
-  
 
   if (txMode == TX_CW){
     //turn off the second local oscillator and the bfo
@@ -557,23 +517,11 @@ void startTx(byte txMode, byte isDisplayUpdate){
     //shif the first oscillator to the tx frequency directly
     //the key up and key down will toggle the carrier unbalancing
     //the exact cw frequency is the tuned frequency + sidetone
-
-    if (cwMode == 0)
-    {
     if (isUSB)
       si5351bx_setfreq(2, frequency + sideTone);
     else
       si5351bx_setfreq(2, frequency - sideTone); 
   }
-    else if (cwMode == 1) //CWL
-    {
-        si5351bx_setfreq(2, frequency - sideTone); 
-    }
-    else  //CWU
-    {
-        si5351bx_setfreq(2, frequency + sideTone);
-    }
-  }
 
   //reduce latency time when begin of CW mode
   if (isDisplayUpdate == 1)
@@ -584,28 +532,10 @@ void stopTx(){
   inTx = 0;
 
   digitalWrite(TX_RX, 0);           //turn off the tx
-
-  if (cwMode == 0)
-    si5351bx_setfreq(0, usbCarrier + (isIFShift ? ifShiftValue : 0));  //set back the carrier oscillator anyway, cw tx switches it off
-  else
-    si5351bx_setfreq(0, cwmCarrier + (isIFShift ? ifShiftValue : 0));  //set back the carrier oscillator anyway, cw tx switches it off
+  si5351bx_setfreq(0, usbCarrier);  //set back the carrier oscillator anyway, cw tx switches it off
 
   if (ritOn)
     setFrequency(ritRxFrequency);
-  else if (splitOn == 1) {
-      //vfo Change
-      if (vfoActive == VFO_B){
-        vfoActive = VFO_A;
-        frequency = vfoA;
-        byteToMode(vfoA_mode, 0);
-      }
-      else if (vfoActive == VFO_A){
-        vfoActive = VFO_B;
-        frequency = vfoB;
-        byteToMode(vfoB_mode, 0);
-      }
-      setFrequency(frequency);
-  } //end of else
   else
     setFrequency(frequency);
   
@@ -755,8 +685,9 @@ void doRIT(){
     updateDisplay();
   }
 }
-/*
- save Frequency and mode to eeprom for Auto Save with protected eeprom cycle, by kd8cec
+
+/**
+ save Frequency and mode to eeprom
  */
 void storeFrequencyAndMode(byte saveType)
 {
@@ -788,22 +719,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 
@@ -846,7 +761,6 @@ void initSettings(){
   if (EEPROM.read(VERSION_ADDRESS) != VERSION_NUM)
     EEPROM.write(VERSION_ADDRESS, VERSION_NUM);
 
-  EEPROM.get(CW_CAL, cwmCarrier);
 
   //for Save VFO_A_MODE to eeprom
   //0: default, 1:not use, 2:LSB, 3:USB, 4:CW, 5:AM, 6:FM
@@ -867,7 +781,7 @@ void initSettings(){
   else
   {
     Iambic_Key = true;
-    if (cwKeyType == 1)
+    if (cwKeyType = 1)
       keyerControl &= ~IAMBICB;
     else
       keyerControl |= IAMBICB;
@@ -910,7 +824,7 @@ void initSettings(){
     hamBandRange[0][0] = 1810; hamBandRange[0][1] = 2000; 
     hamBandRange[1][0] = 3500; hamBandRange[1][1] = 3800; 
     hamBandRange[2][0] = 5351; hamBandRange[2][1] = 5367; 
-    hamBandRange[3][0] = 7000; hamBandRange[3][1] = 7300;   //region 1
+    hamBandRange[3][0] = 7000; hamBandRange[3][1] = 7200; 
     hamBandRange[4][0] = 10100; hamBandRange[4][1] = 10150; 
     hamBandRange[5][0] = 14000; hamBandRange[5][1] = 14350; 
     hamBandRange[6][0] = 18068; hamBandRange[6][1] = 18168; 
@@ -924,8 +838,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++;
   }
 
@@ -996,17 +910,14 @@ void initSettings(){
   if (usbCarrier > 12010000l || usbCarrier < 11990000l)
     usbCarrier = 11995000l;
     
-  if (cwmCarrier > 12010000l || cwmCarrier < 11990000l)
-    cwmCarrier = 11995000l;
-    
   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 +993,7 @@ void setup()
   
   //Serial.begin(9600);
   lcd.begin(16, 2);
-  printLineF(1, F("CECBT v0.35")); 
+  printLineF(1, F("CECBT v0.31")); 
 
   Init_Cat(38400, SERIAL_8N1);
   initMeter(); //not used in this build
@@ -1100,12 +1011,11 @@ void setup()
   }
   
   initPorts();     
-
-  byteToMode(vfoA_mode, 0);
   initOscillators();
 
   frequency = vfoA;
   saveCheckFreq = frequency;  //for auto save frequency
+  byteToMode(vfoA_mode);
   setFrequency(vfoA);
   updateDisplay();
 
@@ -1114,11 +1024,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
@@ -1167,12 +1079,10 @@ void loop(){
   if (!inTx){
     if (ritOn)
       doRIT();
-    //else if (isIFShift)
-    //  doIFShift();
     else 
       doTuningWithThresHold();
 
-    if (isCWAutoMode == 0 && beforeIdle_ProcessTime < millis() - 250) {
+    if (isCWAutoMode == 0 && beforeIdle_ProcessTime < millis() - 200) {
       idle_process();
       beforeIdle_ProcessTime = millis();
     }

ubitx_20/ubitx_factory_alignment.ino

@@ -37,7 +37,6 @@ void factory_alignment(){
 
   
   printLine2("#3:Test 3.5MHz");
-  cwMode = 0;
   isUSB = false;
   setFrequency(3500000l);
   updateDisplay();
@@ -60,7 +59,6 @@ void factory_alignment(){
   btnWaitForClick();
   printLine2("#5:Test 14MHz");
 
-  cwMode = 0;
   isUSB = true;
   setFrequency(14000000l);
   updateDisplay();
@@ -82,7 +80,6 @@ void factory_alignment(){
   printLine2("Alignment done");
   delay(1000);
 
-  cwMode = 0;
   isUSB = false;
   setFrequency(7150000l);
   updateDisplay();  

ubitx_20/ubitx_idle.ino

@@ -17,241 +17,14 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 **************************************************************************/
-char line2Buffer[16];
-//KD8CEC 200Hz ST
-//L14.150 200Hz ST
-//U14.150 +150khz
-int freqScrollPosition = 0;
-//Example Line2 Optinal Display
-//immediate execution, not call by scheulder
-void updateLine2Buffer(char isDirectCall)
-{
-  unsigned long tmpFreq = 0;
-  if (isDirectCall == 0)
-  {
-    if (ritOn)
-    {
-      line2Buffer[0] = 'R';
-      line2Buffer[1] = 'i';
-      line2Buffer[2] = 't';
-      line2Buffer[3] = 'T';
-      line2Buffer[4] = 'X';
-      line2Buffer[5] = ':';
 
-      //display frequency
-      tmpFreq = ritTxFrequency;
-      for (int i = 15; i >= 6; i--) {
-        if (tmpFreq > 0) {
-          if (i == 12 || i == 8) line2Buffer[i] = '.';
-          else {
-            line2Buffer[i] = tmpFreq % 10 + 0x30;
-            tmpFreq /= 10;
-          }
-        }
-        else
-          line2Buffer[i] = ' ';
-      }
 
-      return;
-    } //end of ritOn display
-
-    //======================================================
-    //other VFO display
-    //======================================================
-    if (vfoActive == VFO_B)
-    {
-      tmpFreq = vfoA;
-      //line2Buffer[0] = 'A';
-    }
-    else 
-    {
-      tmpFreq = vfoB;
-      //line2Buffer[0] = 'B';
-    }
-  
-    // EXAMPLE 1 & 2
-    //U14.150.100
-    //display frequency
-    for (int i = 9; i >= 0; i--) {
-      if (tmpFreq > 0) {
-        if (i == 2 || i == 6) line2Buffer[i] = '.';
-        else {
-          line2Buffer[i] = tmpFreq % 10 + 0x30;
-          tmpFreq /= 10;
-        }
-      }
-      else
-        line2Buffer[i] = ' ';
-    }
-  
-    //EXAMPLE #1
-    if ((displayOption1 & 0x04) == 0x00)  //none scroll display
-      line2Buffer[6] = 'k';
-    else
-    {
-      //example #2
-      if (freqScrollPosition++ > 18)    //none scroll display time
-      {
-        line2Buffer[6] = 'k';
-        if (freqScrollPosition > 25)
-          freqScrollPosition = -1;
-      }
-      else                              //scroll frequency 
-      {
-        line2Buffer[10] = 'H';
-        line2Buffer[11] = 'z';
-    
-        if (freqScrollPosition < 7)   
-        {
-          for (int i = 11; i >= 0; i--)
-            if (i - (7 - freqScrollPosition) >= 0)
-              line2Buffer[i] = line2Buffer[i - (7 - freqScrollPosition)];
-            else
-              line2Buffer[i] = ' ';
-        }
-        else
-        {
-          for (int i = 0; i < 11; i++)
-            if (i + (freqScrollPosition - 7) <= 11)
-              line2Buffer[i] = line2Buffer[i + (freqScrollPosition - 7)];
-            else
-              line2Buffer[i] = ' ';
-        }
-      }
-    } //scroll
-    
-    line2Buffer[7] = ' ';
-  } //check direct call by encoder
-  
-  if (isIFShift)
-  {
-    if (isDirectCall == 1)
-      for (int i = 0; i < 16; i++)
-        line2Buffer[i] = ' ';
-      
-      //IFShift Offset Value 
-    line2Buffer[8] = 'I';
-    line2Buffer[9] = 'F';
-
-    if (ifShiftValue == 0)
-    {
-      line2Buffer[10] = 'S';
-      line2Buffer[11] = ':';
-      line2Buffer[12] = 'O';
-      line2Buffer[13] = 'F';
-      line2Buffer[14] = 'F';
-    }
-    else
-    {
-      line2Buffer[10] = ifShiftValue >= 0 ? '+' : 0;
-      line2Buffer[11] = 0;
-      line2Buffer[12] = ' ';
-    
-      //11, 12, 13, 14, 15
-      memset(b, 0, sizeof(b));
-      ltoa(ifShiftValue, b, DEC);
-      strncat(line2Buffer, b, 5);
-    }
-    
-    if (isDirectCall == 1)  //if call by encoder (not scheduler), immediate print value
-        printLine2(line2Buffer);    
-  }       // end of display IF
-  else    // step display
-  {
-    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--) {
-      if (tmpStep > 0) {
-          line2Buffer[i + isStepKhz] = 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[13] = ' ';
-    //if (
-    //Check CW Key cwKeyType = 0; //0: straight, 1 : iambica, 2: iambicb
-    if (cwKeyType == 0)
-    {
-      line2Buffer[14] = 'S';
-      line2Buffer[15] = 'T';
-    }
-    else if (cwKeyType == 1)
-    {
-      line2Buffer[14] = 'I';
-      line2Buffer[15] = 'A';
-    }
-    else
-    {
-      line2Buffer[14] = 'I';
-      line2Buffer[15] = 'B';
-    }    
-  }
-  
-}
-
-//meterType : 0 = S.Meter, 1 : P.Meter
-void DisplayMeter(byte meterType, byte meterValue, char drawPosition)
-{
-  drawMeter(meterValue);  //call original source code
-  int lineNumber = 0;
-  if ((displayOption1 & 0x01) == 0x01)
-    lineNumber = 1;
-  
-  lcd.setCursor(drawPosition, lineNumber);
-
-  for (int i = 0; i < 6; i++) //meter 5 + +db 1 = 6
-    lcd.write(lcdMeter[i]);
-
-}
-
-byte testValue = 0;
-char checkCount = 0;
 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)
-      {
-        updateLine2Buffer(0); //call by scheduler
-        printLine2(line2Buffer);
-        line2DisplayStatus = 2;
-        checkCount = 0;
-      }
-
-      //EX for Meters
-      /*
-      DisplayMeter(0, testValue++, 7);
-      if (testValue > 30)
-        testValue = 0;
-      */
-    }
   }
 }
 

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,7 @@ void menuBand(int btn){
             stepChangeCount = 0;
           }
         }
-      }       //end of only ham band move
+      }
       else {  //original source
         if (knob < 0 && frequency > 3000000l)
           setFrequency(frequency - 200000l);
@@ -122,72 +103,40 @@ 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
-//0: default, 1:not use, 2:LSB, 3:USB, 4:CWL, 5:CWU, 6:FM
+//0: default, 1:not use, 2:LSB, 3:USB, 4:CW, 5:AM, 6:FM
 byte modeToByte(){
-  if (cwMode == 0)
-  {
   if (isUSB)
     return 3;
   else
     return 2;
 }
-  else if (cwMode == 1)
-  {
-    return 4;
-  }
-  else
-  {
-    return 5;
-  }
-}
 
 //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){
-  if (modeValue == 4)
-    cwMode = 1;
-  else if (modeValue == 5)
-    cwMode = 2;
-  else
-  {
-    cwMode = 0;
+void byteToMode(byte modeValue){
   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)
-    cwMode = 1;
-  else if (modeValue == 5)
-    cwMode = 2;
-  else  {
-    cwMode = 0;
   if (modeValue == 3)
     isUSB = 1;
   else if (modeValue == 0)  //Not Set
@@ -195,176 +144,147 @@ void byteWithFreqToMode(byte modeValue){
   else
     isUSB = 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 {
+      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();
+
+      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 menuSidebandToggle(int btn){
+  if (!btn){
+    if (isUSB == true)
+      printLineF2(F("Select LSB?"));
+    else
+      printLineF2(F("Select USB?"));
+  }
+  else {
+      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;
+  }
+}
+
+/*
+//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;
+  }
 }
 */
 
-void menuIFSSetup(int btn){
-  int knob = 0;
-  char needApplyChangeValue = 1;
-  
-  if (!btn){
-    if (isIFShift == 1)
-      printLineF2(F("IF Shift Change?"));
-    else
-      printLineF2(F("IF Shift:Off, On?"));
-  }
-  else {
-      //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() ){
-        if (needApplyChangeValue ==1)
-        {
-          updateLine2Buffer(1);
-          setFrequency(frequency);
-        
-          if (cwMode == 0)
-            si5351bx_setfreq(0, usbCarrier + (isIFShift ? ifShiftValue : 0));  //set back the carrier oscillator anyway, cw tx switches it off
-          else
-            si5351bx_setfreq(0, cwmCarrier + (isIFShift ? ifShiftValue : 0));  //set back the carrier oscillator anyway, cw tx switches it off
-
-          needApplyChangeValue = 0;
-        }
-        
-        knob = enc_read();
-        if (knob != 0){
-          if (knob < 0)
-            ifShiftValue -= 50l;
-          else if (knob > 0)
-            ifShiftValue += 50;
-
-          needApplyChangeValue = 1;
-        }
-      }
-
-      delay_background(500, 0); //for check Long Press function key
-      
-      if (btnDown() || ifShiftValue == 0)
-      {
-        isIFShift = 0;
-        printLineF2(F("IF Shift is OFF"));
-        setFrequency(frequency);
-        delay_background(500, 0);
-      }
-      
-      //menuOn = 0;
-      //printLine2ClearAndUpdate();
-      menuClearExit(0);
-  }
-}
-
-void menuSelectMode(int btn){
-  int knob = 0;
-  int selectModeType = 0;
-  int beforeMode = 0;
-  int moveStep = 0;
-  
-  if (!btn){
-      printLineF2(F("Select Mode?"));
-  }
-  else {
-    delay_background(500, 0);
-
-    //LSB, USB, CWL, CWU
-    if (cwMode == 0 && isUSB == 0)
-      selectModeType = 0;
-    else if (cwMode == 0 && isUSB == 1)
-      selectModeType = 1;
-    else if (cwMode == 1)
-      selectModeType = 2;
-    else
-      selectModeType = 3;
-
-    beforeMode = selectModeType;
-
-    while(!btnDown() && digitalRead(PTT) == HIGH){
-      //Display Mode Name
-      printLineF1(F("LSB USB CWL CWU"));
-      if (selectModeType == 0)
-        printLineF1(F("LSB"));
-      else if (selectModeType == 1)
-        printLineF1(F("USB"));
-      else if (selectModeType == 2)
-        printLineF1(F("CWL"));
-      else if (selectModeType == 3)
-        printLineF1(F("CWU"));
-
-      knob = enc_read();
-
-      if (knob != 0)
-      {
-        moveStep += (knob > 0 ? 1 : -1);
-        if (moveStep < -3) {
-          if (selectModeType > 0)
-            selectModeType--;
-            
-          moveStep = 0;
-        }
-        else if (moveStep > 3) {
-          if (selectModeType < 3)
-            selectModeType++;
-            
-          moveStep = 0;
-        }
-      }
-
-      Check_Cat(0);  //To prevent disconnections
-    }
-
-    if (beforeMode != selectModeType) {
-      //printLineF1(F("Changed Mode"));
-      if (selectModeType == 0) {
-        cwMode = 0; isUSB = 0;
-      }
-      else if (selectModeType == 1) {
-        cwMode = 0; isUSB = 1;
-      }
-      else if (selectModeType == 2) {
-        cwMode = 1;
-      }
-      else if (selectModeType == 3) {
-        cwMode = 2;
-      }
-
-      FrequencyToVFO(1);
-    }
-
-  if (cwMode == 0)
-    si5351bx_setfreq(0, usbCarrier + (isIFShift ? ifShiftValue : 0));  //set back the carrier oscillator anyway, cw tx switches it off
-  else
-    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);
-  }
-}
-
 //Select CW Key Type by KD8CEC
 void menuSetupKeyType(int btn){
   int knob = 0;
   int selectedKeyType = 0;
   int moveStep = 0;
-  if (!btn){
+  if (!btn && digitalRead(PTT) == HIGH){
         printLineF2(F("Change Key Type?"));
   }
   else {
-    printLineF2(F("Press to set Key"));
+    printLineF2(F("Press PTT to set"));
     delay_background(500, 0);
     selectedKeyType = cwKeyType;
-    
-    while(!btnDown()){
+    while(!btnDown() && digitalRead(PTT) == HIGH){
 
       //Display Key Type
       if (selectedKeyType == 0)
@@ -379,13 +299,11 @@ void menuSetupKeyType(int btn){
       if (knob != 0)
       {
         moveStep += (knob > 0 ? 1 : -1);
-        if (moveStep < -3) {
-          if (selectedKeyType > 0)
+        if (selectedKeyType > 0 && moveStep < -3) {
           selectedKeyType--;
           moveStep = 0;
         }
-        else if (moveStep > 3) {
-          if (selectedKeyType < 2)
+        else if (selectedKeyType < 2 && moveStep > 3) {
           selectedKeyType++;
           moveStep = 0;
         }
@@ -394,6 +312,8 @@ void menuSetupKeyType(int btn){
       Check_Cat(0);  //To prevent disconnections
     }
     
+    //save the setting
+    if (digitalRead(PTT) == LOW){
       printLineF2(F("CW Key Type set!"));
       cwKeyType = selectedKeyType;
       EEPROM.put(CW_KEY_TYPE, cwKeyType);
@@ -403,16 +323,16 @@ void menuSetupKeyType(int btn){
       else
       {
         Iambic_Key = true;
-      if (cwKeyType == 1)
+        if (cwKeyType = 1)
           keyerControl &= ~IAMBICB;
         else
           keyerControl |= IAMBICB;
       }
+      delay_background(2000, 0);
+    }
     
-    //delay_background(2000, 0);
-    //printLine2ClearAndUpdate();
-    //menuOn = 0;
-    menuClearExit(1000);
+    printLine2ClearAndUpdate();
+    menuOn = 0;
   }
 }
 
@@ -492,109 +412,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 +434,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 +459,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){
@@ -670,7 +491,7 @@ void menuCWSpeed(int btn){
      return;
     }
 
-    printLineF1(F("Press to set WPm"));
+    printLineF1(F("Press PTT to set"));
     strcpy(b, "WPM:");
     itoa(wpm,c, 10);
     strcat(b, c);
@@ -700,15 +521,14 @@ void menuCWSpeed(int btn){
     }
     
     //save the setting
-    //if (digitalRead(PTT) == LOW){
+    if (digitalRead(PTT) == LOW){
       printLineF2(F("CW Speed set!"));
       cwSpeed = 1200/wpm;
       EEPROM.put(CW_SPEED, cwSpeed);
-    //}
-    //delay_background(2000, 0);
-    //printLine2ClearAndUpdate();
-    //menuOn = 0;
-   menuClearExit(1000);
+      delay_background(2000, 0);
+    }
+    printLine2ClearAndUpdate();
+    menuOn = 0;
 }
 
 //Builtin CW Keyer Logic by KD8CEC
@@ -746,7 +566,7 @@ void menuSetupCwDelay(int btn){
      return;
     }
 
-    printLineF1(F("Press, set Delay"));
+    printLineF1(F("Press PTT to set"));
     strcpy(b, "DELAY:");
     itoa(tmpCWDelay,c, 10);
     strcat(b, c);
@@ -774,15 +594,14 @@ void menuSetupCwDelay(int btn){
     }
     
     //save the setting
-    //if (digitalRead(PTT) == LOW){
+    if (digitalRead(PTT) == LOW){
       printLineF2(F("CW Delay set!"));
       cwDelayTime = tmpCWDelay / 10;
       EEPROM.put(CW_DELAY, cwDelayTime);
-      //delay_background(2000, 0);
-    //}
-    //printLine2ClearAndUpdate();
-    //menuOn = 0;
-   menuClearExit(1000);
+      delay_background(2000, 0);
+    }
+    printLine2ClearAndUpdate();
+    menuOn = 0;
 }
 
 //CW Time delay by KD8CEC
@@ -796,7 +615,7 @@ void menuSetupTXCWInterval(int btn){
      return;
     }
 
-    printLineF1(F("Press, set Delay"));
+    printLineF1(F("Press PTT to set"));
     strcpy(b, "Start Delay:");
     itoa(tmpTXCWInterval,c, 10);
     strcat(b, c);
@@ -824,15 +643,14 @@ void menuSetupTXCWInterval(int btn){
     }
     
     //save the setting
-    //if (digitalRead(PTT) == LOW){
+    if (digitalRead(PTT) == LOW){
       printLineF2(F("CW Start set!"));
       delayBeforeCWStartTime = tmpTXCWInterval / 2;
       EEPROM.put(CW_START, delayBeforeCWStartTime);
-      //delay_background(2000, 0);
-    //}
-    //printLine2ClearAndUpdate();
-    //menuOn = 0;
-   menuClearExit(1000);
+      delay_background(2000, 0);
+    }
+    printLine2ClearAndUpdate();
+    menuOn = 0;
 }
 
 
@@ -865,7 +683,6 @@ void factoryCalibration(int btn){
 
   calibration = 0;
 
-  cwMode = 0;
   isUSB = true;
 
   //turn off the second local oscillator and the bfo
@@ -915,8 +732,7 @@ void factoryCalibration(int btn){
 
   while(btnDown())
     delay(50);
-
-  menuClearExit(100);
+  delay(100);
 }
 
 void menuSetupCalibration(int btn){
@@ -980,9 +796,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){
@@ -996,7 +811,7 @@ void printCarrierFreq(unsigned long freq){
   strcat(c, ".");
   strncat(c, &b[2], 3);
   strcat(c, ".");
-  strncat(c, &b[5], 3);
+  strncat(c, &b[5], 1);
   printLine2(c);    
 }
 
@@ -1048,73 +863,10 @@ void menuSetupCarrier(int btn){
   else 
     usbCarrier = prevCarrier;
 
-  //si5351bx_setfreq(0, usbCarrier);          
-  if (cwMode == 0)
-    si5351bx_setfreq(0, usbCarrier);  //set back the carrier oscillator anyway, cw tx switches it off
-  else
-    si5351bx_setfreq(0, cwmCarrier);  //set back the carrier oscillator anyway, cw tx switches it off
-  
+  si5351bx_setfreq(0, usbCarrier);          
   setFrequency(frequency);    
-  //printLine2ClearAndUpdate();
-  //menuOn = 0; 
-  menuClearExit(0);
-}
-
-//Append by KD8CEC
-void menuSetupCWCarrier(int btn){
-  int knob = 0;
-  unsigned long prevCarrier;
-   
-  if (!btn){
-      printLineF2(F("Set CW RX BFO"));
-    return;
-  }
-
-  prevCarrier = cwmCarrier;
-  printLineF1(F("PTT to confirm. "));
-  delay_background(1000, 0);
-
-  si5351bx_setfreq(0, cwmCarrier);
-  printCarrierFreq(cwmCarrier);
-
-  //disable all clock 1 and clock 2 
-  while (digitalRead(PTT) == HIGH && !btnDown())
-  {
-    knob = enc_read();
-
-    if (knob > 0)
-      cwmCarrier -= 5;
-    else if (knob < 0)
-      cwmCarrier += 5;
-    else
-      continue; //don't update the frequency or the display
-      
-    si5351bx_setfreq(0, cwmCarrier);
-    printCarrierFreq(cwmCarrier);
-
-    //Check_Cat(0);  //To prevent disconnections
-    //delay(100);
-    delay_background(100, 0);
-  }
-
-  //save the setting
-  if (digitalRead(PTT) == LOW){
-    printLineF2(F("Carrier set!"));
-    EEPROM.put(CW_CAL, cwmCarrier);
-    delay_background(1000, 0);
-  }
-  else 
-    cwmCarrier = prevCarrier;
-
-  if (cwMode == 0)
-    si5351bx_setfreq(0, usbCarrier);  //set back the carrier oscillator anyway, cw tx switches it off
-  else
-    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; 
 }
 
 //Modified by KD8CEC
@@ -1149,23 +901,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 +953,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?"));
@@ -1223,14 +972,13 @@ void doMenu(){
   //ADJUST TUNE STEP 
   if (btnDownTimeCount > (PRESS_ADJUST_TUNE / 50))
   {
-    printLineF1(F("Press to set step"));
+    printLineF1(F("Press Key to set"));
     isNeedDisplay = 1; //check to need display for display current value
     
     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:");
@@ -1277,9 +1025,9 @@ void doMenu(){
     btnState = btnDown();
 
     if (i > 0){
-      if (modeCalibrate && select + i < 200)
+      if (modeCalibrate && select + i < 170)
         select += i;
-      if (!modeCalibrate && select + i < 100)
+      if (!modeCalibrate && select + i < 80)
         select += i;
     }
     //if (i < 0 && select - i >= 0)
@@ -1291,42 +1039,36 @@ void doMenu(){
     else if (select < 10)
       menuBand(btnState);
     else if (select < 20)
-      menuVfoToggle(btnState, 1);
-    else if (select < 30)
-      menuSelectMode(btnState);
-    else if (select < 40)
       menuRitToggle(btnState);
+    else if (select < 30)
+      menuVfoToggle(btnState, 1);
+    else if (select < 40)
+      menuSidebandToggle(btnState);
     else if (select < 50)
-      menuIFSSetup(btnState);
-    else if (select < 60)
       menuCWSpeed(btnState);
-    else if (select < 70)
-      menuSplitOnOff(btnState);      //SplitOn / off
-    else if (select < 80)
+    else if (select < 60)
       menuCWAutoKey(btnState);
-    else if (select < 90)
+    else if (select < 70)
       menuSetup(btnState);
-    else if (select < 100)
+    else if (select < 80 && !modeCalibrate)
       menuExit(btnState);
-    else if (select < 110 && modeCalibrate)
+    else if (select < 90 && modeCalibrate)
       menuSetupCalibration(btnState);   //crystal
-    else if (select < 120 && modeCalibrate)
+    else if (select < 100 && modeCalibrate)
       menuSetupCarrier(btnState);       //lsb
-    else if (select < 130 && modeCalibrate)
-      menuSetupCWCarrier(btnState);       //lsb
-    else if (select < 140 && modeCalibrate)
+    else if (select < 110 && modeCalibrate)
       menuSetupCwTone(btnState);
-    else if (select < 150 && modeCalibrate)
+    else if (select < 120 && modeCalibrate)
       menuSetupCwDelay(btnState);
-    else if (select < 160 && modeCalibrate)
+    else if (select < 130 && modeCalibrate)
       menuSetupTXCWInterval(btnState);
-    else if (select < 170 && modeCalibrate)
+    else if (select < 140 && modeCalibrate)
       menuSetupKeyType(btnState);
-    else if (select < 180 && modeCalibrate)
+    else if (select < 150 && modeCalibrate)
       menuADCMonitor(btnState);
-    else if (select < 190 && modeCalibrate)
+    else if (select < 160 && modeCalibrate)
       menuTxOnOff(btnState, 0x01);      //TX OFF / ON
-    else if (select < 200 && modeCalibrate)
+    else if (select < 170 && modeCalibrate)
       menuExit(btnState);
 
     Check_Cat(0);  //To prevent disconnections
@@ -1334,8 +1076,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_si5351.ino

@@ -109,11 +109,7 @@ void initOscillators(){
   //initialize the SI5351
   si5351bx_init();
   si5351bx_vcoa = (SI5351BX_XTAL * SI5351BX_MSA) + calibration; // apply the calibration correction factor
-
-  if (cwMode == 0)
-    si5351bx_setfreq(0, usbCarrier + (isIFShift ? ifShiftValue : 0));
- else
-    si5351bx_setfreq(0, cwmCarrier + (isIFShift ? ifShiftValue : 0));
+  si5351bx_setfreq(0, usbCarrier);
 }
 
 

ubitx_20/ubitx_ui.ino

@@ -25,8 +25,8 @@ int btnDown(){
  * The current reading of the meter is assembled in the string called meter
  */
 
+//char meter[17];
 
-/*
 const PROGMEM uint8_t s_meter_bitmap[] = {
   B00000,B00000,B00000,B00000,B00000,B00100,B00100,B11011,
   B10000,B10000,B10000,B10000,B10100,B10100,B10100,B11011,
@@ -35,18 +35,7 @@ const PROGMEM uint8_t s_meter_bitmap[] = {
   B00010,B00010,B00010,B00010,B00110,B00110,B00110,B11011,
   B00001,B00001,B00001,B00001,B00101,B00101,B00101,B11011
 };
-*/
-
-const PROGMEM uint8_t meters_bitmap[] = {
-  B10000,  B10000,  B10000,  B10000,  B10000,  B10000,  B10000,  B10000 ,   //custom 1
-  B11000,  B11000,  B11000,  B11000,  B11000,  B11000,  B11000,  B11000 ,   //custom 2
-  B11100,  B11100,  B11100,  B11100,  B11100,  B11100,  B11100,  B11100 ,   //custom 3
-  B11110,  B11110,  B11110,  B11110,  B11110,  B11110,  B11110,  B11110 ,   //custom 4
-  B11111,  B11111,  B11111,  B11111,  B11111,  B11111,  B11111,  B11111 ,   //custom 5
-  B01000,  B11100,  B01000,  B00000,  B10111,  B10101,  B10101,  B10111     //custom 6
-};
-
-PGM_P p_metes_bitmap = reinterpret_cast<PGM_P>(meters_bitmap);
+PGM_P ps_meter_bitmap = reinterpret_cast<PGM_P>(s_meter_bitmap);
 
 const PROGMEM uint8_t lock_bitmap[8] = {
   0b01110,
@@ -71,54 +60,36 @@ void initMeter(){
   lcd.createChar(0, tmpbytes);
   
   for (i = 0; i < 8; i++)
-    tmpbytes[i] = pgm_read_byte(p_metes_bitmap + i);
+    tmpbytes[i] = pgm_read_byte(ps_meter_bitmap + i);
   lcd.createChar(1, tmpbytes);
 
   for (i = 0; i < 8; i++)
-    tmpbytes[i] = pgm_read_byte(p_metes_bitmap + i + 8);
+    tmpbytes[i] = pgm_read_byte(ps_meter_bitmap + i + 8);
   lcd.createChar(2, tmpbytes);
   
   for (i = 0; i < 8; i++)
-    tmpbytes[i] = pgm_read_byte(p_metes_bitmap + i + 16);
+    tmpbytes[i] = pgm_read_byte(ps_meter_bitmap + i + 16);
   lcd.createChar(3, tmpbytes);
   
   for (i = 0; i < 8; i++)
-    tmpbytes[i] = pgm_read_byte(p_metes_bitmap + i + 24);
+    tmpbytes[i] = pgm_read_byte(ps_meter_bitmap + i + 24);
   lcd.createChar(4, tmpbytes);
   
   for (i = 0; i < 8; i++)
-    tmpbytes[i] = pgm_read_byte(p_metes_bitmap + i + 32);
+    tmpbytes[i] = pgm_read_byte(ps_meter_bitmap + i + 28);
   lcd.createChar(5, tmpbytes);
   
   for (i = 0; i < 8; i++)
-    tmpbytes[i] = pgm_read_byte(p_metes_bitmap + i + 40);
+    tmpbytes[i] = pgm_read_byte(ps_meter_bitmap + i + 32);
   lcd.createChar(6, tmpbytes);
 }
 
-//by KD8CEC
-//0 ~ 25 : 30 over : + 10
-void drawMeter(int needle) {
-  //5Char + O over
-  int drawCharLength = needle / 5;
-  int drawCharLengthLast = needle % 5;
-  int i;
-
-  for (i = 0; i < 5; i++) {
-    if (needle >= 5)
-      lcdMeter[i] = 5; //full
-    else if (needle > 0)
-      lcdMeter[i] = needle; //full
-    else  //0
-      lcdMeter[i] = 0x20;
-    
-    needle -= 5;
-  }
-
-  if (needle > 0)
-    lcdMeter[5] = 6;
-  else
-    lcdMeter[5] = 0x20;
-}
+/**
+ * The meter is drawn with special characters.
+ * character 1 is used to simple draw the blocks of the scale of the meter
+ * characters 2 to 6 are used to draw the needle in positions 1 to within the block
+ * This displays a meter from 0 to 100, -1 displays nothing
+ */
 
  /*
 void drawMeter(int8_t needle){
@@ -130,18 +101,19 @@ void drawMeter(int8_t needle){
   s = (needle * 4)/10;
   for (i = 0; i < 8; i++){
     if (s >= 5)
-      lcdMeter[i] = 1;
+      meter[i] = 1;
     else if (s >= 0)
-      lcdMeter[i] = 2 + s;
+      meter[i] = 2 + s;
     else
-      lcdMeter[i] = 1;
+      meter[i] = 1;
     s = s - 5;
   }
   if (needle >= 40)
-    lcdMeter[i-1] = 6;
-  lcdMeter[i] = 0;
+    meter[i-1] = 6;
+  meter[i] = 0;
 }
 */
+
 // The generic routine to display one line on the LCD 
 void printLine(unsigned char linenmbr, const char *c) {
   if ((displayOption1 & 0x01) == 0x01)
@@ -235,6 +207,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; //
@@ -261,22 +234,11 @@ void updateDisplay() {
     if (ritOn)
       strcpy(c, "RIT ");
     else {
-      if (cwMode == 0)
-      {
       if (isUSB)
         strcpy(c, "USB ");
       else
         strcpy(c, "LSB ");
     }
-      else if (cwMode == 1)
-      {
-          strcpy(c, "CWL ");
-      }
-      else
-      {
-          strcpy(c, "CWU ");
-      }
-    }
     if (vfoActive == VFO_A) // VFO A is active
       strcat(c, "A:");
     else