Merge pull request #9 from phdlee/version0.28

change delaytimes via cat

ubitx_20/cat_libs.ino

@@ -1,5 +1,4 @@
 /*************************************************************************
-  KD8CEC's CAT Library for uBITX and HAM
   This source code is written for uBITX, but it can also be used on other radios.
   
   The CAT protocol is used by many radios to provide remote control to comptuers through
@@ -130,21 +129,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;
-  }
+  if (isUSB)
+    CAT_BUFF[4] = CAT_MODE_USB;
   else
-  {
-      CAT_BUFF[4] = CAT_MODE_CW;
-  }
+    CAT_BUFF[4] = CAT_MODE_LSB;
 
   SendCatData(5);
 }
@@ -209,18 +197,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 +357,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 (isUSB)
+        CAT_BUFF[0] = CAT_MODE_USB;
+      else
+        CAT_BUFF[0] = CAT_MODE_LSB;
         
       if (CAT_BUFF[0] != 0) CAT_BUFF[0] = 1 << 5;
       break;
@@ -412,7 +383,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;
@@ -427,7 +398,7 @@ void ReadEEPRom_FT817(byte fromType)
 
 void WriteEEPRom_FT817(byte fromType)
 {
-  //byte temp0 = CAT_BUFF[0];
+  byte temp0 = CAT_BUFF[0];
   byte temp1 = CAT_BUFF[1];
 
   CAT_BUFF[0] = 0;
@@ -500,7 +471,7 @@ void WriteEEPRom_FT817(byte fromType)
         printLineF2(F("Sidetone set! CAT"));
         EEPROM.put(CW_SIDETONE, sideTone);
         delay(300);                       //If timeout errors occur in the calling software, remove them
-        clearLine2();
+        printLine2("");                   //Ham radio deluxe is the only one that supports this feature yet. and ham radio deluxe has wait time as greater than 500ms
       }
       break;
 
@@ -512,8 +483,7 @@ void WriteEEPRom_FT817(byte fromType)
         printLineF2(F("Sidetone set! CAT"));
         EEPROM.put(CW_SIDETONE, sideTone);
         delay(300);                   //If timeout errors occur in the calling software, remove them
-        clearLine2();
-        line2DisplayStatus = 0;
+        printLine2("");               //Ham radio deluxe is the only one that supports this feature yet. and ham radio deluxe has wait time as greater than 500ms
       }
       break;
 
@@ -533,7 +503,7 @@ void WriteEEPRom_FT817(byte fromType)
       printLineF2(F("CW Speed set!"));
       EEPROM.put(CW_DELAY, cwDelayTime);
       delay(300);
-      clearLine2();
+      printLine2("");
       break;
     case 0x62 : //
       //5-0  CW Speed (4-60 WPM) (#21) From 0 to 38 (HEX) with 0 = 4 WPM and 38 = 60 WPM (1 WPM steps)
@@ -542,7 +512,7 @@ void WriteEEPRom_FT817(byte fromType)
       printLineF2(F("CW Speed set!"));
       EEPROM.put(CW_SPEED, cwSpeed);
       delay(300);
-      clearLine2();
+      printLine2("");
 
       break;
       /*

ubitx_20/cw_autokey.ino

@@ -1,6 +1,4 @@
 /*************************************************************************
-  KD8CEC's Memory Keyer for HAM
-  
   This source code is written for All amateur radio operator, 
   I have not had amateur radio communication for a long time. CW has been 
   around for a long time, and I do not know what kind of keyer and keying 
@@ -15,7 +13,6 @@
   I wrote this code myself, so there is no license restriction. 
   So this code allows anyone to write with confidence.
   But keep it as long as the original author of the code.
-  DE Ian KD8CEC
 -----------------------------------------------------------------------------
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -211,14 +208,10 @@ void sendCWChar(char cwKeyChar)
         charLength = ((tmpChar >> 6) & 0x03) + 3;
         
         for (j = 0; j < charLength; j++)
-          sendBuff[j] = (tmpChar << (j + 2)) & 0x80;
+          sendBuff[j] = (tmpChar << j + 2) & 0x80;
 
         break;
       }
-      else
-      {
-        charLength = 0;
-      }
     }
   }
 
@@ -264,7 +257,7 @@ unsigned long scrollDispayTime = 0;
 #define scrollSpeed 500
 byte displayScrolStep = 0;
 
-void controlAutoCW(){
+int controlAutoCW(){
     int knob = 0;
     byte i;
 
@@ -298,12 +291,8 @@ void controlAutoCW(){
           }
           
           printLineFromEEPRom(0, 2, cwStartIndex + displayScrolStep + CW_DATA_OFSTADJ, cwEndIndex + CW_DATA_OFSTADJ); 
-
-          byte diplayAutoCWLine = 0;
-          if ((displayOption1 & 0x01) == 0x01)
-            diplayAutoCWLine = 1;
           
-          lcd.setCursor(0, diplayAutoCWLine);
+          lcd.setCursor(0,0);
           lcd.write(byteToChar(selectedCWTextIndex));
           lcd.write(':');
           isNeedScroll = (cwEndIndex - cwStartIndex) > 14 ? 1 : 0;

ubitx_20/ubitx_20.ino

@@ -1,10 +1,4 @@
 /**
- Since KD8CEC Version 0.29, most of the original code is no longer available.
- Most features(TX, Frequency Range, Ham Band, TX Control, CW delay, start Delay... more) have been added by KD8CEC.
- However, the license rules are subject to the original source rules.
- DE Ian KD8CEC
-
- Original source comment            -------------------------------------------------------------
  * This source file is under General Public License version 3.
  * 
  * This verision uses a built-in Si5351 library
@@ -84,7 +78,6 @@
 #define PTT   (A3)
 #define ANALOG_KEYER (A6)
 #define ANALOG_SPARE (A7)
-#define ANALOG_SMETER (A7)  //by KD8CEC
 
 /** 
  * The Raduino board is the size of a standard 16x2 LCD panel. It has three connectors:
@@ -151,7 +144,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,24 +152,6 @@ 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)
-
-//for reduce cw key error, eeprom address
-#define CW_ADC_MOST_BIT1 348   //most 2bits of  DOT_TO , DOT_FROM, ST_TO, ST_FROM
-#define CW_ADC_ST_FROM   349   //CW ADC Range STRAIGHT KEY from (Lower 8 bit)
-#define CW_ADC_ST_TO     350   //CW ADC Range STRAIGHT KEY to   (Lower 8 bit)
-#define CW_ADC_DOT_FROM  351   //CW ADC Range DOT  from         (Lower 8 bit)
-#define CW_ADC_DOT_TO    352   //CW ADC Range DOT  to           (Lower 8 bit)
-
-#define CW_ADC_MOST_BIT2 353   //most 2bits of BOTH_TO, BOTH_FROM, DASH_TO, DASH_FROM
-#define CW_ADC_DASH_FROM 354   //CW ADC Range DASH from         (Lower 8 bit)
-#define CW_ADC_DASH_TO   355   //CW ADC Range DASH to           (Lower 8 bit)
-#define CW_ADC_BOTH_FROM 356   //CW ADC Range BOTH from         (Lower 8 bit)
-#define CW_ADC_BOTH_TO   357   //CW ADC Range BOTH to           (Lower 8 bit)
-#define CW_KEY_TYPE      358
-
-#define DISPLAY_OPTION1  361   //Display Option1
-#define DISPLAY_OPTION2  362   //Display Option2
 
 //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.
@@ -233,11 +207,11 @@ 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
 
-unsigned int cwSpeed = 100; //this is actuall the dot period in milliseconds
+int cwSpeed = 100; //this is actuall the dot period in milliseconds
 extern int32_t calibration;
 
 //for store the mode in eeprom
@@ -250,6 +224,7 @@ byte saveIntervalSec = 10;  //second
 unsigned long saveCheckTime = 0;
 unsigned long saveCheckFreq = 0;
 
+bool isSplitOn = false;
 byte cwDelayTime = 60;
 byte delayBeforeCWStartTime = 50;
 
@@ -260,25 +235,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]
-byte arTuneStep[5];
-byte tuneStepIndex; //default Value 0, start Offset is 0 because of check new user
 
-byte displayOption1 = 0;
-byte displayOption2 = 0;
-
-//CW ADC Range
-int cwAdcSTFrom = 0;
-int cwAdcSTTo = 0;
-int cwAdcDotFrom = 0;
-int cwAdcDotTo = 0;
-int cwAdcDashFrom = 0;
-int cwAdcDashTo = 0;
-int cwAdcBothFrom = 0;
-int cwAdcBothTo = 0;
-byte cwKeyType = 0; //0: straight, 1 : iambica, 2: iambicb
-bool Iambic_Key = true;
-#define IAMBICB 0x10 // 0 for Iambic A, 1 for Iambic B
-unsigned char keyerControl = IAMBICB;
 
 //Variables for auto cw mode
 byte isCWAutoMode = 0;          //0 : none, 1 : CW_AutoMode_Menu_Selection, 2 : CW_AutoMode Sending
@@ -298,13 +255,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
@@ -312,14 +265,6 @@ unsigned long dbgCount = 0;   //not used now
 unsigned char txFilter = 0;   //which of the four transmit filters are in use
 boolean modeCalibrate = false;//this mode of menus shows extended menus to calibrate the oscillators and choose the proper
                               //beat frequency
-
-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 
  * you start hacking around
@@ -372,13 +317,11 @@ 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;
+  if ((resultFreq / 1000) < hamBandRange[findedIndex][0] || (resultFreq / 1000) > hamBandRange[findedIndex][1])
+    resultFreq = (unsigned long)(hamBandRange[findedIndex][0]) * 1000;
 
   setFrequency(resultFreq);
   byteWithFreqToMode(loadMode);
@@ -386,10 +329,10 @@ void setNextHamBandFreq(unsigned long f, char moveDirection)
 
 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.
@@ -479,31 +422,20 @@ void setTXFilters(unsigned long freq){
  */
  
 void setFrequency(unsigned long f){
-  f = (f / arTuneStep[tuneStepIndex -1]) * arTuneStep[tuneStepIndex -1];
+  uint64_t osc_f;
+
+  //1 digits discarded
+  f = (f / 50) * 50;
   
   setTXFilters(f);
 
-  if (cwMode == 0)
-  {
-    if (isUSB){
-      si5351bx_setfreq(2, SECOND_OSC_USB - usbCarrier + f  + (isIFShift ? ifShiftValue : 0));
-      si5351bx_setfreq(1, SECOND_OSC_USB);
-    }
-    else{
-      si5351bx_setfreq(2, SECOND_OSC_LSB + usbCarrier + f + (isIFShift ? ifShiftValue : 0));
-      si5351bx_setfreq(1, SECOND_OSC_LSB);
-    }
+  if (isUSB){
+    si5351bx_setfreq(2, SECOND_OSC_USB - usbCarrier + f);
+    si5351bx_setfreq(1, SECOND_OSC_USB);
   }
-  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);
-    }
+  else{
+    si5351bx_setfreq(2, SECOND_OSC_LSB + usbCarrier + f);
+    si5351bx_setfreq(1, SECOND_OSC_LSB);
   }
   
   frequency = f;
