Attempted incorporation of W0EB interrupt-based keying code from Raduino I2C clone. Kept locking up during the setFrequency() and/or SetCarrierFreq() calls that occurred within startTx() when called from the ISR. Don't have time to work through understanding how to integrated the KD8CEC complex spaghetti codebase with the otherwise relatively straightforward ISR. So I think I will revert to the non-ISR version.

changed version number for nextion lcd protocol

README.md

@@ -1,21 +1,21 @@
-#IMPORTANT INFORMATION
+#KC4UPR'S NOTE
 ----------------------------------------------------------------------------
-- Now Release Version 1.061 on my blog (http://www.hamskey.com)
-- You can download and compiled hex file and uBITX Manager application on my blog (http://www.hamskey.com)
+This is a fork of the KD8CEC firmware that will be specific to my uBITX V5
+installation.  My intent is to remove unnecessary code, as well as make some
+GPIO changes based on my use of the Nextion LCD.  Specifically, I'd like to 
+eliminate the use of analog I/O for reading the CW keys, and possibly enable
+control of accessories such as filters using the extra GPIO pins that are
+now available.
 
 #NOTICE
 ----------------------------------------------------------------------------
-I received uBITX a month ago and found that many features are required, and began coding with the idea of implementing minimal functionality as a general hf transceiver rather than an experimental device.
-
-Most of the basic functions of the HF transceiver I thought were implemented.
-The minimum basic specification for uBITX to operate as a radio, I think it is finished.
-So I will release the 0.27 version and if I do not see the bug anymore, I will try to change the version name to 1.0.
-Now uBITX is an HF radio and will be able to join you in your happy hams life.
-Based on this source, you can use it by adding functions.
+- Now Release Version 1.20 on my blog (http://www.hamskey.com)
+- You can download and compiled hex file and uBITX Manager application on release section (https://github.com/phdlee/ubitx/releases)
+- For more information, see my blog (http://www.hamskey.com)
 
 http://www.hamskey.com
 
-DE KD8CEC
+Ian KD8CEC
 kd8cec@gmail.com
 
 #uBITX
@@ -26,15 +26,53 @@ The copyright information of the original is below.
 KD8CEC
 ----------------------------------------------------------------------------
 Prepared or finished tasks for the next version
-  - Reduce Program size
-  - uBITX with RTL-SDR 
+  - Add TTS module
   - Direct control for Student
   
 ----------------------------------------------------------------------------
 ## REVISION RECORD
-1.07 (Working...)
- - Please do not download it yet. The code will continue to change for the time being.
- - BetaVersion for Reduce program size
+1.20
+ - Support uBITX V5
+ - Change to SDR Frequency (Remove just RTL-SDR's error Frequency (2390Hz))
+1.12
+ - Support Custom LPF Control
+ - Other Minor Bugs
+1.1
+ - Support Nextion LCD, TJC LCD
+ - Read & Backup uBITX, ADC Monitoring, ATT, IF-Shift and more on Nextion LCD (TJC LCD)
+ - Factory Reset (Both Character LCD and Nextion LCD are applicable)
+ - Support Signal Meter using ADC (A7 Port)
+ - Supoort I2C Signal Meter
+ - Spectrum
+ - Band Scan
+ - Memory Control on Nextion LCD (TJC LCD)
+ - Speed Change CW-Option on Nextion LCD
+ - Fixed Band Change Bug (Both Character LCD and Nextion LCD are applicable)
+ - uBITX Manager removed the Encode and Decode buttons. The procedure has become a bit easier.
+ - I2C Device Scan on uBITX Manager ( Both Character LCD and Nextion LCD are applicable)
+ - Si5351 I2C Address can be changed
+ - Recovery using QR-Code Data from Server
+ - Nextion LCD and TJC LCD can display Spectrum and CW Decode (using Stand alone S-Meter)
+ - Other Minor Bugs
+ 
+1.09 (Beta)
+- include 1.094 beta, 1.095 beta, 1.097 beta
+
+1.08
+ - Receive performance is improved compared to the original firmware or version 1.061
+ - ATT function has been added to reduce RF gain (Shift 45Mhz IF)
+ - Added the ability to connect SDR. (Low cost RTL-SDR available)
+ - Added a protocol to ADC Monitoring in CAT communications
+ - Various LCD support, 16x02 Parallel LCD - It is the LCD equipped with uBITX, 16x02 I2C LCD, 20x04 Parallel LCD, 20x04 I2C LCD, 16x02 I2C Dual LCD
+ - Added Extended Switch Support
+ - Support S Meter
+ - Added S-Meter setting assistant to uBITX Manager
+ - Add recovery mode (such as Factory Reset)
+ - There have been many other improvements and fixes. More information is available on the blog. (http://www.hamskey.com)
+
+1.07 (Beta)
+ - include 1.071 beta, 1.073 beta, 1.075 beta
+ - Features implemented in the beta version have been applied to Version 1.08 above.
 
 1.061
  - Added WSPR

ubitx_20/cat_libs.ino

@@ -252,12 +252,35 @@ void ReadEEPRom() //for remove warnings.
 
   Serial.write(0x02); //STX
   checkSum = 0x02;
-  for (uint16_t i = 0; i < eepromReadLength; i++)
+  //I2C Scanner
+  //Magic Key Start 59414, Length : 48583
+  //if (eepromStartIndex == 59414 && eepromReadLength == 48583)
+  if (CAT_BUFF[0] == 0x16  && CAT_BUFF[1] == 0xe8)
   {
-    read1Byte = EEPROM.read(eepromStartIndex + i);
-    checkSum += read1Byte;
-    Serial.write(read1Byte);
+    for (uint8_t i = 1; i < 127; i++)
+    {
+      Wire.beginTransmission(i);
+      read1Byte = Wire.endTransmission();
+      if (read1Byte == 0)
+      {
+        Serial.write(i);
+      }
+      else
+      {
+        Serial.write(0);
+      }
+    }
   }
+  else
+  {
+    for (uint16_t i = 0; i < eepromReadLength; i++)
+    {
+      read1Byte = EEPROM.read(eepromStartIndex + i);
+      checkSum += read1Byte;
+      Serial.write(read1Byte);
+    }
+  }
+  
   Serial.write(checkSum);
   Serial.write(ACK);
 }

ubitx_20/cw_autokey.ino

@@ -31,6 +31,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 **************************************************************************/
+/*
 #include <avr/pgmspace.h>
 
 //27 + 10 + 18 + 1(SPACE) = //56 
@@ -235,30 +236,6 @@ void sendCWChar(char cwKeyChar)
   }
 }
 
-/*
-void sendAutoCW(int cwSendLength, char *sendString)
-{
-  byte i;
-
-  if (!inTx){
-    keyDown = 0;
-    cwTimeout = millis() + cwDelayTime * 10;
-    startTx(TX_CW, 0);  //disable updateDisplay Command for reduce latency time
-    updateDisplay();
-
-    delay_background(delayBeforeCWStartTime * 2, 2);
-  }
-
-  for (i = 0; i < cwSendLength; i++)
-  {
-    sendCWChar(sendString[i]);
-    if (i != cwSendLength -1) delay_background(cwSpeed * 3, 3);
-  }
-
-  delay_background(cwDelayTime * 10, 2);
-  stopTx();
-}
-*/
 byte isNeedScroll = 0;
 unsigned long scrollDispayTime = 0;
 #define scrollSpeed 500
@@ -296,18 +273,19 @@ void controlAutoCW(){
           {
               displayScrolStep = 0;
           }
-          
+
+#ifdef USE_SW_SERIAL
+          //Not need Scroll
+          //Display_AutoKeyTextIndex(selectedCWTextIndex);
+          SendCommand1Num('w', selectedCWTextIndex);                                              //Index
+          SendEEPromData('a', cwStartIndex + CW_DATA_OFSTADJ, cwEndIndex + CW_DATA_OFSTADJ, 0) ;  //Data
+          SendCommand1Num('y', 1);                                                                //Send YN
+          isNeedScroll = 0;
+#else          
           printLineFromEEPRom(0, 2, cwStartIndex + displayScrolStep + CW_DATA_OFSTADJ, cwEndIndex + CW_DATA_OFSTADJ, 0); 
-
-          //byte diplayAutoCWLine = 0;
-          //if ((displayOption1 & 0x01) == 0x01)
-          //  diplayAutoCWLine = 1;
-
-          Display_AutoKeyTextIndex(selectedCWTextIndex);
-          //lcd.setCursor(0, diplayAutoCWLine);
-          //lcd.write(byteToChar(selectedCWTextIndex));
-          //lcd.write(':');
           isNeedScroll = (cwEndIndex - cwStartIndex) > 14 ? 1 : 0;
+          Display_AutoKeyTextIndex(selectedCWTextIndex);
+#endif
           scrollDispayTime = millis() + scrollSpeed;
           beforeCWTextIndex = selectedCWTextIndex;
       }
@@ -421,3 +399,4 @@ void controlAutoCW(){
     }
 }
 
+*/

ubitx_20/softserial_tiny.cpp

@@ -0,0 +1,334 @@
+/*
+Softserial for Nextion LCD and Control MCU
+KD8CEC, Ian Lee
+-----------------------------------------------------------------------
+It is a library rewritten in C format based on SoftwareSerial.c.
+I tried to use as much as possible without modifying the SoftwareSerial. 
+But eventually I had to modify the code. 
+
+I rewrote it in C for the following reasons.
+ - Problems occurred when increasing Program Size and Program Memory
+ - We had to reduce the program size.
+   Of course, Software Serial is limited to one.
+ - reduce the steps for transmitting and receiving
+
+useage
+extern void SWSerial_Begin(long speedBaud);
+extern void SWSerial_Write(uint8_t b);
+extern int SWSerial_Available(void);
+extern int SWSerial_Read(void);
+extern void SWSerial_Print(uint8_t *b);
+
+If you use Softwreserial library instead of this library, you can modify the code as shown below.
+I kept the function name of SoftwareSerial so you only need to modify a few lines of code.
+
+define top of source code
+#include <SoftwareSerial.h>
+SoftwareSerial sSerial(10, 11); // RX, TX
+
+replace source code
+SWSerial_Begin to sSerial.begin
+SWSerial_Write to sSerial.write
+SWSerial_Available to sSerial.available
+SWSerial_Read to sSerial.read
+
+KD8CEC, Ian Lee
+-----------------------------------------------------------------------
+License
+All licenses for the source code are subject to the license of the original source SoftwareSerial Library.
+However, if you use or modify this code, please keep the all comments in this source code.
+KD8CEC
+-----------------------------------------------------------------------
+License from SoftwareSerial
+-----------------------------------------------------------------------
+SoftwareSerial.cpp (formerly NewSoftSerial.cpp) - 
+Multi-instance software serial library for Arduino/Wiring
+-- Interrupt-driven receive and other improvements by ladyada
+   (http://ladyada.net)
+-- Tuning, circular buffer, derivation from class Print/Stream,
+   multi-instance support, porting to 8MHz processors,
+   various optimizations, PROGMEM delay tables, inverse logic and 
+   direct port writing by Mikal Hart (http://www.arduiniana.org)
+-- Pin change interrupt macros by Paul Stoffregen (http://www.pjrc.com)
+-- 20MHz processor support by Garrett Mace (http://www.macetech.com)
+-- ATmega1280/2560 support by Brett Hagman (http://www.roguerobotics.com/)
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+The latest version of this library can always be found at
+http://arduiniana.org.
+ */
+#include <Arduino.h>
+
+//================================================================
+//Public Variable
+//================================================================
+#define TX_PIN 9
+#define RX_PIN 8
+#define _SS_MAX_RX_BUFF 35 // RX buffer size
+#define PRINT_MAX_LENGTH 30
+
+//================================================================
+//Internal Variable from SoftwareSerial.c and SoftwareSerial.h
+//================================================================
+//variable from softwareserial.c and softwareserial.h
+static uint8_t swr_receive_buffer[_SS_MAX_RX_BUFF];
+
+volatile uint8_t *_transmitPortRegister;      //Write Port Register
+uint8_t transmit_RegMask; //use Mask bit 1
+uint8_t transmit_InvMask; //use mask bit 0
+
+volatile uint8_t *_receivePortRegister;       //Read Port Register
+uint8_t _receiveBitMask;
+
+//delay value for Bit
+uint16_t _tx_delay;
+
+//delay value for Receive
+uint16_t _rx_delay_stopbit;
+uint16_t _rx_delay_centering;
+uint16_t _rx_delay_intrabit;
+
+//Customize for uBITX Protocol
+int8_t receiveIndex = 0;
+uint8_t receivedCommandLength = 0;
+int8_t ffCount = 0;
+
+//Values for Receive Buffer
+//uint16_t _buffer_overflow;
+//static volatile uint8_t _receive_buffer_head;
+//static volatile uint8_t _receive_buffer_tail;
+
+//Values for Interrupt (check Start Bit)
+volatile uint8_t *_pcint_maskreg;
+uint8_t _pcint_maskvalue;
+
+//================================================================
+//Internal Function from SoftwareSerial.c
+//================================================================
+uint16_t subtract_cap(uint16_t num, uint16_t sub) 
+{
+  if (num > sub)
+    return num - sub;
+  else
+    return 1;
+}
+
+inline void tunedDelay(uint16_t delay) 
+{
+  _delay_loop_2(delay);
+}
+
+void setRxIntMsk(bool enable)
+{
+    if (enable)
+      *_pcint_maskreg |= _pcint_maskvalue;
+    else
+      *_pcint_maskreg &= ~_pcint_maskvalue;
+}
+
+uint8_t rx_pin_read()
+{
+  return *_receivePortRegister & _receiveBitMask;
+}
+
+//
+// The receive routine called by the interrupt handler
+//
+void softSerail_Recv()
+{
+#if GCC_VERSION < 40302
+// Work-around for avr-gcc 4.3.0 OSX version bug
+// Preserve the registers that the compiler misses
+// (courtesy of Arduino forum user *etracer*)
+  asm volatile(
+    "push r18 \n\t"
+    "push r19 \n\t"
+    "push r20 \n\t"
+    "push r21 \n\t"
+    "push r22 \n\t"
+    "push r23 \n\t"
+    "push r26 \n\t"
+    "push r27 \n\t"
+    ::);
+#endif  
+
+  uint8_t d = 0;
+
+  // If RX line is high, then we don't see any start bit
+  // so interrupt is probably not for us
+  if (!rx_pin_read())     //Start Bit
+  {
+    // Disable further interrupts during reception, this prevents
+    // triggering another interrupt directly after we return, which can
+    // cause problems at higher baudrates.
+    setRxIntMsk(false);
+
+    // Wait approximately 1/2 of a bit width to "center" the sample
+    tunedDelay(_rx_delay_centering);
+
+    // Read each of the 8 bits
+    for (uint8_t i=8; i > 0; --i)
+    {
+      tunedDelay(_rx_delay_intrabit);
+      d >>= 1;
+
+      if (rx_pin_read())
+        d |= 0x80;
+    }
+
+    if (receivedCommandLength == 0) //check Already Command
+    {
+        //Set Received Data
+        swr_receive_buffer[receiveIndex++] = d;
+
+        //Finded Command
+        if (d == 0x73 && ffCount > 1 && receiveIndex > 6)
+        {
+          receivedCommandLength = receiveIndex;
+          receiveIndex = 0;
+          ffCount = 0;
+        }
+        else if (receiveIndex > _SS_MAX_RX_BUFF)
+        {
+          //Buffer Overflow
+          receiveIndex = 0;
+          ffCount = 0;
+        }
+        else if (d == 0xFF)
+        {
+          ffCount++;
+        }
+        else
+        {
+          ffCount = 0;
+        }
+    }
+    
+    // skip the stop bit
+    tunedDelay(_rx_delay_stopbit);
+
+    // Re-enable interrupts when we're sure to be inside the stop bit
+    setRxIntMsk(true);
+  }
+
+#if GCC_VERSION < 40302
+// Work-around for avr-gcc 4.3.0 OSX version bug
+// Restore the registers that the compiler misses
+  asm volatile(
+    "pop r27 \n\t"
+    "pop r26 \n\t"
+    "pop r23 \n\t"
+    "pop r22 \n\t"
+    "pop r21 \n\t"
+    "pop r20 \n\t"
+    "pop r19 \n\t"
+    "pop r18 \n\t"
+    ::);
+#endif
+}
+
+ISR(PCINT0_vect)
+{
+ softSerail_Recv();
+}
+
+//================================================================
+//Public Function from SoftwareSerial.c and modified and create
+//================================================================
+// Read data from buffer
+void SWSerial_Read(uint8_t * receive_cmdBuffer)
+{
+  for (int i = 0; i < receivedCommandLength; i++)
+    receive_cmdBuffer[i] = swr_receive_buffer[i];
+}
+
+void SWSerial_Write(uint8_t b)
+{
+  volatile uint8_t *reg = _transmitPortRegister;
+  uint8_t oldSREG = SREG;
+  uint16_t delay = _tx_delay;
+
+  cli();  // turn off interrupts for a clean txmit
+
+  // Write the start bit
+  *reg &= transmit_InvMask;
+
+  tunedDelay(delay);
+
+  // Write each of the 8 bits
+  for (uint8_t i = 8; i > 0; --i)
+  {
+    if (b & 1) // choose bit
+      *reg |= transmit_RegMask; // send 1
+    else
+      *reg &= transmit_InvMask; // send 0
+
+    tunedDelay(delay);
+    b >>= 1;
+  }
+
+  // restore pin to natural state
+  *reg |= transmit_RegMask;
+
+  SREG = oldSREG; // turn interrupts back on
+  tunedDelay(_tx_delay);
+}
+
+void SWSerial_Print(uint8_t *b)
+{
+  for (int i = 0; i < PRINT_MAX_LENGTH; i++)
+  {
+    if (b[i] == 0x00)
+      break;
+    else
+      SWSerial_Write(b[i]);
+  }
+}
+
+void SWSerial_Begin(long speedBaud)
+{
+  //INT TX_PIN
+  digitalWrite(TX_PIN, HIGH);
+  pinMode(TX_PIN, OUTPUT);
+  transmit_RegMask = digitalPinToBitMask(TX_PIN);   //use Bit 1
+  transmit_InvMask = ~digitalPinToBitMask(TX_PIN);  //use Bit 0
+  _transmitPortRegister = portOutputRegister(digitalPinToPort(TX_PIN));
+
+  //INIT RX_PIN
+  pinMode(RX_PIN, INPUT);
+  digitalWrite(RX_PIN, HIGH);  // pullup for normal logic!
+  _receiveBitMask = digitalPinToBitMask(RX_PIN);
+  _receivePortRegister = portInputRegister(digitalPinToPort(RX_PIN));
+
+  //Set Values
+  uint16_t bit_delay = (F_CPU / speedBaud) / 4;
+  _tx_delay = subtract_cap(bit_delay, 15 / 4);
+
+  if (digitalPinToPCICR(RX_PIN)) 
+  {
+    _rx_delay_centering = subtract_cap(bit_delay / 2, (4 + 4 + 75 + 17 - 23) / 4);
+    _rx_delay_intrabit = subtract_cap(bit_delay, 23 / 4);
+    _rx_delay_stopbit = subtract_cap(bit_delay * 3 / 4, (37 + 11) / 4);
+    *digitalPinToPCICR(RX_PIN) |= _BV(digitalPinToPCICRbit(RX_PIN));
+    _pcint_maskreg = digitalPinToPCMSK(RX_PIN);
+    _pcint_maskvalue = _BV(digitalPinToPCMSKbit(RX_PIN));
+
+    tunedDelay(_tx_delay); // if we were low this establishes the end
+  }
+
+  //Start Listen
+  setRxIntMsk(true);
+}

ubitx_20/ubitx.h

@@ -22,29 +22,150 @@
 //==============================================================================
 // Compile Option
 //==============================================================================
+//Ubitx Board Version
+#define UBITX_BOARD_VERSION 5           //v1 ~ v4 : 4, v5: 5
+
 //Depending on the type of LCD mounted on the uBITX, uncomment one of the options below.
 //You must select only one.
-#define UBITX_DISPLAY_LCD1602P        //LCD mounted on unmodified uBITX (Parallel)
+//#define UBITX_DISPLAY_LCD1602P        //LCD mounted on unmodified uBITX (Parallel)
 //#define UBITX_DISPLAY_LCD1602I        //I2C type 16 x 02 LCD
 //#define UBITX_DISPLAY_LCD1602I_DUAL   //I2C type 16 x02 LCD Dual
 //#define UBITX_DISPLAY_LCD2004P        //24 x 04 LCD (Parallel)
 //#define UBITX_DISPLAY_LCD2004I        //I2C type 24 x 04 LCD
+#define UBITX_DISPLAY_NEXTION         //NEXTION LCD
 
-#define I2C_LCD_MASTER_ADDRESS_DEFAULT  0x3F     //0x27  //DEFAULT, if Set I2C Address by uBITX Manager, read from EEProm
-#define I2C_LCD_SECOND_ADDRESS_DEFAULT  0x27     //0x27  //only using Dual LCD Mode
+//#define UBITX_DISPLAY_NEXTION_SAFE      //Only EEProm Write 770~775
+#define I2C_LCD_MASTER_ADDRESS_DEFAULT  0x27     //0x27  //DEFAULT, if Set I2C Address by uBITX Manager, read from EEProm
+#define I2C_LCD_SECOND_ADDRESS_DEFAULT  0x3F     //0x27  //only using Dual LCD Mode
 
-#define EXTEND_KEY_GROUP1               //MODE, BAND(-), BAND(+), STEP
+//Select betwen Analog S-Meter and DSP (I2C) Meter
+//#define USE_I2CSMETER
+
+// Use alternate keyer?
+#define USE_ALTKEYER
+
+//#define EXTEND_KEY_GROUP1               //MODE, BAND(-), BAND(+), STEP
 //#define EXTEND_KEY_GROUP2             //Numeric (0~9), Point(.), Enter  //Not supported in Version 1.0x
 
+//Custom LPF Filter Mod
+//#define USE_CUSTOM_LPF_FILTER           //LPF FILTER MOD
+
 //#define ENABLE_FACTORYALIGN
 #define FACTORY_RECOVERY_BOOTUP         //Whether to enter Factory Recovery mode by pressing FKey and turning on power
 #define ENABLE_ADCMONITOR               //Starting with Version 1.07, you can read ADC values directly from uBITX Manager. So this function is not necessary.
 
 extern byte I2C_LCD_MASTER_ADDRESS;     //0x27  //if Set I2C Address by uBITX Manager, read from EEProm
 extern byte I2C_LCD_SECOND_ADDRESS;     //only using Dual LCD Mode
-
 #define SMeterLatency   3               //1 is 0.25 sec
 
+//==============================================================================
+// User Select feather list
+//==============================================================================
+//Enable all features
+#define FN_BAND         1 //592
+#define FN_VFO_TOGGLE   1 //78
+#define FN_MODE         1 //20
+#define FN_RIT          1 //58
+#define FN_SPLIT        1 //62
+#define FN_IFSHIFT      1 //238
+#define FN_ATT          1 //128
+#define FN_CW_SPEED     1 //152
+#define FN_VFOTOMEM     1 //254
+#define FN_MEMTOVFO     1 //188
+#define FN_MEMORYKEYER  1 //156
+#define FN_WSPR         1 //1044
+#define FN_SDRMODE      1 //68
+#define FN_CALIBRATION  1 //666
+#define FN_CARRIER      1 //382
+#define FN_CWCARRIER    1 //346
+#define FN_CWTONE       1 //148
+#define FN_CWDELAY      1 //98
+#define FN_TXCWDELAY    1 //94
+#define FN_KEYTYPE      1 //168
+#define FN_ADCMONITOR   1 //516
+#define FN_TXONOFF      1 //58
+
+/*
+//Test Configuration  (88%)
+#define FN_BAND         0 //592
+#define FN_VFO_TOGGLE   0 //78
+#define FN_MODE         0 //20
+#define FN_RIT          0 //58
+#define FN_SPLIT        0 //62
+#define FN_IFSHIFT      0 //238
+#define FN_ATT          0 //128
+#define FN_CW_SPEED     1 //152
+#define FN_VFOTOMEM     0 //254
+#define FN_MEMTOVFO     0 //188
+#define FN_MEMORYKEYER  1 //156
+#define FN_WSPR         0 //1044
+#define FN_SDRMODE      1 //68
+#define FN_CALIBRATION  1 //666
+#define FN_CARRIER      1 //382
+#define FN_CWCARRIER    1 //346
+#define FN_CWTONE       1 //148
+#define FN_CWDELAY      1 //98
+#define FN_TXCWDELAY    1 //94
+#define FN_KEYTYPE      1 //168
+#define FN_ADCMONITOR   1 //516
+#define FN_TXONOFF      1 //58
+*/
+
+/*
+//Recommended Character LCD Developer  87%
+#define FN_BAND         1 //592
+#define FN_VFO_TOGGLE   1 //78
+#define FN_MODE         1 //20
+#define FN_RIT          1 //58
+#define FN_SPLIT        1 //62
+#define FN_IFSHIFT      1 //238
+#define FN_ATT          0 //128
+#define FN_CW_SPEED     0 //152 //using MM
+#define FN_VFOTOMEM     1 //254
+#define FN_MEMTOVFO     1 //188
+#define FN_MEMORYKEYER  1 //156
+#define FN_WSPR         1 //1044
+#define FN_SDRMODE      1 //68
+#define FN_CALIBRATION  0 //667 //using MM
+#define FN_CARRIER      0 //382 //using MM
+#define FN_CWCARRIER    0 //346 //using MM
+#define FN_CWTONE       0 //148 //using MM
+#define FN_CWDELAY      0 //98 //using MM
+#define FN_TXCWDELAY    0 //94 //using MM
+#define FN_KEYTYPE      0 //168 //using MM
+#define FN_ADCMONITOR   0 //516 //using MM
+#define FN_TXONOFF      1 //58
+*/
+
+/*
+//Recommended for Nextion, TJC LCD 88%
+#define FN_BAND         1 //600
+#define FN_VFO_TOGGLE   1 //90
+#define FN_MODE         1 //318
+#define FN_RIT          1 //62
+#define FN_SPLIT        1 //2
+#define FN_IFSHIFT      1 //358
+#define FN_ATT          1 //250
+#define FN_CW_SPEED     0 //286
+#define FN_VFOTOMEM     0 //276
+#define FN_MEMTOVFO     0 //234
+#define FN_MEMORYKEYER  1 //168
+#define FN_WSPR         1 //1130
+#define FN_SDRMODE      1 //70
+#define FN_CALIBRATION  0 //790
+#define FN_CARRIER      0 //500
+#define FN_CWCARRIER    0 //464
+#define FN_CWTONE       0 //158
+#define FN_CWDELAY      0 //108
+#define FN_TXCWDELAY    0 //106
+#define FN_KEYTYPE      0 //294
+#define FN_ADCMONITOR   0 //526 //not available with Nextion or Serial UI
+#define FN_TXONOFF      1 //70
+*/
+//==============================================================================
+// End of User Select Mode and Compil options
+//==============================================================================
+
 #ifdef UBITX_DISPLAY_LCD1602I
   #define USE_I2C_LCD
 #elif defined(UBITX_DISPLAY_LCD1602I_DUAL)
@@ -53,6 +174,17 @@ extern byte I2C_LCD_SECOND_ADDRESS;     //only using Dual LCD Mode
   #define USE_I2C_LCD
 #endif
 
+#ifdef UBITX_DISPLAY_NEXTION
+  #define USE_SW_SERIAL
+  #undef ENABLE_ADCMONITOR
+  #undef FACTORY_RECOVERY_BOOTUP  
+#elif defined(UBITX_CONTROL_MCU)
+  #define USE_SW_SERIAL
+  #undef ENABLE_ADCMONITOR
+  #undef FACTORY_RECOVERY_BOOTUP  
+#endif
+
+
 //==============================================================================
 // Hardware, Define PIN Usage
 //==============================================================================
@@ -64,7 +196,7 @@ extern byte I2C_LCD_SECOND_ADDRESS;     //only using Dual LCD Mode
  * ground and six pins. Each of these six pins can be individually programmed 
  * either as an analog input, a digital input or a digital output. 
  * The pins are assigned as follows (left to right, display facing you): 
- *      Pin 1 (Violet), A7, SPARE
+ *      Pin 1 (Violet), A7, SPARE => Analog S-Meter
  *      Pin 2 (Blue),   A6, KEYER (DATA)
  *      Pin 3 (Green), +5v 
  *      Pin 4 (Yellow), Gnd
@@ -90,11 +222,17 @@ extern byte I2C_LCD_SECOND_ADDRESS;     //only using Dual LCD Mode
 #define ANALOG_SPARE  (A7)
 #define ANALOG_SMETER (A7)  //by KD8CEC
 
+#ifdef USE_ALTKEYER
+  #define DIGITAL_DOT     (11) // can't remember if I need to swap still???
+  #define DIGITAL_DASH    (12)
+  #define DIGITAL_KEY     (A3)
+#endif
+
 /** 
  *  The second set of 16 pins on the Raduino's bottom connector are have the three clock outputs and the digital lines to control the rig.
  *  This assignment is as follows :
  *    Pin   1   2    3    4    5    6    7    8    9    10   11   12   13   14   15   16
- *         GND +5V CLK0  GND  GND  CLK1 GND  GND  CLK2  GND  D2   D3   D4   D5   D6   D7  
+ *         GND +5V CLK2  GND  GND  CLK1 GND  GND  CLK0  GND  D2   D3   D4   D5   D6   D7  
  *  These too are flexible with what you may do with them, for the Raduino, we use them to :
  *  - TX_RX line : Switches between Transmit and Receive after sensing the PTT or the morse keyer
  *  - CW_KEY line : turns on the carrier for CW
@@ -106,6 +244,24 @@ extern byte I2C_LCD_SECOND_ADDRESS;     //only using Dual LCD Mode
 #define TX_LPF_C      (3)   //Relay
 #define CW_KEY        (2)
 
+//******************************************************
+//DSP (I2C) Meter 
+//******************************************************
+//S-Meter Address
+#define I2CMETER_ADDR     0x58
+//VALUE TYPE============================================
+//Signal
+#define I2CMETER_CALCS    0x59 //Calculated Signal Meter
+#define I2CMETER_UNCALCS  0x58 //Uncalculated Signal Meter
+
+//Power
+#define I2CMETER_CALCP    0x57 //Calculated Power Meter
+#define I2CMETER_UNCALCP  0x56 //UnCalculated Power Meter
+
+//SWR
+#define I2CMETER_CALCR    0x55 //Calculated SWR Meter
+#define I2CMETER_UNCALCR  0x54 //Uncalculated SWR Meter
+
 //==============================================================================
 // for public, Variable, functions
 //==============================================================================
@@ -146,6 +302,8 @@ extern byte I2C_LCD_SECOND_ADDRESS;     //only using Dual LCD Mode
 
 #define FKEY_TYPE_MAX   0x1F
 
+extern uint8_t SI5351BX_ADDR;     //change typical -> variable at Version 1.097, address read from eeprom, default value is 0x60
+                                  //EEProm Address : 63
 extern unsigned long frequency;
 extern byte WsprMSGCount;
 extern byte sMeterLevels[9];
@@ -153,6 +311,7 @@ extern int currentSMeter;         //ADC Value for S.Meter
 extern byte scaledSMeter;         //Calculated S.Meter Level
 
 extern byte KeyValues[16][3];     //Set : Start Value, End Value, Key Type, 16 Set (3 * 16 = 48)
+extern byte TriggerBySW;   //Action Start from Nextion LCD, Other MCU
 
 extern void printLine1(const char *c);
 extern void printLine2(const char *c);
@@ -179,6 +338,25 @@ extern char byteToChar(byte srcByte);
 extern void DisplayCallsign(byte callSignLength);
 extern void DisplayVersionInfo(const char* fwVersionInfo);
 
+//I2C Signal Meter, Version 1.097
+extern int GetI2CSmeterValue(int valueType);  //ubitx_ui.ino
+
+#define DIT_L 0x01 // DIT latch
+#define DAH_L 0x02 // DAH latch
+#define DIT_PROC 0x04 // DIT is being processed
+#define PDLSWAP 0x08
+enum KSTYPE {IDLE, CHK_DIT, CHK_DAH, KEYED_PREP, KEYED, INTER_ELEMENT };
+
+#define IAMBICB 0x10 // 0 for Iambic A, 1 for Iambic B
+
+// For compatibility w/ W0EB code
+#define MODE_USB  0
+#define MODE_LSB  1
+#define MODE_CW   2
+#define MODE_CWR  3
+#define MODE_SWU  4
+#define MODE_SWL  5
+
+#define PTT_HNDKEY_DEBOUNCE_CT 2
+
 #endif    //end of if header define
-
-

ubitx_20/ubitx_20.ino

@@ -1,4 +1,4 @@
-//Firmware Version
+ //Firmware Version
 //+ : This symbol identifies the firmware. 
 //    It was originally called 'CEC V1.072' but it is too long to waste the LCD window.
 //    I do not want to make this Firmware users's uBITX messy with my callsign.
@@ -6,8 +6,10 @@
 //    So I put + in the sense that it was improved one by one based on Original Firmware.
 //    This firmware has been gradually changed based on the original firmware created by Farhan, Jack, Jerry and others.
 
-#define FIRMWARE_VERSION_INFO F("+v1.080")  
-#define FIRMWARE_VERSION_NUM 0x03       //1st Complete Project : 1 (Version 1.061), 2st Project : 2
+#define FIRMWARE_VERSION_INFO F("+v1.200")  
+#define FIRMWARE_VERSION_NUM 0x04       //1st Complete Project : 1 (Version 1.061), 2st Project : 2, 1.08: 3, 1.09 : 4
+
+extern void Connect_Interrupts(void);
 
 /**
  Cat Suppoort uBITX CEC Version
@@ -72,10 +74,43 @@
 
 // the second oscillator should ideally be at 57 MHz, however, the crystal filter's center frequency 
 // is shifted down a little due to the loading from the impedance matching L-networks on either sides
-#define SECOND_OSC_USB (56995000l)
-#define SECOND_OSC_LSB (32995000l) 
-//these are the two default USB and LSB frequencies. The best frequencies depend upon your individual taste and filter shape
-#define INIT_USB_FREQ   (11996500l)
+
+#if UBITX_BOARD_VERSION == 5
+//For Test  //45005000
+  //#define SECOND_OSC_USB (56064200l)
+  //#define SECOND_OSC_LSB (33945800l) 
+
+/*
+  //For Test //4500000
+  #define SECOND_OSC_USB (56059200l)
+  #define SECOND_OSC_LSB (33940800l) 
+*/
+
+/*
+  //For Test // V1.121  44991500(LSB), 44998500 (USB), abs : 7k
+  #define SECOND_OSC_USB (56057700l)
+  #define SECOND_OSC_LSB (33932300l) 
+*/
+
+  //==============================================================================================================================
+  //For Test // V1.200 V1.122  45002500 (LSB), 45002000 (USB) (Change Default BFO Frequency 11056xxx, adjust bfo and ifshift ), abs: 0.5k
+  //Best, Test 3 uBITX V5
+  //Last Value, If more data is collected, it can be changed to a better value.
+  #define SECOND_OSC_USB (56058700l)
+  #define SECOND_OSC_LSB (33945800l) 
+
+  //Not used, Just comment (Default)
+  #define INIT_USB_FREQ   (11056500l)
+  //-----------------------------------------------------------------------------------------------------------------------------
+#else
+  #define SECOND_OSC_USB (56995000l)
+  #define SECOND_OSC_LSB (32995000l) 
+  //these are the two default USB and LSB frequencies. The best frequencies depend upon your individual taste and filter shape
+  //Not used, Just comment (Default)
+  #define INIT_USB_FREQ   (11996500l)
+#endif
+  
+
 // limits the tuning and working range of the ubitx between 3 MHz and 30 MHz
 #define LOWEST_FREQ  (3000000l)
 #define HIGHEST_FREQ (30000000l)
@@ -132,7 +167,6 @@ 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;
 
 byte isShiftDisplayCWFreq = 1;  //Display Frequency 
@@ -154,10 +188,10 @@ byte userCallsignLength = 0;    //7 : display callsign at system startup, 6~0 :
 /**
  * Raduino needs to keep track of current state of the transceiver. These are a few variables that do it
  */
-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)
+volatile boolean txCAT = false;        //turned on if the transmitting due to a CAT command
+bool inTx = false;                //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 keyDown = 0;             //in cw mode, denotes the carrier is being transmitted
+//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
@@ -192,7 +226,16 @@ byte I2C_LCD_SECOND_ADDRESS;         //only using Dual LCD Mode
 byte KeyValues[16][3];
 
 byte isIFShift = 0;     //1 = ifShift, 2 extend
-int ifShiftValue = 0;  //
+int ifShiftValue = 0;   //
+
+byte TriggerBySW = 0;   //Action Start from Nextion LCD, Other MCU
+
+//Use Custom Filter
+//#define CUST_LPF_ENABLED 48
+//#define CUST_LPF_START   49
+char isCustomFilter = 0;
+char isCustomFilter_A7 = 0;
+char CustFilters[7][2];
                               
 /**
  * Below are the basic functions that control the uBitx. Understanding the functions before 
@@ -270,6 +313,7 @@ void saveBandFreqByIndex(unsigned long f, unsigned long mode, char bandIndex) {
   When the delay is used, the program will generate an error because it is not communicating, 
   so Create a new delay function that can do background processing.
  */
+ 
 unsigned long delayBeforeTime = 0;
 byte delay_background(unsigned delayTime, byte fromType){ //fromType : 4 autoCWKey -> Check Paddle
   delayBeforeTime = millis();
@@ -279,11 +323,11 @@ byte delay_background(unsigned delayTime, byte fromType){ //fromType : 4 autoCWK
     if (fromType == 4)
     {
       //CHECK PADDLE
-      if (getPaddle() != 0) //Interrupt : Stop cw Auto mode by Paddle -> Change Auto to Manual
-        return 1;
+//      if (getPaddle() != 0) //Interrupt : Stop cw Auto mode by Paddle -> Change Auto to Manual
+//        return 1;
         
       //Check PTT while auto Sending
-      autoSendPTTCheck();
+      //autoSendPTTCheck();
       
       Check_Cat(3);
     }
@@ -296,6 +340,7 @@ byte delay_background(unsigned delayTime, byte fromType){ //fromType : 4 autoCWK
 
   return 0;
 }
+
  
 
 /**
@@ -315,27 +360,74 @@ byte delay_background(unsigned delayTime, byte fromType){ //fromType : 4 autoCWK
  */
 
 void setTXFilters(unsigned long freq){
+#ifdef USE_CUSTOM_LPF_FILTER 
+  freq = freq / 1000000UL;
+  for (byte i = 0; i < 7; i++) {
+    if (freq >= CustFilters[i][0])
+    {
+      char aIn = CustFilters[i][1];
+      digitalWrite(TX_LPF_A, aIn & 0x01);
+      digitalWrite(TX_LPF_B, aIn & 0x02);
+      digitalWrite(TX_LPF_C, aIn & 0x04);
+
+      if (isCustomFilter_A7 == 1)
+      {
+        digitalWrite(10, aIn & 0x08);
+        digitalWrite(11, aIn & 0x10);
+        digitalWrite(12, aIn & 0x20);
+        digitalWrite(13, aIn & 0x40);
+      }
+      return;
+    }
+  } //end of for
+#else
   
-  if (freq > 21000000L){  // the default filter is with 35 MHz cut-off
-    digitalWrite(TX_LPF_A, 0);
-    digitalWrite(TX_LPF_B, 0);
-    digitalWrite(TX_LPF_C, 0);
-  }
-  else if (freq >= 14000000L){ //thrown the KT1 relay on, the 30 MHz LPF is bypassed and the 14-18 MHz LPF is allowd to go through
-    digitalWrite(TX_LPF_A, 1);
-    digitalWrite(TX_LPF_B, 0);
-    digitalWrite(TX_LPF_C, 0);
-  }
-  else if (freq > 7000000L){
-    digitalWrite(TX_LPF_A, 1);
-    digitalWrite(TX_LPF_B, 1);
-    digitalWrite(TX_LPF_C, 0);    
-  }
-  else {
-    digitalWrite(TX_LPF_A, 1);
-    digitalWrite(TX_LPF_B, 1);
-    digitalWrite(TX_LPF_C, 1);    
-  }
+  #if UBITX_BOARD_VERSION == 5
+    if (freq > 21000000L){  // the default filter is with 35 MHz cut-off
+      digitalWrite(TX_LPF_A, 0);
+      digitalWrite(TX_LPF_B, 0);
+      digitalWrite(TX_LPF_C, 0);
+    }
+    else if (freq >= 14000000L){ //thrown the KT1 relay on, the 30 MHz LPF is bypassed and the 14-18 MHz LPF is allowd to go through
+      digitalWrite(TX_LPF_A, 1);
+      digitalWrite(TX_LPF_B, 0);
+      digitalWrite(TX_LPF_C, 0);
+    }
+    else if (freq > 7000000L){
+      digitalWrite(TX_LPF_A, 0);
+      digitalWrite(TX_LPF_B, 1);
+      digitalWrite(TX_LPF_C, 0);    
+    }
+    else {
+      digitalWrite(TX_LPF_A, 0);
+      digitalWrite(TX_LPF_B, 0);
+      digitalWrite(TX_LPF_C, 1);    
+    }
+  #else
+    if (freq > 21000000L){  // the default filter is with 35 MHz cut-off
+      digitalWrite(TX_LPF_A, 0);
+      digitalWrite(TX_LPF_B, 0);
+      digitalWrite(TX_LPF_C, 0);
+    }
+    else if (freq >= 14000000L){ //thrown the KT1 relay on, the 30 MHz LPF is bypassed and the 14-18 MHz LPF is allowd to go through
+      digitalWrite(TX_LPF_A, 1);
+      digitalWrite(TX_LPF_B, 0);
+      digitalWrite(TX_LPF_C, 0);
+    }
+    else if (freq > 7000000L){
+      digitalWrite(TX_LPF_A, 1);
+      digitalWrite(TX_LPF_B, 1);
+      digitalWrite(TX_LPF_C, 0);    
+    }
+    else {
+      digitalWrite(TX_LPF_A, 1);
+      digitalWrite(TX_LPF_B, 1);
+      digitalWrite(TX_LPF_C, 1);    
+    }
+  #endif
+
+
+#endif
 }
 
 /**
@@ -355,7 +447,7 @@ void setFrequency(unsigned long f){
   f = (f / arTuneStep[tuneStepIndex -1]) * arTuneStep[tuneStepIndex -1];
   setTXFilters(f);
 
-  unsigned long appliedCarrier = ((cwMode == 0 ? usbCarrier : cwmCarrier) + (isIFShift && (inTx == 0) ? ifShiftValue : 0));
+  unsigned long appliedCarrier = ((cwMode == 0 ? usbCarrier : cwmCarrier) + (isIFShift && (!inTx) ? ifShiftValue : 0));
   int appliedTuneValue = 0;
 
   //applied if tune 
@@ -365,7 +457,7 @@ void setFrequency(unsigned long f){
     appliedTuneValue = if1TuneValue;
 
     //In the LSB state, the optimum reception value was found. To apply to USB, 3Khz decrease is required.
-    if (sdrModeOn && (inTx == 0))
+    if (sdrModeOn && (!inTx))
       appliedTuneValue -= 15; //decrease 1.55Khz
       
     //if (isUSB)
@@ -375,13 +467,13 @@ void setFrequency(unsigned long f){
 
    //if1Tune RX, TX Enabled, ATT : only RX Mode
   //The IF Tune shall be measured at the LSB. Then, move the 3Khz down for USB.
-  long if1AdjustValue = ((inTx == 0) ? (attLevel * 100) : 0) + (appliedTuneValue * 100); //if1Tune RX, TX Enabled, ATT : only RX Mode  //5600
+  long if1AdjustValue = ((!inTx) ? (attLevel * 100) : 0) + (appliedTuneValue * 100); //if1Tune RX, TX Enabled, ATT : only RX Mode  //5600
 
   //for DIY uBITX (custom filter)
   if ((advancedFreqOption1 & 0x80) != 0x00)  //Reverse IF Tune (- Value for DIY uBITX)
     if1AdjustValue *= -1;
     
-  if (sdrModeOn && (inTx == 0))  //IF SDR MODE
+  if (sdrModeOn && (!inTx))  //IF SDR MODE
   {
     //Fixed Frequency SDR (Default Frequency : 32Mhz, available change sdr Frequency by uBITX Manager)
     //Dynamic Frequency is for SWL without cat
@@ -414,13 +506,23 @@ void setFrequency(unsigned long f){
       moveFrequency = (f % 1000000);
     }
 
+#if UBITX_BOARD_VERSION == 5    
+    si5351bx_setfreq(2, 45002000 + if1AdjustValue + f);
+    si5351bx_setfreq(1, 45002000 
+      + if1AdjustValue 
+      + SDR_Center_Freq 
+      //+ ((advancedFreqOption1 & 0x04) == 0x00 ? 0 : (f % 10000000))
+      + moveFrequency);
+      // + 2390);  //RTL-SDR Frequency Error, Do not add another SDR because the error is different. V1.3
+#else
     si5351bx_setfreq(2, 44991500 + if1AdjustValue + f);
     si5351bx_setfreq(1, 44991500 
       + if1AdjustValue 
       + SDR_Center_Freq 
       //+ ((advancedFreqOption1 & 0x04) == 0x00 ? 0 : (f % 10000000))
-      + moveFrequency
-      + 2390);
+      + moveFrequency );
+      //+ 2390); Do not add another SDR because the error is different. V1.3
+#endif
   }
   else
   {
@@ -446,7 +548,7 @@ void setFrequency(unsigned long f){
  * put the uBitx in tx mode. It takes care of rit settings, sideband settings
  * Note: In cw mode, doesnt key the radio, only puts it in tx mode
  */
-void startTx(byte txMode, byte isDisplayUpdate){
+void startTx(byte txMode, byte isDisplayUpdate = 0){
   //Check Hamband only TX //Not found Hamband index by now frequency
   if (tuneTXType >= 100 && getIndexHambanBbyFreq(ritOn ? ritTxFrequency :  frequency) == -1) {
     //no message
@@ -456,7 +558,7 @@ void startTx(byte txMode, byte isDisplayUpdate){
   if ((isTxType & 0x01) != 0x01)
     digitalWrite(TX_RX, 1);
 
-  inTx = 1;
+  inTx = true;
   
   if (ritOn){
     //save the current as the rx frequency
@@ -465,13 +567,17 @@ void startTx(byte txMode, byte isDisplayUpdate){
   }
   else 
   {
-    if (splitOn == 1) {
-      if (vfoActive == VFO_B) {
+    if (splitOn == 1) 
+    {
+      FrequencyToVFO(1);  //Save current Frequency and Mode to eeprom
+      if (vfoActive == VFO_B) 
+      {
         vfoActive = VFO_A;
         frequency = vfoA;
         byteToMode(vfoA_mode, 0);
       }
-      else if (vfoActive == VFO_A){
+      else if (vfoActive == VFO_A)
+      {
         vfoActive = VFO_B;
         frequency = vfoB;
         byteToMode(vfoB_mode, 0);
@@ -512,10 +618,12 @@ void startTx(byte txMode, byte isDisplayUpdate){
   //reduce latency time when begin of CW mode
   if (isDisplayUpdate == 1)
     updateDisplay();
+
+  Serial.println("exiting startTx()");
 }
 
 void stopTx(void){
-  inTx = 0;
+  inTx = false;
 
   digitalWrite(TX_RX, 0);           //turn off the tx
   SetCarrierFreq();
@@ -579,12 +687,12 @@ void checkPTT(){
   if (cwTimeout > 0)
     return;
     
-  if (digitalRead(PTT) == 0 && inTx == 0){
+  if (digitalRead(PTT) == 0 && !inTx){
     startTx(TX_SSB, 1);
     delay(50); //debounce the PTT
   }
   
-  if (digitalRead(PTT) == 1 && inTx == 1)
+  if (digitalRead(PTT) == 1 && inTx)
     stopTx();
 }
 #ifdef EXTEND_KEY_GROUP1  
@@ -602,7 +710,18 @@ void checkButton(){
     return;
     
   if (keyStatus == FKEY_PRESS)  //Menu Key
+  {
+    //for touch screen
+#ifdef USE_SW_SERIAL
+    SetSWActivePage(1);
     doMenu();
+
+    if (isCWAutoMode == 0)
+          SetSWActivePage(0);
+#else
+    doMenu();
+#endif    
+  }
   else if (keyStatus <= FKEY_TYPE_MAX)  //EXTEND KEY GROUP #1
   {
 
@@ -665,74 +784,7 @@ void checkButton(){
         menuRitToggle(1);
         break;
     }
-    /*
-    if (keyStatus == FKEY_MODE) //Press Mode Key
-    {
-      if (cwMode == 1)
-      {
-        cwMode = 2;
-      }
-      else if (cwMode == 2)
-      {
-        cwMode = 0;
-        isUSB = 0;
-      }
-      else if (isUSB == 0)
-      {
-        isUSB = 1;
-      }
-      else
-      {
-        cwMode = 1;
-      }
-    }
-    else if (keyStatus == FKEY_BANDUP || keyStatus == FKEY_BANDDOWN)  //Press Mode Key
-    {
 
-      char currentBandIndex = -1;
-      
-      //Save Band Information
-      if (tuneTXType == 2 || tuneTXType == 3 || tuneTXType == 102 || tuneTXType == 103) { //only ham band move
-        currentBandIndex = getIndexHambanBbyFreq(frequency);
-        
-        if (currentBandIndex >= 0) {
-          saveBandFreqByIndex(frequency, modeToByte(), currentBandIndex);
-        }
-      }
-      
-      setNextHamBandFreq(frequency, keyStatus == FKEY_BANDDOWN ? -1 : 1);  //Prior Band      
-    }
-    else if (keyStatus == FKEY_STEP)  //FKEY_BANDUP
-    {
-      if (++tuneStepIndex > 5)
-        tuneStepIndex = 1;
-
-      EEPROM.put(TUNING_STEP, tuneStepIndex);
-      printLine2ClearAndUpdate();
-    }
-
-    else if (keyStatus == FKEY_VFOCHANGE)
-    {
-      menuVfoToggle(1); //Vfo Toggle
-    }
-    else if (keyStatus == FKEY_SPLIT)
-    {
-      menuSplitOnOff(1);
-    }
-    else if (keyStatus == FKEY_TXOFF)
-    {
-      menuTxOnOff(1, 0x01);
-    }
-    else if (keyStatus == FKEY_SDRMODE)
-    {
-      menuSDROnOff(1);
-    }
-    else if (keyStatus == FKEY_RIT)
-    {
-      menuRitToggle(1);
-    }
-    */
-      
     FrequencyToVFO(1);
     SetCarrierFreq();
     setFrequency(frequency);
@@ -941,6 +993,15 @@ void initSettings(){
   if (EEPROM.read(VERSION_ADDRESS) != FIRMWARE_VERSION_NUM)
     EEPROM.write(VERSION_ADDRESS, FIRMWARE_VERSION_NUM);
 
+  //SI5351 I2C Address
+  //I2C_ADDR_SI5351
+  SI5351BX_ADDR = EEPROM.read(I2C_ADDR_SI5351);
+  if (SI5351BX_ADDR < 0x10 || SI5351BX_ADDR > 0xF0)
+  {
+    SI5351BX_ADDR = 0x60;
+  }
+  
+
   //Backup Calibration Setting from Factory Setup
   //Check Factory Setting Backup Y/N
   if (EEPROM.read(FACTORY_BACKUP_YN) != 0x13) {
@@ -992,6 +1053,24 @@ void initSettings(){
     KeyValues[i][2] = EEPROM.read(EXTENDED_KEY_RANGE + (i * 3) + 2);    //KEY TYPE 
   }
 
+#ifdef USE_CUSTOM_LPF_FILTER 
+  //Custom Filters
+  EEPROM.get(CUST_LPF_ENABLED, isCustomFilter);
+  if (isCustomFilter == 0x58)
+  {
+    isCustomFilter_A7 = 1;
+  }
+  isCustomFilter = (isCustomFilter == 0x58 || isCustomFilter == 0x57);
+  
+  for (byte i = 0; i < 7; i++) {
+    CustFilters[i][0] = EEPROM.read(CUST_LPF_START + (i * 2));        //LPF (To) Mhz
+    CustFilters[i][1] = EEPROM.read(CUST_LPF_START + (i * 2) + 1);    //Enabled I/O
+  }
+//char isCustomFilter = 0;
+//char isCustomFilter_A7 = 0;
+//char CustFilters[2][7];
+#endif
+
   //User callsign information
   if (EEPROM.read(USER_CALLSIGN_KEY) == 0x59)
     userCallsignLength = EEPROM.read(USER_CALLSIGN_LEN);  //MAXIMUM 18 LENGTH
@@ -1153,12 +1232,22 @@ void initSettings(){
   if (vfoB_mode < 2)
     vfoB_mode = 3;
 
+
+#if UBITX_BOARD_VERSION == 5
+  //original code with modified by kd8cec
+  if (usbCarrier > 11060000l || usbCarrier < 11048000l)
+    usbCarrier = 11052000l;
+
+  if (cwmCarrier > 11060000l || cwmCarrier < 11048000l)
+    cwmCarrier = 11052000l;
+#else
   //original code with modified by kd8cec
   if (usbCarrier > 12010000l || usbCarrier < 11990000l)
     usbCarrier = 11997000l;
 
   if (cwmCarrier > 12010000l || cwmCarrier < 11990000l)
     cwmCarrier = 11997000l;
+#endif
     
   if (vfoA > 35000000l || 3500000l > vfoA) {
      vfoA = 7150000l;
@@ -1208,6 +1297,21 @@ void initPorts(){
   pinMode(ANALOG_KEYER, INPUT_PULLUP);
   pinMode(ANALOG_SMETER, INPUT); //by KD8CEC
 
+#ifdef USE_ALTKEYER
+  pinMode(DIGITAL_DOT, INPUT_PULLUP);
+  pinMode(DIGITAL_DASH, INPUT_PULLUP);
+#endif
+
+#ifdef USE_CUSTOM_LPF_FILTER 
+  if (isCustomFilter_A7)
+  {
+    pinMode(10, OUTPUT);
+    pinMode(11, OUTPUT);
+    pinMode(12, OUTPUT);
+    pinMode(13, OUTPUT);
+  }
+#endif  
+
   pinMode(CW_TONE, OUTPUT);  
   digitalWrite(CW_TONE, 0);
   
@@ -1294,11 +1398,18 @@ void setup()
 
   Init_Cat(38400, SERIAL_8N1);
   initSettings();
+  initPorts();     
 
-  if (userCallsignLength > 0 && ((userCallsignLength & 0x80) == 0x80)) {
+#ifdef USE_SW_SERIAL
+//  if (userCallsignLength > 0 && ((userCallsignLength & 0x80) == 0x80)) 
+//  {
+    userCallsignLength = userCallsignLength & 0x7F;
+//  }
+#else
+//for Chracter LCD
+  if (userCallsignLength > 0 && ((userCallsignLength & 0x80) == 0x80)) 
+  {
     userCallsignLength = userCallsignLength & 0x7F;
-    //printLineFromEEPRom(0, 0, 0, userCallsignLength -1, 0); //eeprom to lcd use offset (USER_CALLSIGN_DAT)
-    //delay(500);
     DisplayCallsign(userCallsignLength);
   }
   else {
@@ -1306,8 +1417,7 @@ void setup()
     delay(500);
     clearLine2();
   }
-  
-  initPorts();     
+#endif
 
 #ifdef FACTORY_RECOVERY_BOOTUP
   if (btnDown())
@@ -1320,6 +1430,11 @@ void setup()
   frequency = vfoA;
   saveCheckFreq = frequency;  //for auto save frequency
   setFrequency(vfoA);
+
+#ifdef USE_SW_SERIAL
+  SendUbitxData();
+#endif
+  
   updateDisplay();
 
 #ifdef ENABLE_FACTORYALIGN
@@ -1327,6 +1442,8 @@ void setup()
     factory_alignment();
 #endif
 
+  Connect_Interrupts();
+
 }
 
 //Auto save Frequency and Mode with Protected eeprom life by KD8CEC
@@ -1355,14 +1472,21 @@ void checkAutoSaveFreqMode()
 
 void loop(){ 
   if (isCWAutoMode == 0){  //when CW AutoKey Mode, disable this process
-    if (!txCAT)
-      checkPTT();
+#ifdef USE_ALTKEYER
+    // when using the alternate keyer, don't check the PTT if we're in CW mode, because 
+    // the PTT is also a straight key
+//    if (!txCAT && (cwMode == 0))
+//      checkPTT();
+#else
+//    if (!txCAT)
+//      checkPTT();
+#endif
     checkButton();
   }
  else
-    controlAutoCW();
+    ; //controlAutoCW();
 
-  cwKeyer(); 
+  //cwKeyer(); 
   
   //tune only when not tranmsitting 
   if (!inTx){
@@ -1382,5 +1506,11 @@ void loop(){
   } //end of check TX Status
 
   //we check CAT after the encoder as it might put the radio into TX
-  Check_Cat(inTx? 1 : 0);
+  // Maybe make this do all four versions of Check_Cat depending on state
+  Check_Cat(inTx ? 1 : 0);
+
+  //for SEND SW Serial
+  #ifdef USE_SW_SERIAL
+    SWS_Process();
+  #endif  
 }

ubitx_20/ubitx_eemap.h

@@ -35,10 +35,27 @@
 
 //==============================================================================
 // The spare space available in the original firmware #1
-// Address : 32 ~ 63
+// Address : 32 ~ 62
 //==============================================================================
 #define RESERVE_FOR_FACTORY1  32
 
+//==============================================================================
+// custom LPF Filter
+// 48 : Using Custom LPF Filter  (48 = 0x57 or 0x58 => Using Custom LPF Filter, 0x58 = using A7 IO
+// 49, 50 : LPF1  (49 : MHz  (~ Mhz), 50 : Enabled PIN
+// 51, 52 : LPF2
+// 53, 54 : LPF3
+// 55, 56 : LPF4
+// 57, 58 : LPF5
+// 59, 60 : LPF6
+// 61, 62 : LPF7
+//==============================================================================
+#define CUST_LPF_ENABLED 48
+#define CUST_LPF_START   49
+
+//SI5351 I2C Address (Version 1.097)
+#define I2C_ADDR_SI5351       63
+
 //==============================================================================
 // The spare space available in the original firmware #2
 // (Enabled if the EEProm address is insufficient)
@@ -112,7 +129,8 @@
 
 #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
+#define EXTERNAL_DEVICE_OPT1  770   //for External Deivce 4byte
+#define EXTERNAL_DEVICE_OPT2  774   //for External Deivce 2byte
 
 //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.

ubitx_20/ubitx_factory_alignment.ino

@@ -1,3 +1,4 @@
+#include "ubitx.h"
 
 /**
  * This procedure is only for those who have a signal generator/transceiver tuned to exactly 7.150 and a dummy load 
@@ -27,14 +28,25 @@ void factory_alignment(){
   printLine2("#2 BFO");
   delay(1000);
 
+#if UBITX_BOARD_VERSION == 5
+  usbCarrier = 11053000l;
+  menuSetupCarrier(1);
+  if (usbCarrier == 11053000l){
+    printLine2("Setup Aborted");
+    return;
+  }
+  
+#else
   usbCarrier = 11994999l;
   menuSetupCarrier(1);
-
   if (usbCarrier == 11994999l){
     printLine2("Setup Aborted");
     return;
   }
 
+#endif
+
+
   
   printLine2("#3:Test 3.5MHz");
   cwMode = 0;
@@ -88,4 +100,3 @@ void factory_alignment(){
   updateDisplay();  
   
 }
-

ubitx_20/ubitx_keyer.cpp

@@ -0,0 +1,336 @@
+/**
+ * File name ubitx_keyer.cpp
+ * CW Keyer
+ *
+ * The CW keyer handles either a straight key or an iambic / paddle key.
+ * D12 for DOT Paddle  and D11 for DASH Paddle  and D* for PTT/Handkey
+ *
+ * Generating CW
+ * The CW is cleanly generated by unbalancing the front-end mixer
+ * and putting the local oscillator directly at the CW transmit frequency.
+ * The sidetone, generated by the Arduino is injected into the volume control
+ */
+#include "ubitx.h"
+#include <Arduino.h>
+
+extern void stopTx(void);
+extern void startTx(byte txMode, byte isDisplayUpdate = 0);
+
+extern unsigned long sideTone;
+extern int cwSpeed;
+// extern long CW_TIMEOUT;
+extern long cwTimeout;
+#define CW_TIMEOUT (cwTimeout)
+extern volatile bool inTx;
+// extern volatile int ubitx_mode;
+extern char isUSB;
+extern char cwMode;
+
+extern volatile unsigned char keyerControl;
+// extern volatile unsigned char keyerState;
+volatile unsigned char keyerState = IDLE;
+// extern unsigned volatile char IAMBICB;
+// extern unsigned volatile char PDLSWAP;
+
+// extern volatile unsigned long Ubitx_Voltage;
+// extern volatile int Ubitx_Voltage_Timer;
+
+volatile bool keyDown = false; // in cw mode, denotes the carrier is being transmitted
+volatile uint8_t Last_Bits = 0xFF;
+;
+
+volatile bool Dot_in_Progress = false;
+volatile unsigned long Dot_Timer_Count = 0;
+volatile bool Dash_in_Progress = false;
+volatile unsigned long Dash_Timer_Count = 0;
+volatile bool Inter_Bit_in_Progress = false;
+volatile unsigned long Inter_Bit_Timer_Count = 0;
+volatile bool Turn_Off_Carrier_in_Progress = false;
+volatile unsigned long Turn_Off_Carrier_Timer_Count = 0;
+volatile bool Ubitx_Voltage_Act = false;
+volatile bool PTT_HANDKEY_ACTIVE = false;
+volatile long last_interrupt_time = 20;
+// extern bool Cat_Lock;
+// extern volatile bool TX_In_Progress;
+extern volatile bool txCAT;
+
+/**
+ * Starts transmitting the carrier with the sidetone
+ * It assumes that we have called cwTxStart and not called cwTxStop
+ * each time it is called, the cwTimeOut is pushed further into the future
+ */
+void cwKeydown(void) {
+  keyDown = 1; // tracks the CW_KEY
+  tone(CW_TONE, (int)sideTone);
+  digitalWrite(CW_KEY, 1);
+#ifdef XMIT_LED
+  digitalWrite(ON_AIR, 0); // extinguish the LED on NANO's pin 13
+#endif
+}
+/**
+ * Stops the CW carrier transmission along with the sidetone
+ * Pushes the cwTimeout further into the future
+ */
+void cwKeyUp(void) {
+  keyDown = 0; // tracks the CW_KEY
+  noTone(CW_TONE);
+  digitalWrite(CW_KEY, 0);
+#ifdef XMIT_LED
+  digitalWrite(ON_AIR, 1); // extinguish the LED on NANO's pin 13
+#endif
+}
+
+void update_PaddleLatch() {
+  //  if (!digitalRead(DIGITAL_DOT) ) keyerControl |= DIT_L;
+  //  if (!digitalRead(DIGITAL_DASH)  ) keyerControl |= DAH_L;
+  if (digitalRead(DIGITAL_DOT) == LOW) {
+    if (keyerControl & PDLSWAP)
+      keyerControl |= DAH_L;
+    else
+      keyerControl |= DIT_L;
+  }
+  if (digitalRead(DIGITAL_DASH) == LOW) {
+    if (keyerControl & PDLSWAP)
+      keyerControl |= DIT_L;
+    else
+      keyerControl |= DAH_L;
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//   interupt  handlers
+
+////   timers
+ISR(TIMER1_OVF_vect) {
+  static volatile bool i_am_running = false;
+  bool continue_loop = true;
+
+  if (i_am_running) return;
+  i_am_running = true;
+
+  // process if CW modes
+  // if( (ubitx_mode == MODE_CW)||(ubitx_mode == MODE_CWR)){
+  if (cwMode > 0) {
+
+    // process DOT and DASH timing
+    if ((Dot_in_Progress) && (Dot_Timer_Count > 0)) {
+      if (!inTx) {
+        keyDown = 0;
+        startTx(TX_CW);
+      }
+      if (keyDown == 0)
+        cwKeydown();
+      Dot_Timer_Count = Dot_Timer_Count - 1;
+      if (Dot_Timer_Count <= 0) {
+        Dot_Timer_Count = 0;
+        Dot_in_Progress = false;
+        cwKeyUp();
+      }
+    }
+
+    // process Inter Bit Timing
+    if ((Inter_Bit_in_Progress) && (Inter_Bit_Timer_Count > 0)) {
+      Inter_Bit_Timer_Count = Inter_Bit_Timer_Count - 1;
+      if (Inter_Bit_Timer_Count <= 0) {
+        Inter_Bit_Timer_Count = 0;
+        Inter_Bit_in_Progress = false;
+      }
+    }
+
+    // process turning off carrier
+    if ((Turn_Off_Carrier_in_Progress) && (Turn_Off_Carrier_Timer_Count > 0)) {
+      Turn_Off_Carrier_Timer_Count = Turn_Off_Carrier_Timer_Count - 1;
+      if (Turn_Off_Carrier_Timer_Count <= 0) {
+        Turn_Off_Carrier_in_Progress = false;
+        Turn_Off_Carrier_Timer_Count = 0;
+        stopTx();
+      }
+    }
+
+    // process hand key
+    if (digitalRead(DIGITAL_KEY) == 0) {
+      // If interrupts come faster than 5ms, assume it's a bounce and ignore
+      last_interrupt_time = last_interrupt_time - 1;
+      if (last_interrupt_time <= 0) {
+        last_interrupt_time = 0;
+        if (!inTx) {
+          keyDown = 0;
+          startTx(TX_CW);
+        }
+        if (keyDown == 0)
+          cwKeydown();
+        PTT_HANDKEY_ACTIVE = true;
+        Turn_Off_Carrier_Timer_Count = CW_TIMEOUT;
+      }
+    } else if ((keyDown == 1) && (PTT_HANDKEY_ACTIVE == true)) {
+      cwKeyUp();
+      Turn_Off_Carrier_Timer_Count = CW_TIMEOUT;
+      Turn_Off_Carrier_in_Progress = true;
+      last_interrupt_time = PTT_HNDKEY_DEBOUNCE_CT;
+      PTT_HANDKEY_ACTIVE = false;
+    } else
+      last_interrupt_time = PTT_HNDKEY_DEBOUNCE_CT;
+
+    if (PTT_HANDKEY_ACTIVE == false) {
+      while (continue_loop) {
+        switch (keyerState) {
+        case IDLE:
+          if ((!digitalRead(DIGITAL_DOT)) || (!digitalRead(DIGITAL_DASH)) ||
+              (keyerControl & 0x03)) {
+            update_PaddleLatch();
+            keyerState = CHK_DIT;
+            Dot_in_Progress = false;
+            Dot_Timer_Count = 0;
+            Turn_Off_Carrier_Timer_Count = 0;
+            Turn_Off_Carrier_in_Progress = false;
+          } else {
+            continue_loop = false;
+          }
+          break;
+
+        case CHK_DIT:
+          if (keyerControl & DIT_L) {
+            keyerControl |= DIT_PROC;
+            keyerState = KEYED_PREP;
+            Dot_Timer_Count = cwSpeed;
+          } else {
+            keyerState = CHK_DAH;
+          }
+          break;
+
+        case CHK_DAH:
+          if (keyerControl & DAH_L) {
+            keyerState = KEYED_PREP;
+            Dot_Timer_Count = cwSpeed * 3;
+          } else {
+            continue_loop = false;
+            keyerState = IDLE;
+          }
+          break;
+
+        case KEYED_PREP:
+          keyerControl &= ~(DIT_L + DAH_L); // clear both paddle latch bits
+          keyerState = KEYED;               // next state
+          Turn_Off_Carrier_Timer_Count = 0;
+          Turn_Off_Carrier_in_Progress = false;
+          Dot_in_Progress = true;
+          break;
+
+        case KEYED:
+          if (Dot_in_Progress == false) { // are we at end of key down ?
+            Inter_Bit_in_Progress = true;
+            Inter_Bit_Timer_Count = cwSpeed;
+            keyerState = INTER_ELEMENT; // next state
+          } else if (keyerControl & IAMBICB) {
+            update_PaddleLatch(); // early paddle latch in Iambic B mode
+            continue_loop = false;
+          } else
+            continue_loop = false;
+          break;
+
+        case INTER_ELEMENT:
+          // Insert time between dits/dahs
+          update_PaddleLatch();                 // latch paddle state
+          if (Inter_Bit_in_Progress == false) { // are we at end of inter-space ?
+            Turn_Off_Carrier_Timer_Count = CW_TIMEOUT;
+            Turn_Off_Carrier_in_Progress = true;
+            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
+            }
+          } else
+            continue_loop = false;
+          break;
+        }
+      }
+    }
+  }
+
+  // process PTT
+  //  if( (ubitx_mode == MODE_USB)|| (ubitx_mode == MODE_LSB)){
+  if (cwMode == 0) {
+    if (digitalRead(PTT) == 0) {
+      // If interrupts come faster than 5ms, assume it's a bounce and ignore
+      last_interrupt_time = last_interrupt_time - 1;
+      if (last_interrupt_time <= 0) {
+        last_interrupt_time = 0;
+        if (!inTx)
+          startTx(TX_SSB);
+      }
+    } else if ((inTx) && (txCAT == false)) {
+      last_interrupt_time = PTT_HNDKEY_DEBOUNCE_CT;
+      stopTx();
+    } else
+      last_interrupt_time = PTT_HNDKEY_DEBOUNCE_CT;
+  }
+
+  i_am_running = false;
+}
+void Connect_Interrupts(void) {
+  keyerControl = 0;
+  cli();
+  TIMSK1 |= (1 << TOIE1);
+  sei();
+}
+
+/*
+#define     N_MORSE  (sizeof(morsetab)/sizeof(morsetab[0]))
+// Morse table
+struct t_mtab { char c, pat; } ;
+struct t_mtab morsetab[] = {
+  {'.', 106}, {',', 115}, {'?', 76}, {'/', 41}, {'A', 6},  {'B', 17}, {'C', 21}, {'D', 9},
+        {'E', 2},   {'F', 20},  {'G', 11}, {'H', 16}, {'I', 4},  {'J', 30}, {'K', 13}, {'L', 18},
+        {'M', 7},   {'N', 5},   {'O', 15}, {'P', 22}, {'Q', 27}, {'R', 10}, {'S', 8},  {'T', 3},
+        {'U', 12},  {'V', 24},  {'W', 14}, {'X', 25}, {'Y', 29}, {'Z', 19}, {'1', 62}, {'2', 60},
+        {'3', 56},  {'4', 48},  {'5', 32}, {'6', 33}, {'7', 35}, {'8', 39}, {'9', 47}, {'0', 63}
+  };
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+// CW generation routines for CQ message
+void key(int LENGTH){
+
+    if( !inTx ) startTx(TX_CW);
+    cwKeydown();
+    delay(LENGTH*2);
+    cwKeyUp();
+    delay(cwSpeed*2);
+
+}
+
+
+void send(char c){
+  int i ;
+
+
+  if (c == ' ') {
+    delay(7*cwSpeed) ;
+    return ;
+  }
+  for (i=0; i<N_MORSE; i++){
+    if (morsetab[i].c == c){
+      unsigned char p = morsetab[i].pat ;
+      while (p != 1) {
+        if (p & 1) Dot_Timer_Count = cwSpeed*3;
+        else Dot_Timer_Count = cwSpeed;
+        key(Dot_Timer_Count);
+        p = p / 2 ;
+      }
+      delay(cwSpeed*5) ;
+      return ;
+    }
+  }
+}
+
+
+
+void sendmsg(char *str){
+
+  while (*str) send(*str++);
+  delay(650);
+  stopTx();
+}
+*/

ubitx_20/ubitx_keyer.ino

@@ -1,369 +0,0 @@
-/**
- 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 ----------------------------------------------------------------------------
- * 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. 
- * When a straight key is connected, it shorts the pull-up resistor, analog input is 0 volts
- * When a paddle is connected, the dot and the dash are connected to the analog pin through
- * a 10K and a 2.2K resistors. These produce a 4v and a 2v input to the analog pins.
- * So, the readings are as follows :
- * 0v - straight key
- * 1-2.5 v - paddle dot
- * 2.5 to 4.5 v - paddle dash
- * 2.0 to 0.5 v - dot and dash pressed
- * 
- * The keyer is written to transparently handle all these cases
- * 
- * Generating CW
- * The CW is cleanly generated by unbalancing the front-end mixer
- * and putting the local oscillator directly at the CW transmit frequency.
- * The sidetone, generated by the Arduino is injected into the volume control
- */
-
-
-// in milliseconds, this is the parameter that determines how long the tx will hold between cw key downs
-//#define CW_TIMEOUT (600l)   //Change to CW Delaytime for value save to eeprom
-#define PADDLE_DOT 1
-#define PADDLE_DASH 2
-#define PADDLE_BOTH 3
-#define PADDLE_STRAIGHT 4
-
-//we store the last padde's character 
-//to alternatively send dots and dashes 
-//when both are simultaneously pressed
-char lastPaddle = 0;
-
-//reads the analog keyer pin and reports the paddle
-byte getPaddle(){
-  int paddle = analogRead(ANALOG_KEYER);
-
-  if (paddle > 800)         // above 4v is up
-    return 0;
-    
-  if (paddle > 600)    // 4-3v is dot
-    return PADDLE_DASH;
-  else if (paddle > 300)    //1-2v is dash
-    return PADDLE_DOT;
-  else if (paddle > 50)
-    return PADDLE_BOTH;     //both are between 1 and 2v
-  else
-    return PADDLE_STRAIGHT; //less than 1v is the straight key
-}
-
-/**
- * Starts transmitting the carrier with the sidetone
- * It assumes that we have called cwTxStart and not called cwTxStop
- * each time it is called, the cwTimeOut is pushed further into the future
- */
-void cwKeydown(){
-  keyDown = 1;                  //tracks the CW_KEY
-  tone(CW_TONE, (int)sideTone); 
-  digitalWrite(CW_KEY, 1);     
-
-  //Modified by KD8CEC, for CW Delay Time save to eeprom
-  //cwTimeout = millis() + CW_TIMEOUT;
-  cwTimeout = millis() + cwDelayTime * 10;  
-}
-
-/**
- * Stops the cw carrier transmission along with the sidetone
- * Pushes the cwTimeout further into the future
- */
-void cwKeyUp(){
-  keyDown = 0;    //tracks the CW_KEY
-  noTone(CW_TONE);
-  digitalWrite(CW_KEY, 0);    
-  
-  //Modified by KD8CEC, for CW Delay Time save to eeprom
-  //cwTimeout = millis() + CW_TIMEOUT;
-  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 unsigned 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;
-  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){
-  lastPaddle = 0;
-  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:
-          //modified KD8CEC
-          /*
-          ktimer += millis(); // set ktimer to interval end time
-          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);
-          }
-          */
-          if (!inTx){
-            //DelayTime Option
-            delay_background(delayBeforeCWStartTime * 2, 2);
-            
-            keyDown = 0;
-            cwTimeout = millis() + cwDelayTime * 10;  //+ CW_TIMEOUT;
-            startTx(TX_CW, 1);
-          }
-          ktimer += millis(); // set ktimer to interval end time
-          keyerControl &= ~(DIT_L + DAH_L); // clear both paddle latch bits
-          keyerState = KEYED; // next state
-          
-          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(2);
-    } //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){
-          //DelayTime Option
-          delay_background(delayBeforeCWStartTime * 2, 2);
-          
-          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) //removed by KD8CEC
-        //   return;
-        // got back to the beginning of the loop, if no further activity happens on straight key
-        // we will time out, and return out of this routine 
-        //delay(5);
-        //delay_background(5, 3); //removed by KD8CEC
-        //continue;               //removed by KD8CEC
-        return;                   //Tx stop control by Main Loop
-      }
-
-      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;
-
-  while(1){
-    paddle = getPaddle();
-    
-    // do nothing if the paddle has not been touched, unless
-    // we are in the cw mode and we have timed out
-    if (!paddle){
-       //modifed by KD8CEC for auto CW Send
-      if (isCWAutoMode > 1)  //if while auto cw sending, dont stop tx by paddle position
-        return;
-        
-      if (0 < cwTimeout && cwTimeout < millis()){
-        cwTimeout = 0;
-        keyDown = 0;
-        stopTx();
-      }
-
-      if (!cwTimeout)
-        return;
-
-      Check_Cat(2); //for uBITX on Raspberry pi, when straight keying, disconnect / test complete
-      continue;
-    }
-
-    //if while auto cw send, stop auto cw
-    //but isAutoCWHold for Manual Keying with cwAutoSend
-    if (isCWAutoMode > 1 && isAutoCWHold == 0)
-      isCWAutoMode = 1;                         //read status
-
-    //Remoark Debug code / Serial Use by CAT Protocol
-    //Serial.print("paddle:");Serial.println(paddle);
-    // if we are here, it is only because the key or the paddle is pressed
-    if (!inTx){
-      keyDown = 0;
-      //Modified by KD8CEC, for CW Delay Time save to eeprom
-      //cwTimeout = millis() + CW_TIMEOUT;
-      cwTimeout = millis() + cwDelayTime * 10;
-      
-      startTx(TX_CW, 0);  //disable updateDisplay Command for reduce latency time
-      updateDisplay();
-
-      //DelayTime Option
-      delay_background(delayBeforeCWStartTime * 2, 2);
-    }
-    
-    // star the transmission)
-    // we store the transmitted character in the lastPaddle
-    cwKeydown();
-    if (paddle == PADDLE_DOT){
-      //delay(cwSpeed);
-      delay_background(cwSpeed, 3);
-      lastPaddle = PADDLE_DOT;
-    }
-    else if (paddle == PADDLE_DASH){
-      //delay(cwSpeed * 3);
-      delay_background(cwSpeed * 3, 3);
-      lastPaddle = PADDLE_DASH;
-    }
-    else if (paddle == PADDLE_BOTH){ //both paddles down
-      //depending upon what was sent last, send the other 
-      if (lastPaddle == PADDLE_DOT) {
-        //delay(cwSpeed * 3);
-        delay_background(cwSpeed * 3, 3);
-        lastPaddle = PADDLE_DASH;
-      }else{      
-        //delay(cwSpeed);
-        delay_background(cwSpeed, 3);
-        lastPaddle = PADDLE_DOT;
-      }
-    }
-    else if (paddle == PADDLE_STRAIGHT){
-      while (getPaddle() == PADDLE_STRAIGHT) {
-        delay(1);
-        Check_Cat(2);
-      }
-      lastPaddle = PADDLE_STRAIGHT;
-    }
-    cwKeyUp();
-    //introduce a dot long gap between characters if the keyer was used
-    if (lastPaddle != PADDLE_STRAIGHT)
-      delay(cwSpeed);
-  }
-}
-*/
-
-

ubitx_20/ubitx_lcd_1602.ino

@@ -738,6 +738,9 @@ void idle_process()
     {
       int newSMeter;
 
+#ifdef USE_I2CSMETER 
+    scaledSMeter = GetI2CSmeterValue(I2CMETER_CALCS);
+#else
       //VK2ETA S-Meter from MAX9814 TC pin / divide 4 by KD8CEC for reduce EEPromSize
       newSMeter = analogRead(ANALOG_SMETER) / 4;
   
@@ -752,6 +755,7 @@ void idle_process()
           break;
         }
       }
+#endif  
   
       DisplayMeter(0, scaledSMeter, 13);
       checkCountSMeter = 0; //Reset Latency time

ubitx_20/ubitx_lcd_1602Dual.ino

@@ -669,6 +669,9 @@ void idle_process()
       int newSMeter;
       displaySDRON = 0;
   
+#ifdef USE_I2CSMETER 
+    scaledSMeter = GetI2CSmeterValue(I2CMETER_CALCS);
+#else
       //VK2ETA S-Meter from MAX9814 TC pin / divide 4 by KD8CEC for reduce EEPromSize
       newSMeter = analogRead(ANALOG_SMETER) / 4;
   
@@ -684,9 +687,9 @@ void idle_process()
           break;
         }
       }
+#endif  
   
       DisplayMeter(0, scaledSMeter, 0);
-      
       checkCountSMeter = 0;
     } //end of S-Meter
     _Addr = I2C_LCD_MASTER_ADDRESS;

ubitx_20/ubitx_lcd_2004.ino

@@ -690,7 +690,10 @@ void idle_process()
     if (((displayOption1 & 0x08) == 0x08 && (sdrModeOn == 0)) && (++checkCountSMeter > SMeterLatency))
     {
       int newSMeter;
-      
+
+#ifdef USE_I2CSMETER 
+    scaledSMeter = GetI2CSmeterValue(I2CMETER_CALCS);
+#else
       //VK2ETA S-Meter from MAX9814 TC pin
       newSMeter = analogRead(ANALOG_SMETER) / 4;
   
@@ -706,6 +709,7 @@ void idle_process()
           break;
         }
       }
+#endif  
   
       DisplayMeter(0, scaledSMeter, 0);
       checkCountSMeter = 0; //Reset Latency time

ubitx_20/ubitx_menu.ino

@@ -8,6 +8,10 @@ Ian KD8CEC
 #include "ubitx.h"
 #include "ubitx_eemap.h"
 
+extern void cwKeydown();
+extern void cwKeyUp();
+extern volatile bool keyDown;
+
 //Current Frequency and mode to active VFO by KD8CEC
 void FrequencyToVFO(byte isSaveFreq)
 {
@@ -389,7 +393,14 @@ void menuVfoToggle(int btn)
 
       ritDisable();
       setFrequency(frequency);
-      menuClearExit(0);
+
+#ifdef USE_SW_SERIAL
+    menuOn = 0;
+#else
+    //Only Clear And Delay for Character LCD
+    menuClearExit(0);
+#endif    
+      
   }
 }
 
@@ -406,17 +417,20 @@ void menuSplitOnOff(int btn){
       if (splitOn == 1){
         splitOn = 0;
         printLineF2(F("SPT Off"));
-        //printLineF2(F("[OFF]"));
       }
       else {
         splitOn = 1;
         if (ritOn == 1)
           ritOn = 0;
         printLineF2(F("SPT On"));
-        //printLineF2(F("[ON]"));
       }
-      
+
+#ifdef USE_SW_SERIAL
+    menuOn = 0;
+#else
+//Only Clear And Delay for Character LCD
     menuClearExit(500);
+#endif    
   }
 }
 
@@ -438,8 +452,13 @@ void menuTxOnOff(int btn, byte optionType){
         isTxType &= ~(optionType);
         printLineF2(F("TX ON"));
       }
-      
+
+#ifdef USE_SW_SERIAL
+    menuOn = 0;
+#else
+    //Only Clear And Delay for Character LCD
     menuClearExit(500);
+#endif
   }
 }
 
@@ -472,7 +491,13 @@ void menuSDROnOff(int btn)
     EEPROM.put(ENABLE_SDR, sdrModeOn);
     setFrequency(frequency);
     SetCarrierFreq();
+
+#ifdef USE_SW_SERIAL
+    menuOn = 0;
+#else
+    //Only Clear And Delay for Character LCD
     menuClearExit(500);
+#endif
   }
 }
 
@@ -498,9 +523,9 @@ void menuCWAutoKey(int btn){
 
     printLineF1(F("PTT to Send"));
     delay_background(500, 0);
-    updateDisplay();
     beforeCWTextIndex = 255;  //255 value is for start check
     isCWAutoMode = 1;
+    updateDisplay();
     menuOn = 0;
 }
 
@@ -666,7 +691,11 @@ int getValueByKnob(int valueType, int targetValue, int minKnobValue, int maxKnob
             ifShiftValue = targetValue;
           else 
             attLevel = targetValue;
-            
+
+#ifdef USE_SW_SERIAL
+  menuOn=2;
+  updateDisplay();
+#endif
           setFrequency(frequency);
           SetCarrierFreq();
         }
@@ -726,7 +755,14 @@ void menuCWSpeed(int btn){
   //printLineF2(F("CW Speed set!"));
   cwSpeed = 1200 / wpm;
   EEPROM.put(CW_SPEED, cwSpeed);
-  menuClearExit(1000);
+  //menuClearExit(1000);
+#ifdef USE_SW_SERIAL
+    menuOn = 0;
+#else
+    //Only Clear And Delay for Character LCD
+    menuClearExit(1000);
+#endif
+  
 }
 
 //Modified by KD8CEC
@@ -747,44 +783,22 @@ void menuSetupCwTone(int btn){
 
     sideTone = getValueByKnob(1, sideTone, 100, 2000, 10, "Tone", 2); //1 : Generate Tone, targetValue, minKnobValue, maxKnobValue, stepSize
 
-    /*
-    //disable all clock 1 and clock 2 
-    while (digitalRead(PTT) == HIGH && !btnDown())
-    {
-      knob = enc_read();
-
-      if (knob > 0 && sideTone < 2000)
-        sideTone += 10;
-      else if (knob < 0 && sideTone > 100 )
-        sideTone -= 10;
-      else
-        continue; //don't update the frequency or the display
-        
-      tone(CW_TONE, sideTone);
-      itoa(sideTone, b, 10);
-      printLine2(b);
-
-      delay_background(100, 0);
-    }
-    */
-
-    
     noTone(CW_TONE);
     
-    //save the setting
-    //if (digitalRead(PTT) == LOW){
-      printLineF2(F("Sidetone set!"));
-      EEPROM.put(CW_SIDETONE, sideTone);
-      delay_background(2000, 0);
-    //}
-    //else
-    //  sideTone = prev_sideTone;
-   
-  menuClearExit(0);
+    printLineF2(F("Sidetone set!"));
+    EEPROM.put(CW_SIDETONE, sideTone);
+
+    //delay_background(2000, 0);
+    //menuClearExit(0);
+#ifdef USE_SW_SERIAL
+    menuOn = 0;
+#else
+    //Only Clear And Delay for Character LCD
+    delay_background(2000, 0);
+    menuClearExit(0);
+#endif
  }
 
-
-
 //Modified by KD8CEC
 void menuSetupCwDelay(int btn){
     //int knob = 0;
@@ -795,44 +809,18 @@ void menuSetupCwDelay(int btn){
      return;
     }
 
-    //printLineF1(F("Press, set Delay"));
-    /*
-    strcpy(b, "DELAY:");
-    itoa(tmpCWDelay,c, 10);
-    strcat(b, c);
-    printLine2(b);
-    */
-    //delay_background(300, 0);
-
     tmpCWDelay = getValueByKnob(0, tmpCWDelay, 3, 2500, 10, "Delay", 2); //0 : Generate Tone, targetValue, minKnobValue, maxKnobValue, stepSize
 
-/*
-    while(!btnDown()){
-      knob = enc_read();
-      if (knob != 0){
-        if (tmpCWDelay > 3 && knob < 0)
-          tmpCWDelay -= 10;
-        if (tmpCWDelay < 2500 && knob > 0)
-          tmpCWDelay += 10;
-
-        strcpy(b, "DELAY:");
-        itoa(tmpCWDelay,c, 10);
-        strcat(b, c);
-        printLine2(b);
-      }
-      //abort if this button is down
-      if (btnDown())
-        break;
-
-      Check_Cat(0);  //To prevent disconnections
-    }
-*/
-    
     //save the setting
-    //printLineF2(F("CW Delay set!"));
     cwDelayTime = tmpCWDelay / 10;
     EEPROM.put(CW_DELAY, cwDelayTime);
-   menuClearExit(1000);
+   //menuClearExit(1000);
+#ifdef USE_SW_SERIAL
+    menuOn = 0;
+#else
+    //Only Clear And Delay for Character LCD
+    menuClearExit(1000);
+#endif
 }
 
 //CW Time delay by KD8CEC
@@ -851,41 +839,17 @@ void menuSetupTXCWInterval(int btn){
 
     tmpTXCWInterval = getValueByKnob(0, tmpTXCWInterval, 0, 500, 2, "Delay", 2); //0 : Generate Tone, targetValue, minKnobValue, maxKnobValue, stepSize
 
-/*
-    while(!btnDown()){
-
-      if (needDisplayInformation == 1) {
-        strcpy(b, "Start Delay:");
-        itoa(tmpTXCWInterval,c, 10);
-        strcat(b, c);
-        printLine2(b);
-        needDisplayInformation = 0;
-      }
-      
-      knob = enc_read();
-      if (knob != 0){
-        if (tmpTXCWInterval > 0 && knob < 0)
-          tmpTXCWInterval -= 2;
-        if (tmpTXCWInterval < 500 && knob > 0)
-          tmpTXCWInterval += 2;
-          
-        needDisplayInformation = 1;
-      }
-      //abort if this button is down
-      //if (btnDown())
-      //  break;
-
-      Check_Cat(0);  //To prevent disconnections
-    }
-*/
-
-    
-    //save the setting
-   //printLineF2(F("CW Start set!"));
    delayBeforeCWStartTime = tmpTXCWInterval / 2;
    EEPROM.put(CW_START, delayBeforeCWStartTime);
+   //menuClearExit(1000);
+
+#ifdef USE_SW_SERIAL
+    menuOn = 0;
+#else
+    //Only Clear And Delay for Character LCD
+    menuClearExit(1000);
+#endif
    
-   menuClearExit(1000);
 }
 
 //IF Shift function, BFO Change like RIT, by KD8CEC
@@ -903,36 +867,7 @@ void menuIFSSetup(int btn){
   {
       isIFShift = 1;
 
-      //delay_background(500, 0);
-      //updateLine2Buffer(1);
-      //setFrequency(frequency);
-
       ifShiftValue = getValueByKnob(2, ifShiftValue, -20000, 20000, 50, "IFS", 2); //2 : IF Setup (updateLine2Buffer(1), SetFrequency), targetValue, minKnobValue, maxKnobValue, stepSize
-
-/*
-      //Off or Change Value
-      while(!btnDown() ){
-        if (needApplyChangeValue ==1)
-        {
-          updateLine2Buffer(1);
-          setFrequency(frequency);
-          SetCarrierFreq();
-          needApplyChangeValue = 0;
-        }
-        
-        knob = enc_read();
-        if (knob != 0){
-          if (knob < 0)
-            ifShiftValue -= 50;
-          else if (knob > 0)
-            ifShiftValue += 50;
-
-          needApplyChangeValue = 1;
-        }
-        Check_Cat(0);  //To prevent disconnections
-      }
-*/
-
       delay_background(500, 0); //for check Long Press function key
       
       if (btnDown() || ifShiftValue == 0)
@@ -945,7 +880,13 @@ void menuIFSSetup(int btn){
 
       //Store IF Shiift
       EEPROM.put(IF_SHIFTVALUE, ifShiftValue);
-      menuClearExit(0);
+      //menuClearExit(0);
+#ifdef USE_SW_SERIAL
+    menuOn = 0;
+#else
+    //Only Clear And Delay for Character LCD
+    menuClearExit(0);
+#endif
   }
 }
 
@@ -971,7 +912,15 @@ void menuATTSetup(int btn){
         setFrequency(frequency);
         //SetCarrierFreq();
       }
+      //menuClearExit(0);
+
+#ifdef USE_SW_SERIAL
+      menuOn = 0;
+#else
+      //Only Clear And Delay for Character LCD
       menuClearExit(0);
+#endif
+      
   }
 }
 
@@ -998,44 +947,10 @@ void menuSelectMode(int btn){
       selectModeType = 3;
 
     beforeMode = selectModeType;
-
-    //delay_background(500, 0);
-
     selectModeType = getValueByKnob(11, selectModeType, 0, 3, 1, " LSB USB CWL CWU", 4); //3 : Select Mode, targetValue, minKnobValue, maxKnobValue, stepSize
 
-/*
-    while(!btnDown()){
-      //Display Mode Name
-      memset(c, 0, sizeof(c));
-      strcpy(c, " LSB USB CWL CWU");
-      c[selectModeType * 4] = '>';
-      printLine1(c);
-      
-      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
-      delay_background(50, 0);
-    }
-*/
-
-    if (beforeMode != selectModeType) {
+    if (beforeMode != selectModeType) 
+    {
       //printLineF1(F("Changed Mode"));
       if (selectModeType == 0) {
         cwMode = 0; isUSB = 0;
@@ -1054,9 +969,14 @@ void menuSelectMode(int btn){
     }
 
     SetCarrierFreq();
-    
     setFrequency(frequency);
+    //menuClearExit(500);
+#ifdef USE_SW_SERIAL
+    menuOn = 0;
+#else
+    //Only Clear And Delay for Character LCD
     menuClearExit(500);
+#endif
   }
 }
 
@@ -1069,45 +989,11 @@ void menuSetupKeyType(int btn){
         printLineF2(F("Change Key Type?"));
   }
   else {
-    //printLineF2(F("Press to set Key")); //for reduce usable flash memory
-    //delay_background(500, 0);
     selectedKeyType = cwKeyType;
 
     //selectedKeyType = getValueByKnob(12, selectedKeyType, 0, 2, 1, " KEY:", 5); //4 : Select Key Type, targetValue, minKnobValue, maxKnobValue, stepSize
     selectedKeyType = getValueByKnob(11, selectedKeyType, 0, 2, 1, " ST  IA  IB", 5); //4 : Select Key Type, targetValue, minKnobValue, maxKnobValue, stepSize
 
-    /*
-    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);
@@ -1123,7 +1009,14 @@ void menuSetupKeyType(int btn){
         keyerControl |= IAMBICB;
     }
     
+    //menuClearExit(1000);
+#ifdef USE_SW_SERIAL
+    menuOn = 0;
+#else
+    //Only Clear And Delay for Character LCD
     menuClearExit(1000);
+#endif
+    
   }
 }
 
@@ -1223,7 +1116,191 @@ void doMenu(){
 
   //Below codes are origial code with modified by KD8CEC
   menuOn = 2;
-  
+  TriggerBySW = 0;  //Nextion LCD and Other MCU
+
+  //*********************************************************************************
+  // New type menu for developer by KD8CEC
+  // Selectable menu
+  // Version : 1.097 ~
+  //*********************************************************************************
+#ifndef ENABLE_ADCMONITOR
+  #define FN_ADCMONITOR  0
+#endif
+
+  #define FN_DEFAULT_MENU     2 //Setup Onff / Exit
+  #define FN_DEFAULT_SETUP    1 //Exit
+
+  #define FN_BAND_IDX         (FN_BAND -1)        //0 or -1
+  #define FN_VFO_TOGGLE_IDX   (FN_BAND_IDX        + FN_VFO_TOGGLE)
+  #define FN_MODE_IDX         (FN_VFO_TOGGLE_IDX  + FN_MODE)
+  #define FN_RIT_IDX          (FN_MODE_IDX        + FN_RIT)
+  #define FN_IFSHIFT_IDX      (FN_RIT_IDX         + FN_IFSHIFT)
+  #define FN_ATT_IDX          (FN_IFSHIFT_IDX     + FN_ATT)
+  #define FN_CW_SPEED_IDX     (FN_ATT_IDX         + FN_CW_SPEED)
+  #define FN_SPLIT_IDX        (FN_CW_SPEED_IDX    + FN_SPLIT)
+  #define FN_VFOTOMEM_IDX     (FN_SPLIT_IDX       + FN_VFOTOMEM)
+  #define FN_MEMTOVFO_IDX     (FN_VFOTOMEM_IDX    + FN_MEMTOVFO)
+  #define FN_MEMORYKEYER_IDX  (FN_MEMTOVFO_IDX    + FN_MEMORYKEYER)
+  #define FN_WSPR_IDX         (FN_MEMORYKEYER_IDX + FN_WSPR)
+  #define FN_SDRMODE_IDX      (FN_WSPR_IDX        + FN_SDRMODE)
+  #define FN_SETUP_IDX        (FN_SDRMODE_IDX     + 1)
+  #define FN_EXIT_IDX         (FN_SETUP_IDX       + 1)
+  #define FN_CALIBRATION_IDX  (FN_EXIT_IDX        + FN_CALIBRATION)
+  #define FN_CARRIER_IDX      (FN_CALIBRATION_IDX + FN_CARRIER)
+  #define FN_CWCARRIER_IDX    (FN_CARRIER_IDX     + FN_CWCARRIER)
+  #define FN_CWTONE_IDX       (FN_CWCARRIER_IDX   + FN_CWTONE)
+  #define FN_CWDELAY_IDX      (FN_CWTONE_IDX      + FN_CWDELAY)
+  #define FN_TXCWDELAY_IDX    (FN_CWDELAY_IDX     + FN_TXCWDELAY)
+  #define FN_KEYTYPE_IDX      (FN_TXCWDELAY_IDX   + FN_KEYTYPE)
+  #define FN_ADCMONITOR_IDX   (FN_KEYTYPE_IDX     + FN_ADCMONITOR)
+  #define FN_TXONOFF_IDX      (FN_ADCMONITOR_IDX  + FN_TXONOFF)
+
+  #define FN_MENU_COUNT       (FN_DEFAULT_MENU + FN_BAND + FN_VFO_TOGGLE + FN_MODE + FN_RIT + FN_IFSHIFT + FN_ATT + FN_CW_SPEED + FN_SPLIT + FN_VFOTOMEM + FN_MEMTOVFO + FN_MEMORYKEYER + FN_WSPR + FN_SDRMODE)
+  #define FN_SETUP_COUNT      (FN_DEFAULT_SETUP + FN_CALIBRATION + FN_CARRIER + FN_CWCARRIER + FN_CWTONE + FN_CWDELAY + FN_TXCWDELAY + FN_KEYTYPE + FN_ADCMONITOR + FN_TXONOFF)
+  #define FN_STEP_COUNT       (FN_MENU_COUNT + FN_SETUP_COUNT)
+    
+  while (menuOn){
+    i = enc_read();
+    btnState = btnDown();
+
+    if (i > 0){
+      if (modeCalibrate && select + i < FN_STEP_COUNT * 10)
+        select += i;
+      else if (!modeCalibrate && select + i < FN_MENU_COUNT * 10)
+        select += i;
+    }
+    else if (i < 0 && select - i >= -10)
+      select += i;
+      
+    switch (select / 10)
+    {
+#if FN_BAND == 1
+      case FN_BAND_IDX : 
+        menuBand(btnState); 
+        break;
+#endif
+#if FN_VFO_TOGGLE == 1
+      case FN_VFO_TOGGLE_IDX : 
+        menuVfoToggle(btnState); 
+        break;
+#endif        
+#if FN_MODE == 1
+      case FN_MODE_IDX : 
+        menuSelectMode(btnState); 
+        break;
+#endif        
+#if FN_RIT == 1
+      case FN_RIT_IDX : 
+        menuRitToggle(btnState); 
+        break;
+#endif        
+#if FN_IFSHIFT == 1
+      case FN_IFSHIFT_IDX : 
+        menuIFSSetup(btnState); 
+        break;
+#endif        
+#if FN_ATT == 1
+      case FN_ATT_IDX : 
+        menuATTSetup(btnState); 
+        break;
+#endif        
+#if FN_CW_SPEED == 1
+      case FN_CW_SPEED_IDX : 
+        menuCWSpeed(btnState); 
+        break;
+#endif        
+#if FN_SPLIT == 1
+      case FN_SPLIT_IDX : 
+        menuSplitOnOff(btnState);        //SplitOn / off
+        break;
+#endif        
+#if FN_VFOTOMEM == 1
+      case FN_VFOTOMEM_IDX : 
+        menuCHMemory(btnState, 0);       //VFO to Memroy
+        break;
+#endif        
+#if FN_MEMTOVFO == 1
+      case FN_MEMTOVFO_IDX : 
+        menuCHMemory(btnState, 1);       //Memory to VFO
+        break;
+#endif        
+#if FN_MEMORYKEYER == 1
+      case FN_MEMORYKEYER_IDX : 
+        menuCWAutoKey(btnState);  
+        break;
+#endif        
+#if FN_WSPR == 1
+      case FN_WSPR_IDX : 
+        menuWSPRSend(btnState);
+        break;
+#endif        
+#if FN_SDRMODE == 1
+      case FN_SDRMODE_IDX : 
+        menuSDROnOff(btnState);
+        break;
+#endif        
+      case FN_SETUP_IDX : 
+        menuSetup(btnState);
+        break;
+      case FN_EXIT_IDX : 
+        menuExit(btnState);
+        break;
+        
+#if FN_CALIBRATION == 1
+      case FN_CALIBRATION_IDX : 
+        menuSetupCalibration(btnState);  //crystal
+        break;
+#endif        
+#if FN_CARRIER == 1
+      case FN_CARRIER_IDX : 
+        menuSetupCarrier(btnState);      //ssb
+        break;
+#endif        
+#if FN_CWCARRIER == 1
+      case FN_CWCARRIER_IDX : 
+        menuSetupCWCarrier(btnState);    //cw
+        break;
+#endif        
+#if FN_CWTONE == 1
+      case FN_CWTONE_IDX : 
+        menuSetupCwTone(btnState);  
+        break;
+#endif        
+#if FN_CWDELAY == 1
+      case FN_CWDELAY_IDX : 
+        menuSetupCwDelay(btnState);  
+        break;
+#endif        
+#if FN_TXCWDELAY == 1
+      case FN_TXCWDELAY_IDX : 
+        menuSetupTXCWInterval(btnState);  
+        break;
+#endif        
+#if FN_KEYTYPE == 1
+      case FN_KEYTYPE_IDX :
+        menuSetupKeyType(btnState);  
+        break;
+#endif        
+#if FN_ADCMONITOR == 1
+      case FN_ADCMONITOR_IDX :
+        menuADCMonitor(btnState);  
+        break;
+#endif        
+#if FN_TXONOFF == 1
+      case FN_TXONOFF_IDX :
+        menuTxOnOff(btnState, 0x01);       //TX OFF / ON
+        break;
+#endif        
+      default :
+        menuExit(btnState);  break;
+    } //end of switch
+    Check_Cat(0);  //To prevent disconnections
+  }   //end of while
+
+  //****************************************************************************
+  //Before change menu type (Version : ~ 0.95)
+  //****************************************************************************
+  /*
   while (menuOn){
     i = enc_read();
     btnState = btnDown();
@@ -1318,9 +1395,10 @@ void doMenu(){
         break;
       default :
         menuExit(btnState);  break;
-    }    
+    } //end of case    
     Check_Cat(0);  //To prevent disconnections
-  }
+  } //end of while
+  */
 }
 
 //*************************************************************************************
@@ -1359,7 +1437,14 @@ void menuSetup(int btn){
   else 
   {
     modeCalibrate = ! modeCalibrate;
+    //menuClearExit(1000);
+
+#ifdef USE_SW_SERIAL
+    menuOn = 0;
+#else
+    //Only Clear And Delay for Character LCD
     menuClearExit(1000);
+#endif
   }
 }
 
@@ -1390,13 +1475,17 @@ void menuRitToggle(int btn){
         ritDisable();
       }
       
+      //menuClearExit(500);
+#ifdef USE_SW_SERIAL
+      menuOn = 0;
+#else
+      //Only Clear And Delay for Character LCD
       menuClearExit(500);
+#endif
+      
   }
 }
 
-
-
-
 /**
  * Take a deep breath, math(ematics) ahead
  * The 25 mhz oscillator is multiplied by 35 to run the vco at 875 mhz
@@ -1577,6 +1666,15 @@ void menuSetupCarrier(int btn){
   delay_background(1000, 0);
 
   //usbCarrier = 11995000l; //Remarked by KD8CEC, Suggest from many user, if entry routine factoryrest
+  /*
+  //for uBITX V5.0, but not used by KD8CEC, if you want default value of carrier on Calibration, delete remark symbols
+#if UBITX_BOARD_VERSION == 5
+  usbCarrier = 11053000l;
+#else
+  usbCarrier = 11995000l;
+#endif
+   */
+
   
   si5351bx_setfreq(0, usbCarrier);
   printCarrierFreq(usbCarrier);
@@ -1620,4 +1718,3 @@ void menuSetupCarrier(int btn){
   //menuOn = 0; 
   menuClearExit(0);
 }
-

ubitx_20/ubitx_si5351.ino

@@ -13,6 +13,7 @@
  * The output clock channel that controls the frequency is connected to the PLL-B. 
  * The WSPR protocol is generated by changing the clock of the PLL-B.
  ************************************************************************************/
+#include "ubitx.h"
 
 // *************  SI5315 routines - tks Jerry Gaffke, KE7ER   ***********************
 // An minimalist standalone set of Si5351 routines.
@@ -47,7 +48,8 @@
 #define BB1(x) ((uint8_t)(x>>8))
 #define BB2(x) ((uint8_t)(x>>16))
 
-#define SI5351BX_ADDR 0x60              // I2C address of Si5351   (typical)
+//#define SI5351BX_ADDR 0x60              // I2C address of Si5351   (typical)
+uint8_t SI5351BX_ADDR;                    // I2C address of Si5351   (variable from Version 1.097)
 #define SI5351BX_XTALPF 2               // 1:6pf  2:8pf  3:10pf
 
 // If using 27mhz crystal, set XTAL=27000000, MSA=33.  Then vco=891mhz
@@ -57,7 +59,13 @@
 // User program may have reason to poke new values into these 3 RAM variables
 uint32_t si5351bx_vcoa = (SI5351BX_XTAL*SI5351BX_MSA);  // 25mhzXtal calibrate
 uint8_t  si5351bx_rdiv = 0;             // 0-7, CLK pin sees fout/(2**rdiv)
+
+#if UBITX_BOARD_VERSION == 5
+uint8_t  si5351bx_drive[3] = {3, 3, 3}; // 0=2ma 1=4ma 2=6ma 3=8ma for CLK 0,1,2
+#else
 uint8_t  si5351bx_drive[3] = {1, 1, 1}; // 0=2ma 1=4ma 2=6ma 3=8ma for CLK 0,1,2
+#endif
+
 uint8_t  si5351bx_clken = 0xFF;         // Private, all CLK output drivers off
 int32_t calibration = 0;
 
@@ -91,6 +99,18 @@ void si5351bx_init() {                  // Call once at power-up, start PLLA
   
   i2cWriten(26, si5351Val, 8);               // Write to 8 PLLA msynth regs
   i2cWrite(177, 0x20);                  // Reset PLLA  (0x80 resets PLLB)
+
+
+#if UBITX_BOARD_VERSION == 5
+  //why? TODO : CHECK by KD8CEC
+  //initializing the ppl2 as well
+  i2cWriten(34, si5351Val, 8);          // Write to 8 PLLA msynth regs
+  i2cWrite(177, 0xa0);                  // Reset PLLA  & PPLB (0x80 resets PLLB)
+#else
+  //
+#endif
+
+    
 }
 
 void si5351bx_setfreq(uint8_t clknum, uint32_t fout) {  // Set a CLK to fout Hz
@@ -125,9 +145,9 @@ void si5351_set_calibration(int32_t cal){
 
 void SetCarrierFreq()
 {
-  unsigned long appliedCarrier = ((cwMode == 0 ? usbCarrier : cwmCarrier) + (isIFShift && (inTx == 0) ? ifShiftValue : 0));
+  unsigned long appliedCarrier = ((cwMode == 0 ? usbCarrier : cwmCarrier) + (isIFShift && (!inTx) ? ifShiftValue : 0));
   //si5351bx_setfreq(0, (sdrModeOn ? 0 : appliedCarrier));
-  si5351bx_setfreq(0, ((sdrModeOn && (inTx == 0)) ? 0 : appliedCarrier)); //found bug by KG4GEK
+  si5351bx_setfreq(0, ((sdrModeOn && (!inTx)) ? 0 : appliedCarrier)); //found bug by KG4GEK
   
 
     /*
@@ -168,6 +188,3 @@ void TXSubFreq(unsigned long P2)
   i2cWrite(40, (P2 & 65280) >> 8);
   i2cWrite(41, P2 & 255);
 }
-
-
-

ubitx_20/ubitx_ui.ino

@@ -268,4 +268,32 @@ int enc_read(void) {
   return(result);
 }
 
+//===================================================================
+//I2C Signal Meter, Version 1.097
+//===================================================================
+
+// 0xA0 ~ 0xCF : CW Decode Mode + 100Hz ~
+// 0xD0 ~ 0xF3 : RTTY Decode Mode + 100Hz ~
+// 0x10 ~ 0x30 : Spectrum Mode
+int GetI2CSmeterValue(int valueType)
+{
+  if (valueType > 0)
+  {
+    Wire.beginTransmission(I2CMETER_ADDR);  //j : S-Meter
+    Wire.write(valueType);                  //Y : Get Value Type
+    Wire.endTransmission();
+  }
+  
+  Wire.requestFrom(I2CMETER_ADDR, 1);
+
+  if (Wire.available() > 0)
+  {
+    return Wire.read();
+  }
+  else
+  {
+    return 0;
+  }
+}
+
 

ubitx_20/ubitx_wspr.ino

@@ -6,8 +6,6 @@ Thanks to G3ZIL for sharing great code.
 Due to the limited memory of uBITX, I have implemented at least only a few of the codes in uBITX.
 
 Thanks for testing
-Beta Tester : 
-
 -----------------------------------------------------------------------------
    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
@@ -73,13 +71,14 @@ void SendWSPRManage()
 
     if (nowWsprStep == 0) //select Message status
     {
-      printLineF2(F("WSPR:"));
+      //printLineF2(F("WSPR:"));
       
       if (selectedWsprMessageIndex != nowSelectedIndex)
       {
         selectedWsprMessageIndex = nowSelectedIndex;
         int wsprMessageBuffIndex = selectedWsprMessageIndex * 46;
         
+        printLineF2(F("WSPR:"));
         //Display WSPR Name tag
         printLineFromEEPRom(0, 6, wsprMessageBuffIndex, wsprMessageBuffIndex + 4, 1); 
 
@@ -146,9 +145,16 @@ void SendWSPRManage()
       }
 
       printLine1(c);
-      
+
+#ifdef USE_SW_SERIAL
+      SWS_Process();
+      if ((digitalRead(PTT) == 0) || (TriggerBySW == 1))
+      {
+        TriggerBySW = 0;
+#else
       if (digitalRead(PTT) == 0)
       {
+#endif
         //SEND WSPR
         //If you need to consider the Rit and Sprite modes, uncomment them below.
         //remark = To reduce the size of the program