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

@@ -109,8 +109,7 @@ void CatSetFreq(byte fromType)
 //#define BCD_LEN 9
 //PROTOCOL : 0x03
 //Computer <-(frequency)-> TRCV CAT_BUFF
-//void CatGetFreqMode(unsigned long freq, byte fromType)
-void CatGetFreqMode(unsigned long freq) //for remove warning messages
+void CatGetFreqMode(unsigned long freq, byte fromType)
 {
   int i;
   byte tmpValue;
@@ -150,21 +149,15 @@ void CatGetFreqMode(unsigned long freq) //for remove warning messages
   SendCatData(5);
 }
 
-//void CatSetSplit(boolean isSplit, byte fromType)
-void CatSetSplit(boolean isSplit) //for remove warning messages
+void CatSetSplit(boolean isSplit, byte fromType)
 {
-  if (isSplit)
-    splitOn = 1;
-  else
-    splitOn = 0;
 
   Serial.write(ACK);
 }
 
 void CatSetPTT(boolean isPTTOn, byte fromType)
 {
-  //
-  if ((!inTx) && (fromType == 2 || fromType == 3)) {
+  if (fromType == 2 || fromType == 3) {
     Serial.write(ACK);  
     return;  
   }
@@ -200,7 +193,7 @@ void CatSetPTT(boolean isPTTOn, byte fromType)
 void CatVFOToggle(boolean isSendACK, byte fromType)
 {
   if (fromType != 2 && fromType != 3) {
-    menuVfoToggle(1);
+    menuVfoToggle(1, 0);
   }  
 
   if (isSendACK)
@@ -239,8 +232,7 @@ void CatSetMode(byte tmpMode, byte fromType)
 }
 
 //Read EEProm by uBITX Manager Software
-//void ReadEEPRom(byte fromType)
-void ReadEEPRom() //for remove warnings.
+void ReadEEPRom(byte fromType)
 {
   //5BYTES
   //CAT_BUFF[0] [1] [2] [3] [4] //4 COMMAND
@@ -263,8 +255,7 @@ void ReadEEPRom() //for remove warnings.
 }
 
 //Write just proecess 1byes
-//void WriteEEPRom(byte fromType)
-void WriteEEPRom(void)  //for remove warning
+void WriteEEPRom(byte fromType)
 {
   //5BYTES
   uint16_t eepromStartIndex = CAT_BUFF[0] + CAT_BUFF[1] * 256;
@@ -284,8 +275,7 @@ void WriteEEPRom(void)  //for remove warning
   }
 }
 
-//void ReadEEPRom_FT817(byte fromType)
-void ReadEEPRom_FT817(void) //for remove warnings
+void ReadEEPRom_FT817(byte fromType)
 {
   byte temp0 = CAT_BUFF[0];
   byte temp1 = CAT_BUFF[1];
@@ -611,8 +601,7 @@ void WriteEEPRom_FT817(byte fromType)
   Serial.write(ACK);
 }
 
-//void CatRxStatus(byte fromType) 
-void CatRxStatus(void)  //for remove warning
+void CatRxStatus(byte fromType) 
 {
   byte sMeterValue = 1;
 
@@ -632,8 +621,7 @@ void CatRxStatus(void)  //for remove warning
 }
 
 
-//void CatTxStatus(byte fromType)
-void CatTxStatus(void)  //for remove warning
+void CatTxStatus(byte fromType)
 {
   boolean isHighSWR = false;
   boolean isSplitOn = false;
@@ -734,11 +722,11 @@ void Check_Cat(byte fromType)
       
     case 0x02 : //Split On
     case 0x82:  //Split Off
-      CatSetSplit(CAT_BUFF[4] == 0x02);
+      CatSetSplit(CAT_BUFF[4] == 0x02, fromType);
       break;
 
     case 0x03 :   //Read Frequency and mode
-      CatGetFreqMode(frequency);
+      CatGetFreqMode(frequency, fromType);
       break;
 
     case 0x07 :   //Set Operating  Mode
@@ -755,24 +743,24 @@ void Check_Cat(byte fromType)
       break;
 
     case 0xDB:  //Read uBITX EEPROM Data
-      ReadEEPRom(); //Call by uBITX Manager Program
+      ReadEEPRom(fromType); //Call by uBITX Manager Program
       break;
     case 0xBB:  //Read FT-817 EEPROM Data  (for comfirtable)
-      ReadEEPRom_FT817();
+      ReadEEPRom_FT817(fromType);
       break;
 
     case 0xDC:  //Write uBITX EEPROM Data
-      WriteEEPRom(); //Call by uBITX Manager Program
+      WriteEEPRom(fromType); //Call by uBITX Manager Program
       break;
     case 0xBC:  //Write FT-817 EEPROM Data  (for comfirtable)
       WriteEEPRom_FT817(fromType);
       break;
 
     case 0xE7 :       //Read RX Status
-      CatRxStatus();
+      CatRxStatus(fromType);
       break;
     case 0xF7:      //Read TX Status
-      CatTxStatus();
+      CatTxStatus(fromType);
       break;
     default:
     /*

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
@@ -180,10 +179,6 @@ int count = 0;          //to generally count ticks, loops, etc
 #define DISPLAY_OPTION1  361   //Display Option1
 #define DISPLAY_OPTION2  362   //Display Option2
 
-#define CHANNEL_FREQ    630   //Channel 1 ~ 20, 1 Channel = 4 bytes
-#define CHANNEL_DESC    710   //Channel 1 ~ 20, 1 Channel = 4 bytes
-#define RESERVE3        770   //Reserve3 between Channel and Firmware id check
-
 //Check Firmware type and version
 #define FIRMWAR_ID_ADDR 776 //776 : 0x59, 777 :0x58, 778 : 0x68 : Id Number, if not found id, erase eeprom(32~1023) for prevent system error.
 #define VERSION_ADDRESS 779   //check Firmware version
@@ -265,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;
@@ -386,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) {
@@ -541,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);
@@ -601,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
@@ -696,6 +691,7 @@ byte lastMovedirection = 0; //0 : stop, 1 : cw, 2 : ccw
 void doTuningWithThresHold(){
   int s = 0;
   unsigned long prev_freq;
+  long incdecValue = 0;
 
   if ((vfoActive == VFO_A && ((isDialLock & 0x01) == 0x01)) ||
     (vfoActive == VFO_B && ((isDialLock & 0x02) == 0x02)))
@@ -749,19 +745,36 @@ void doRIT(){
   unsigned long old_freq = frequency;
 
   if (knob < 0)
-    frequency -= (arTuneStep[tuneStepIndex -1]);  //
-    //frequency -= 100l;
+    frequency -= 100l;
   else if (knob > 0)
-    frequency += (arTuneStep[tuneStepIndex -1]);  //
-    //frequency += 100;
+    frequency += 100;
  
   if (old_freq != frequency){
     setFrequency(frequency);
     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)
 {
@@ -793,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 
@@ -909,13 +906,13 @@ void initSettings(){
   if ((3 < tuneTXType && tuneTXType < 100) || 103 < tuneTXType || useHamBandCount < 1 || findedValidValueCount < 5)
   {
     tuneTXType = 2;
-    //if empty band Information, auto insert default region 2 frequency range
+    //if empty band Information, auto insert default region 1 frequency range
     //This part is made temporary for people who have difficulty setting up, so can remove it when you run out of memory.
     useHamBandCount = 10;
     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 2
+    hamBandRange[3][0] = 7000; hamBandRange[3][1] = 7300;   //region 1
     hamBandRange[4][0] = 10100; hamBandRange[4][1] = 10150; 
     hamBandRange[5][0] = 14000; hamBandRange[5][1] = 14350; 
     hamBandRange[6][0] = 18068; hamBandRange[6][1] = 18168; 
@@ -929,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++;
   }
 
@@ -1006,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
 
@@ -1087,7 +1084,7 @@ void setup()
   
   //Serial.begin(9600);
   lcd.begin(16, 2);
-  printLineF(1, F("CECBT v1.01")); 
+  printLineF(1, F("CECBT v0.33")); 
 
   Init_Cat(38400, SERIAL_8N1);
   initMeter(); //not used in this build
@@ -1106,7 +1103,7 @@ void setup()
   
   initPorts();     
 
-  byteToMode(vfoA_mode, 0);
+  byteToMode(vfoA_mode);
   initOscillators();
 
   frequency = vfoA;
@@ -1118,7 +1115,14 @@ void setup()
     factory_alignment();
 }
 
-//Auto save Frequency and Mode with Protected eeprom life by KD8CEC
+
+/**
+ * The loop checks for keydown, ptt, function button and tuning.
+ */
+//for debug
+int dbgCnt = 0;
+byte flasher = 0;
+
 void checkAutoSaveFreqMode()
 {
   //when tx or ritOn, disable auto save
@@ -1136,8 +1140,18 @@ void checkAutoSaveFreqMode()
     //check time for Frequency auto save
     if (millis() - saveCheckTime > saveIntervalSec * 1000)
     {
-      FrequencyToVFO(1);
-      saveCheckTime = 0;  //for reduce cpu use rate
+      if (vfoActive == VFO_A)
+      {
+        vfoA = frequency;
+        vfoA_mode = modeToByte();
+        storeFrequencyAndMode(1);
+      }
+      else
+      {
+        vfoB = frequency;
+        vfoB_mode = modeToByte();
+        storeFrequencyAndMode(2);
+      }
     }
   }
 }
@@ -1164,11 +1178,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();
 }

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,18 +82,18 @@ 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';
@@ -118,11 +115,11 @@ void updateLine2Buffer(char isDirectCall)
               line2Buffer[i] = ' ';
         }
       }