@@ -516,6 +448,8 @@ void setFrequency(unsigned long f){
  */
  
 void startTx(byte txMode, byte isDisplayUpdate){
+  unsigned long tx_freq = 0;
+
   //Check Hamband only TX //Not found Hamband index by now frequency
   if (tuneTXType >= 100 && getIndexHambanBbyFreq(ritOn ? ritTxFrequency :  frequency) == -1) {
     //no message
@@ -532,21 +466,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);
-      }
-      else if (vfoActive == VFO_A){
-        vfoActive = VFO_B;
-        frequency = vfoB;
-        byteToMode(vfoB_mode);
-      }
-
-      setFrequency(frequency);
-  } //end of else
-  
 
   if (txMode == TX_CW){
     //turn off the second local oscillator and the bfo
@@ -556,22 +475,10 @@ 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);
-    }
+    if (isUSB)
+      si5351bx_setfreq(2, frequency + sideTone);
+    else
+      si5351bx_setfreq(2, frequency - sideTone); 
   }
 
   //reduce latency time when begin of CW mode
@@ -583,28 +490,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);
-      }
-      else if (vfoActive == VFO_A){
-        vfoActive = VFO_B;
-        frequency = vfoB;
-        byteToMode(vfoB_mode);
-      }
-      setFrequency(frequency);
-  } //end of else
   else
     setFrequency(frequency);
   