-    } //scroll
-    
+    }
     line2Buffer[7] = ' ';
   } //check direct call by encoder
 
+  
   if (isIFShift)
   {
     if (isDirectCall == 1)
@@ -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--) {
+    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] = ' ';
+        line2Buffer[i] = ' ';
     }
-    //if (isStepKhz == 1)
-    //  line2Buffer[10] = 'k';
-
-    if (isStepKhz == 0)
-    {
     line2Buffer[11] = 'H';
     line2Buffer[12] = 'z';
-    }
   
     line2Buffer[13] = ' ';
     //if (
@@ -213,8 +196,6 @@ void updateLine2Buffer(char isDirectCall)
 //meterType : 0 = S.Meter, 1 : P.Meter
 void DisplayMeter(byte meterType, byte meterValue, char drawPosition)
 {
-  if (meterType == 0 || meterType == 1 || meterType == 2)
-  {
   drawMeter(meterValue);  //call original source code
   int lineNumber = 0;
   if ((displayOption1 & 0x01) == 0x01)
@@ -224,7 +205,7 @@ void DisplayMeter(byte meterType, byte meterValue, char drawPosition)
 
   for (int i = 0; i < 6; i++) //meter 5 + +db 1 = 6
     lcd.write(lcdMeter[i]);
-  }
+
 }
 
 byte testValue = 0;