@@ -656,6 +545,8 @@ void checkPTT(){
 }
 
 void checkButton(){
+  int i, t1, t2, knob, new_knob;
+
   //only if the button is pressed
   if (!btnDown())
     return;
@@ -674,24 +565,17 @@ void checkButton(){
 }
 
 
-/************************************
-Replace function by KD8CEC
-prevent error controls
-applied Threshold for reduct errors,  dial Lock, dynamic Step
- *************************************/
-byte threshold = 2;  //noe action for count
-unsigned long lastEncInputtime = 0;
-int encodedSumValue = 0;
-unsigned long lastTunetime = 0; //if continous moving, skip threshold processing
-byte lastMovedirection = 0; //0 : stop, 1 : cw, 2 : ccw
+/**
+ * The tuning jumps by 50 Hz on each step when you tune slowly
+ * As you spin the encoder faster, the jump size also increases 
+ * This way, you can quickly move to another band by just spinning the 
+ * tuning knob
+ */
 
-#define skipThresholdTime 100
-#define encodeTimeOut 1000
-
-void doTuningWithThresHold(){
+void doTuning(){
   int s = 0;
   unsigned long prev_freq;
-  long incdecValue = 0;
+  int incdecValue = 0;
 
   if ((vfoActive == VFO_A && ((isDialLock & 0x01) == 0x01)) ||
     (vfoActive == VFO_B && ((isDialLock & 0x02) == 0x02)))
@@ -700,47 +584,54 @@ void doTuningWithThresHold(){
   if (isCWAutoMode == 0 || cwAutoDialType == 1)
     s = enc_read();
 
-  //if time is exceeded, it is recognized as an error,
-  //ignore exists values, because of errors
-  if (s == 0) {
-    if (encodedSumValue != 0 && (millis() - encodeTimeOut) > lastEncInputtime)
-      encodedSumValue = 0;
+  if (s){
+    prev_freq = frequency;
+    
+    if (s > 10)
+      incdecValue = 200000l;
+    if (s > 7)
+      incdecValue = 10000l;
+    else if (s > 4)
+      incdecValue = 1000l;
+    else if (s > 2)
+      incdecValue = 500;
+    else if (s > 0)
+      incdecValue =  50l;
+    else if (s > -2)
+      incdecValue = -50l;
+    else if (s > -4)
+      incdecValue = -500l;
+    else if (s > -7)
+      incdecValue = -1000l;
+    else if (s > -9)
+      incdecValue = -10000l;
+    else
+      incdecValue = -200000l;
 
-    lastMovedirection = 0;
-    return;
+    if (incdecValue > 0 && frequency + incdecValue > HIGHEST_FREQ_DIAL)
+        frequency = HIGHEST_FREQ_DIAL;      
+    else if (incdecValue < 0 && frequency < -incdecValue + LOWEST_FREQ_DIAL)  //for compute and compare based integer type.
+      frequency = LOWEST_FREQ_DIAL;
+    else
+      frequency += incdecValue;
+      
+    if (prev_freq < 10000000l && frequency > 10000000l)
+      isUSB = true;
+      
+    if (prev_freq > 10000000l && frequency < 10000000l)
+      isUSB = false;
+
+    setFrequency(frequency);
+    updateDisplay();
   }
-  lastEncInputtime = millis();
-
-  //for check moving direction
-  encodedSumValue += (s > 0 ? 1 : -1);
-
-  //check threshold and operator actions (hold dial speed = continous moving, skip threshold check)
-  if ((lastTunetime < millis() - skipThresholdTime) && ((encodedSumValue *  encodedSumValue) <= (threshold * threshold)))
-    return;
-
-  lastTunetime = millis();
-
-  //Valid Action without noise
-  encodedSumValue = 0;
-
-  prev_freq = frequency;
-  //incdecValue = tuningStep * s;
-  frequency += (arTuneStep[tuneStepIndex -1] * s * (s * s < 10 ? 1 : 3));  //appield weight (s is speed)
-    
-  if (prev_freq < 10000000l && frequency > 10000000l)
-    isUSB = true;
-    
-  if (prev_freq > 10000000l && frequency < 10000000l)
-    isUSB = false;
-    
-  setFrequency(frequency);
-  updateDisplay();
 }
 
 /**
  * RIT only steps back and forth by 100 hz at a time
  */
 void doRIT(){
+  unsigned long newFreq;
+ 
   int knob = enc_read();
   unsigned long old_freq = frequency;
 
@@ -755,24 +646,6 @@ void doRIT(){
   }
 }
 
-/*
-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
  */
@@ -821,10 +694,7 @@ void initSettings(){
   EEPROM.get(VFO_B, vfoB);
   EEPROM.get(CW_SIDETONE, sideTone);
   EEPROM.get(CW_SPEED, cwSpeed);
-  //End of original code
-  
-  //----------------------------------------------------------------
-  //Add Lines by KD8CEC
+
   //for custom source Section =============================
   //ID & Version Check from EEProm 
   //if found different firmware, erase eeprom (32
@@ -848,7 +718,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
@@ -860,24 +729,6 @@ void initSettings(){
 
   //CW interval between TX and CW Start
   EEPROM.get(CW_START, delayBeforeCWStartTime);
-  EEPROM.get(CW_KEY_TYPE, cwKeyType);
-  if (cwKeyType > 2)
-    cwKeyType = 0;
-
-  if (cwKeyType == 0)
-    Iambic_Key = false;
-  else
-  {
-    Iambic_Key = true;
-    if (cwKeyType == 1)
-      keyerControl &= ~IAMBICB;
-    else
-      keyerControl |= IAMBICB;
-  }
-    
-
-  EEPROM.get(DISPLAY_OPTION1, displayOption1);
-  EEPROM.get(DISPLAY_OPTION2, displayOption2);
 
   //User callsign information
   if (EEPROM.read(USER_CALLSIGN_KEY) == 0x59)
@@ -887,103 +738,18 @@ void initSettings(){
   EEPROM.get(HAM_BAND_COUNT, useHamBandCount);
   EEPROM.get(TX_TUNE_TYPE, tuneTXType);
 
-  byte findedValidValueCount = 0;
+  
+  if ((3 < tuneTXType && tuneTXType < 100) || 103 < tuneTXType || useHamBandCount < 1)
+    tuneTXType = 0;
     
   //Read band Information
   for (byte i = 0; i < useHamBandCount; i++) {
     unsigned int tmpReadValue = 0;
     EEPROM.get(HAM_BAND_RANGE + 4 * i, tmpReadValue);
     hamBandRange[i][0] = tmpReadValue;
-
-    if (tmpReadValue > 1 && tmpReadValue < 55000)
-      findedValidValueCount++;
-
     EEPROM.get(HAM_BAND_RANGE + 4 * i + 2, tmpReadValue);
     hamBandRange[i][1] = tmpReadValue;
   }
-
-  //Check Value Range and default Set for new users
-  if ((3 < tuneTXType && tuneTXType < 100) || 103 < tuneTXType || useHamBandCount < 1 || findedValidValueCount < 5)
-  {
-    tuneTXType = 2;
-    //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 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; 
-    hamBandRange[7][0] = 21000; hamBandRange[7][1] = 21450; 
-    hamBandRange[8][0] = 24890; hamBandRange[8][1] = 24990; 
-    hamBandRange[9][0] = 28000; hamBandRange[9][1] = 29700; 
-  }
-  
-
-  //Read Tuning Step Index, and steps
-  findedValidValueCount = 0;
-  EEPROM.get(TUNING_STEP, tuneStepIndex);
-  for (byte i = 0; i < 5; i++) {
-    arTuneStep[i] = EEPROM.read(TUNING_STEP + i + 1);
-    if (arTuneStep[i] >= 1 && arTuneStep[i] < 251) //Maximum 250 for check valid Value
-       findedValidValueCount++;
-  }
-
-  //Check Value Range and default Set for new users
-  if (findedValidValueCount < 5)
-  {
-    //Default Setting
-    arTuneStep[0] = 10;
-    arTuneStep[1] = 20;
-    arTuneStep[2] = 50;
-    arTuneStep[3] = 100;
-    arTuneStep[4] = 200;
-  }
-
-  if (tuneStepIndex == 0) //New User
-    tuneStepIndex = 3;
-
-  //CW Key ADC Range ======= adjust set value for reduce cw keying error
-  //by KD8CEC
-  unsigned int tmpMostBits = 0;
-  tmpMostBits = EEPROM.read(CW_ADC_MOST_BIT1);
-  cwAdcSTFrom = EEPROM.read(CW_ADC_ST_FROM)   | ((tmpMostBits & 0x03) << 8);
-  cwAdcSTTo = EEPROM.read(CW_ADC_ST_TO)       | ((tmpMostBits & 0x0C) << 6);
-  cwAdcDotFrom = EEPROM.read(CW_ADC_DOT_FROM) | ((tmpMostBits & 0x30) << 4);
-  cwAdcDotTo = EEPROM.read(CW_ADC_DOT_TO)     | ((tmpMostBits & 0xC0) << 2);
-  
-  tmpMostBits = EEPROM.read(CW_ADC_MOST_BIT2);
-  cwAdcDashFrom = EEPROM.read(CW_ADC_DASH_FROM) | ((tmpMostBits & 0x03) << 8);
-  cwAdcDashTo = EEPROM.read(CW_ADC_DASH_TO)     | ((tmpMostBits & 0x0C) << 6);
-  cwAdcBothFrom = EEPROM.read(CW_ADC_BOTH_FROM) | ((tmpMostBits & 0x30) << 4);
-  cwAdcBothTo = EEPROM.read(CW_ADC_BOTH_TO)     | ((tmpMostBits & 0xC0) << 2);
-
-  //default Value (for original hardware)
-  if (cwAdcSTFrom >= cwAdcSTTo)
-  {
-    cwAdcSTFrom = 0;
-    cwAdcSTTo = 50;
-  }
-
-  if (cwAdcBothFrom >= cwAdcBothTo)
-  {
-    cwAdcBothFrom = 51;
-    cwAdcBothTo = 300;
-  }
-  
-  if (cwAdcDotFrom >= cwAdcDotTo)
-  {
-    cwAdcDotFrom = 301;
-    cwAdcDotTo = 600;
-  }
-  if (cwAdcDashFrom >= cwAdcDashTo)
-  {
-    cwAdcDashFrom = 601;
-    cwAdcDashTo = 800;
-  }
-  //end of CW Keying Variables
   
   if (cwDelayTime < 1 || cwDelayTime > 250)
     cwDelayTime = 60;
@@ -994,12 +760,8 @@ void initSettings(){
   if (vfoB_mode < 2)
     vfoB_mode = 3;
 
-  //original code with modified by kd8cec
   if (usbCarrier > 12010000l || usbCarrier < 11990000l)
     usbCarrier = 11995000l;
-
-  if (cwmCarrier > 12010000l || cwmCarrier < 11990000l)
-    cwmCarrier = 11995000l;
     
   if (vfoA > 35000000l || 3500000l > vfoA) {
      vfoA = 7150000l;
@@ -1010,9 +772,8 @@ void initSettings(){
      vfoB = 14150000l;  
      vfoB_mode = 3;
   }
-  //end of original code section
 
-  //for protect eeprom life by KD8CEC
+  //for protect eeprom life
   vfoA_eeprom = vfoA;
   vfoB_eeprom = vfoB;
   vfoA_mode_eeprom = vfoA_mode;
@@ -1048,7 +809,6 @@ void initPorts(){
 
   pinMode(PTT, INPUT_PULLUP);
   pinMode(ANALOG_KEYER, INPUT_PULLUP);
-  pinMode(ANALOG_SMETER, INPUT); //by KD8CEC
 
   pinMode(CW_TONE, OUTPUT);  
   digitalWrite(CW_TONE, 0);
@@ -1084,7 +844,7 @@ void setup()
   
   //Serial.begin(9600);
   lcd.begin(16, 2);
-  printLineF(1, F("CECBT v0.33")); 
+  printLineF(1, F("CECBT v0.27")); 
 
   Init_Cat(38400, SERIAL_8N1);
   initMeter(); //not used in this build
@@ -1098,16 +858,15 @@ void setup()
   else {
     printLineF(0, F("uBITX v0.20")); 
     delay(500);
-    clearLine2();
+    printLine2(""); 
   }
   
   initPorts();     
-
-  byteToMode(vfoA_mode);
   initOscillators();
 
   frequency = vfoA;
   saveCheckFreq = frequency;  //for auto save frequency
+  byteToMode(vfoA_mode);
   setFrequency(vfoA);
   updateDisplay();
 
@@ -1171,16 +930,9 @@ void loop(){
   if (!inTx){
     if (ritOn)
       doRIT();
-    //else if (isIFShift)
-    //  doIFShift();
     else 
-      doTuningWithThresHold();
-
-    if (isCWAutoMode == 0 && beforeIdle_ProcessTime < millis() - 250) {
-      idle_process();
-      beforeIdle_ProcessTime = millis();
-    }
-  } //end of check TX Status
+      doTuning();
+  }
 
   //we check CAT after the encoder as it might put the radio into TX
   Check_Cat(inTx? 1 : 0);

ubitx_20/ubitx_factory_alignment.ino

@@ -14,7 +14,6 @@ void btnWaitForClick(){
 void factory_alignment(){
         
   factoryCalibration(1);
-  line2DisplayStatus = 1;
 
   if (calibration == 0){
     printLine2("Setup Aborted");
@@ -37,7 +36,6 @@ void factory_alignment(){
 
   
   printLine2("#3:Test 3.5MHz");
-  cwMode = 0;
   isUSB = false;
   setFrequency(3500000l);
   updateDisplay();
@@ -60,7 +58,6 @@ void factory_alignment(){
   btnWaitForClick();
   printLine2("#5:Test 14MHz");
 
-  cwMode = 0;
   isUSB = true;
   setFrequency(14000000l);
   updateDisplay();
@@ -82,7 +79,6 @@ void factory_alignment(){
   printLine2("Alignment done");
   delay(1000);
 
-  cwMode = 0;
   isUSB = false;
   setFrequency(7150000l);
   updateDisplay();  

ubitx_20/ubitx_idle.ino

@@ -1,237 +0,0 @@
-/*************************************************************************
-  KD8CEC's uBITX Idle time Processing
-  Functions that run at times that do not affect TX, CW, and CAT
-  It is called in 1/10 time unit.
------------------------------------------------------------------------------
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-**************************************************************************/
-byte 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;
-    }
-    
-    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)
-      line2Buffer[6] = 'k';
-    else
-    {
-      //example #2
-      if (freqScrollPosition++ > 18)
-      {
-        line2Buffer[6] = 'k';
-        if (freqScrollPosition > 25)
-          freqScrollPosition = -1;
-      }
-      else
-      {
-        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] = ' ';
-        }
-      }
-    }
-    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);    
-  }
-  else
-  {
-    if (isDirectCall != 0)
-      return;
-      
-    //Step
-    byte tmpStep = arTuneStep[tuneStepIndex -1];
-    for (int i = 10; i >= 8; i--) {
-      if (tmpStep > 0) {
-          line2Buffer[i] = tmpStep % 10 + 0x30;
-          tmpStep /= 10;
-      }
-      else
-        line2Buffer[i] = ' ';
-    }
-    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 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_keyer.ino

@@ -1,9 +1,6 @@
 /**
- CW Keyer
- CW Key logic change with ron's code (ubitx_keyer.cpp)
- Ron's logic has been modified to work with the original uBITX by KD8CEC
-
- Original Comment ----------------------------------------------------------------------------
+ * CW Keyer
+ * 
  * The CW keyer handles either a straight key or an iambic / paddle key.
  * They all use just one analog input line. This is how it works.
  * The analog line has the internal pull-up resistor enabled. 
@@ -37,6 +34,7 @@
 //when both are simultaneously pressed
 char lastPaddle = 0;
 
+
 //reads the analog keyer pin and reports the paddle
 byte getPaddle(){
   int paddle = analogRead(ANALOG_KEYER);
@@ -83,181 +81,13 @@ void cwKeyUp(){
   cwTimeout = millis() + cwDelayTime * 10;
 }
 
-//Variables for Ron's new logic
-#define DIT_L 0x01 // DIT latch
-#define DAH_L 0x02 // DAH latch
-#define DIT_PROC 0x04 // DIT is being processed
-#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 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;
-  int paddle = analogRead(ANALOG_KEYER);
-
-  if (paddle >= cwAdcDashFrom && paddle <= cwAdcDashTo)
-    tmpKeyerControl |= DAH_L;
-  else if (paddle >= cwAdcDotFrom && paddle <= cwAdcDotTo)
-    tmpKeyerControl |= DIT_L;
-  else if (paddle >= cwAdcBothFrom && paddle <= cwAdcBothTo)
-    tmpKeyerControl |= (DAH_L | DIT_L) ;     
-  else 
-  {
-    if (Iambic_Key)
-      tmpKeyerControl = 0 ;
-    else if (paddle >= cwAdcSTFrom && paddle <= cwAdcSTTo)
-      tmpKeyerControl = DIT_L ;
-     else
-       tmpKeyerControl = 0 ; 
-  }
-  
-  if (isUpdateKeyState == 1)
-    keyerControl |= tmpKeyerControl;
-
-  return tmpKeyerControl;
-}
-
-/*****************************************************************************
-// New logic, by RON
-// modified by KD8CEC
-******************************************************************************/
-void cwKeyer(void){
-  byte paddle;
-  lastPaddle = 0;
-  int dot,dash;
-  bool continue_loop = true;
-  unsigned tmpKeyControl = 0;
-  
-  if( Iambic_Key ) {
-    while(continue_loop) {
-      switch (keyerState) {
-        case IDLE:
-          tmpKeyControl = update_PaddleLatch(0);
-          if ( tmpKeyControl == DAH_L || tmpKeyControl == DIT_L || 
-            tmpKeyControl == (DAH_L | DIT_L) || (keyerControl & 0x03)) {
-             update_PaddleLatch(1);
-             keyerState = CHK_DIT;
-          }else{
-            if (0 < cwTimeout && cwTimeout < millis()){
-              cwTimeout = 0;
-              stopTx();
-            }
-            continue_loop = false;
-          }
-          break;
-    
-        case CHK_DIT:
-          if (keyerControl & DIT_L) {
-            keyerControl |= DIT_PROC;
-            ktimer = cwSpeed;
-            keyerState = KEYED_PREP;
-          }else{
-            keyerState = CHK_DAH;
-          }
-          break;
-    
-        case CHK_DAH:
-          if (keyerControl & DAH_L) {
-            ktimer = cwSpeed*3;
-            keyerState = KEYED_PREP;
-          }else{
-            keyerState = IDLE;
-          }
-          break;
-    
-        case KEYED_PREP:
-          ktimer += millis(); // set ktimer to interval end time
-          keyerControl &= ~(DIT_L + DAH_L); // clear both paddle latch bits
-          keyerState = KEYED; // next state
-          if (!inTx){
-            keyDown = 0;
-            cwTimeout = millis() + cwDelayTime * 10;  //+ CW_TIMEOUT;
-            startTx(TX_CW, 1);
-          }
-          cwKeydown();
-          break;
-    
-        case KEYED:
-          if (millis() > ktimer) { // are we at end of key down ?
-           cwKeyUp();
-           ktimer = millis() + cwSpeed; // inter-element time
-            keyerState = INTER_ELEMENT; // next state
-          }else if (keyerControl & IAMBICB) {
-            update_PaddleLatch(1); // early paddle latch in Iambic B mode
-          }
-          break;
-    
-        case INTER_ELEMENT:
-          // Insert time between dits/dahs
-          update_PaddleLatch(1); // latch paddle state
-          if (millis() > ktimer) { // are we at end of inter-space ?
-            if (keyerControl & DIT_PROC) { // was it a dit or dah ?
-              keyerControl &= ~(DIT_L + DIT_PROC); // clear two bits
-              keyerState = CHK_DAH; // dit done, check for dah
-            }else{
-              keyerControl &= ~(DAH_L); // clear dah latch
-              keyerState = IDLE; // go idle
-            }
-          }
-          break;
-      }
-  
-      Check_Cat(3);
-    } //end of while
-  }
-  else{
-    while(1){
-      if (update_PaddleLatch(0) == DIT_L) {
-        // if we are here, it is only because the key is pressed
-        if (!inTx){
-          keyDown = 0;
-          cwTimeout = millis() + cwDelayTime * 10;  //+ CW_TIMEOUT; 
-          startTx(TX_CW, 1);
-        }
-        cwKeydown();
-        
-        while ( update_PaddleLatch(0) == DIT_L ) 
-          delay_background(1, 3);
-          
-        cwKeyUp();
-      }
-      else{
-        if (0 < cwTimeout && cwTimeout < millis()){
-          cwTimeout = 0;
-          keyDown = 0;
-          stopTx();
-        }
-        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);
-        continue;
-      }
-
-      Check_Cat(2);
-    } //end of while
-  }   //end of elese
-}
-
-
-//=======================================================================================
-//Before logic
-//by Farhan and modified by KD8CEC
-//======================================================================================
-
 /**
  * The keyer handles the straight key as well as the iambic key
  * This module keeps looping until the user stops sending cw
  * if the cwTimeout is set to 0, then it means, we have to exit the keyer loop
  * Each time the key is hit the cwTimeout is pushed to a time in the future by cwKeyDown()
  */
- /*
+ 
 void cwKeyer(){
   byte paddle;
   lastPaddle = 0;
@@ -281,7 +111,17 @@ void cwKeyer(){
       if (!cwTimeout)
         return;
 
-      Check_Cat(2); //for uBITX on Raspberry pi, when straight keying, disconnect / test complete
+      //if a paddle was used (not a straight key) we should extend the space to be a full dash 
+      //by adding two more dots long space (one has already been added at the end of the dot or dash)
+      /*
+      if (cwTimeout > 0 && lastPaddle != PADDLE_STRAIGHT)
+        delay_background(cwSpeed * 2, 3);
+        //delay(cwSpeed * 2);
+
+      // got back to the begining of the loop, if no further activity happens on the paddle or the straight key
+      // we will time out, and return out of this routine 
+      delay(5);
+      */
       continue;
     }
 
@@ -344,6 +184,3 @@ void cwKeyer(){
       delay(cwSpeed);
   }
 }
-*/
-
-

ubitx_20/ubitx_menu.ino

@@ -13,8 +13,7 @@
 #define printLineF1(x) (printLineF(1, x))
 #define printLineF2(x) (printLineF(0, x))
 
-//Ham band move by KD8CEC
-void menuBand(int btn){
+int menuBand(int btn){
   int knob = 0;
   int stepChangeCount = 0;
   byte btnPressCount = 0;
@@ -37,6 +36,21 @@ void menuBand(int btn){
       }
       else {
         tuneTXType = 2;
+        //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.
+        if (useHamBandCount < 1) {
+          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] = 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; 
+          hamBandRange[7][0] = 21000; hamBandRange[7][1] = 21450; 
+          hamBandRange[8][0] = 24890; hamBandRange[8][1] = 24990; 
+          hamBandRange[9][0] = 28000; hamBandRange[9][1] = 29700; 
+        }
         printLineF2(F("Ham band mode"));
       }
       delay_background(1000, 0);
@@ -87,8 +101,6 @@ void menuBand(int btn){
             stepChangeCount = 0;
           }
         }
-
-      //setFrequency(frequency + 200000l);
       }
       else {  //original source
         if (knob < 0 && frequency > 3000000l)
@@ -120,60 +132,29 @@ void menuBand(int btn){
   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;
-  }
+  if (isUSB)
+    return 3;
   else
-  {
-    return 5;
-  }
+    return 2;
 }
 
-//Convert Number to Mode by KD8CEC
 void byteToMode(byte modeValue){
-  if (modeValue == 4)
-    cwMode = 1;
-  else if (modeValue == 5)
-    cwMode = 2;
+  if (modeValue == 3)
+    isUSB = 1;
   else
-  {
-    cwMode = 0;
-    if (modeValue == 3)
-      isUSB = 1;
-    else
-      isUSB = 0;
-  }
+    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
-      isUSB = (frequency > 10000000l) ? true : false;
-    else
-      isUSB = 0;
-  }
+  if (modeValue == 3)
+    isUSB = 1;
+  else if (modeValue == 0)  //Not Set
+    isUSB = (frequency > 10000000l) ? true : false;
+  else
+    isUSB = 0;
 }
 
-//VFO Toggle and save VFO Information, modified by KD8CEC
 void menuVfoToggle(int btn, char isUseDelayTime)
 {
   if (!btn){
@@ -207,11 +188,10 @@ void menuVfoToggle(int btn, char isUseDelayTime)
       }
 
       ritDisable();
-      setFrequency(frequency);
 
       if (isUseDelayTime == 1)        //Found Issue in wsjt-x Linux 32bit 
         delay_background(500, 0);
-
+        
       printLine2ClearAndUpdate();
       //exit the menu
       menuOn = 0;
@@ -241,94 +221,6 @@ void menuRitToggle(int btn){
   }
 }
 
-/*
-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;
-  
-  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() && digitalRead(PTT) == HIGH){
-        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 -= 1l;
-          else if (knob > 0)
-            ifShiftValue += 1;
-
-          needApplyChangeValue = 1;
-        }
-      }
-
-      delay_background(500, 0); //for check Long Press function key
-      
-      if (btnDown() || digitalRead(PTT) == LOW || ifShiftValue == 0)
-      {
-        isIFShift = 0;
-        printLineF2(F("IF Shift is OFF"));
-        setFrequency(frequency);
-        delay_background(500, 0);
-      }
-      
-      menuOn = 0;
-      //delay_background(500, 0);
-      printLine2ClearAndUpdate();
-  }
-}
-
-
-/* 
 void menuSidebandToggle(int btn){
   if (!btn){
     if (isUSB == true)
@@ -337,7 +229,6 @@ void menuSidebandToggle(int btn){
       printLineF2(F("Select USB?"));
   }
   else {
-      cwMode = 0;
       if (isUSB == true){
         isUSB = false;
         printLineF2(F("LSB Selected"));
@@ -352,315 +243,7 @@ void menuSidebandToggle(int btn){
     menuOn = 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;
-      }
-
-      //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)
-    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;
-  }
-}
-
-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;
-  int selectedKeyType = 0;
-  int moveStep = 0;
-  if (!btn){
-        printLineF2(F("Change Key Type?"));
-  }
-  else {
-    printLineF2(F("Press to set Key"));
-    delay_background(500, 0);
-    selectedKeyType = cwKeyType;
-    
-    while(!btnDown()){
-
-      //Display Key Type
-      if (selectedKeyType == 0)
-        printLineF1(F("Straight"));
-      else if (selectedKeyType == 1)
-        printLineF1(F("IAMBICA"));
-      else if (selectedKeyType == 2)
-        printLineF1(F("IAMBICB"));
-
-      knob = enc_read();
-
-      if (knob != 0)
-      {
-        moveStep += (knob > 0 ? 1 : -1);
-        if (moveStep < -3) {
-          if (selectedKeyType > 0)
-            selectedKeyType--;
-          moveStep = 0;
-        }
-        else if (moveStep > 3) {
-          if (selectedKeyType < 2)
-            selectedKeyType++;
-          moveStep = 0;
-        }
-      }
-
-      Check_Cat(0);  //To prevent disconnections
-    }
-    
-    printLineF2(F("CW Key Type set!"));
-    cwKeyType = selectedKeyType;
-    EEPROM.put(CW_KEY_TYPE, cwKeyType);
-
-    if (cwKeyType == 0)
-      Iambic_Key = false;
-    else
-    {
-      Iambic_Key = true;
-      if (cwKeyType == 1)
-        keyerControl &= ~IAMBICB;
-      else
-        keyerControl |= IAMBICB;
-    }
-    delay_background(2000, 0);
-    
-    printLine2ClearAndUpdate();
-    menuOn = 0;
-  }
-}
-
-//Analog pin monitoring with CW Key and function keys connected.
-//by KD8CEC
-void menuADCMonitor(int btn){
-  int adcPinA0 = 0;  //A0(BLACK, EncoderA)
-  int adcPinA1 = 0;  //A1(BROWN, EncoderB)
-  int adcPinA2 = 0;  //A2(RED, Function Key)
-  int adcPinA3 = 0;  //A3(ORANGE, CW Key)
-  int adcPinA6 = 0;  //A6(BLUE, Ptt)
-  int adcPinA7 = 0;  //A7(VIOLET, Spare)
-  unsigned long pressKeyTime = 0;
-  
-  if (!btn){
-        printLineF2(F("ADC Line Monitor"));
-        return;
-  }
-  
-  printLineF2(F("Exit:Long PTT"));
-  delay_background(2000, 0);
-  printLineF1(F("A0   A1   A2"));
-  printLineF2(F("A3   A6   A7"));
-  delay_background(3000, 0);
-  
-  while (true) {
-    adcPinA0 = analogRead(A0);  //A0(BLACK, EncoderA)
-    adcPinA1 = analogRead(A1);  //A1(BROWN, EncoderB)
-    adcPinA2 = analogRead(A2);  //A2(RED, Function Key)
-    adcPinA3 = analogRead(A3);  //A3(ORANGE, CW Key)
-    adcPinA6 = analogRead(A6);  //A6(BLUE, Ptt)
-    adcPinA7 = analogRead(A7);  //A7(VIOLET, Spare)
-
-/*
-  sprintf(c, "%4d %4d %4d", adcPinA0, adcPinA1, adcPinA2);
-  printLine1(c);
-  sprintf(c, "%4d %4d %4d", adcPinA3, adcPinA6, adcPinA7);
-  printLine2(c);
-*/  
-  
-    if (adcPinA6 < 10) {
-      if (pressKeyTime == 0)
-        pressKeyTime = millis();
-      else if (pressKeyTime < (millis() - 3000))
-          break;
-    }
-    else
-      pressKeyTime = 0;
-    
-    ltoa(adcPinA0, c, 10);
-    //strcat(b, c);
-    strcpy(b, c);
-    strcat(b, ", ");
-    
-    ltoa(adcPinA1, c, 10);
-    strcat(b, c);
-    strcat(b, ", ");
-    
-    ltoa(adcPinA2, c, 10);
-    strcat(b, c);
-
-    printLine1(b);
-
-    //strcpy(b, " ");
-    ltoa(adcPinA3, c, 10);
-    strcpy(b, c);
-    strcat(b, ", ");
-
-    ltoa(adcPinA6, c, 10);
-    strcat(b, c);
-    strcat(b, ", ");
-    
-    ltoa(adcPinA7, c, 10);
-    strcat(b, c);
-    printLine2(b);
-    
-    delay_background(200, 0);
-  } //end of while
-      
-  printLine2ClearAndUpdate();
-  menuOn = 0;
-}
-
-//Function to disbled transmission
-//by KD8CEC
 void menuTxOnOff(int btn, byte optionType){
   if (!btn){
     if ((isTxType & optionType) == 0)
@@ -719,7 +302,7 @@ void menuExit(int btn){
   }
 }
 
-void menuCWSpeed(int btn){
+int menuCWSpeed(int btn){
     int knob = 0;
     int wpm;
 
@@ -734,7 +317,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);
@@ -764,18 +347,17 @@ 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;
 }
 
-//Builtin CW Keyer Logic by KD8CEC
-void menuCWAutoKey(int btn){
+int menuCWAutoKey(int btn){
     if (!btn){
      printLineF2(F("CW AutoKey Mode?"));
      return;
@@ -798,8 +380,7 @@ void menuCWAutoKey(int btn){
     menuOn = 0;
 }
 
-//Modified by KD8CEC
-void menuSetupCwDelay(int btn){
+int menuSetupCwDelay(int btn){
     int knob = 0;
     int tmpCWDelay = cwDelayTime * 10;
      
@@ -809,7 +390,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);
@@ -837,18 +418,17 @@ 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;
 }
 
-//CW Time delay by KD8CEC
-void menuSetupTXCWInterval(int btn){
+int menuSetupTXCWInterval(int btn){
     int knob = 0;
     int tmpTXCWInterval = delayBeforeCWStartTime * 2;
      
@@ -858,7 +438,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);
@@ -886,12 +466,12 @@ 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;
 }
@@ -911,8 +491,10 @@ void menuSetupTXCWInterval(int btn){
 extern int32_t calibration;
 extern uint32_t si5351bx_vcoa;
 
-void factoryCalibration(int btn){
+int factoryCalibration(int btn){
   int knob = 0;
+  int32_t prev_calibration;
+
 
   //keep clear of any previous button press
   while (btnDown())
@@ -921,12 +503,12 @@ void factoryCalibration(int btn){
    
   if (!btn){
     printLineF2(F("Set Calibration?"));
-    return;
+    return 0;
   }
 
+  prev_calibration = calibration;
   calibration = 0;
 
-  cwMode = 0;
   isUSB = true;
 
   //turn off the second local oscillator and the bfo
@@ -979,13 +561,13 @@ void factoryCalibration(int btn){
   delay(100);
 }
 
-void menuSetupCalibration(int btn){
+int menuSetupCalibration(int btn){
   int knob = 0;
   int32_t prev_calibration;
    
   if (!btn){
     printLineF2(F("Set Calibration?"));
-    return;
+    return 0;
   }
 
   printLineF1(F("Set to Zero-beat,"));
@@ -1044,6 +626,7 @@ void menuSetupCalibration(int btn){
   menuOn = 0;
 }
 
+
 void printCarrierFreq(unsigned long freq){
 
   memset(c, 0, sizeof(c));
@@ -1055,11 +638,10 @@ 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);    
 }
 
-//modified by KD8CEC (just 1 line remarked //usbCarrier = ...
 void menuSetupCarrier(int btn){
   int knob = 0;
   unsigned long prevCarrier;
@@ -1074,8 +656,7 @@ void menuSetupCarrier(int btn){
   printLineF1(F("PTT to confirm. "));
   delay_background(1000, 0);
 
-  //usbCarrier = 11995000l; //Remarked by KD8CEC, Suggest from many user, if entry routine factoryrest
-  
+  usbCarrier = 11995000l;
   si5351bx_setfreq(0, usbCarrier);
   printCarrierFreq(usbCarrier);
 
@@ -1107,72 +688,12 @@ 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; 
 }
 
-//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);
-  }
-
-  //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; 
-}
-//Modified by KD8CEC
 void menuSetupCwTone(int btn){
     int knob = 0;
     int prev_sideTone;
@@ -1221,7 +742,6 @@ void menuSetupCwTone(int btn){
     menuOn = 0; 
  }
 
-//Lock Dial move by KD8CEC
 void setDialLock(byte tmpLock, byte fromMode) {
   if (tmpLock == 1)
     isDialLock |= (vfoActive == VFO_A ? 0x01 : 0x02);
@@ -1239,30 +759,22 @@ void setDialLock(byte tmpLock, byte fromMode) {
   printLine2ClearAndUpdate();
 }
 
-unsigned int btnDownTimeCount;
+int btnDownTimeCount;
 
-#define PRESS_ADJUST_TUNE 1000
-#define PRESS_LOCK_CONTROL 2000
-
-//Modified by KD8CEC
 void doMenu(){
   int select=0, i,btnState;
-  char isNeedDisplay = 0;
   
   //for DialLock On/Off function
   btnDownTimeCount = 0;
   
   //wait for the button to be raised up
-
-  //Appened Lines by KD8CEC for Adjust Tune step and Set Dial lock
   while(btnDown()){
     delay(50);
     Check_Cat(0);  //To prevent disconnections
     
-    if (btnDownTimeCount++ == (PRESS_ADJUST_TUNE / 50)) { //Set Tune Step 
-      printLineF2(F("Set Tune Step?"));
-    }
-    else if (btnDownTimeCount > (PRESS_LOCK_CONTROL / 50)) {  //check long time Down Button -> 2.5 Second => Lock
+    //btnDownTimeCount++;
+    //check long time Down Button -> 3 Second
+    if (btnDownTimeCount++ > (2000 / 50)) {
       if (vfoActive == VFO_A)
         setDialLock((isDialLock & 0x01) == 0x01 ? 0 : 1, 0); //Reverse Dial lock
       else
@@ -1272,55 +784,6 @@ void doMenu(){
   }
   delay(50);  //debounce
 
-  //ADJUST TUNE STEP 
-  if (btnDownTimeCount > (PRESS_ADJUST_TUNE / 50))
-  {
-    printLineF1(F("Press to set step"));
-    isNeedDisplay = 1; //check to need display for display current value
-    
-    while (digitalRead(PTT) == HIGH && !btnDown())
-    {
-      Check_Cat(0);  //To prevent disconnections
-      delay(50);  //debounce    
-
-      if (isNeedDisplay) {
-        strcpy(b, "Tune Step:");
-        itoa(arTuneStep[tuneStepIndex -1], c, 10);
-        strcat(b, c);
-        printLine2(b);
-        isNeedDisplay = 0;
-      }
-        
-      i = enc_read();
-
-      if (i != 0) {
-        select += (i > 0 ? 1 : -1);
-
-        if (select * select >= 25) {  //Threshold 5 * 5 = 25
-          if (select < 0) {
-            if (tuneStepIndex > 1)
-              tuneStepIndex--;
-          }
-          else {
-            if (tuneStepIndex < 5)
-              tuneStepIndex++;
-          }
-          select = 0;
-          isNeedDisplay = 1;
-        }
-      }
-    } //end of while
-
-    printLineF2(F("Changed Step!"));
-    //SAVE EEPROM
-    EEPROM.put(TUNING_STEP, tuneStepIndex);
-    delay_background(500, 0);
-    printLine2ClearAndUpdate();
-    return;
-  }   //set tune step
-
-  //Below codes are origial code with modified by KD8CEC
-  //Select menu
   menuOn = 2;
   
   while (menuOn){
@@ -1328,56 +791,43 @@ void doMenu(){
     btnState = btnDown();
 
     if (i > 0){
-      if (modeCalibrate && select + i < 200)
+      if (modeCalibrate && select + i < 150)
         select += i;
-      if (!modeCalibrate && select + i < 100)
+      if (!modeCalibrate && select + i < 80)
         select += i;
     }
-    //if (i < 0 && select - i >= 0)
-    if (i < 0 && select - i >= -10)
+    if (i < 0 && select - i >= 0)
       select += i;      //caught ya, i is already -ve here, so you add it
 
-    if (select < -5)
-      menuExit(btnState);
-    else if (select < 10)
+    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)
-      menuIFSToggle(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)
-      menuSetupKeyType(btnState);
-    else if (select < 180 && modeCalibrate)
-      menuADCMonitor(btnState);
-    else if (select < 190 && modeCalibrate)
+    else if (select < 140 && modeCalibrate)
       menuTxOnOff(btnState, 0x01);      //TX OFF / ON
-    else if (select < 200 && modeCalibrate)
+    else if (select < 150 && modeCalibrate)
       menuExit(btnState);
 
     Check_Cat(0);  //To prevent disconnections

ubitx_20/ubitx_si5351.ino

@@ -62,7 +62,7 @@ void i2cWriten(uint8_t reg, uint8_t *vals, uint8_t vcnt) {  // write array
 
 
 void si5351bx_init() {                  // Call once at power-up, start PLLA
-  uint32_t msxp1;
+  uint8_t reg;  uint32_t msxp1;
   Wire.begin();
   i2cWrite(149, 0);                     // SpreadSpectrum off
   i2cWrite(3, si5351bx_clken);          // Disable all CLK output drivers
@@ -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,56 +60,38 @@ 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;
+/**
+ * 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
+ */
 
-  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;
-}
-
-/*
+ /*
 void drawMeter(int8_t needle){
   int16_t best, i, s;
 
@@ -130,23 +101,21 @@ 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)
-    linenmbr = (linenmbr == 0 ? 1 : 0); //Line Toggle
-    
+void printLine(char linenmbr, char *c) {
   if (strcmp(c, printBuff[linenmbr])) {     // only refresh the display when there was a change
     lcd.setCursor(0, linenmbr);             // place the cursor at the beginning of the selected line
     lcd.print(c);
@@ -176,9 +145,6 @@ void printLineF(char linenmbr, const __FlashStringHelper *c)
 
 #define LCD_MAX_COLUMN 16
 void printLineFromEEPRom(char linenmbr, char lcdColumn, byte eepromStartIndex, byte eepromEndIndex) {
-  if ((displayOption1 & 0x01) == 0x01)
-    linenmbr = (linenmbr == 0 ? 1 : 0); //Line Toggle
-  
   lcd.setCursor(lcdColumn, linenmbr);
 
   for (byte i = eepromStartIndex; i <= eepromEndIndex; i++)
@@ -194,20 +160,14 @@ void printLineFromEEPRom(char linenmbr, char lcdColumn, byte eepromStartIndex, b
 }
 
 //  short cut to print to the first line
-void printLine1(const char *c){
+void printLine1(char *c){
   printLine(1,c);
 }
 //  short cut to print to the first line
-void printLine2(const char *c){
+void printLine2(char *c){
   printLine(0,c);
 }
 
-void clearLine2()
-{
-  printLine2("");
-  line2DisplayStatus = 0;
-}
-
 //  short cut to print to the first line
 void printLine1Clear(){
   printLine(1,"");
@@ -219,7 +179,6 @@ void printLine2Clear(){
 
 void printLine2ClearAndUpdate(){
   printLine(0, "");
-  line2DisplayStatus = 0;  
   updateDisplay();
 }
 
@@ -262,21 +221,10 @@ 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 ");
-      }
+      if (isUSB)
+        strcpy(c, "USB ");
       else
-      {
-          strcpy(c, "CWU ");
-      }
+        strcpy(c, "LSB ");
     }
     if (vfoActive == VFO_A) // VFO A is active
       strcat(c, "A:");
@@ -303,22 +251,18 @@ void updateDisplay() {
   //  strcat(c, " TX");
   printLine(1, c);
 
-  byte diplayVFOLine = 1;
-  if ((displayOption1 & 0x01) == 0x01)
-    diplayVFOLine = 0;
-
   if ((vfoActive == VFO_A && ((isDialLock & 0x01) == 0x01)) ||
     (vfoActive == VFO_B && ((isDialLock & 0x02) == 0x02))) {
-    lcd.setCursor(5,diplayVFOLine);
+    lcd.setCursor(5,1);
     lcd.write((uint8_t)0);
   }
   else if (isCWAutoMode == 2){
-    lcd.setCursor(5,diplayVFOLine);
+    lcd.setCursor(5,1);
     lcd.write(0x7E);
   }
   else
   {
-    lcd.setCursor(5,diplayVFOLine);
+    lcd.setCursor(5,1);
     lcd.write(":");
   }
 
@@ -368,9 +312,9 @@ int enc_read(void) {
   byte newState;
   int enc_speed = 0;
   
-  unsigned long start_at = millis();
+  long stop_by = millis() + 50;
   
-  while (millis() - start_at < 50) { // check if the previous state was stable
+  while (millis() < stop_by) { // check if the previous state was stable
     newState = enc_state(); // Get current state  
     
     if (newState != enc_prev_state)