@@ -234,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_keyer.ino

@@ -90,13 +90,13 @@ void cwKeyUp(){
 #define PDLSWAP 0x08 // 0 for normal, 1 for swap
 #define IAMBICB 0x10 // 0 for Iambic A, 1 for Iambic B
 enum KSTYPE {IDLE, CHK_DIT, CHK_DAH, KEYED_PREP, KEYED, INTER_ELEMENT };
-static unsigned long ktimer;
+static long ktimer;
 unsigned char keyerState = IDLE;
 
 //Below is a test to reduce the keying error. do not delete lines
 //create by KD8CEC for compatible with new CW Logic
 char update_PaddleLatch(byte isUpdateKeyState) {
-  unsigned char tmpKeyerControl = 0;
+  unsigned char tmpKeyerControl;
   int paddle = analogRead(ANALOG_KEYER);
 
   if (paddle >= cwAdcDashFrom && paddle <= cwAdcDashTo)
@@ -126,7 +126,9 @@ char update_PaddleLatch(byte isUpdateKeyState) {
 // modified by KD8CEC
 ******************************************************************************/
 void cwKeyer(void){
+  byte paddle;
   lastPaddle = 0;
+  int dot,dash;
   bool continue_loop = true;
   unsigned tmpKeyControl = 0;
   
@@ -172,9 +174,6 @@ void cwKeyer(void){
           keyerControl &= ~(DIT_L + DAH_L); // clear both paddle latch bits
           keyerState = KEYED; // next state
           if (!inTx){
-            //DelayTime Option
-            delay_background(delayBeforeCWStartTime * 2, 2);
-            
             keyDown = 0;
             cwTimeout = millis() + cwDelayTime * 10;  //+ CW_TIMEOUT;
             startTx(TX_CW, 1);
@@ -207,7 +206,7 @@ void cwKeyer(void){
           break;
       }
   
-      Check_Cat(2);
+      Check_Cat(3);
     } //end of while
   }
   else{
@@ -215,9 +214,6 @@ void cwKeyer(void){
       if (update_PaddleLatch(0) == DIT_L) {
         // if we are here, it is only because the key is pressed
         if (!inTx){
-          //DelayTime Option
-          delay_background(delayBeforeCWStartTime * 2, 2);
-          
           keyDown = 0;
           cwTimeout = millis() + cwDelayTime * 10;  //+ CW_TIMEOUT; 
           startTx(TX_CW, 1);
@@ -235,14 +231,13 @@ void cwKeyer(void){
           keyDown = 0;
           stopTx();
         }
-        //if (!cwTimeout) //removed by KD8CEC
-        //   return;
+        if (!cwTimeout)
+          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); //removed by KD8CEC
-        //continue;               //removed by KD8CEC
-        return;                   //Tx stop control by Main Loop
+        delay_background(5, 3);
+        continue;
       }
 
       Check_Cat(2);

ubitx_20/ubitx_ui.ino

@@ -99,6 +99,8 @@ void initMeter(){
 //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++) {
@@ -233,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; //