making sure any outstanding updates are committed

This reverts commit 86ae1ddb2f.

Raduino/Raduino.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.
@@ -122,7 +122,8 @@ char vfoActive = VFO_A;
 int8_t meter_reading = 0; // a -1 on meter makes it invisible
 unsigned long vfoA=7150000L, vfoB=14200000L, sideTone=800, usbCarrier, cwmCarrier;
 unsigned long vfoA_eeprom, vfoB_eeprom; //for protect eeprom life
-unsigned long frequency, ritRxFrequency, ritTxFrequency;  //frequency is the current frequency on the dial
+unsigned long frequency;
+unsigned long ritRxFrequency, ritTxFrequency;  //frequency is the current frequency on the dial
 
 unsigned int cwSpeed = 100; //this is actuall the dot period in milliseconds
 extern int32_t calibration;
@@ -316,6 +317,17 @@ unsigned long delayBeforeTime = 0;
 byte delay_background(unsigned delayTime, byte fromType){ //fromType : 4 autoCWKey -> Check Paddle
   delayBeforeTime = millis();
 
+  /*
+   * KC4UPR - IOP review, 2020-05-03
+   * 
+   * I don't see anything in here that is either important to, or will adversely affect, IOP 
+   * operation.  I'm not planning on using the uBITX autokeyer (since all keying will be in the
+   * IOP), so neither getPaddle() nor autoSendPTTCheck() will be issues.  I do need to look into
+   * overall CAT operation, in general.
+   * 
+   * UPDATE:  Fixed getPaddle() to be compatible.
+   */
+
   while (millis() - delayBeforeTime <= delayTime) {
 
     if (fromType == 4)
@@ -325,14 +337,14 @@ byte delay_background(unsigned delayTime, byte fromType){ //fromType : 4 autoCWK
         return 1;
         
       //Check PTT while auto Sending
-      autoSendPTTCheck();
+      //autoSendPTTCheck();
       
-      Check_Cat(3);
+      //Check_Cat(3);
     }
     else
     {
       //Background Work      
-      Check_Cat(fromType);
+      //Check_Cat(fromType);
     }
   }
 
@@ -678,6 +690,10 @@ void ritDisable(){
  */
 
 void checkPTT(){  
+  /*
+   * KC4UPR - note that some of this is superfluous now that checkPTT() is only executed
+   * in SSB mode, and cwKeyer is only executed in CW mode...
+   */
   //we don't check for ptt when transmitting cw
   if (cwTimeout > 0)
     return;
@@ -790,7 +806,7 @@ void checkButton(){
   //wait for the button to go up again
   while(keyStatus == getBtnStatus()) {
     delay(10);
-    Check_Cat(0);
+    //Check_Cat(0);
   }
   //delay(50);//debounce
 }
@@ -809,7 +825,7 @@ void checkButton(){
   //wait for the button to go up again
   while(btnDown()) {
     delay(10);
-    Check_Cat(0);
+    //Check_Cat(0);
   }
   //delay(50);//debounce
 }
@@ -1386,7 +1402,8 @@ void setup()
   //printLineF(1, FIRMWARE_VERSION_INFO);
   DisplayVersionInfo(FIRMWARE_VERSION_INFO);
 
-  Init_Cat(38400, SERIAL_8N1);
+  //Init_Cat(38400, SERIAL_8N1);
+  Serial.begin(38400);
   initSettings();
   initPorts();     
 
@@ -1432,6 +1449,7 @@ void setup()
     factory_alignment();
 #endif
 
+  rigState.begin();
 }
 
 //Auto save Frequency and Mode with Protected eeprom life by KD8CEC
@@ -1459,15 +1477,35 @@ void checkAutoSaveFreqMode()
 }
 
 void loop(){ 
-  if (isCWAutoMode == 0){  //when CW AutoKey Mode, disable this process
-    if (!txCAT)
+  /*
+   * KC4UPR - IOP update, 2020-05-03
+   * 
+   * Getting rid of the autokeyer code... not planning on using, since any autokeying
+   * would actually be done by the IOP.  We'll check the PTT, but only in SSB mode
+   * (same line as CW, so it would be caught by cwKeyer() in CW mode).
+   * 
+   * Only check the CW keyer if we are in one of the CW modes.  Why?  Because we
+   * are using the same input for PTT and CW.
+   */
+//  if (isCWAutoMode == 0){  //when CW AutoKey Mode, disable this process
+//    if (!txCAT)
+//      checkPTT();
+//    checkButton();
+//  }
+// else
+//    controlAutoCW();
+  // KC4UPR:  Note, implementation below leaves no manual way to abort TX due to CAT.  May
+  // want to add in a way to interrupt CAT transmission with a PTT/CW event.
+  //if (!txCAT) {
+    if (cwMode == 0) {
       checkPTT();
-    checkButton();
-  }
- else
-    controlAutoCW();
-
+    } else {
       cwKeyer();
+    }
+    checkButton();    
+  //}
+  
+//cwKeyer(); 
   
   //tune only when not tranmsitting 
   if (!inTx){
@@ -1487,7 +1525,7 @@ 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);
+  //Check_Cat(inTx? 1 : 0);
 
   //for SEND SW Serial
   #ifdef USE_SW_SERIAL

Raduino/ubitx.h

@@ -19,11 +19,13 @@
 
 #include <Arduino.h>  //for Linux, On Linux it is case sensitive.
 
+#include "RigState.h"
+
 //==============================================================================
 // Compile Option
 //==============================================================================
 //Ubitx Board Version
-#define UBITX_BOARD_VERSION 2           //v1 ~ v4 : 4, v5: 5
+#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.
@@ -48,8 +50,8 @@
 //#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.
+//#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
@@ -253,6 +255,12 @@ extern byte I2C_LCD_SECOND_ADDRESS;     //only using Dual LCD Mode
 #define I2CMETER_CALCR    0x55 //Calculated SWR Meter
 #define I2CMETER_UNCALCR  0x54 //Uncalculated SWR Meter
 
+// Raduino<=>TeensyDSP data exchange
+#define I2CMETER_RIGINF   0x50
+
+// Raduino requests any CAT updates from TeensyDSP
+//#define I2CMETER_REQCAT   0x51
+
 //==============================================================================
 // for public, Variable, functions
 //==============================================================================

Raduino/ubitx_keyer.ino

@@ -39,6 +39,22 @@ char lastPaddle = 0;
 
 //reads the analog keyer pin and reports the paddle
 byte getPaddle(){
+  /*
+   * KC4UPR - IOP update, 2020-05-03
+   * 
+   * Modifying this for the uBITX IOP.  Big picture:
+   * 
+   * (1) It uses the PTT input line.
+   * 
+   * (2) It's always "straight key" mode (the IOP provides the keyer).
+   */
+
+  if (digitalRead(PTT) == 1)  // key/PTT is up
+    return 0;
+  else
+    return PADDLE_STRAIGHT;
+
+/*
   int paddle = analogRead(ANALOG_KEYER);
 
   if (paddle > 800)         // above 4v is up
@@ -52,6 +68,7 @@ byte getPaddle(){
     return PADDLE_BOTH;     //both are between 1 and 2v
   else
     return PADDLE_STRAIGHT; //less than 1v is the straight key
+*/
 }
 
 /**
@@ -96,6 +113,17 @@ 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) {
+  /*
+   * KC4UPR - IOP update, 2020-05-03
+   * 
+   * Modifying this for the uBITX IOP.  Big picture:
+   * 
+   * No iambic keyer.  It's always "straight key" based on the IOP.
+   * 
+   * It uses the PTT line.
+   */
+  return (digitalRead(PTT) ? 0 : DIT_L);
+/*   
   unsigned char tmpKeyerControl = 0;
   int paddle = analogRead(ANALOG_KEYER);
   
@@ -119,6 +147,7 @@ char update_PaddleLatch(byte isUpdateKeyState) {
     keyerControl |= tmpKeyerControl;
 
   return tmpKeyerControl;
+*/
 }
 
 /*****************************************************************************
@@ -126,106 +155,113 @@ char update_PaddleLatch(byte isUpdateKeyState) {
 // 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);
-          }
+   * KC4UPR - IOP update, 2020-05-03
+   * 
+   * Modifying this for the uBITX IOP.  Big picture:
+   * 
+   * No iambic keyer.  It's always "straight key" based on the IOP.
    */
-          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{
+//  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
@@ -260,9 +296,9 @@ void cwKeyer(void){
         return;                   //Tx stop control by Main Loop
       }
 
-      Check_Cat(2);
+      //Check_Cat(2);
     } //end of while
-  }   //end of elese
+//  }   //end of elese
 }
 
 
@@ -365,5 +401,3 @@ void cwKeyer(){
   }
 }
 */
-
-

Raduino/ubitx_lcd_nextion.ino

@@ -993,6 +993,14 @@ char checkCountSMeter = 0;
 //execute interval : 0.25sec
 void idle_process()
 {
+  // KC4UPR 2021-02-05 added update process for Raduino-TeensyDSP coordination
+  rigState.send_RIGINF();
+  delay(1);
+  rigState.receive_RIGINF();
+  //updateStateFromRaduino(rigState);
+  //doRaduinoToTeensy(&rigState);
+  //updateRaduinoFromState(rigState);
+    
   //S-Meter Display
   if (((displayOption1 & 0x08) == 0x08 && (sdrModeOn == 0)) && (++checkCountSMeter > SMeterLatency))
   {

Raduino/ubitx_menu.ino

@@ -263,7 +263,7 @@ void menuCHMemory(int btn, byte isMemoryToVfo){
         }
       }
 
-      Check_Cat(0);  //To prevent disconnections
+      //Check_Cat(0);  //To prevent disconnections
     } //end of while (knob)
 
     if (selectChannel < 20 && selectChannel >= 0)
@@ -697,7 +697,7 @@ int getValueByKnob(int valueType, int targetValue, int minKnobValue, int maxKnob
         }
       }
 
-      Check_Cat(0);  //To prevent disconnections
+      //Check_Cat(0);  //To prevent disconnections
     }
 
     return targetValue;
@@ -1290,7 +1290,7 @@ void doMenu(){
       default :
         menuExit(btnState);  break;
     } //end of switch
-    Check_Cat(0);  //To prevent disconnections
+    //Check_Cat(0);  //To prevent disconnections
   }   //end of while
 
   //****************************************************************************
@@ -1690,7 +1690,7 @@ void menuSetupCarrier(int btn){
     si5351bx_setfreq(0, usbCarrier);
     printCarrierFreq(usbCarrier);
 
-    Check_Cat(0);  //To prevent disconnections
+    //Check_Cat(0);  //To prevent disconnections
     delay(100);
   }
 

Raduino/ubitx_ui.ino

@@ -18,6 +18,8 @@ const PROGMEM uint8_t meters_bitmap[] = {
 };
 */
 
+//#include "RigState.h"
+
 //SWR GRAPH,  DrawMeter and drawingMeter Logic function by VK2ETA 
 
 #ifdef OPTION_SKINNYBARS //We want skninny bars with more text
@@ -296,4 +298,4 @@ int GetI2CSmeterValue(int valueType)
   }
 }
 
-
+//======================================================================

Schematics/IO_Board/IO_Board-cache.lib

@@ -0,0 +1,342 @@
+EESchema-LIBRARY Version 2.4
+#encoding utf-8
+#
+# Amplifier_Operational_LM324A
+#
+DEF Amplifier_Operational_LM324A U 0 5 Y Y 5 L N
+F0 "U" 0 200 50 H V L CNN
+F1 "Amplifier_Operational_LM324A" 0 -200 50 H V L CNN
+F2 "" -50 100 50 H I C CNN
+F3 "" 50 200 50 H I C CNN
+ALIAS LM324 TLC274 TLC279 TL074 LM324A MCP6004 TL084 TL064 LMV324 LMC6484 MCP604 MC33079 MC33174 MC33179 OPA1604 OPA1679 OPA4134 OPA4340UA OPA4376 MCP6L94 TSV914 ADA4807-4 TSV994
+$FPLIST
+ SOIC*3.9x8.7mm*P1.27mm*
+ DIP*W7.62mm*
+ TSSOP*4.4x5mm*P0.65mm*
+ SSOP*5.3x6.2mm*P0.65mm*
+ MSOP*3x3mm*P0.5mm*
+$ENDFPLIST
+DRAW
+P 4 1 1 10 -200 200 200 0 -200 -200 -200 200 f
+P 4 2 1 10 -200 200 200 0 -200 -200 -200 200 f
+P 4 3 1 10 -200 200 200 0 -200 -200 -200 200 f
+P 4 4 1 10 -200 200 200 0 -200 -200 -200 200 f
+X ~ 1 300 0 100 L 50 50 1 1 O
+X - 2 -300 -100 100 R 50 50 1 1 I
+X + 3 -300 100 100 R 50 50 1 1 I
+X + 5 -300 100 100 R 50 50 2 1 I
+X - 6 -300 -100 100 R 50 50 2 1 I
+X ~ 7 300 0 100 L 50 50 2 1 O
+X + 10 -300 100 100 R 50 50 3 1 I
+X ~ 8 300 0 100 L 50 50 3 1 O
+X - 9 -300 -100 100 R 50 50 3 1 I
+X + 12 -300 100 100 R 50 50 4 1 I
+X - 13 -300 -100 100 R 50 50 4 1 I
+X ~ 14 300 0 100 L 50 50 4 1 O
+X V- 11 -100 -300 150 U 50 50 5 1 W
+X V+ 4 -100 300 150 D 50 50 5 1 W
+ENDDRAW
+ENDDEF
+#
+# Amplifier_Operational_LM358
+#
+DEF Amplifier_Operational_LM358 U 0 5 Y Y 3 L N
+F0 "U" 0 200 50 H V L CNN
+F1 "Amplifier_Operational_LM358" 0 -200 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ SOIC*3.9x4.9mm*P1.27mm*
+ DIP*W7.62mm*
+ TO*99*
+ OnSemi*Micro8*
+ TSSOP*3x3mm*P0.65mm*
+ TSSOP*4.4x3mm*P0.65mm*
+ MSOP*3x3mm*P0.65mm*
+ SSOP*3.9x4.9mm*P0.635mm*
+ LFCSP*2x2mm*P0.5mm*
+ *SIP*
+ SOIC*5.3x6.2mm*P1.27mm*
+$ENDFPLIST
+DRAW
+P 4 1 1 10 -200 200 200 0 -200 -200 -200 200 f
+P 4 2 1 10 -200 200 200 0 -200 -200 -200 200 f
+X ~ 1 300 0 100 L 50 50 1 1 O
+X - 2 -300 -100 100 R 50 50 1 1 I
+X + 3 -300 100 100 R 50 50 1 1 I
+X + 5 -300 100 100 R 50 50 2 1 I
+X - 6 -300 -100 100 R 50 50 2 1 I
+X ~ 7 300 0 100 L 50 50 2 1 O
+X V- 4 -100 -300 150 U 50 50 3 1 W
+X V+ 8 -100 300 150 D 50 50 3 1 W
+ENDDRAW
+ENDDEF
+#
+# Amplifier_Operational_TL072
+#
+DEF Amplifier_Operational_TL072 U 0 5 Y Y 3 L N
+F0 "U" 0 200 50 H V L CNN
+F1 "Amplifier_Operational_TL072" 0 -200 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+ALIAS LM358 AD8620 LMC6062 LMC6082 TL062 TL072 TL082 NE5532 SA5532 RC4558 RC4560 RC4580 LMV358 TS912 TSV912IDT TSV912IST TLC272 TLC277 MCP602 OPA1678 OPA2134 OPA2340 OPA2376xxD OPA2376xxDGK MC33078 MC33178 LM4562 OP249 OP275 ADA4075-2 MCP6002-xP MCP6002-xSN MCP6002-xMS LM7332 OPA2333xxD OPA2333xxDGK LMC6482 LT1492 LTC6081xMS8 LM6172 MCP6L92 NJM2043 NJM2114 NJM4556A NJM4558 NJM4559 NJM4560 NJM4580 NJM5532 ADA4807-2ARM OPA2691 LT6234 OPA2356xxD OPA2356xxDGK OPA1612AxD MC33172 OPA1602 TLV2372 LT6237 OPA2277
+$FPLIST
+ SOIC*3.9x4.9mm*P1.27mm*
+ DIP*W7.62mm*
+ TO*99*
+ OnSemi*Micro8*
+ TSSOP*3x3mm*P0.65mm*
+ TSSOP*4.4x3mm*P0.65mm*
+ MSOP*3x3mm*P0.65mm*
+ SSOP*3.9x4.9mm*P0.635mm*
+ LFCSP*2x2mm*P0.5mm*
+ *SIP*
+ SOIC*5.3x6.2mm*P1.27mm*
+$ENDFPLIST
+DRAW
+P 4 1 1 10 -200 200 200 0 -200 -200 -200 200 f
+P 4 2 1 10 -200 200 200 0 -200 -200 -200 200 f
+X ~ 1 300 0 100 L 50 50 1 1 O
+X - 2 -300 -100 100 R 50 50 1 1 I
+X + 3 -300 100 100 R 50 50 1 1 I
+X + 5 -300 100 100 R 50 50 2 1 I
+X - 6 -300 -100 100 R 50 50 2 1 I
+X ~ 7 300 0 100 L 50 50 2 1 O
+X V- 4 -100 -300 150 U 50 50 3 1 W
+X V+ 8 -100 300 150 D 50 50 3 1 W
+ENDDRAW
+ENDDEF
+#
+# Connector_Conn_01x02_Male
+#
+DEF Connector_Conn_01x02_Male J 0 40 Y N 1 F N
+F0 "J" 0 100 50 H V C CNN
+F1 "Connector_Conn_01x02_Male" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_1x??_*
+$ENDFPLIST
+DRAW
+S 34 -95 0 -105 1 1 6 F
+S 34 5 0 -5 1 1 6 F
+P 2 1 1 6 50 -100 34 -100 N
+P 2 1 1 6 50 0 34 0 N
+X Pin_1 1 200 0 150 L 50 50 1 1 P
+X Pin_2 2 200 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Connector_Conn_01x03_Male
+#
+DEF Connector_Conn_01x03_Male J 0 40 Y N 1 F N
+F0 "J" 0 200 50 H V C CNN
+F1 "Connector_Conn_01x03_Male" 0 -200 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_1x??_*
+$ENDFPLIST
+DRAW
+S 34 -95 0 -105 1 1 6 F
+S 34 5 0 -5 1 1 6 F
+S 34 105 0 95 1 1 6 F
+P 2 1 1 6 50 -100 34 -100 N
+P 2 1 1 6 50 0 34 0 N
+P 2 1 1 6 50 100 34 100 N
+X Pin_1 1 200 100 150 L 50 50 1 1 P
+X Pin_2 2 200 0 150 L 50 50 1 1 P
+X Pin_3 3 200 -100 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Connector_Conn_01x06_Male
+#
+DEF Connector_Conn_01x06_Male J 0 40 Y N 1 F N
+F0 "J" 0 300 50 H V C CNN
+F1 "Connector_Conn_01x06_Male" 0 -400 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Connector*:*_1x??_*
+$ENDFPLIST
+DRAW
+S 34 -295 0 -305 1 1 6 F
+S 34 -195 0 -205 1 1 6 F
+S 34 -95 0 -105 1 1 6 F
+S 34 5 0 -5 1 1 6 F
+S 34 105 0 95 1 1 6 F
+S 34 205 0 195 1 1 6 F
+P 2 1 1 6 50 -300 34 -300 N
+P 2 1 1 6 50 -200 34 -200 N
+P 2 1 1 6 50 -100 34 -100 N
+P 2 1 1 6 50 0 34 0 N
+P 2 1 1 6 50 100 34 100 N
+P 2 1 1 6 50 200 34 200 N
+X Pin_1 1 200 200 150 L 50 50 1 1 P
+X Pin_2 2 200 100 150 L 50 50 1 1 P
+X Pin_3 3 200 0 150 L 50 50 1 1 P
+X Pin_4 4 200 -100 150 L 50 50 1 1 P
+X Pin_5 5 200 -200 150 L 50 50 1 1 P
+X Pin_6 6 200 -300 150 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_C
+#
+DEF Device_C C 0 10 N Y 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "Device_C" 25 -100 50 H V L CNN
+F2 "" 38 -150 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ C_*
+$ENDFPLIST
+DRAW
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 110 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_CP1
+#
+DEF Device_CP1 C 0 10 N N 1 F N
+F0 "C" 25 100 50 H V L CNN
+F1 "Device_CP1" 25 -100 50 H V L CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ CP_*
+$ENDFPLIST
+DRAW
+A 0 -150 128 1287 513 0 1 20 N -80 -50 80 -50
+P 2 0 1 20 -80 30 80 30 N
+P 2 0 1 0 -70 90 -30 90 N
+P 2 0 1 0 -50 70 -50 110 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 130 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_D
+#
+DEF Device_D D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "Device_D" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 8 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 8 50 50 50 -50 -50 0 50 50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_R_POT_US
+#
+DEF Device_R_POT_US RV 0 40 Y N 1 F N
+F0 "RV" -175 0 50 V V C CNN
+F1 "Device_R_POT_US" -100 0 50 V V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Potentiometer*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 0 -90 0 -100 N
+P 2 0 1 0 0 100 0 90 N
+P 2 0 1 0 100 0 60 0 N
+P 4 0 1 0 45 0 90 20 90 -20 45 0 F
+P 5 0 1 0 0 -30 40 -45 0 -60 -40 -75 0 -90 N
+P 5 0 1 0 0 30 40 15 0 0 -40 -15 0 -30 N
+P 5 0 1 0 0 90 40 75 0 60 -40 45 0 30 N
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 150 0 50 L 50 50 1 1 P
+X 3 3 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Device_R_US
+#
+DEF Device_R_US R 0 0 N Y 1 F N
+F0 "R" 100 0 50 V V C CNN
+F1 "Device_R_US" -100 0 50 V V C CNN
+F2 "" 40 -10 50 V I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ R_*
+$ENDFPLIST
+DRAW
+P 2 0 1 0 0 -90 0 -100 N
+P 2 0 1 0 0 90 0 100 N
+P 5 0 1 0 0 -30 40 -45 0 -60 -40 -75 0 -90 N
+P 5 0 1 0 0 30 40 15 0 0 -40 -15 0 -30 N
+P 5 0 1 0 0 90 40 75 0 60 -40 45 0 30 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Transistor_BJT_PN2222A
+#
+DEF Transistor_BJT_PN2222A Q 0 0 Y N 1 F N
+F0 "Q" 200 75 50 H V L CNN
+F1 "Transistor_BJT_PN2222A" 200 0 50 H V L CNN
+F2 "Package_TO_SOT_THT:TO-92_Inline" 200 -75 50 H I L CIN
+F3 "" 0 0 50 H I L CNN
+$FPLIST
+ TO?92*
+$ENDFPLIST
+DRAW
+C 50 0 111 0 1 10 N
+P 2 0 1 0 0 0 25 0 N
+P 2 0 1 0 100 -100 25 -25 N
+P 2 0 1 0 100 100 25 25 N
+P 3 0 1 20 25 75 25 -75 25 -75 N
+P 3 0 1 0 95 -95 75 -75 75 -75 N
+P 5 0 1 0 45 -65 65 -45 85 -85 45 -65 45 -65 F
+X E 1 100 -200 100 U 50 50 1 1 P
+X B 2 -200 0 200 R 50 50 1 1 I
+X C 3 100 200 100 D 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# power_+5V
+#
+DEF power_+5V #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -150 50 H I C CNN
+F1 "power_+5V" 0 140 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 2 0 1 0 -30 50 0 100 N
+P 2 0 1 0 0 0 0 100 N
+P 2 0 1 0 0 100 30 50 N
+X +5V 1 0 0 0 U 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+# power_GND
+#
+DEF power_GND #PWR 0 0 Y Y 1 F P
+F0 "#PWR" 0 -250 50 H I C CNN
+F1 "power_GND" 0 -150 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+DRAW
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
+X GND 1 0 0 0 D 50 50 1 1 W N
+ENDDRAW
+ENDDEF
+#
+#End Library

Schematics/IO_Board/IO_Board.kicad_pcb

@@ -0,0 +1 @@
+(kicad_pcb (version 4) (host kicad "dummy file") )

Schematics/IO_Board/IO_Board.pro

@@ -0,0 +1,33 @@
+update=22/05/2015 07:44:53
+version=1
+last_client=kicad
+[general]
+version=1
+RootSch=
+BoardNm=
+[pcbnew]
+version=1
+LastNetListRead=
+UseCmpFile=1
+PadDrill=0.600000000000
+PadDrillOvalY=0.600000000000
+PadSizeH=1.500000000000
+PadSizeV=1.500000000000
+PcbTextSizeV=1.500000000000
+PcbTextSizeH=1.500000000000
+PcbTextThickness=0.300000000000
+ModuleTextSizeV=1.000000000000
+ModuleTextSizeH=1.000000000000
+ModuleTextSizeThickness=0.150000000000
+SolderMaskClearance=0.000000000000
+SolderMaskMinWidth=0.000000000000
+DrawSegmentWidth=0.200000000000
+BoardOutlineThickness=0.100000000000
+ModuleOutlineThickness=0.150000000000
+[cvpcb]
+version=1
+NetIExt=net
+[eeschema]
+version=1
+LibDir=
+[eeschema/libraries]

Schematics/IO_Board/IO_Board_Wiring.sch

@@ -0,0 +1,16 @@
+EESchema Schematic File Version 4
+EELAYER 30 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 2 2
+Title ""
+Date ""
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+$EndSCHEMATC

TeensyDSP/DSP.cpp

@@ -4,146 +4,477 @@
 
 #include "DSP.h"
 
-#include <Audio.h>
 #include <i2c_t3.h>
 //#include <Wire.h>
 //#include <SPI.h>
 //#include <SD.h>
 //#include <SerialFlash.h>
 
-#define RX_AUDIO_CH 0
-
-#define TX_MIC_IN_CH  0
-#define TX_LINE_IN_CH 0
-#define TX_USB_IN_CH1 1
-#define TX_USB_IN_CH2 2
-
-UBitxDSP DSP;
-
-//static struct {
-
-  // GUItool: begin automatically generated code
-  AudioInputI2S            lineIn;           //xy=137,220
-  AudioInputUSB            usbIn;           //xy=142,326
-  AudioMixer4              rxAudio;         //xy=394,134
-  AudioMixer4              txAudio;         //xy=398,322
-  AudioOutputAnalog        spkrOut;           //xy=774,104
-  AudioOutputUSB           usbOut;           //xy=774,138
-  AudioOutputI2S           lineOut;           //xy=776,236
-  AudioConnection          patchCord1(lineIn, 0, rxAudio, 0);
-  AudioConnection          patchCord2(lineIn, 1, txAudio, 0);
-  AudioConnection          patchCord3(usbIn, 0, txAudio, 1);
-  AudioConnection          patchCord4(usbIn, 1, txAudio, 2);
-  AudioConnection          patchCord5(rxAudio, spkrOut);
-  AudioConnection          patchCord6(rxAudio, 0, lineOut, 0);
-  AudioConnection          patchCord7(rxAudio, 0, usbOut, 0);
-  AudioConnection          patchCord8(rxAudio, 0, usbOut, 1);
-  AudioConnection          patchCord9(txAudio, 0, lineOut, 1);
-  AudioControlSGTL5000     audioCtrl;     //xy=403,463
-  // GUItool: end automatically generated code
-
-//} audio;
+// GUItool: begin automatically generated code
+AudioInputUSB            usbIn;          //xy=63,305
+AudioInputI2S            lineIn;         //xy=71,197
+AudioSynthWaveformSine   tone1;          //xy=111,369
+AudioSynthWaveformSine   tone2;          //xy=111,410
+AudioMixer4              rxAudio;        //xy=328,111
+AudioMixer4              txAudio;        //xy=332,299
+AudioAnalyzeRMS          txVoxLevel;     //xy=490,340
+AudioFilterFIR           rxFilter;       //xy=493,103
+AudioAmplifier           usbOutAmp;      //xy=658,99
+AudioAmplifier           lineOutAmp;     //xy=659,162
+AudioAmplifier           usbBypassAmp;   //xy=666,225
+AudioAmplifier           txOutAmp;       //xy=713,301
+AudioOutputI2S           lineOut;        //xy=876,294
+AudioOutputUSB           usbOut;         //xy=878,255
+AudioConnection          patchCord1(usbIn, 0, txAudio, 1);
+AudioConnection          patchCord2(lineIn, 0, rxAudio, 0);
+AudioConnection          patchCord3(lineIn, 1, txAudio, 0);
+AudioConnection          patchCord4(tone1, 0, txAudio, 2);
+AudioConnection          patchCord5(tone1, 0, rxAudio, 2);
+AudioConnection          patchCord6(tone2, 0, txAudio, 3);
+AudioConnection          patchCord7(tone2, 0, rxAudio, 3);
+AudioConnection          patchCord8(rxAudio, rxFilter);
+AudioConnection          patchCord9(rxAudio, usbBypassAmp);
+AudioConnection          patchCord10(txAudio, txVoxLevel);
+AudioConnection          patchCord11(txAudio, txOutAmp);
+AudioConnection          patchCord12(rxFilter, usbOutAmp);
+AudioConnection          patchCord13(rxFilter, lineOutAmp);
+AudioConnection          patchCord14(usbOutAmp, 0, usbOut, 0);
+AudioConnection          patchCord15(lineOutAmp, 0, lineOut, 0);
+AudioConnection          patchCord16(usbBypassAmp, 0, usbOut, 1);
+AudioConnection          patchCord17(txOutAmp, 0, lineOut, 1);
+AudioControlSGTL5000     audioCtrl;      //xy=337,440
+// GUItool: end automatically generated code
 
 void UBitxDSP::begin() {
-  AudioMemory(20);
+
+  // Basic audio setup
+  AudioMemory(16);            // TODO: optimize this
   audioCtrl.enable();
   audioCtrl.volume(0.0);      // headphone volume...
   audioCtrl.muteHeadphone();  // ...not used by UBitxDSP
 
-  for (int i = 0; i < 4; i++) {
-    if (i == RX_AUDIO_CH)
+  setupRxAudio();
+  setupTxAudio();
+
+  // Default to RX.
+  muteRxIn(); // redundant?
+  muteTxIn(); // redundant?
+  isTx = true;  // so that rx() call works
+  rx();
+
+  // Setup the VOX - TBD
+
+  // Setup the RX Filter.
+  setRxFilter(300.0, 3000.0);
+
+  sinceLastUpdate = 0;
+}
+
+void UBitxDSP::update() {
+  // Update the USB volume (level of TX USB output) periodically.
+  if (sinceLastUpdate > DSP_MILLIS_PER_UPDATE) {
+    float vol = usbIn.volume();
+    if (vol != usbVol) {
+      setTxInLevel(TX_USB, vol);
+      usbVol = vol;
+    }
+    sinceLastUpdate = 0;
+  }
+}
+
+void UBitxDSP::end() {
+  bypassRxFilter();
+}
+
+/**********************************************************************
+ * Transmit/Receive switching
+ **********************************************************************/
+
+/*!
+ *  Return to receive (RX) mode from transmit (TX) mode.  
+ *  First the transmit audio output is muted, to ensure that no more
+ *  audio goes to the rig.  Then we check to see if the latched TX audio 
+ *  source was different than the selected TX audio source; this happens 
+ *  if the radio is currently set for a particular input (which 
+ *  determines what is monitored by the VOX), but then is commanded to 
+ *  transmit a different source (e.g. based on a CAT command).  The 
+ *  actual transmit audio source is latched during transmit, but upon 
+ *  returning to receive, we restore the selected transmit audio.
+ */
+void UBitxDSP::rx() {
+  if (isTx) {
+    muteTxOut();
+    if (txSrcLatched != txSrc) {
+      setTxAudioIn(txSrc);
+    }
+    if (txSrcLatched == MIC_IN) {
+      audioCtrl.inputSelect(AUDIO_INPUT_LINEIN);
+    }
+    unmuteRxIn(RX_AUDIO);
+    isTx = false;
+  }
+}
+
+/*!
+ *  Enter transmit (TX) mode from receive (RX) mode.  
+ */
+void UBitxDSP::tx(TxAudioIn src) {
+  if (!isTx) {
+    muteRxIn(RX_AUDIO);
+
+    txSrcLatched = src;
+    if (txSrcLatched != txSrc) {
+      setTxAudioIn(txSrcLatched, true);
+    }
+
+    if (txSrcLatched == MIC_IN) {
+      audioCtrl.inputSelect(AUDIO_INPUT_MIC);
+      audioCtrl.micGain(micGain);
+    }
+
+    unmuteTxOut();
+    isTx = true;
+  }
+}
+
+/**********************************************************************
+ * General audio setup -- called via begin()
+ **********************************************************************/
+
+void UBitxDSP::setupRxAudio() {
+  for (int i = 0; i < NUM_RX_AUDIO_CH; i++) {
+    if (i == RX_AUDIO)
       rxAudio.gain(i, 1.0);
     else
       rxAudio.gain(i, 0.0);
   }  
 
-  for (int i = 0; i < 4; i++) {
-    txAudio.gain(i, 0.0);
-  }
-
-  // SETUP THE AUDIO INPUTS
-
   // Rig (Line) Input (RX)
   audioCtrl.inputSelect(AUDIO_INPUT_LINEIN);
   audioCtrl.unmuteLineout();
-  audioCtrl.lineInLevel(5, 5);  // RX, TX
-  audioCtrl.lineOutLevel(29, 29); //RX, TX
+  audioCtrl.lineInLevel(9, 5);  // RX, TX
+  audioCtrl.lineOutLevel(29, 31); // RX, TX
+
+  // Line Output (RX)
+  setLineOutLevel(1.0);
+
+  // USB Output (RX)
+  setUSBOutLevel(1.0);
+}
+
+void UBitxDSP::setupTxAudio() {
+  for (int i = 0; i < NUM_TX_AUDIO_CH; i++) {
+    txAudio.gain(i, 0.0);
+  }
 
   // Mic Input (TX)
   audioCtrl.micGain(0); // TODO: set value
-
   // Line Input (TX)
 
   // USB Input (TX)
 
-  // SETUP THE AUDIO OUTPUTS
-
-  // Speaker Output (RX)
-  spkrOut.analogReference(INTERNAL);
-
-  // Line Output (RX)
-
-  // USB Output (RX)
-
   // Rig (Line) Output (TX)
+  txOutAmp.gain(1.0);
 
-  // Default to RX.
-  rx();
+  tone1.amplitude(1.0);   // TODO - just do this once.
+  tone1.frequency(1500);  // TODO:  Make this dynamic based on CW (sidetone freq) versus data (1500 Hz)
+
+  tone1.amplitude(1.0); // TODO - just do this once.
+  tone1.amplitude(1.0); // TODO - just do this once.
+  tone1.frequency(700);
+  tone2.frequency(1900);
 }
 
-void UBitxDSP::end() {
-}
+/**********************************************************************
+ * Receive audio chain
+ **********************************************************************/
 
-void UBitxDSP::rx() {
-  // mute all tx audio
-  for (int i = 0; i < 4; i++) {
-    txAudio.gain(i, 0.0);
+void UBitxDSP::setRxInLevel(RxAudioCh ch, float level) {
+  if (ch < NUM_RX_AUDIO_CH) {
+    state.rxIn[ch].level = level;
+    rxAudio.gain(ch, state.rxIn[ch].mute ? 0.0 : state.rxIn[ch].level);
   }
-  // select line in for rx
-  audioCtrl.inputSelect(AUDIO_INPUT_LINEIN);
-  // restore rx audio
-  rxAudio.gain(RX_AUDIO_CH, 1.0); // restore the RX audio
 }
 
-void UBitxDSP::txMicIn() {
-  // mute the rx audio
-  rxAudio.gain(RX_AUDIO_CH, 0.0);
-  // restore the tx mic audio
-  audioCtrl.inputSelect(AUDIO_INPUT_MIC);  
-  for (int i = 0; i < 4; i++) {
-    if (i == TX_MIC_IN_CH)
-      txAudio.gain(i, 1.0);
-    else
+void UBitxDSP::muteRxIn() {
+  for (int i = 0; i < NUM_RX_AUDIO_CH; i++) {
+    state.rxIn[RxAudioCh(i)].mute = true;
+    rxAudio.gain(i, 0.0);
+  }
+}
+
+void UBitxDSP::muteRxIn(RxAudioCh ch) {
+  if (ch < NUM_RX_AUDIO_CH) {
+    if (!state.rxIn[ch].mute) {
+      state.rxIn[ch].mute = true;
+      rxAudio.gain(ch, 0.0);
+    }
+  }
+}
+
+void UBitxDSP::unmuteRxIn(RxAudioCh ch) {
+  if (ch < NUM_RX_AUDIO_CH) {
+    if (state.rxIn[ch].mute) {
+      state.rxIn[ch].mute = false;
+      rxAudio.gain(ch, state.rxIn[ch].level);
+    }
+  }
+}
+
+void UBitxDSP::setLineOutLevel(float level) {
+  state.rxOut[LINE_OUT].level = level;
+  lineOutAmp.gain(state.rxOut[LINE_OUT].mute ? 0.0 : state.rxOut[LINE_OUT].level);
+}
+
+void UBitxDSP::setUSBOutLevel(float level) {
+  state.rxOut[USB_OUT].level = level;
+  usbOutAmp.gain(state.rxOut[USB_OUT].mute ? 0.0 : state.rxOut[USB_OUT].level);
+  usbBypassAmp.gain(state.rxOut[USB_OUT].mute ? 0.0 : state.rxOut[USB_OUT].level);
+}
+
+/**********************************************************************
+ * Transmit audio chain
+ **********************************************************************/
+
+void UBitxDSP::setTxInLevel(TxAudioCh ch, float level) {
+  if (ch < NUM_TX_AUDIO_CH) {
+    state.txIn[ch].level = level;
+    txAudio.gain(ch, state.txIn[ch].mute ? 0.0 : state.txIn[ch].level);
+  }
+}
+
+void UBitxDSP::muteTxIn() {
+  for (int i = 0; i < NUM_TX_AUDIO_CH; i++) {
+    state.txIn[TxAudioCh(i)].mute = true;
     txAudio.gain(i, 0.0);
   }
 }
 
-void UBitxDSP::txLineIn() {
-  // mute the rx audio
-  rxAudio.gain(RX_AUDIO_CH, 0.0);
-  // restore the tx line in audio
-  audioCtrl.inputSelect(AUDIO_INPUT_LINEIN);
-  for (int i = 0; i < 4; i++) {
-    if (i == TX_LINE_IN_CH)
-      txAudio.gain(i, 1.0);
-    else
-      txAudio.gain(i, 0.0);
+void UBitxDSP::muteTxIn(TxAudioCh ch) {
+  if (ch < NUM_TX_AUDIO_CH) {
+    if (!state.txIn[ch].mute) {
+      state.txIn[ch].mute = true;
+      txAudio.gain(ch, 0.0);
+    }
   }
 }
 
-void UBitxDSP::txUSBIn() {
-    // mute the rx audio
-  rxAudio.gain(RX_AUDIO_CH, 0.0);
-  // restore the tx usb in audio
-  audioCtrl.inputSelect(AUDIO_INPUT_LINEIN);
-  for (int i = 0; i < 4; i++) {
-    if (i == TX_USB_IN_CH1 || i == TX_USB_IN_CH2)
-      txAudio.gain(i, 1.0);
-    else
-      txAudio.gain(i, 0.0);
+void UBitxDSP::unmuteTxIn(TxAudioCh ch) {
+  if (ch < NUM_TX_AUDIO_CH) {
+    if (state.txIn[ch].mute) {
+      state.txIn[ch].mute = false;
+      rxAudio.gain(ch, state.txIn[ch].level);
+    }
   }
 }
 
+void UBitxDSP::setTxOutLevel(float level) {
+  state.txOut.level = level;
+  txOutAmp.gain(state.txOut.mute ? 0.0 : state.txOut.level);
+}
+
+void UBitxDSP::muteTxOut() {
+  if (!state.txOut.mute) {
+    state.txOut.mute = true;
+    txOutAmp.gain(0.0);
+  }
+}
+
+void UBitxDSP::unmuteTxOut() {
+  if (state.txOut.mute) {
+    state.txOut.mute = false;
+    txOutAmp.gain(state.txOut.level);
+  }
+}
+
+void UBitxDSP::setLineInLevel(float level) {
+  state.txIn[TX_LINE].level = level;
+  txAudio.gain(TX_LINE, state.txIn[TX_LINE].mute ? 0.0 : state.txIn[TX_LINE].level);  
+}
+
+void UBitxDSP::setUSBInLevel(float level) {
+  state.txIn[TX_USB].level = level;
+  txAudio.gain(TX_USB, state.txIn[TX_USB].mute ? 0.0 : state.txIn[TX_USB].level);    
+}
+
+void UBitxDSP::setTxAudioIn(TxAudioIn src, bool isTemp) {
+  if (!isTemp) {
+    txSrc = src;
+  }
+
+  if (!isTx) {
+    muteTxIn();     // Mute all channels, then unmute the desired ones.
+    switch (src) {  // Don't switch inputs while transmitting.
+      case MIC_IN:
+      // Note that we can't actually use the VOX code on the mic input,
+      // because we can't make the actual mic input active without
+      // losing our receive audio.  So, mic input is never actually 
+      // selected until it is time for it to transmit, which makes the
+      // VOX moot.  The caller must make use of an external, analog VOX
+      // circuit driving a GPIO pin, or something similar (or the PTT of
+      // course) to begin actually using the mic input.  So this case 
+      // just falls through to the line input.
+      
+      case LINE_IN:
+      unmuteTxIn(TX_LINE);
+      break;
+
+      case USB_IN:
+      unmuteTxIn(TX_USB);
+      break;
+  
+      case TUNE_IN:
+      tone1.amplitude(1.0);   // TODO - just do this once.
+      tone1.frequency(1500);  // TODO:  Make this dynamic based on CW (sidetone freq) versus data (1500 Hz)
+      unmuteTxIn(TX_TONE1);
+      break;
+  
+      case TWO_TONE_IN:
+      tone1.amplitude(1.0); // TODO - just do this once.
+      tone1.amplitude(1.0); // TODO - just do this once.
+      tone1.frequency(700);
+      tone2.frequency(1900);
+      unmuteTxIn(TX_TONE1);
+      unmuteTxIn(TX_TONE2);
+      break;
+
+      default:
+      // should never happen
+      break;
+    }
+  }
+}
+
+/**********************************************************************
+ * Receive audio filter (band pass)
+ **********************************************************************/
+
+const int minRxFilterLo = MIN_RX_FILTER_LO;
+const int maxRxFilterHi = MAX_RX_FILTER_HI;
+const int minRxFilterWidth = MIN_RX_FILTER_WIDTH;
+const int maxRxFilterWidth = MAX_RX_FILTER_WIDTH;
+const int minRxFilterCenter = MIN_RX_FILTER_CENTER;
+const int maxRxFilterCenter = MAX_RX_FILTER_CENTER;
+
+/*!
+ *  @brief  Bypass the RX audio filter.
+ */
+void UBitxDSP::bypassRxFilter() {
+  rxFilter.begin(FIR_PASSTHRU, NUM_COEFFICIENTS);
+}
+
+/*!
+    @brief  Update the RX audio filter using the currently set low and
+            high frequencies.  This is called by each of the public
+            filter methods to update the filter with new frequencies.
+*/
+void UBitxDSP::updateRxFilter() {
+  audioFilter(coefficients, NUM_COEFFICIENTS, ID_BANDPASS, W_HAMMING, double(state.rxFilterLo), double(state.rxFilterHi));
+  rxFilter.begin(coefficients, NUM_COEFFICIENTS);
+}
+
+void UBitxDSP::setRxFilter(int lo, int hi) {
+  if (hi < lo + minRxFilterWidth) {
+    hi = lo + minRxFilterWidth;
+  }
+  if (hi > maxRxFilterHi) {
+    hi = maxRxFilterHi;
+  }
+  if (lo > hi - minRxFilterWidth) {
+    lo = hi - minRxFilterWidth;
+  }
+  if (lo < minRxFilterLo) {
+    lo = minRxFilterLo;
+  }
+  state.rxFilterHi = hi;
+  state.rxFilterLo = lo;
+  updateRxFilter();
+}
+
+void UBitxDSP::setRxFilterLo(int lo) {
+  if (lo > state.rxFilterHi - minRxFilterWidth) {
+    lo = state.rxFilterHi - minRxFilterWidth;
+  }
+  if (lo < minRxFilterLo) {
+    lo = minRxFilterLo;
+  }
+  state.rxFilterLo = lo;
+  updateRxFilter();
+}
+
+void UBitxDSP::setRxFilterHi(int hi) {
+  if (hi < state.rxFilterLo + minRxFilterWidth) {
+    hi = state.rxFilterLo + minRxFilterWidth;
+  }
+  if (hi > maxRxFilterHi) {
+    hi = maxRxFilterHi;
+  }
+  state.rxFilterHi = hi;
+  updateRxFilter();
+}
+
+void UBitxDSP::setRxFilterWidth(int width) {
+  if (width < minRxFilterWidth) {
+    width = minRxFilterWidth;
+  } else if (width > maxRxFilterWidth) {
+    width = maxRxFilterWidth;
+  }
+  int center = (state.rxFilterHi + state.rxFilterLo) / 2;
+  int lo = center - (width / 2);
+  int hi = center + (width / 2);
+  setRxFilter(lo, hi);
+}
+
+void UBitxDSP::setRxFilterCenter(int center) {
+  if (center < minRxFilterCenter) {
+    center = minRxFilterCenter;
+  } else if (center > maxRxFilterCenter) {
+    center = maxRxFilterCenter;
+  }
+  int width = state.rxFilterHi - state.rxFilterLo;
+  int lo = center - (width / 2);
+  int hi = center + (width / 2);
+  setRxFilter(lo, hi);
+}
+
+/**********************************************************************
+ * Transmit Voice-Operated-Switch (VOX)
+ **********************************************************************/
+
+float UBitxDSP::getVoxLevel() const {
+  if (return txVoxLevel.available()) {
+    prevVox = txVoxLevel.read();
+  }
+  return prevVox;
+}
+
+/**********************************************************************
+ * Singleton - the DSP instance
+ **********************************************************************/
+
+// TODO:  Fix this. This won't work... this compilation unit won't be
+// able to instantiate a class it doesn't know about.
+
+#ifndef UBITXDSP_CLASS
+#define UBITXDSP_CLASS UBitxDSP
+#endif
+
+UBITXDSP_CLASS theDSP;
+UBitxDSP& DSP = theDSP;
+
+/*
+    NOTES
+
+    Major functions:
+      - tx() - start transmitting / pause receiving
+      - rx() - stop transmitting / resume receiving
+      - setTxSource() - set the TX audio source to MIC_IN, LINE_IN, or USB_IN
+                      - also sets the relevant VOX source/parameters (as applicable)
+
+    Receive audio chain:
+      -
+*/
+
 //======================================================================
 // EOF
 //======================================================================

TeensyDSP/DSP.h

@@ -5,35 +5,276 @@
 #ifndef __DSP_h__
 #define __DSP_h__
 
+#include <Audio.h>
+#include <dynamicFilters.h>
 #include "Debug.h"
 
-enum TRState {
-  TRANSMIT,
-  RECEIVE
+/**********************************************************************
+ * Macros
+ **********************************************************************/
+
+#define MIN_RX_FILTER_LO      (0.0)     //! Min allowable value of the RX filter low-cut frequency
+#define MAX_RX_FILTER_HI      (5000.0)  //! Max allowable value of the RX filter hi-cut frequency
+#define MIN_RX_FILTER_WIDTH   (0.0)     //! Min allowable value of the RX filter bandwidth
+#define MAX_RX_FILTER_WIDTH   (5000.0)  //! Max allowable value of the RX filter bandwidth
+#define MIN_RX_FILTER_CENTER  (0.0)     //! Min allowable value of the RX filter center frequency
+#define MAX_RX_FILTER_CENTER  (5000.0)  //! Max allowable value of the RX filter center frequency
+
+#define DSP_MILLIS_PER_UPDATE (100)   //! Number of milliseconds between update of the DSP object
+
+#define TX_VOX_MIC_THRESH   (0.0)     //! Threshold for mic VOX (not implemented, since mic requires special handling)
+#define TX_VOX_LINE_THRESH  (0.25)    //! Threshold for line in VOX
+#define TX_VOX_USB_THRESH   (0.25)    //! Threshold for USB VOX
+#define TX_VOX_TUNE_THRESH  (0.0)     //! Threshold for tune (single tone) VOX (not expected to be used)
+#define TX_VOX_TT_THRESH    (0.0)     //! Threshold for two-tone VOX (not expected to be used)
+#define TX_VOX_DELAY        (500)     //! VOX delay in milliseconds
+
+/**********************************************************************
+ * Enumerations
+ **********************************************************************/
+
+//! Defines the four separate RX audio input channels available.
+enum RxAudioCh {
+  RX_AUDIO = 0,       // Normal receiver audio input channel
+  RX_SPARE,           // Not used
+  RX_TONE1 ,          // Optional tone #1 input channel (currently not used)
+  RX_TONE2,           // Optional tone #2 input channel (currently not used)
+  NUM_RX_AUDIO_CH     // Total number of channels
 };
 
+//! Defines the different RX audio inputs (not channels).
 enum RxAudioIn {
-  RIG_AUDIO
+  RIG_IN = 0,         // Normal rig input (receiver audio)
+  NUM_RX_AUDIO_IN     // Total number of inputs
 };
 
+//! Defines the different RX audio outputs.
+enum RxAudioOut {
+  LINE_OUT = 0,       // Line audio out (and speaker)
+  USB_OUT,            // USB audio out
+  NUM_RX_AUDIO_OUT
+};
+
+//! Defines the four separate TX audio input channels available.
+enum TxAudioCh {
+  TX_LINE = 0,        // Line and/or mic audio input channel
+  TX_USB,             // USB audio input channel
+  TX_TONE1,           // Audio tone #1 input channel
+  TX_TONE2,           // Audio tone #2 input channel
+  NUM_TX_AUDIO_CH     // Toal number of channels
+};
+
+//! Defines the different TX audio input sources (not channels!).
 enum TxAudioIn {
-  MIC_IN,
-  LINE_IN,
-  USB_IN
+  MIC_IN = 0,         // Microphone transmit audio input
+  LINE_IN,            // Line ("AUX") transmit audio input
+  USB_IN,             // USB transmit audio input
+  TUNE_IN,            // Tune input (transmits a single tone)
+  TWO_TONE_IN,        // Two tone audio input (transmits two tones)
+  NUM_TX_AUDIO_IN     // Total number of inputs
 };
 
+/**********************************************************************
+ * Classes
+ **********************************************************************/
+
+//! Defines parameters for a simple audio channel that can be muted.
+struct AudioChannel {
+  bool mute = false;
+  float level = 0.0;
+};
+
+/*!
+ *  Contains the current 'persistent' state of the DSP.
+ *  This includes all audio-specific state that can be saved to, or
+ *  restored from, EEPROM.  It does not include 'transient' state (such 
+ *  as whether we're currently transmitting or receiving).
+ */
+struct DSPState {
+ 
+  //! Receiver audio inputs; all default to muted.
+  AudioChannel rxIn[NUM_RX_AUDIO_CH] = {
+    {true, 1.0},    // audio
+    {true, 0.0},    // spare 1
+    {true, 0.0},    // spare 2
+    {true, 0.0}     // spare 3
+  };
+
+  //! Receiver audio output; defaults to un
+  muted.
+  AudioChannel rxOut[NUM_RX_AUDIO_OUT] = {
+    {false, 1.0},   // line
+    {false, 1.0}    // USB
+  };
+
+  //! Transmitter audio inputs; all default to muted.
+  AudioChannel txIn[NUM_TX_AUDIO_CH] = {
+    {true, 0.1},    // line
+    {true, 0.1},    // USB
+    {true, 0.1},    // tone 1
+    {true, 0.1}     // tone 2
+  };
+
+  //! Tranmitter audio output; defaults to muted.
+  AudioChannel txOut = {true, 1.0};
+
+  //! Current RX filter settings
+  float rxFilterLo = 300.0;
+  float rxFilterHi = 3000.0;
+};
+
+/*!
+ *  Defines the DSP subsystem of the UBitx V5X.
+ *  The DSP subsystem, which relies on the Teensy Audio Library, is
+ *  responsible for setting up the audio inputs and outputs for both
+ *  receive (RX) and transmit (TX) audio, maintaining the correct path
+ *  between inputs and outputs based on current TX/RX state, and setting
+ *  up audio filters and other audio-based modules for the RX and TX
+ *  audio paths.
+ */
 class UBitxDSP {
+
+  /********************************************************************
+   * Object creation/deletion
+   ********************************************************************/
+
+  public:  
+  UBitxDSP() {}
+
+  /********************************************************************
+   * Basic administration
+   ********************************************************************/
+
   public:  
-  UBitxDSP() {};
   void begin();
+  void update();
   void end();
+
+  /********************************************************************
+   * Transmit/Receive switching
+   ********************************************************************/
+  
+  public:
   void rx();
-  void txMicIn();
-  void txLineIn();
-  void txUSBIn();
+  inline void tx() { tx(txSrc); }
+  void tx(TxAudioIn src);
+
+  /********************************************************************
+   * General audio setup -- called via begin()
+   ********************************************************************/
+
+  protected:
+  virtual void setupRxAudio();
+  virtual void setupTxAudio();
+
+  /********************************************************************
+   * Receive audio chain
+   ********************************************************************/
+
+  // Basic control of RX audio inputs and outputs.
+  public:
+  void setRxInLevel(RxAudioCh ch, float level);     // Set the audio input level for a given channel.
+  void muteRxIn();                                  // Mute all RX audio input channels.
+  void muteRxIn(RxAudioCh ch);                      // Mute a specific RX audio input channel.
+  void unmuteRxIn(RxAudioCh ch);                    // Un-mute a specific RX audio input channel.
+  
+  void setLineOutLevel(float level);                // Set the line output level (0.0 - 1.0).
+  void setUSBOutLevel(float level);                 // Set the USB output level (0.0 - 1.0).
+
+  /********************************************************************
+   * Transmit audio chain
+   ********************************************************************/
+
+  // Basic control of TX audio inputs and outputs.
+  public:
+  void setTxInLevel(TxAudioCh ch, float level); // Set the audio input level for a given channel.
+  void muteTxIn();                              // Mute all TX audio input channels.
+  void muteTxIn(TxAudioCh ch);                  // Mute a specific TX audio input channel.
+  void unmuteTxIn(TxAudioCh ch);                // Un-mute a specific TX audio input channel.
+  
+  void setTxOutLevel(float level);              // Set the TX audio output level.
+  void muteTxOut();                             // Mute the TX audio output.
+  void unmuteTxOut();                           // Un-mute the TX audio output.
+
+  void setLineInLevel(float level);                // Set the line input level (0.0 - 1.0).
+  void setUSBInLevel(float level);                 // Set the USB input level (0.0 - 1.0).
+
+  // Transmit audio selection (may be overriden at actual transmit time).
+  public:
+  void setTxAudioIn(TxAudioIn src, bool isTemp = false);  // Select a specific TX audio input path, and identify it as permanent or temporary.
+  inline TxAudioIn getTxAudioIn() const { return txSrc; } // Return the current TX audio input.
+
+  // Mic input controls.
+  public:
+  inline void setMicGain(float level) { micGain = static_cast<unsigned>(level * 63.0); } // Set the mic gain.
+
+  /********************************************************************
+   * Receive audio filter (band pass)
+   ********************************************************************/
+
+  public:
+  void bypassRxFilter();
+  void updateRxFilter();
+  
+  void setRxFilter(float lo, float hi);
+  void setRxFilterLo(float lo);
+  void setRxFilterHi(float hi);
+  void setRxFilterWidth(float width);
+  void setRxFilterCenter(float center);
+
+  /*!
+   *  Get the current low frequency bound of the RX band pass filter.
+   *  @return The low frequency bound.
+   */
+  inline float getRxFilterLo() const { return state.rxFilterLo; }
+
+  /*!
+   *  Get the current high frequency bound of the RX band pass filter.
+   *  @return The high frequency bound.
+   */
+  inline float getRxFilterHi() const { return state.rxFilterHi; }
+
+  /*!
+   *  Get the current width of the RX band pass filter.
+   *  @return The filter width.
+   */
+  inline float getRxFilterWidth() const { return state.rxFilterHi - state.rxFilterLo; }
+
+  /*!
+   *  Get the current center frequency of the RX band pass filter.
+   *  @return The center frequency.
+   */
+  inline float getRxFilterCenter() const { return (state.rxFilterHi + state.rxFilterLo) / 2.0; }
+
+  /********************************************************************
+   * Transmit Voice-Operated-Switch (VOX)
+   ********************************************************************/
+
+  public:
+  float getVoxLevel() const;
+
+  /********************************************************************
+   * Private state
+   ********************************************************************/
+   
+  private:
+  DSPState state;
+
+  bool isTx = false;
+  TxAudioIn txSrc = MIC_IN;
+  TxAudioIn txSrcLatched = MIC_IN;
+
+  short coefficients[NUM_COEFFICIENTS] = {0};
+  
+  elapsedMillis sinceLastUpdate = 0;
+  float usbVol = 0.0;
+
+  unsigned micGain = 0;
+
+  float prevVox = 0.0;
 };
 
-extern UBitxDSP DSP;
+extern UBitxDSP& DSP;
 
 #endif
 

TeensyDSP/Debug.h

@@ -7,12 +7,14 @@
 #define DBGPRINT(MSG) do { Serial.print("DBG: "); Serial.print(MSG); } while (0)
 #define DBGPRINTLN(MSG) do { Serial.print("DBG: "); Serial.println(MSG); } while (0)
 #define DBGNEWLINE() do { Serial.println(); } while (0)
-#define DBGCMD(CMD) do { Serial.println("DBG: "); Serial.println(#CMD); CMD; } while (0)
+#define DBGCMD(CMD) do { Serial.print("DBG: "); Serial.println(#CMD); CMD; } while (0)
+#define IFDEBUG(CMD) do { CMD; } while (0)
 #else
 #define DBGPRINT(MSG) do {} while (0)
 #define DBGPRINTLN(MSG) do {} while (0)
 #define DBGNEWLINE() do {} while (0)
 #define DBGCMD(CMD) do { CMD; } while (0)
+#define IFDEBUG(CMD) do {} while (0)
 #endif
 
 #endif

TeensyDSP/Keyer.cpp

@@ -0,0 +1,185 @@
+//======================================================================
+//
+//  nanoIO paddle keyer (c) 2018, David Freese, W1HKJ
+//
+//  based on code from Iambic Keyer Code Keyer Sketch
+//  Copyright (c) 2009 Steven T. Elliott
+//
+//  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:
+//
+//  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+//  Boston, MA  02111-1307  USA
+//
+//======================================================================
+
+#include <Arduino.h>
+//#include "TimerOne.h"
+//#include "config.h"
+#include "Keyer.h"
+
+const uint8_t LP_in = KEYER_LEFT_PADDLE_PIN;
+const uint8_t RP_in = KEYER_RIGHT_PADDLE_PIN;
+
+//#define ST_Freq 600   // Set the Sidetone Frequency to 600 Hz
+
+//======================================================================
+//  keyerControl bit definitions
+//
+#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
+//======================================================================
+//
+//  State Machine Defines
+
+enum KSTYPE { IDLE, CHK_DIT, CHK_DAH, KEYED_PREP, KEYED, INTER_ELEMENT };
+
+UBitxKeyer::UBitxKeyer(int wpm, float weight):
+speed(wpm), symWeight(weight)
+{
+  // Setup outputs
+  pinMode(LP_in, INPUT_PULLUP);            // sets Left Paddle digital pin as input
+  pinMode(RP_in, INPUT_PULLUP);            // sets Right Paddle digital pin as input
+
+  keyerState = IDLE;
+  keyerControl = 0;
+  keyMode = IAMBICA;
+  keyDown = false;
+
+  calcRatio();
+}
+
+// Calculate the length of dot, dash and silence
+void UBitxKeyer::calcRatio()
+{
+  float w = (1 + symWeight) / (symWeight -1);
+  spaceLen = (1200 / speed);
+  dotLen = spaceLen * (w - 1);
+  dashLen =  (1 + w) * spaceLen;
+}
+
+void UBitxKeyer::setWPM(int wpm)
+{
+  speed = wpm;
+  calcRatio();
+}
+
+//======================================================================
+//    Latch paddle press
+//======================================================================
+
+void UBitxKeyer::updatePaddleLatch()
+{
+  if (digitalRead(LP_in) == LOW) {
+    keyerControl |= DIT_L;
+  }
+  if (digitalRead(RP_in) == LOW) {
+    keyerControl |= DAH_L;
+  }
+}
+
+bool UBitxKeyer::doPaddles()
+{
+  if (keyMode == STRAIGHT) { // Straight Key
+    if ((digitalRead(LP_in) == LOW) || (digitalRead(RP_in) == LOW)) {
+      keyDown = true;
+      return true;
+    } else {
+      keyDown = false;
+    }
+    return false;
+  }
+
+  // keyerControl contains processing flags and keyer mode bits
+  // Supports Iambic A and B
+  // State machine based, uses calls to millis() for timing.
+  switch (keyerState) {
+    case IDLE:      // Wait for direct or latched paddle press
+      if ((digitalRead(LP_in) == LOW) || (digitalRead(RP_in) == LOW) || (keyerControl & 0x03)) {
+        updatePaddleLatch();
+        keyerState = CHK_DIT;
+        // letting this fall through // return true;
+      } else {
+        return false;
+      }
+//      break;
+
+    case CHK_DIT:      // See if the dit paddle was pressed
+      if (keyerControl & DIT_L) {
+        keyerControl |= DIT_PROC;
+        ktimer = dotLen;
+        keyerState = KEYED_PREP;
+        return true;
+      } else { // fall through
+        keyerState = CHK_DAH;
+      }
+      
+    case CHK_DAH:      // See if dah paddle was pressed
+      if (keyerControl & DAH_L) {
+        ktimer = dashLen;
+        keyerState = KEYED_PREP;
+        // letting this fall through // return true;
+      } else {
+        keyerState = IDLE;
+        return false;
+      }
+//      break;
+
+    case KEYED_PREP:                     // Assert key down, start timing
+                                         // state shared for dit or dah
+      keyDown = true;
+      ktimer += millis();                // set ktimer to interval end time
+      keyerControl &= ~(DIT_L + DAH_L);  // clear both paddle latch bits
+      keyerState = KEYED;                // next state
+      // letting this fall through // return true;
+//      break;
+
+    case KEYED:                          // Wait for timer to expire
+      if (millis() > ktimer) {           // are we at end of key down ?
+        keyDown = false;
+        ktimer = millis() + spaceLen;  // inter-element time
+        keyerState = INTER_ELEMENT;      // next state
+        // letting this fall through // return true;
+      } else if (keyMode == IAMBICB) {     // Iambic B Mode ?
+        updatePaddleLatch();           // yes, early paddle latch in Iambic B mode
+      } else {
+        return true;
+      }
+//      break;
+
+    case INTER_ELEMENT:                 // Insert time between dits/dahs
+      updatePaddleLatch();              // 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
+          return true;
+        } else {
+          keyerControl &= ~(DAH_L);     // clear dah latch
+          keyerState = IDLE;            // go idle
+          return false;
+        }
+      } else {
+        return true;
+      }
+//      break;
+  }
+
+  return false; // resolve compiler warning; do we ever get here?
+}
+
+UBitxKeyer basicKeyer(15, 3.0);
+UBitxKeyer& Keyer = basicKeyer;
+
+//======================================================================
+// EOF
+//======================================================================

TeensyDSP/Keyer.h

@@ -0,0 +1,79 @@
+//**********************************************************************
+//
+// Keyer, a part of nanoIO
+//
+//  nanoIO paddle keyer (c) 2018, David Freese, W1HKJ
+//
+//  based on code from Iambic Keyer Code Keyer Sketch
+//  Copyright (c) 2009 Steven T. Elliott
+//
+// nanoIO is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// nanoIO is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with fldigi.  If not, see <http://www.gnu.org/licenses/>.
+//
+//Revisions:
+//
+//1.0.0:  Initial release
+//
+//**********************************************************************
+
+
+#ifndef __Keyer_h__
+#define __Keyer_h__
+
+#define IAMBICA 0
+#define IAMBICB 1
+#define STRAIGHT 2
+
+#define KEYER_LEFT_PADDLE_PIN   17
+#define KEYER_RIGHT_PADDLE_PIN  16
+
+class UBitxKeyer
+{
+public:
+  UBitxKeyer(int wpm, float weight);
+  //void cw_pin(int pin);
+  //void ptt_pin(int pin);
+  void setWPM(int wpm);
+  inline void setMode(int mode) { keyMode = mode; }
+  inline int  getMode() { return keyMode; }
+  inline bool isDown() { return keyDown; }
+//  void setWeight();
+ 
+  bool doPaddles();
+
+private:
+  void calcRatio();
+  void updatePaddleLatch();
+
+  bool keyDown;
+  
+  long ktimer;
+
+  int speed;
+  int dashLen;  // Length of dash
+  int dotLen;   // Length of dot
+  int spaceLen; // Length of space
+  float symWeight;
+
+  char keyerControl;
+  char keyerState;
+  int  keyMode;
+};
+
+extern UBitxKeyer& Keyer;
+
+#endif
+
+//======================================================================
+// EOF
+//======================================================================

TeensyDSP/Nextion.cpp

@@ -30,10 +30,10 @@ float calcVSWR = 0.0;
 float L_calcVSWR = 0.0;
 byte scaledVSWR = 0;
 byte L_scaledVSWR = 0;
-int fwdPower = 0;
-int L_fwdPower = 0;
-int revPower = 0;
-int L_revPower = 0;
+float fwdPower = 0;
+float L_fwdPower = 0;
+float revPower = 0;
+float L_revPower = 0;
 
 
 //Control must have prefix 'v' or 's'

TeensyDSP/Nextion.h

@@ -107,11 +107,11 @@ extern float L_calcVSWR;
 extern byte scaledVSWR;
 extern byte L_scaledVSWR;
 
-extern int fwdPower;
-extern int L_fwdPower;
+extern float fwdPower;
+extern float L_fwdPower;
 
-extern int revPower;
-extern int L_revPower;
+extern float revPower;
+extern float L_revPower;
 
 void sendHeader(char varType, char varIndex);
 void sendCommandUL(char varIndex, unsigned long sendValue);

TeensyDSP/Rig.cpp

@@ -0,0 +1,3 @@
+#include "Rig.h"
+
+UBitxRig Rig;

TeensyDSP/Rig.h

@@ -0,0 +1,73 @@
+#ifndef __Rig_h__
+#define __Rig_h__
+
+#include "RigState.h"
+
+struct RigState {
+};
+
+class UBitxRig {
+  public:
+  inline void begin() {}
+  inline void update() {}
+  
+  inline unsigned getFreqA() const { return radState.getFreqA(); }
+  inline unsigned getFreqB() const { return radState.getFreqB(); }
+  inline int getRIT() const { return radState.getRIT(); }
+  inline int getXIT() const { return radState.getXIT(); }
+  inline bool isVFOA() const { return radState.isVFOA(); }
+  inline bool isVFOB() const { return radState.isVFOB(); }
+  inline bool isSplit() const { return radState.isSplit(); }
+  inline bool isRIT() const { return radState.isRIT(); }
+  inline bool isXIT() const { return radState.isXIT(); }
+  inline bool isModeCWAny() const { return radState.isModeCWAny(); }
+  inline bool isModeCW() const { return radState.isModeCW(); }
+  inline bool isModeCWR() const { return radState.isModeCWR(); }
+  inline bool isModeUSB() const { return radState.isModeUSB(); }
+  inline bool isModeLSB() const { return radState.isModeLSB(); }
+  inline bool isAI() const { return autoInfo; }
+
+  inline void setFreqA(unsigned freq) { catState.setFreqA(freq); }
+  inline void setFreqB(unsigned freq) { catState.setFreqB(freq); }
+  inline void setRIT(int freq) { catState.setRIT(freq); }
+  inline void setXIT(int freq) { catState.setXIT(freq); }
+  inline void setVFOA() { catState.setVFOA(); }
+  inline void setVFOB() { catState.setVFOB(); }
+  inline void setSplitOn() { catState.setSplitOn(); }
+  inline void setSplitOff() { catState.setSplitOff(); }
+  inline void setRITOn() { catState.setRITOn(); }
+  inline void setRITOff() { catState.setRITOff(); }
+  inline void setXITOn() { catState.setXITOn(); }
+  inline void setXITOff() { catState.setXITOff(); }
+  inline void setCW() { catState.setCW(); }
+  inline void setCWR() { catState.setCWR(); }
+  inline void setUSB() { catState.setUSB(); }
+  inline void setLSB() { catState.setLSB(); }
+
+  inline void setAI(bool on) { autoInfo = on; }
+  inline void aiOn() { autoInfo = true; }
+  inline void aiOff() { autoInfo = false; }
+
+  inline UBitxRigState& cat() { return catState; }
+  inline UBitxRigState& rad() { return radState; }
+
+  /********************************************************************/
+  // New functional/mode-based Rig methods
+
+  // AG
+  //void setVolOut(uint8_t level);
+  //uint8_t getVolOut();
+
+  // BD/BU
+  //void setBand();
+  //void getBand();
+
+  private:
+  UBitxRigState catState;
+  UBitxRigState radState;  
+  bool autoInfo = false;  // TODO: Move this to rig state struct
+};
+
+extern UBitxRig Rig;
+
+#endif

TeensyDSP/RigState.cpp

@@ -0,0 +1,416 @@
+/*!
+ *  @file     RigState.cpp
+ *  
+ *  @mainpage uBITX V5X Software - RigState
+ *  
+ *  @section  introsec Introduction
+ *  
+ *  TBD
+ *  
+ *  @section  dependencies Dependencies
+ *  
+ *  TBD
+ *  
+ *  @section  author Author
+ *  
+ *  Written by Rob "Scrape" French, KC4UPR
+ *  
+ *  @section  license License
+ *  
+ *  TBD
+ */
+
+#include "Debug.h"
+#include "RigState.h"
+
+/***********************************************************************
+ * COMMON FUNCTIONS
+ * 
+ * The following are all common to RigState objects, whether on the
+ * Raduino or on the TeensyDSP.
+ **********************************************************************/
+
+static uint32_t zeroes[1] = {0};  // used to transmit zeroes
+
+/*!
+ *  @brief  Begin using the RigState object.  In order to force an 
+ *          initial update (i.e. sending current state to the remote 
+ *          device), all fields are initially marked dirty.
+ */
+void UBitxRigState::begin() {
+  setDirty();
+}
+
+/***********************************************************************
+ * RADUINO FUNCTIONS
+ * 
+ * The following are specific to the Raduino implementation.  Note that
+ * this depends on the use of the TEENSYDUINO #define, which may result
+ * in a fragile implementation for other development environments (e.g.
+ * if the normal Arduino IDE is not being used).
+ **********************************************************************/
+
+#ifndef TEENSYDUINO
+
+#include <Wire.h>
+#include "ubitx.h"
+#include "ubitx_eemap.h"
+
+extern unsigned long frequency, ritRxFrequency, ritTxFrequency;
+extern unsigned long vfoA;
+extern unsigned long vfoB;
+extern char cwMode;
+extern char isUSB;
+extern char vfoActive;
+extern char ritOn;
+extern char splitOn;
+extern char inTx;
+void setFrequency(unsigned long);
+
+/*!
+ *  @brief  Send the RigState from the Raduino to the TeensyDSP.  The
+ *          basic process is:  (1) read in any updated (dirty) data
+ *          from the Raduino's state variables; (2) transmit the dirty
+ *          data to the TeensyDSP; (2a) for clean data, zeroes are
+ *          transmitted; (3) mark all data as clean.
+ */
+void UBitxRigState::send_RIGINF() {
+  readDirty();
+  Wire.beginTransmission(I2CMETER_ADDR);
+  Wire.write(I2CMETER_RIGINF);
+  for (RigStateWord i = DIRTY_WORD; i < NUM_WORDS; i++) {
+    if (i == DIRTY_WORD || isDirty(i)) {
+      // always send the current dirty bits
+      // or, bytes for updated (dirty) fields
+      Wire.write((byte*)&data[i], sizeof(uint32_t));
+    } else {
+      // otherwise, send out zeroes
+      Wire.write((byte*)&zeroes, sizeof(uint32_t));
+      //----------------------------------------------------------------
+      // NOTE:  I am sending these zeroed out fields under a possibly
+      // mistaken assumption that in doing so, I will be sending a 
+      // constant voltage on the SDA line most of the time, i.e. no
+      // bit changes, and so this will help reduce noise generated by
+      // I2C traffic (since most of the time there will be no updates.)
+      //----------------------------------------------------------------
+    }
+  }
+  Wire.endTransmission();  
+  IFDEBUG( serialHexState("Sent") );
+  //IFDEBUG( serialPrettyState("Sent") );
+  setClean();
+}
+
+//  delay(1);   // 1ms - some delay required between ending transmission and requesting?
+
+/*!
+ *  @brief  Receive the RigState from the TeensyDSP.  This generally
+ *          reflects changes due to CAT transmission to the TeensyDSP.
+ *  @param  numBytes
+ *          Number of bytes received from the TeensyDSP.
+ */
+void UBitxRigState::receive_RIGINF(int numBytes) {
+  // Retrieve all of the deltas.  Mark any received fields as dirty.  It
+  // is assumed that send_RIGINF() was called immedaitely before this,
+  // so the fields are already clean.
+  byte* ptr = (byte*)&data;
+  Wire.requestFrom(I2CMETER_ADDR, sizeof(data));
+  for (RigStateWord i = DIRTY_WORD; i < NUM_WORDS && Wire.available(); i++) {
+    for (size_t j = 0; j < sizeof(uint32_t) && Wire.available(); j++) {
+      byte incomingByte = Wire.read();
+      if (i == DIRTY_WORD || isDirty(i)) {
+        // always overwrite the dirty bits
+        // and, update bytes for fields marked dirty
+        *ptr = incomingByte;
+      }
+      ptr++;
+    }
+  }
+  writeDirty();
+  IFDEBUG( serialHexState("Rcvd") );
+  //IFDEBUG( serialPrettyState("Rcvd") );
+  setClean(); // They get marked dirty as req'd during readDirty().
+}
+
+/*!
+ *  @brief  Write dirty fields from the RigState out to the Raduino 
+ *          variables.
+ */
+void UBitxRigState::writeDirty() {
+  // VFO A frequency
+  if (isDirty(VFOA_WORD)) {
+    if (vfoActive == VFO_A) {
+      setFrequency(getFreqA());
+    } else {
+      vfoA = getFreqA();
+    }    
+  }
+
+  // VFO B frequency
+  if (isDirty(VFOB_WORD)) {
+    if (vfoActive == VFO_B) {
+      setFrequency(getFreqB());
+    } else {
+      vfoB = getFreqB(); 
+    }    
+  }
+
+  // RIT and XIT frequencies
+  if (isDirty(OFFSETS_WORD)) {
+    // RIT
+    ritRxFrequency = getRIT() + ritTxFrequency;
+    if (ritOn == 1) {
+      if (inTx == 0) {
+        setFrequency(ritRxFrequency);
+      } else {
+        setFrequency(ritTxFrequency);
+      }
+    }
+    // XIT - TODO
+  }
+
+  // VFO A/B selection
+  if (isDirty(FLAGS_WORD)) {
+    char prev = vfoActive;
+    vfoActive = isVFOA() ? VFO_A : VFO_B;
+    if (vfoActive != prev) {
+      if (vfoActive == VFO_A) {
+        if (vfoA != frequency) {
+          setFrequency(vfoA);      
+        } 
+      } else if (vfoActive == VFO_B) {
+        if (vfoB != frequency) {
+          setFrequency(vfoB);
+        }
+      }
+    }  
+
+    // Split on/off
+    splitOn = isSplit() ? 1 : 0;
+
+    // RIT on/off
+    prev = ritOn;
+    ritOn = isRIT() ? 1 : 0;
+    if (ritOn != prev) {
+      if ((ritOn == 1) && (inTx == 0)) {
+        setFrequency(ritRxFrequency);
+      }
+    }
+
+    // XIT on/off
+    // TODO
+
+    // Mode
+    prev = (cwMode << 1) | isUSB;
+    isUSB = isModeUSB() ? 1 : 0;
+    if (isModeCW()) {
+      cwMode = 2; // 2 = cwu
+    } else if (isModeCWR()) {
+      cwMode = 1; // 1 = cwl
+    } else {
+      cwMode = 0; // 0 = no cw
+    }
+    if ((cwMode << 1) | isUSB != prev) {
+      setFrequency(frequency);
+    }
+  }
+}
+
+/*!
+ *  @brief  Read current Raduino variables into the RigState
+ *          (if they are changed) and set the appropriate dirty flags.
+ *  @param  r
+ *          RigState reference to put the values into.
+ */
+void UBitxRigState::readDirty() {
+  unsigned long freq;
+  short offset;
+  
+  // VFO A frequency
+  freq = (vfoActive == VFO_A) ? frequency : vfoA;
+  if (getFreqA() != freq) {
+    setFreqA(freq);
+  }
+
+  // VFO B frequency
+  freq = (vfoActive == VFO_B) ? frequency : vfoB;
+  if (getFreqB() != freq) {
+    setFreqB(freq);
+  }
+  
+  // RIT frequency
+  if (inTx) {
+    offset = ritRxFrequency - ritTxFrequency;
+  } else {
+    offset = frequency - ritTxFrequency;
+  }
+  if (getRIT() != offset) {
+    setRIT(offset);
+  }
+
+  // XIT frequency
+  offset = 0; // xitRxFrequency - frequency;
+  if (getXIT() != offset) {
+    setXIT(offset);
+  }
+ 
+  // VFO A/B selection
+  if (isVFOA() && vfoActive == VFO_B) {
+    setVFOB();
+  } else if (isVFOB() && vfoActive == VFO_A) {
+    setVFOA();
+  }
+
+  // Split selection
+  if (isSplit() && splitOn == 0) {
+    setSplitOff();
+  } else if (!isSplit() && splitOn != 0) {
+    setSplitOn();
+  }
+
+  // RIT selection
+  if (isRIT() && ritOn == 0) {
+    setRITOff();
+  } else if (!isRIT() && ritOn != 0) {
+    setRITOn();
+  }
+
+  // XIT selection
+  //setXITOff();
+  // TODO
+
+  // Mode
+  char prev = (isModeCW() ? 4 : 0) | (isModeCWR() ? 2 : 0) | (isModeUSB() ? 1 : 0);
+  char curr = (cwMode << 1) | isUSB;
+  if (curr != prev) {
+    if (cwMode == 2) {
+      setCW();
+    } else if (cwMode == 1) {
+      setCWR();
+    } else {
+      if (isUSB) {
+        setUSB();
+      } else {
+        setLSB();
+      }
+    }
+  }
+}
+
+/***********************************************************************
+ * TEENSYDSP FUNCTIONS
+ * 
+ * The following are specific to the TeensyDSP implementation.  Note
+ * that this depends on the use of the TEENSYDUINO #define, which may 
+ * result in a fragile implementation for other development environments 
+ * (e.g. if the normal Arduino IDE is not being used).
+ **********************************************************************/
+
+#else
+
+#include <i2c_t3.h>
+
+/*!
+ *  @brief  Receive RIGINF data from the Raduino.  This method should
+ *          be called on the TeensyDSP 'radState' (Raduino state) 
+ *          instance, when a RIGINF signal is received via I2C.  It 
+ *          receives the incoming data from the Raduino and updates the
+ *          state.
+ */
+void UBitxRigState::receive_RIGINF(int numBytes) {
+  byte* ptr = (byte*)&data;
+  setClean();  // we'll get new dirty bits via the I2C message
+  for (RigStateWord i = DIRTY_WORD; i < NUM_WORDS && Wire1.available(); i++) {
+    for (size_t j = 0; j < sizeof(uint32_t) && Wire1.available(); j++) {
+      byte incomingByte = Wire1.read();
+      if (i == DIRTY_WORD || isDirty(i)) {
+        // always overwrite the dirty bits
+        // and, update bytes for fields marked dirty
+        *ptr = incomingByte;
+      }
+      ptr++;
+    }
+  }
+
+  IFDEBUG( serialHexState("Rcvd") );
+  IFDEBUG( serialPrettyState("Rcvd") );
+}
+
+/**********************************************************************/
+/*!
+ *  @brief  Handle a RIGINF signal from the Raduino.  This method should
+ *          be called on the TeensyDSP 'catState' (CAT state) 
+ *          instance, when a RIGINF signal is received via I2C.  It 
+ *          sends a response to the Raduino via I2C, using the Wire1
+ *          interface.
+ */
+void UBitxRigState::send_RIGINF() {
+  for (RigStateWord i = DIRTY_WORD; i < NUM_WORDS; i++) {
+    if (i == DIRTY_WORD || isDirty(i)) {
+      // always send the current dirty bits
+      // or, bytes for updated (dirty) fields
+      Wire1.write((byte*)&data[i], sizeof(uint32_t));
+    } else {
+      // otherwise, send out zeroes
+      Wire1.write((byte*)&zeroes, sizeof(uint32_t));
+      //----------------------------------------------------------------
+      // NOTE:  I am sending these zeroed out fields under a possibly
+      // mistaken assumption that in doing so, I will be sending a 
+      // constant voltage on the SDA line most of the time, i.e. no
+      // bit changes, and so this will help reduce noise generated by
+      // I2C traffic (since most of the time there will be no updates.)
+      //----------------------------------------------------------------
+    }
+  }
+  IFDEBUG( serialHexState("Sent") );
+  IFDEBUG( serialPrettyState("Sent") );
+  setClean();  // now that we've sent them, they're clean
+  //--------------------------------------------------------------------
+  // TODO:  Need to look at possibly merging the two states together at
+  // this point.  The purpose would be to minimize the turnaround time
+  // for getting the most recent data to a CAT response.
+  //--------------------------------------------------------------------  
+}
+
+#endif
+
+#ifdef DEBUG
+
+char debugString[81] = {'\0'};
+
+void UBitxRigState::serialHexState(const char* label = "RigState") {
+  Serial.print(label);
+  sprintf(debugString, ": %#010lx, %#010lx, %#010lx, %#010lx, %#010lx", 
+    data[DIRTY_WORD], data[VFOA_WORD], data[VFOB_WORD], data[OFFSETS_WORD], data[FLAGS_WORD]);
+  Serial.println(debugString);
+}
+
+void UBitxRigState::serialPrettyState(const char* label = "RigState") {
+  Serial.println(label);
+  sprintf(debugString, "VFO A : %011ld %1c   /   VFO B : %011ld %1c", 
+    getFreqA(), isDirty(VFOA_WORD) ? 'D' : ' ', getFreqB(), isDirty(VFOB_WORD) ? 'D' : ' ');
+  Serial.println(debugString);
+  sprintf(debugString, "RIT   : %011ld %1c   /   XIT   : %011ld %1c", 
+    getRIT(), isDirty(OFFSETS_WORD) ? 'D' : ' ', getXIT(), isDirty(OFFSETS_WORD) ? 'D' : ' ');
+  Serial.println(debugString);
+  sprintf(debugString, "Split? %1c / VFO? %1c / RIT? %1c / XIT? %1c / Mode? %3s",
+    isSplit() ? 'Y' : 'N', isVFOA() ? 'A' : 'B', isRIT() ? 'Y' : 'N', isXIT() ? 'Y' : 'N',
+    isModeUSB() ? "USB" : (isModeLSB() ? "LSB" : (isModeCW() ? "CW " : (isModeCWR() ? "CWR" : "   "))));
+  Serial.println(debugString);
+}
+
+#endif
+
+
+/**********************************************************************/
+
+#ifndef TEENSYDUINO
+
+UBitxRigState _rigState;
+UBitxRigState& rigState = _rigState;
+
+#endif
+
+/***********************************************************************
+ * EOF
+ **********************************************************************/

TeensyDSP/RigState.h

@@ -0,0 +1,372 @@
+/*!
+ *  @file     RigState.h
+ */
+
+#ifndef __RigState_h__
+#define __RigState_h__
+
+#include <Arduino.h>
+
+#define UBITX_VFOB_FLAG   0x00000001
+#define UBITX_SPLIT_FLAG  0x00000002
+#define UBITX_RIT_FLAG    0x00000004
+#define UBITX_XIT_FLAG    0x00000008
+#define UBITX_CW_FLAG     0x00000010
+#define UBITX_USB_FLAG    0x00000020
+#define UBITX_TX_FLAG     0x00000040
+
+#ifdef TEENSYDUINO
+#define DISABLEINTS(CMD) do { noInterrupts(); CMD; interrupts(); } while (0)
+#else
+#define DISABLEINTS(CMD) do { CMD; } while (0)
+#endif
+
+enum RigStateWord {
+  DIRTY_WORD = 0,
+  VFOA_WORD,
+  VFOB_WORD,
+  OFFSETS_WORD,
+  FLAGS_WORD,
+  NUM_WORDS
+};
+
+inline RigStateWord& operator++(RigStateWord& orig) {
+  orig = static_cast<RigStateWord>(orig + 1);
+  // NOTE: Will overflow...
+  return orig;
+}
+
+inline RigStateWord operator++(RigStateWord& orig, int) {
+  RigStateWord rVal = orig;
+  ++orig;
+  return rVal;
+}
+
+struct UBitxRigState {
+  volatile uint32_t data[NUM_WORDS] = {0};
+
+  void begin();
+
+  void send_RIGINF();
+  void receive_RIGINF(int numBytes = sizeof(data));
+
+  /*!
+   *  @brief  Set the dirty bit for the specified word.
+   *  
+   *  @param  w
+   *          The word to mark as dirty.
+   */
+  inline void setDirty(RigStateWord w) {
+    data[DIRTY_WORD] |= w < NUM_WORDS ? 1 << w : 0;
+  }
+
+  /*!
+   *  @brief  Set the dirty bits for all words.
+   */
+  inline void setDirty() { DISABLEINTS( data[DIRTY_WORD] = 0xFFFFFFFF ); }
+
+  /*!
+   *  @brief  Clear the dirty bit for the specified word.
+   *  
+   *  @param  w
+   *          The word to mark as clean.
+   */
+  inline void setClean(RigStateWord w) {
+    data[DIRTY_WORD] &= ~(w < NUM_WORDS ? 1 << w : 0);
+  }
+
+  /*!
+   *  @brief  Clear the dirty bits for all words.
+   */
+  inline void setClean() { DISABLEINTS( data[DIRTY_WORD] = 0 ); }
+
+  /*!
+   *  @brief  Check whether the specified word is clean.
+   *  
+   *  @param  w
+   *          The word to check for clean status.
+   *          
+   *  @return True if the word is clean.
+   */
+  inline bool isClean(RigStateWord w) {
+    bool clean;
+    DISABLEINTS( clean = ((1 << w) & data[DIRTY_WORD]) > 0 ? false : true );
+    return clean;
+  }
+
+  /*!
+   *  @brief  Check whether the data is clean (as a whole).
+   *  
+   *  @return True if the data is clean (no dirty fields).
+   */
+  inline bool isClean() {
+    bool clean;
+    DISABLEINTS( clean = data[DIRTY_WORD] == 0 );
+    return clean;
+  }
+  
+  /*!
+   *  @brief  Check whether the specified word is dirty.
+   *  
+   *  @param  w
+   *          The word to check for dirty status.
+   *          
+   *  @return True if the word is dirty.
+   */
+  inline bool isDirty(RigStateWord w) {
+    bool dirty;
+    DISABLEINTS( dirty = ((1 << w) & data[DIRTY_WORD]) > 0 ? true : false );
+    return dirty;
+  }
+  
+  /*!
+   *  @brief  Check whether the data is dirty (as a whole).
+   *  
+   *  @return True if the data is dirty (at least one dirty field).
+   */
+  inline bool isDirty() { 
+    bool dirty;
+    DISABLEINTS( dirty = data[DIRTY_WORD] != 0 );
+    return dirty; 
+  }
+
+  /*!
+   *  @brief  Set the VFO A frequency.
+   *  
+   *  @param  freq
+   *          The new frequency in Hz.
+   */
+  inline void setFreqA(uint32_t freq, bool mark = true) { 
+    DISABLEINTS( data[VFOA_WORD] = freq;
+                 if (mark) setDirty(VFOA_WORD) );
+  }
+  
+  inline uint32_t getFreqA() const { 
+    uint32_t result;
+    DISABLEINTS( result = data[VFOA_WORD] );
+    return result;
+  }
+
+  /*!
+   *  @brief  Set the VFO B frequency.
+   *  
+   *  @param  freq
+   *          The new frequency in Hz.
+   */
+  inline void setFreqB(uint32_t freq, bool mark = true) { 
+    DISABLEINTS( data[VFOB_WORD] = freq );
+  }
+  
+  inline uint32_t getFreqB() const { 
+    uint32_t result; 
+    DISABLEINTS( result = data[VFOB_WORD] );
+    return result; 
+  }
+
+  inline void setRIT(int16_t offset, bool mark = true) { 
+    DISABLEINTS( data[OFFSETS_WORD] = (int32_t(offset) << 16) | (0x0000FFFF & data[OFFSETS_WORD]);
+                 if (mark) setDirty(OFFSETS_WORD) );
+  }
+  
+  inline int16_t getRIT() const { 
+    int16_t result;
+    DISABLEINTS( result = data[OFFSETS_WORD] >> 16 );
+    return result; 
+  }
+
+  inline void setXIT(int16_t offset, bool mark = true) { 
+    DISABLEINTS( data[OFFSETS_WORD] = (0xFFFF0000 & data[OFFSETS_WORD]) | offset;
+                 if (mark) setDirty(OFFSETS_WORD) );
+  }
+  
+  inline int16_t getXIT() const { 
+    int16_t result;
+    DISABLEINTS( result = 0x0000FFFF & data[OFFSETS_WORD] );
+    return result; 
+  }
+
+  inline void setVFOA(bool mark = true) { 
+    DISABLEINTS( data[FLAGS_WORD] &= ~UBITX_VFOB_FLAG; 
+                 if (mark) setDirty(FLAGS_WORD) );
+  }
+
+  inline void setVFOB(bool mark = true) { 
+    DISABLEINTS( data[FLAGS_WORD] |= UBITX_VFOB_FLAG; 
+                 if (mark) setDirty(FLAGS_WORD) );
+  }
+  
+  inline bool isVFOA() const { 
+    bool result;
+    DISABLEINTS( result = data[FLAGS_WORD] & UBITX_VFOB_FLAG ? false : true );
+    return result; 
+  }
+  
+  inline bool isVFOB() const { 
+    bool result;
+    DISABLEINTS( result = data[FLAGS_WORD] & UBITX_VFOB_FLAG ? true : false );
+    return result; 
+  }
+
+  inline void setSplitOn(bool mark = true) { 
+    DISABLEINTS( data[FLAGS_WORD] |= UBITX_SPLIT_FLAG; 
+                 if (mark) setDirty(FLAGS_WORD) );
+  }
+
+  inline void setSplitOff(bool mark = true) { 
+    DISABLEINTS( data[FLAGS_WORD] &= ~UBITX_SPLIT_FLAG; 
+                 if (mark) setDirty(FLAGS_WORD) );
+  }
+  
+  inline bool isSplit() const { 
+    bool result;
+    DISABLEINTS( result = data[FLAGS_WORD] & UBITX_SPLIT_FLAG ? true : false );
+    return result; 
+  }
+
+  inline void setRITOn(bool mark = true) { 
+    DISABLEINTS( data[FLAGS_WORD] |= UBITX_RIT_FLAG; 
+                 if (mark) setDirty(FLAGS_WORD) );
+  } 
+  
+  inline void setRITOff(bool mark = true) { 
+    DISABLEINTS( data[FLAGS_WORD] &= ~UBITX_RIT_FLAG; 
+                 if (mark) setDirty(FLAGS_WORD) );
+  } 
+  
+  inline bool isRIT() const { 
+    bool result;
+    DISABLEINTS( result = data[FLAGS_WORD] & UBITX_RIT_FLAG ? true : false );
+    return result;
+  }
+  
+  inline void setXITOn(bool mark = true) { 
+    DISABLEINTS( data[FLAGS_WORD] |= UBITX_XIT_FLAG; 
+                 if (mark) setDirty(FLAGS_WORD) );
+  } 
+  
+  inline void setXITOff(bool mark = true) { 
+    DISABLEINTS( data[FLAGS_WORD] &= ~UBITX_XIT_FLAG; 
+                 if (mark) setDirty(FLAGS_WORD) );
+  } 
+  
+  inline bool isXIT() const { 
+    bool result;
+    DISABLEINTS( result = data[FLAGS_WORD] & UBITX_XIT_FLAG ? true : false );
+    return result;
+  }
+  
+  inline void setUSB(bool mark = true) { 
+    DISABLEINTS( data[FLAGS_WORD] |= UBITX_USB_FLAG; 
+                 data[FLAGS_WORD] &= ~UBITX_CW_FLAG; 
+                 if (mark) setDirty(FLAGS_WORD) );
+  }
+  
+  inline void setLSB(bool mark = true) { 
+    DISABLEINTS( data[FLAGS_WORD] &= ~UBITX_USB_FLAG; 
+                 data[FLAGS_WORD] &= ~UBITX_CW_FLAG; 
+                 if (mark) setDirty(FLAGS_WORD) );
+  }
+  
+  inline void setCW(bool mark = true)  { 
+    DISABLEINTS( data[FLAGS_WORD] |= UBITX_USB_FLAG; 
+                 data[FLAGS_WORD] |= UBITX_CW_FLAG; 
+                 if (mark) setDirty(FLAGS_WORD) );
+  }
+  
+  inline void setCWR(bool mark = true) { 
+    DISABLEINTS( data[FLAGS_WORD] &= ~UBITX_USB_FLAG; 
+                 data[FLAGS_WORD] |= UBITX_CW_FLAG; 
+                 if (mark) setDirty(FLAGS_WORD) );
+  }
+  
+  inline bool isModeUSB() const { 
+    bool result;
+    DISABLEINTS( result = ((data[FLAGS_WORD] & UBITX_USB_FLAG) > 0) && ((data[FLAGS_WORD] & UBITX_CW_FLAG) == 0) );
+    return result;
+  }
+  
+  inline bool isModeLSB() const { 
+    bool result;
+    DISABLEINTS( result = ((data[FLAGS_WORD] & UBITX_USB_FLAG) == 0) && ((data[FLAGS_WORD] & UBITX_CW_FLAG) == 0) );
+    return result; 
+  }
+
+  inline bool isModeCWAny() const {
+    bool result;
+    DISABLEINTS( result = (data[FLAGS_WORD] & UBITX_CW_FLAG) > 0 );
+    return result;
+  }
+  
+  inline bool isModeCW() const { 
+    bool result;
+    DISABLEINTS( result = ((data[FLAGS_WORD] & UBITX_USB_FLAG) > 0) && ((data[FLAGS_WORD] & UBITX_CW_FLAG) > 0) );
+    return result; 
+  }
+  
+  inline bool isModeCWR() const { 
+    bool result;
+    DISABLEINTS( result = ((data[FLAGS_WORD] & UBITX_USB_FLAG) == 0) && ((data[FLAGS_WORD] & UBITX_CW_FLAG) > 0) );
+    return result; 
+  }
+
+#ifdef DEBUG
+  void serialHexState(const char* label);
+  void serialPrettyState(const char* label);
+#endif
+
+#ifndef TEENSYDUINO
+  // These methods are only defined in the Raduino (Arduino) case of the
+  // RigState, not in the TeensyDSP (Teensy) case.
+  void writeDirty();  // write fields FROM RigState TO Raduino
+  void readDirty();   // read variables FROM Raduino TO RigState
+#endif
+};
+
+#ifndef TEENSYDUINO
+
+extern UBitxRigState& rigState;
+
+#endif
+
+/*
+NOTE:  This is all currently OBE, leaving it here for reference/future cleanup.
+
+Protocol discussion:
+- I2C master: Raduino
+- I2C slave:  TeensyDSP
+
+Raduino state:
+  - Baseline uBITX variables
+  - I2C buffer
+    - On I2C transmit:  make updates based on current variables
+    - On I2C receive:
+      - Update based on received I2C responses
+      - Update associated variables
+    
+TeensyDSP state:
+  - CAT buffer
+    - Used to receive command from CAT (when commands arrive via Serial)
+    - Used to transmit state to Raduino (when requested via Wire1)
+  - Raduino buffer
+    - Used to receive state from Raduino (when received via Wire1)
+    - Used to transmit responses to CAT (over Serial)
+  - Questions
+    - How can these be synchronized?
+      - At the tail end of an I2C request handler.  Before sending the response to the Raduino via I2C:
+        - Copy updated CAT buffer items to the Raduino buffer.
+        - Copy updated Raduino buffer items to the CAT buffer.
+        - In the case of conflicts, CAT wins.
+        - Transmit the CAT buffer state to the Raduino.
+- TeensyDSP updates 'outgoing' state based on CAT inputs.
+  - Make change to data.
+  - Mark data as dirty, if different than incoming state.
+- When requested, Teensy DSP sends 'outgoing' state to Raduino.
+  - Send dirty data over I2C.
+  - Mark data as clean.  
+ */
+
+#endif
+
+/***********************************************************************
+ * EOF
+ **********************************************************************/

TeensyDSP/Sensors.h

@@ -8,31 +8,39 @@
 /**********************************************************************/
 
 #ifndef UBITX_SENSORS_S_METER_PIN
-#define UBITX_SENSORS_S_METER_PIN 27
+#define UBITX_SENSORS_S_METER_PIN 28
 #endif
 
 #ifndef UBITX_SENSORS_FWD_PWR_PIN
-#define UBITX_SENSORS_FWD_PWR_PIN 20
+#define UBITX_SENSORS_FWD_PWR_PIN 26
 #endif
 
 #ifndef UBITX_SENSORS_REV_PWR_PIN
-#define UBITX_SENSORS_REV_PWR_PIN 28
+#define UBITX_SENSORS_REV_PWR_PIN 20
 #endif
 
 #ifndef UBITX_SENSORS_SUPPLY_PIN
 #define UBITX_SENSORS_SUPPLY_PIN 21
 #endif
 
+#ifndef UBITX_SENSORS_SPARE1_PIN
+#define UBITX_SENSORS_SPARE1_PIN 27
+#endif
+
+#ifndef UBITX_SENSORS_SPARE2_PIN
+#define UBITX_SENSORS_SPARE2_PIN 31
+#endif
+
 #ifndef UBITX_SENSORS_AVG_SAMPLES
 #define UBITX_SENSORS_AVG_SAMPLES 16
 #endif
 
 #ifndef UBITX_SENSORS_S_METER_R1
-#define UBITX_SENSORS_S_METER_R1 22000.0
+#define UBITX_SENSORS_S_METER_R1 0.0
 #endif
 
 #ifndef UBITX_SENSORS_S_METER_R2
-#define UBITX_SENSORS_S_METER_R2 33000.0
+#define UBITX_SENSORS_S_METER_R2 1.0
 #endif
 
 #ifndef UBITX_SENSORS_FWD_PWR_R1
@@ -101,6 +109,8 @@ const int   uBitxSensorsSMeterPin  = UBITX_SENSORS_S_METER_PIN;
 const int   uBitxSensorsFwdPwrPin  = UBITX_SENSORS_FWD_PWR_PIN;
 const int   uBitxSensorsRevPwrPin  = UBITX_SENSORS_REV_PWR_PIN;
 const int   uBitxSensorsSupplyPin  = UBITX_SENSORS_SUPPLY_PIN;
+const int   uBitxSensorsSpare1Pin  = UBITX_SENSORS_SPARE1_PIN;
+const int   uBitxSensorsSpare2Pin  = UBITX_SENSORS_SPARE2_PIN;
 const int   uBitxSensorsAvgSamples = UBITX_SENSORS_AVG_SAMPLES;
 const float uBitxSensorsSMeterR1   = UBITX_SENSORS_S_METER_R1;
 const float uBitxSensorsSMeterR2   = UBITX_SENSORS_S_METER_R2;
@@ -162,10 +172,15 @@ class TrailingAverage {
    *          The new element/value to incorporate into the average.
    */
   inline void add(T val) {
-    int last = (current - 1) % N;
-    average -= data[last];
+    //int last = (current - 1) % N;
+    //average -= data[last];
+    //current = (current + 1) % N;
+    //data[current] = val / divisor;
+    //average += data[current];
+    average -= data[current];
+    data[current] = val / divisor;
+    average += data[current];
     current = (current + 1) % N;    
-    average += data[current] / divisor;
   }
 
   /*!
@@ -200,12 +215,16 @@ class UBitxSensors {
   sMeterPin(uBitxSensorsSMeterPin),
   fwdPwrPin(uBitxSensorsFwdPwrPin),
   revPwrPin(uBitxSensorsRevPwrPin),
-  supplyPin(uBitxSensorsSupplyPin)
+  supplyPin(uBitxSensorsSupplyPin),
+  spare1Pin(uBitxSensorsSpare1Pin),
+  spare2Pin(uBitxSensorsSpare2Pin)
   {
     pinMode(sMeterPin, INPUT);  // analog
     pinMode(fwdPwrPin, INPUT);  // analog
     pinMode(revPwrPin, INPUT);  // analog
     pinMode(supplyPin, INPUT);  // analog
+    pinMode(spare1Pin, INPUT);  // analog
+    pinMode(spare2Pin, INPUT);  // analog
   }
 
   /*!
@@ -222,7 +241,7 @@ class UBitxSensors {
    *          measurements by reading the associated ADC pin.
    */
   void updatePower() {
-    ADC::Sync_result value = adc.analogSyncRead(fwdPwrPin, revPwrPin);
+    ADC::Sync_result value = adc.analogSyncRead(revPwrPin, fwdPwrPin);
 
     float fwdV = HF::adcIn(value.result_adc0);
     float revV = HF::adcIn(value.result_adc1);
@@ -263,7 +282,7 @@ class UBitxSensors {
    *  @return Scaled S-Meter reading.
    */
   int sMeterScaled() {
-    float sig = sMeter.read();
+    int sig = sMeter.read() >> 2;
     // small number of elements; just doing a linear search
     for (int i = uBitxSensorsSMeterLevels; i > 0; i--) {
       if (sig > uBitxSensorsSMeterValues[i - 1]) {
@@ -328,6 +347,8 @@ class UBitxSensors {
   int fwdPwrPin;
   int revPwrPin;
   int supplyPin;
+  int spare1Pin;
+  int spare2Pin;
 
   // Buffers for averages
   TrailingAverage<int, uBitxSensorsAvgSamples>   sMeter;

TeensyDSP/TR.cpp

@@ -7,34 +7,46 @@
 
 UBitxTR TR(DSP);
 
-void UBitxTR::update(bool cw) {
-  updatePTT();
-  updateVOX();
-  updateKey();
+void UBitxTR::update(bool cw, bool extKey) {
+  updateLinePTT();
+  
+  if (cw) {    
+    if ((keyEnable && keyDown) || extKey) {
+      setTX(); 
+    } else {
+      setRX();
+    }
+    return;
+  }
+  
+  updateMicPTT();
+  updateMicVOX();
+  updateDataVOX();
   
   if (isTX) {
     // If we are currently transmitting, then ANY T/R release (key
-    // release) will result in exitting transmit... except for VOX
+    // release) will result in exiting transmit... except for VOX
     // and CAT which can only function as a release if it was enabled.
-    if (pttReleased() || keyReleased() || 
-        (voxEnabled && voxDeactivated()) ||
-        (catEnabled && catDeactivated())) {
+    if (micPTTReleased() || linePTTReleased() || 
+        (micVOXEnabled() && micVOXDeactivated()) ||
+        (catEnabled() && catDeactivated()) ||
+        (dataVOXEnabled() && dataVOXDeactivated())) {
       // first, stop transmitting; then, setup RX audio
       DBGCMD( setRX()  );
       DBGCMD( dsp.rx() );
     }
   } else {
-    if ((pttEnabled && pttPressed()) || (voxEnabled && voxActivated())) {
+    if ((micPTTEnabled() && micPTTPressed()) || (micVOXEnabled() && micVOXActivated())) {
       // first, setup TX audio; then, start transmitting (from Mic)
-      DBGCMD( dsp.txMicIn() );
+      DBGCMD( dsp.tx(MIC_IN)  );
       DBGCMD( setTX()         );
-    } else if (keyEnabled && keyPressed()) {
+    } else if ((linePTTEnabled() && linePTTPressed())) {
       // first, setup TX audio; then, start transmitting (from Line In)
-      DBGCMD( dsp.txLineIn() );
+      DBGCMD( dsp.tx(LINE_IN) );
       DBGCMD( setTX()         );
-    } else if (catEnabled && catActivated()) {
+    } else if (catEnable && catActivated()) {
       // first, setup TX audio; then, start transmitting (USB)
-      DBGCMD( dsp.txUSBIn() );
+      DBGCMD( dsp.tx(USB_IN)  );
       DBGCMD( setTX()         );
     }
   }    

TeensyDSP/TR.h

@@ -32,21 +32,42 @@ class UBitxTR {
     ptt.interval(5);
 
     // default configuration: PTT, key, and CAT enabled; VOX disabled
-    DBGCMD( enablePTT()  );
-    DBGCMD( disableVOX() );
-    DBGCMD( enableKey()  );
+    DBGCMD( enableMicPTT()  );
+    DBGCMD( disableMicVOX() );
+    DBGCMD( enableLinePTT()  );
     DBGCMD( enableCAT()  );
+
+    DBGCMD( setRX() );
   }
 
-  inline void enablePTT() { pttEnabled = true; }
-  inline void enableVOX() { voxEnabled = true; }
-  inline void enableKey() { keyEnabled = true; }
-  inline void enableCAT() { catEnabled = true; }
-  inline void disablePTT() { pttEnabled = false; }
-  inline void disableVOX() { voxEnabled = false; }
-  inline void disableKey() { keyEnabled = false; }
-  inline void disableCAT() { catEnabled = false; }
+  inline void enableMicPTT() { pttEnable = true; }
+  inline void enableLinePTT() { keyEnable = true; }
+  inline void enableMicVOX() { voxEnable = true; }
+  inline void enableDataVOX() { dvoxEnable = true; }
+  inline void enableCAT() { catEnable = true; }
   
+  inline void disableMicPTT() { pttEnable = false; }
+  inline void disableLinePTT() { keyEnable = false; }
+  inline void disableMicVOX() { voxEnable = false; }
+  inline void disableDataVOX() { dvoxEnable = false; }
+  inline void disableCAT() { catEnable = false; }
+
+  inline bool micPTTEnabled() const { return pttEnable; }
+  inline bool linePTTEnabled() const { return keyEnable; }
+  inline bool micVOXEnabled() const { return voxEnable; }
+  inline bool dataVOXEnabled() const { return dvoxEnable; }
+  inline bool catEnabled() const { return catEnable; }
+  
+  inline bool micPTTPressed() { return ptt.fell(); }
+  inline bool micPTTReleased() { return ptt.rose(); }
+  inline bool linePTTPressed() { return (L_keyDown != keyDown) && L_keyDown; }
+  inline bool linePTTReleased() { return (L_keyDown != keyDown) && keyDown; }
+  inline bool micVOXActivated() { return (L_voxActive != voxActive) && L_voxActive; }
+  inline bool micVOXDeactivated() { return (L_voxActive != voxActive) && voxActive; }
+  inline bool dataVOXActivated() { return (L_dvoxActive != dvoxActive) && L_dvoxActive; }
+  inline bool dataVOXDeactivated() { return (L_dvoxActive != dvoxActive) && dvoxActive; }
+  inline bool catActivated() { return (L_catActive != catActive) && L_catActive; }
+  inline bool catDeactivated() { return (L_catActive != catActive) && catActive; }
   
   inline void catTX() {
     L_catActive = catActive;
@@ -72,8 +93,12 @@ class UBitxTR {
    *  @param  cw
    *          True if CW mode is currently active; false otherwise.  
    *          Different/faster logic is used in CW mode.
+   *          
+   *  @param  extKey
+   *          True if an external keying signal (ie. CW keyer) is 
+   *          currently active (ie. key down).
    */
-  void update(bool cw = false);
+  void update(bool cw = false, bool extKey = false);
   
   void end() {
   }
@@ -90,74 +115,58 @@ class UBitxTR {
     digitalWrite(outPin, HIGH);
   }
 
-  inline void updatePTT() {
+  inline void updateMicPTT() {
     ptt.update();
   }
 
-  inline bool pttPressed() {
-    return ptt.fell();
-  }
-
-  inline bool pttReleased() {
-    return ptt.rose();
-  }
-
-  inline void updateVOX() {
-    L_voxActive = voxActive;
-    voxActive = (digitalRead(voxPin) == LOW);
-  }
-
-  inline bool voxActivated() {
-    return (L_voxActive != voxActive) && L_voxActive;
-  }
-
-  inline bool voxDeactivated() {
-    return (L_voxActive != voxActive) && voxActive;
-  }
-  
-  inline void updateKey() {
+  inline void updateLinePTT() {
     L_keyDown = keyDown;
     keyDown = (digitalRead(keyPin) == LOW);
   }
 
-  inline bool keyPressed() {
-    return (L_keyDown != keyDown) && L_keyDown;
+  inline void updateMicVOX() {
+    L_voxActive = voxActive;
+    voxActive = (digitalRead(voxPin) == LOW);
   }
 
-  inline bool keyReleased() {
-    return (L_keyDown != keyDown) && keyDown;
+  inline void updateDataVOX() {
+    L_dvoxActive = dvoxActive;
+    if (dsp.getVoxLevel() > dvoxThreshold) {
+      dvoxActive = true;
+      dvoxElapsed = 0;
+    } else if (dvoxActive && (dvoxElapsed > dvoxDelay)) {
+      dvoxActive = false;
     }
-
-  inline bool catActivated() {
-    return (L_catActive != catActive) && L_catActive;
-  }
-
-  inline bool catDeactivated() {
-    return (L_catActive != catActive) && catActive;
   }
 
   UBitxDSP& dsp;
 
   Bounce ptt;
   
-  int outPin;
   int pttPin;
   int voxPin;
   int keyPin;
+  int outPin;
   
   bool isTX = false;
 
-  bool pttEnabled = false;
-  bool voxEnabled = false;
-  bool keyEnabled = false;
-  bool catEnabled = false;
+  bool pttEnable = false;
+  bool voxEnable = false;
+  bool dvoxEnable = false;
+  bool keyEnable = false;
+  bool catEnable = false;
 
   bool voxActive = false;
   bool L_voxActive = false;
+  bool dvoxActive = false;
+  bool L_dvoxActive = false;
   bool keyDown = false;
   bool L_keyDown = false;
   bool catActive = false;
   bool L_catActive = false;
+
+  elapsedMillis dvoxElapsed = 0;
+  unsigned dvoxDelay = 250; // TODO: make dynamic
 };
 
 extern UBitxTR TR;

TeensyDSP/TS590.cpp

@@ -0,0 +1,510 @@
+#include <Arduino.h>
+#include "TS590.h"
+#include "Debug.h"
+
+/**********************************************************************/
+
+/*!
+ *  @brief  Send a command to the PC via CAT.  Note that the command
+ *          should not include the trailing terminator (;).  That will
+ *          be automatically added.
+ *  @param  format
+ *          A printf-style format string.
+ *  @param  args
+ *          Zero or more arguments to include in the command.
+ */
+void ts590SendCommand(const char* format, ...) {
+  static char outBuf[ts590CommandMaxLength];
+  va_list args;
+  va_start(args, format);
+  vsprintf(outBuf, format, args);
+  va_end(args);
+  Serial.print(outBuf);
+  Serial.print(";");
+}
+
+/**********************************************************************/
+
+/*!
+ *  @brief  Create a new CAT command.  It should be initialized with
+ *          a 2-character command prefix.
+ *  @param  pre
+ *          A 2-character command prefix.  If more than 2 characters
+ *          are supplied, only the first two will be used.  If less
+ *          than two are supplied, then the command will be
+ *          initialized with a null prefix.
+ */
+TS590Command::TS590Command(const char* pre)
+: myPrefix(pre), prefixLength(strlen(pre))
+{}
+
+TS590Command::~TS590Command() {}
+
+/*!
+ *  @brief  Determine whether this is a Read command or not.  by
+ *          default, if it's a 2-letter command, it's a Read.
+ *  @return True if a Read command; false otherwise.
+ */
+bool TS590Command::isReadCommand(const char* cmd) const {
+  if (strlen(cmd) == prefixLength) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+/*!
+ *  @brief  Process the provided command.  If the command is a Set
+ *          command, it calls handleCommand().  If Auto Information
+ *          is eet (by the rig), sendResponse() is called at the end.
+ *          If the command is a Read command, it also calls 
+ *          sendResponse().  Finally, if necessary, it will return
+ *          any error codes to the PC.
+ *  @param  cmd
+ *          The current command string received from the PC via CAT.
+ *          It should be null-terminated, and should no longer have
+ *          the terminator (;).
+ */
+void TS590Command::process(const char* cmd) {
+  theError = NoError;
+
+  if (isReadCommand(cmd)) {
+    DBGCMD( sendResponse(cmd) );
+  } else {
+    DBGCMD( handleCommand(cmd) );
+    switch(theError) {
+      case NoError:
+      if (theRig->isAI()) {
+        DBGCMD( sendResponse(cmd) );
+      }
+      break;
+
+      case SyntaxError:
+      DBGCMD( ts590SyntaxError() );
+      break;
+
+      case CommError:
+      DBGCMD( ts590CommError() );
+      break;
+
+      case ProcessError:
+      DBGCMD( ts590ProcessError() );
+      break;
+    }
+  }  
+}
+
+/*!
+ *  @brief  Set the syntax error flag.  This is cleared at the 
+ *          beginning of each call to process().
+ */
+void TS590Command::setSyntaxError() {
+  theError = SyntaxError;
+}
+
+/*!
+ *  @brief  Set the comms error flag.  This is cleared at the 
+ *          beginning of each call to process().
+ */
+void TS590Command::setCommError() {
+  theError = CommError;
+}
+
+/*!
+ *  @brief  Set the process error flag.  This is cleared at the 
+ *          beginning of each call to process().
+ */
+void TS590Command::setProcessError() {
+  theError = ProcessError;
+}
+
+/*!
+ *  @brief  Set the rig that will be used to process commands.
+ *  @param  r
+ *          Pointer to the UBitxRig object.
+ */
+void TS590Command::setRig(UBitxRig* r) {
+  theRig = r;
+}
+
+/*!
+ *  @brief  Set the DSP that will be used to process commands.
+ *  @param  d
+ *          Pointer to the UBitxDSP object.
+ */
+void TS590Command::setDSP(UBitxDSP* d) {
+  theDSP = d;
+}
+
+UBitxRig* TS590Command::theRig = &Rig;
+UBitxDSP* TS590Command::theDSP = &DSP;
+TS590Error TS590Command::theError = NoError;
+
+/**********************************************************************/
+
+void TS590Command_Bool::handleCommand(const char* cmd) {
+  setter(cmd[length()] == '0' ? false : true);
+}
+
+void TS590Command_Bool::sendResponse(const char* cmd) {
+  ts590SendCommand("%s%s", prefix(), getter() ? "1" : "0");
+}
+/**********************************************************************/
+
+void TS590Command_UL::handleCommand(const char* cmd) {
+  unsigned val = static_cast<unsigned>(strtoul(&cmd[length()], NULL, 10));
+  if (val < myMin) {
+    val = myMin;
+  } else if (val > myMax) {
+    val = myMax;
+  }
+  val = (val * mySlope) + myIntercept;
+  setter(val);
+}
+
+void TS590Command_UL::sendResponse(const char* cmd) {
+  unsigned val = getter();
+  val = (val - myIntercept) / mySlope;
+  if (val < myMin) {
+    val = myMin; 
+  } else if (val > myMax) {
+    val = myMax;
+  }
+  ts590SendCommand("%s%0*u", prefix(), myWidth, getter());
+}
+
+/**********************************************************************/
+
+void TS590_FR::handleCommand(const char* cmd) {
+  if (strlen(cmd) == 3) {
+    switch (cmd[2]) {
+      case '0':
+      rig()->setVFOA();
+      rig()->setSplitOff();
+      break;
+      
+      case '1':
+      rig()->setVFOB();
+      rig()->setSplitOff();
+      break;
+      
+      case '2':
+      // TODO: Need to add something for channel mode.
+      break;
+      
+      default:
+      setSyntaxError();
+    }
+  } else {
+    setSyntaxError();
+  }
+}
+
+void TS590_FR::sendResponse(const char* cmd) {
+  if (rig()->isVFOA()) {
+    ts590SendCommand("FR0");
+  } else if (rig()->isVFOB()) {
+    ts590SendCommand("FR1");      
+  } else {
+    ts590SendCommand("FR2");
+  }
+}
+
+/**********************************************************************/
+
+void TS590_FT::handleCommand(const char* cmd) {
+  if (strlen(cmd) == 3) {
+    switch (cmd[2]) {
+      case '0':
+      if (rig()->isVFOA()) {
+        rig()->setSplitOff();  
+      } else if (rig()->isVFOB()) {
+        rig()->setSplitOn();
+      } else {
+        setSyntaxError();
+      }          
+      break;
+      
+      case '1':
+      if (rig()->isVFOA()) {
+        rig()->setSplitOn();
+      } else if (rig()->isVFOB()) {
+        rig()->setSplitOff();
+      } else {
+        setSyntaxError();
+      }
+      break;
+      
+      default:
+      setSyntaxError();
+    }
+  } else {
+    setSyntaxError();
+  }
+}
+
+void TS590_FT::sendResponse(const char* cmd) {
+  if (rig()->isVFOA()) {
+    ts590SendCommand(rig()->isSplit() ? "FT1" : "FT0");
+  } else if (rig()->isVFOB()) {
+    ts590SendCommand(rig()->isSplit() ? "FT0" : "FT1");
+  } else {
+    ts590SendCommand("FT2");
+  }
+}
+
+/**********************************************************************/
+
+void TS590_MD::handleCommand(const char* cmd) {
+  if (strlen(cmd) == 3) {
+    switch (cmd[2]) {
+      case '0': // None (setting failure)
+      case '4': // FM - not supported
+      case '5': // AM - not supported
+      case '6': // FSK - not supported
+      case '8': // None (setting failure)
+      case '9': // FSK-R - not supported
+      setProcessError();
+      break;
+
+      case '1': // LSB
+      rig()->setLSB();
+      break;
+
+      case '2': // USB
+      rig()->setUSB();
+      break;
+
+      case '3': // CW
+      rig()->setCW();
+      break;
+
+      case '7': // CW-R
+      rig()->setCWR();
+      break;
+
+      default:
+      setSyntaxError();
+    }
+  } else {
+    setSyntaxError();
+  }
+}
+
+void TS590_MD::sendResponse(const char* cmd) {
+  if (rig()->isModeCW()) {
+    ts590SendCommand("MD3");      
+  } else if (rig()->isModeCWR()) {
+    ts590SendCommand("MD7");
+  } else if (rig()->isModeUSB()) {
+    ts590SendCommand("MD2");
+  } else if (rig()->isModeLSB()) {
+    ts590SendCommand("MD1");
+  } else {
+    ts590SendCommand("MD0");
+  }
+}
+
+/**********************************************************************/
+
+int ssbHiCut[14] = {1000, 1200, 1400, 1600, 1800, 2000, 2200, 2400, 2600, 2800, 3000, 3400, 4000, 5000};
+int ssbLoCut[12] = {0, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000};
+
+int ssbWidth[14] = {50, 80, 100, 150, 200, 250, 300, 400, 500, 600, 1000, 1500, 2000, 2500};
+int ssbCenter[14] = {1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1750, 1800, 1900, 2000, 2100, 2210};
+
+void TS590_SH::handleCommand(const char* cmd) {
+  if (strlen(cmd) == 4) {
+    index = strtoul(&cmd[2], NULL, 10);
+    if (index < sizeof(ssbHiCut) / sizeof(ssbHiCut[0])) {
+      dsp()->setRxFilterHi(ssbHiCut[index]);
+    } else {          
+      setSyntaxError();
+    }
+  } else {
+    setSyntaxError();
+  }
+}
+
+void TS590_SH::sendResponse(const char* cmd) {
+  ts590SendCommand("SH%02u", index);
+}
+
+void TS590_SL::handleCommand(const char* cmd) {
+  if (strlen(cmd) == 4) {
+    index = strtoul(&cmd[2], NULL, 10);
+    if (index < sizeof(ssbLoCut) / sizeof(ssbLoCut[0])) {
+      dsp()->setRxFilterLo(ssbLoCut[index]);
+    } else {          
+      setSyntaxError();
+    }
+  } else {
+    setSyntaxError();
+  }
+}
+
+void TS590_SL::sendResponse(const char* cmd) {
+  ts590SendCommand("SL%02u", index);
+}
+
+/**********************************************************************/
+
+void TS590_VX::handleCommand(const char* cmd) {
+  
+}
+
+void TS590_VX::sendResponse(const char* cmd) {
+  
+}
+
+/**********************************************************************/
+
+void nullSetFunc(unsigned x) { return; }
+unsigned getIDFunc() {
+#ifndef USE_TS590SG_CAT
+  return 021;
+#else
+  return 023;
+#endif
+}
+
+SetUL setAG = SetUL::create<UBitxDSP, &UBitxDSP::setLineOut255>(DSP);
+GetUL getAG = GetUL::create<UBitxDSP, &UBitxDSP::getLineOut255>(DSP);
+SetUL setAI = [](unsigned v) -> void { v == 0 ? Rig.aiOff() : Rig.aiOn(); };
+GetUL getAI = []() -> unsigned { return Rig.isAI() ? 4 : 0; };
+//SetUL setSidetone = SetUL::create<UBitxDSP, ...>(...);
+//GetUL getSidetone = GetUL::create<UBitxDSP, ...>(...);
+SetUL setUSBin = SetUL::create<UBitxDSP, &UBitxDSP::setUSBIn9>(DSP);
+GetUL getUSBin = GetUL::create<UBitxDSP, &UBitxDSP::getUSBIn9>(DSP);
+SetUL setUSBout = SetUL::create<UBitxDSP, &UBitxDSP::setUSBOut9>(DSP);
+GetUL getUSBout = GetUL::create<UBitxDSP, &UBitxDSP::getUSBOut9>(DSP);
+SetUL setACC2in = SetUL::create<UBitxDSP, &UBitxDSP::setLineIn9>(DSP);
+GetUL getACC2in = GetUL::create<UBitxDSP, &UBitxDSP::getLineIn9>(DSP);
+SetUL setACC2out = SetUL::create<UBitxDSP, &UBitxDSP::setLineOut9>(DSP);
+GetUL getACC2out = GetUL::create<UBitxDSP, &UBitxDSP::getLineOut9>(DSP);
+SetUL setVoxDelay = SetUL::create<UBitxDSP, &UBitxDSP::setDataVoxDelay>(DSP);
+GetUL getVoxDelay = GetUL::create<UBitxDSP, &UBitxDSP::getDataVoxDelay>(DSP);
+SetUL setUSBvox = SetUL::create<UBitxDSP, &UBitxDSP::setUSBVOXThresh9>(DSP);
+GetUL getUSBvox = GetUL::create<UBitxDSP, &UBitxDSP::getUSBVOXThresh9>(DSP);
+SetUL setACC2vox = SetUL::create<UBitxDSP, &UBitxDSP::setLineVOXThresh9>(DSP);
+GetUL getACC2vox = GetUL::create<UBitxDSP, &UBitxDSP::getLineVOXThresh9>(DSP);
+SetUL setID = SetUL::create<nullSetFunc>();
+GetUL getID = GetUL::create<getIDFunc>();
+
+TS590Command_UL TS590_AG("AG0", 3, 0, 255, setAG, getAG);
+TS590Command_UL TS590_AI("AI", 1, 0, 4, setAI, getAI);
+// TS590_AS
+// TS590_BD
+// TS590_BU
+// TS590_CA
+// TS590_CD0
+// TS590_CD1
+// TS590_CD2
+// TS590_CH
+#ifndef USE_TS590SG_CAT
+//TS590Command_UL TS590_EX034("EX0340000", 2, 0, 14, 50, 300, setSideTone, getSideTone);
+TS590Command_UL TS590_EX064("EX0640000", 1, 0, 9, setUSBin, getUSBin);
+TS590Command_UL TS590_EX065("EX0650000", 1, 0, 9, setUSBout, getUSBout);
+TS590Command_UL TS590_EX066("EX0660000", 1, 0, 9, setACC2in, getACC2in);
+TS590Command_UL TS590_EX067("EX0670000", 1, 0, 9, setACC2out, getACC2out);
+TS590Command_UL TS590_EX070("EX0700000", 2, 0, 20, 5, 0, setVoxDelay, getVoxDelay);
+TS590Command_UL TS590_EX071("EX0710000", 1, 0, 9, setUSBvox, getUSBvox);
+TS590Command_UL TS590_EX072("EX0720000", 1, 0, 9, setACC2vox, getACC2vox);
+#else
+//TS590Command_UL TS590_EX040("EX0400000", 2, 0, 14, 50, 300, setSideTone, getSideTone);
+TS590Command_UL TS590_EX071("EX0710000", 1, 0, 9, setUSBin, getUSBin);
+TS590Command_UL TS590_EX072("EX0720000", 1, 0, 9, setUSBout, getUSBout);
+TS590Command_UL TS590_EX073("EX0730000", 1, 0, 9, setACC2in, getACC2in);
+TS590Command_UL TS590_EX074("EX0740000", 1, 0, 9, setACC2out, getACC2out);
+TS590Command_UL TS590_EX077("EX0770000", 2, 0, 20, 5, 0, setVoxDelay, getVoxDelay);
+TS590Command_UL TS590_EX078("EX0780000", 1, 0, 9, setUSBvox, getUSBvox);
+TS590Command_UL TS590_EX079("EX0790000", 1, 0, 9, setACC2vox, getACC2vox);
+#endif
+TS590Command_UL TS590_ID("ID", 3, 21, 23, setID, getID);
+
+TS590_FA cmdFA;
+TS590_FB cmdFB;
+TS590_FR cmdFR;
+TS590_FT cmdFT;
+TS590_MD cmdMD;
+TS590_SH cmdSH;
+TS590_SL cmdSL;
+
+TS590Command* catCommands[] = {
+  &cmdFA,
+  &cmdFB,
+  &cmdFR,
+  &cmdFT,
+  &cmdMD,
+  &cmdSH,
+  &cmdSL
+};
+int numCatCommands = sizeof(catCommands) / sizeof(catCommands[0]);
+
+/**********************************************************************/
+
+void UBitxTS590::begin() {
+  Serial.begin(9600); // USB is always 12 Mbit/sec
+  #ifdef DEBUG
+    delay(500);
+    Serial.print("DBG: Number of CAT commands: ");
+    Serial.println(numCommands);
+    for (int i = 0; i < numCommands; i++) {
+      Serial.print("     ");
+      Serial.println(commands[i]->prefix());
+    }
+  #endif
+}
+
+void UBitxTS590::update() {
+  char incomingChar;
+  
+  while (Serial.available()) {
+    if (bufLen < ts590CommandMaxLength) {
+      incomingChar = Serial.read();      
+      if (incomingChar == ';') {
+        buf[bufLen++] = '\0';
+        strupr(buf);
+        processCommand();
+      } else if (incomingChar == '\n' && bufLen == 0) {
+        ;
+      } else {
+        buf[bufLen++] = incomingChar;
+      }
+    } else {
+      // too long... we're going to bail on this.
+      ts590SyntaxError();
+      bufLen = 0;
+    }
+  }
+}
+
+typedef class TS590Command* PCmd;
+
+int compareCATCommands(const void* a, const void* b) {
+  TS590Command const *B = *(TS590Command const **)b;
+  int cmp = strncmp((char*)a, (char*)B->prefix(), B->length());
+  #ifdef DEBUG
+    Serial.print("Comparison: ");
+    Serial.print((char*)a);
+    Serial.print(" ? ");
+    Serial.print((char*)B->prefix());
+    Serial.print(" --> ");
+    Serial.println(cmp);
+  #endif
+  return cmp;
+}
+
+void UBitxTS590::processCommand() {
+  TS590Command** cmd = (TS590Command**)bsearch(buf, commands, numCommands, sizeof(TS590Command*), compareCATCommands);
+  if (cmd == NULL) {
+    ts590SyntaxError();
+  } else {
+    (*cmd)->process(buf);
+  }
+  bufLen = 0;
+}
+
+UBitxTS590 TS590(catCommands, numCatCommands);
+
+/**********************************************************************/

TeensyDSP/TS590.h

@@ -0,0 +1,362 @@
+#ifndef __TS590_h__
+#define __TS590_h__
+
+#include <Arduino.h>
+#include <Embedded_Template_Library.h>
+#include <etl/delegate.h>
+#include "DSP.h"
+#include "Rig.h"
+
+/**********************************************************************/
+
+#define TS590_COMMAND_MAX_LENGTH  50 // including terminator (which will get converted to null)
+
+const int ts590CommandMaxLength = TS590_COMMAND_MAX_LENGTH;
+
+void ts590SendCommand(const char*, ...);
+
+/*!
+ *  @brief  Send a syntax error response to the PC via CAT.
+ */
+inline void ts590SyntaxError() { ts590SendCommand("?"); }
+
+/*!
+ *  @brief  Send a communications error response to the PC via CAT.
+ */
+inline void ts590CommError() { ts590SendCommand("E"); }  
+
+/*!
+ *  @brief  Send a processing error response to the PC via CAT.
+ */
+inline void ts590ProcessError() { ts590SendCommand("O"); }
+
+enum TS590Error {
+  NoError,
+  SyntaxError,
+  CommError,
+  ProcessError
+};
+
+/**********************************************************************
+ **********************************************************************/
+/*
+class TS590BaseCommand {
+  public:
+  TS590BaseCommand(const char* prefix)
+  : myPrefix(prefix), prefixLength(strlen(prefix))
+  {}
+  virtual ~TS590BaseCommand() = 0;
+
+  inline const char* prefix() { return &myPrefix[0]; }
+  inline size_t length() { return prefixLength; }
+
+  virtual void handleCommand(const char* cmd) = 0;
+  virtual void sendResponse(const char* cmd) = 0;
+  virtual bool isReadCommand(const char* cmd) const;
+  
+  inline void process(const char* cmd) {
+    theError = NoError;
+  
+    if (isReadCommand(cmd)) {
+      DBGCMD( sendResponse(cmd) );
+    } else {
+      DBGCMD( handleCommand(cmd) );
+      switch(theError) {
+        case NoError:
+        if (theRig->isAI()) {
+          DBGCMD( sendResponse(cmd) );
+        }
+        break;
+  
+        case SyntaxError:
+        DBGCMD( ts590SyntaxError() );
+        break;
+  
+        case CommError:
+        DBGCMD( ts590CommError() );
+        break;
+  
+        case ProcessError:
+        DBGCMD( ts590ProcessError() );
+        break;
+      }
+    }  
+  }
+
+  private:
+  const char* myPrefix;
+  size_t prefixLength;
+};
+*/
+typedef etl::delegate<bool(const char*)> ValidateFunc;
+typedef etl::delegate<bool(const char*)> IsReadFunc;
+typedef etl::delegate<void(bool)> ToggleFunc;
+
+/*
+class TS590ToggleCommand : public TS590BaseCommand {
+  TS590ToggleCommand(const char* prefix, ToggleFunc& setter, ToggleFunc& getter)
+  : TS590BaseCommand(prefix) 
+  {}
+
+  private:
+  ToggleFunc& mySetter;
+  ToggleFunc& myGetter;
+};
+*/
+/**********************************************************************/
+
+/*!
+ *  @brief  A TS590S/SG "CAT" command.  This is the base class for all
+ *          CAT commands.
+ */
+class TS590Command {
+  public:
+  TS590Command(const char* pre);
+  virtual ~TS590Command();
+
+  /*!
+   *  @brief  Return the 2-character prefix for the command.
+   *  @return The 2-character prefix for the command.
+   */
+  inline const char* prefix() const { return &myPrefix[0]; }
+
+  inline size_t length() const { return prefixLength; }
+
+  /*!
+   *  @brief  Return the rig that this command will be used to control.
+   */
+  inline UBitxRig* rig() const { return theRig; }
+
+  /*!
+   *  @brief  Return the DSP that this command will be used to control.
+   */
+  inline UBitxDSP* dsp() const { return theDSP; }
+
+  /*!
+   *  @brief  Handle the provided Set command.  If the Set command
+   *          results in an error, then set the appropriate flag with
+   *          setSyntaxError(), setCommError(), or setProcessError().
+   *  @param  cmd
+   *          The current command string received from the PC via CAT.
+   *          It should be null-terminated, and should no longer have
+   *          the terminator (;).
+   */
+  virtual void handleCommand(const char* cmd) = 0;
+
+  /*!
+   *  @brief  Send a response back to the PC.  This assumes a
+   *          successful command (no errors).
+   */
+  virtual void sendResponse(const char* cmd) = 0;
+
+  virtual bool isReadCommand(const char* cmd) const;
+  
+  void process(const char* cmd);
+
+  static void setSyntaxError();
+  static void setCommError();
+  static void setProcessError();
+  static void setRig(UBitxRig* r);
+  static void setDSP(UBitxDSP* d);
+
+  private:
+  const char* myPrefix;
+  size_t prefixLength;
+  static TS590Error theError;
+  static UBitxRig* theRig;
+  static UBitxDSP* theDSP;
+};
+
+/**********************************************************************/
+
+typedef etl::delegate<void(bool)> SetBool;
+typedef etl::delegate<bool(void)> GetBool;
+
+class TS590Command_Bool : public TS590Command {
+  public:
+  TS590Command_Bool(const char* prefix, SetBool set, GetBool get)
+  : TS590Command(prefix), setter(set), getter(get) {}
+
+  virtual void handleCommand(const char* cmd);
+  virtual void sendResponse(const char* cmd);
+
+  private:
+  SetBool setter;
+  GetBool getter;
+};
+
+/**********************************************************************/
+
+typedef etl::delegate<void(unsigned)> SetUL;
+typedef etl::delegate<unsigned(void)> GetUL;
+
+class TS590Command_UL : public TS590Command {
+  public:
+  TS590Command_UL(const char* prefix, size_t width, unsigned min, unsigned max, SetUL set, GetUL get)
+  : TS590Command(prefix), myWidth(width), myMin(min), myMax(max), mySlope(1), myIntercept(0), setter(set), getter(get) {}
+
+  TS590Command_UL(const char* prefix, size_t width, unsigned min, unsigned max, unsigned slope, unsigned intercept, SetUL set, GetUL get)
+  : TS590Command(prefix), myWidth(width), myMin(min), myMax(max), mySlope(slope), myIntercept(intercept), setter(set), getter(get) {}
+
+  virtual void handleCommand(const char* cmd);
+  virtual void sendResponse(const char* cmd);
+
+  private:
+  size_t myWidth;
+  unsigned myMin;
+  unsigned myMax;
+  unsigned mySlope;
+  unsigned myIntercept;
+  SetUL setter;
+  GetUL getter;
+};
+
+/**********************************************************************/
+/*
+typedef etl::delegate<void(bool)> SetULArray;
+typedef etl::delegate<bool(void)> GetULArray;
+
+class TS590Command_ULArray : public TS590Command {
+  public:
+  TS590Command_ULArray(const char* prefix, SetUL set, GetUL get)
+  : TS590Command(prefix), setter(set), getter(get) {}
+
+  virtual void handleCommand(const char* cmd);
+  virtual void sendResponse(const char* cmd);
+
+  private:
+  SetUL setter;
+  GetUL getter;
+};
+*/
+/**********************************************************************/
+
+/*!
+ *  @brief  CAT command for setting or reading the VFO A/B frequency.
+ */
+template<bool VFOA>
+class TS590_FAB : public TS590Command {
+  public:
+  TS590_FAB(): TS590Command(VFOA ? "FA" : "FB") {}
+
+  virtual void handleCommand(const char* cmd) {
+    if (strlen(cmd) == 13) {
+      unsigned long freq = strtoul(&cmd[2], NULL, 10);
+      if (VFOA) {
+        rig()->setFreqA(freq);
+      } else {
+        rig()->setFreqB(freq);
+      }
+    } else {
+      setSyntaxError();
+    }
+  }
+
+  virtual void sendResponse(const char* cmd) {
+    ts590SendCommand(VFOA ? "FA%011u" : "FB%011u", VFOA ? rig()->getFreqA() : rig()->getFreqB());
+  }
+};
+
+typedef TS590_FAB<true> TS590_FA;
+typedef TS590_FAB<false> TS590_FB;
+
+/**********************************************************************/
+
+/*!
+ *  @brief  CAT command for setting the receiver VFO.  This will always
+ *          disable split mode, if it was previously enabled.
+ */
+class TS590_FR : public TS590Command {
+  public:
+  TS590_FR(): TS590Command("FR") {}
+  virtual void handleCommand(const char* cmd);
+  virtual void sendResponse(const char* cmd);
+};
+
+/**********************************************************************/
+
+/*!
+ *  @brief  CAT command for setting the transmitter VFO.  If it is
+ *          different than the receiver VFO, then split mode will be
+ *          automatically enabled.
+ */
+class TS590_FT : public TS590Command {
+  public:
+  TS590_FT(): TS590Command("FT") {}
+  virtual void handleCommand(const char* cmd);
+  virtual void sendResponse(const char* cmd);
+};
+
+/**********************************************************************/
+
+/*!
+ *  @brief  CAT command for setting the mode.
+ */
+class TS590_MD : public TS590Command {
+  public:
+  TS590_MD(): TS590Command("MD") {}
+  virtual void handleCommand(const char* cmd);
+  virtual void sendResponse(const char* cmd);
+};
+
+/**********************************************************************/
+
+/*!
+ *  @brief  CAT command for setting the receiver high-cut frequency.
+ */
+class TS590_SH : public TS590Command {
+  public:
+  TS590_SH(): TS590Command("SH") {}
+  virtual void handleCommand(const char* cmd);
+  virtual void sendResponse(const char* cmd);
+  private:
+  unsigned index;
+};
+
+/*!
+ *  @brief  CAT command for setting the receiver low-cut frequency.
+ */
+class TS590_SL : public TS590Command {
+  public:
+  TS590_SL(): TS590Command("SL") {}
+  virtual void handleCommand(const char* cmd);
+  virtual void sendResponse(const char* cmd);
+  private:
+  unsigned index;
+};
+
+/*!
+ *  CAT command for enabling or disabling the mic VOX.
+ */
+class TS590_VX : public TS590Command {
+  public:
+  TS590_VX(): TS590Command("VX") {}
+  virtual void handleCommand(const char* cmd);
+  virtual void sendResponse(const char* cmd);
+  private:
+  unsigned index;
+};
+
+/**********************************************************************/
+
+class UBitxTS590 {
+  public:
+  UBitxTS590(TS590Command** cmds, int len): commands(cmds), numCommands(len) {}
+  
+  void begin();
+  void update();
+
+  private:
+  void processCommand();
+  
+  char buf[ts590CommandMaxLength] = {0};
+  int bufLen = 0;
+  TS590Command** commands;
+  int numCommands;
+};
+
+extern UBitxTS590 TS590;
+
+#endif
+
+/**********************************************************************/

TeensyDSP/TeensyDSP.h

@@ -10,9 +10,13 @@ KD8CEC, Ian Lee
 #include <Arduino.h>
 #include "Debug.h"
 #include "DSP.h"
+#include "Keyer.h"
 #include "Nextion.h"
+#include "Rig.h"
+#include "RigState.h"
 #include "Sensors.h"
 #include "TR.h"
+#include "TS590.h"
 
 //================================================================
 //COMMUNICATION SECTION
@@ -63,3 +67,9 @@ extern int magnitudelimit_low;
 //SWR
 #define I2CMETER_CALCR    0x55 //Calculated SWR Meter
 #define I2CMETER_UNCALCR  0x54 //Uncalculated SWR Meter
+
+// Raduino<=>TeensyDSP data exchange
+#define I2CMETER_RIGINF   0x50
+
+// Raduino requests any CAT updates from TeensyDSP
+//#define I2CMETER_REQCAT   0x51

TeensyDSP/TeensyDSP.ino

@@ -16,6 +16,11 @@
 //const uint8_t responseFooter[4]={'"', 0xFF, 0xFF, 0xFF};
 //const char hexCodes[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', };
 
+#ifdef DEBUG
+int i2cCmdCounter[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+int i2cRespCounter[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+#endif
+
 unsigned long SAMPLE_INTERVAL = 0;
 
 int i2cCommand = 0;
@@ -308,6 +313,12 @@ void sendMeterData(uint8_t isSend)
 
 void setup()
 {
+  // Startup each of the subsystems, beginning with CAT.
+  DBGCMD( TS590.begin() );
+  DBGCMD( TR.begin()    );
+  DBGCMD( Rig.begin()   );
+  DBGCMD( DSP.begin()   );
+  
   // load configuration
   EEPROM.get(EEPROM_DSPTYPE, DSPType);
   if (DSPType > 5)
@@ -350,9 +361,6 @@ void setup()
   SAMPLE_INTERVAL = round(1000000 * (1.0 / SAMPLE_FREQUENCY));
   //calculateCoeff(cwDecodeHz);  //Set 750Hz //9 * 50 + 300 = 750Hz
   //Serial1.println("Start...");
-
-  DBGCMD( DSP.begin() );
-  DBGCMD( TR.begin()  );
 }
 
 /*!
@@ -364,16 +372,29 @@ void setup()
 void i2cReceiveEvent(size_t numBytes)
 {  
   int readCommand = 0;
+  bool exitLoop = false;
 
-  while (Wire1.available() > 0) // for Last command
-  {
+  // Does this really need to be a while loop?  Don't we know the number of bytes?
+  while (Wire1.available() > 0 && !exitLoop) {
     readCommand = Wire1.read();
-    // KC4UPR:  Note that this looks to be only reading the last command, i.e.
-    // if multiple commands have been queued up, only the last will get executed.
+    if (readCommand == I2CMETER_RIGINF) {
+      Rig.rad().receive_RIGINF(numBytes - 1);
+      exitLoop = true;
     }
+  }
+
+//  while (Wire1.available() > 0) // for Last command
+//  {
+//    readCommand = Wire1.read();
+//    // KC4UPR:  Note that this looks to be only reading the last command, i.e.
+//    // if multiple commands have been queued up, only the last will get executed.
+//  }
 
   if (0x50 <= readCommand && readCommand <= 0x59)
   {
+    #ifdef DEBUG
+      i2cCmdCounter[readCommand - 0x50]++;
+    #endif
     i2cCommand = readCommand;
   }
 }
@@ -402,17 +423,52 @@ void i2cRequestEvent(void)
 
     case I2CMETER_CALCP:
       // Returns a raw forward power value.
-      Wire1.write(fwdPower);
+      Wire1.write(int(fwdPower * 100.0));
       break;
 
     case I2CMETER_CALCR:
       // Returns a raw reverse power value.
-      Wire1.write(revPower);
+      Wire1.write(int(revPower * 100.0));
       break;
 
+    case I2CMETER_RIGINF:
+    // Receive current rig state; transmit any CAT updates, if required.
+    Rig.cat().send_RIGINF();
+    //Wire1.write(catState.header); // temporary - just writing a single, null byte
+    // NEEDS TO GET UPDATED
+    break;
+
+/*
+    case I2CMETER_REQCAT:
+    // Provide latest CAT updates, if any.
+    //Wire1.write(catState.header); // temporary - just writing a single, null byte
+    // NEEDS TO GET UPDATED
+    if (Rig.updatedByCAT()) {
+      if (sentRigInfFlag) {
+        DBGPRINTLN("I2CMETER_REQCAT -- updated by CAT");
+        Wire1.write(Rig.stateAsBytes(), sizeof(UBitxRigState));
+        Rig.clearUpdate();
+      } else {
+        Wire1.write(1);
+        sentRigInfFlag = true;
+      }
+    } else {
+      DBGPRINTLN("I2CMETER_REQCAT -- NOT updated by CAT");
+      //Wire1.write(Rig.stateAsBytes(), sizeof(uint8_t));
+      Wire1.write(0);
+    }
+    break;
+*/
     default:
       break;
   }
+
+#ifdef DEBUG
+  if (0x50 <= i2cCommand && i2cCommand <= 0x59)
+  {
+    i2cRespCounter[i2cCommand - 0x50]++;
+  }
+#endif
 }
 
 //extern void Decode_Morse(float magnitude);
@@ -449,16 +505,18 @@ const int adcIntervalMillis = ADC_INTERVAL_MS;
 int frameCounter = 0;
 #endif
 
+/**********************************************************************/
+
 void loop()
 {
   //char isProcess = 0; // 0: init, 1: complete ADC sampling, 2: complete FFT
   //isProcess = 0;
 
-  forwardData();
-
+  // One-shot delay to ensure everything is booted up (primarily, the 
+  // Nextion, and secondarily the Raduino.
   if (isBooted < 100)
   {
-    //Delay 20msec
+    // delay 20msec
     for (int i = 0; i < 20; i++)
     {
       forwardData();
@@ -468,15 +526,35 @@ void loop()
     return;
   }
 
+  // If CW mode, we need to update keying a lot...
+  if (Rig.isModeCWAny()) {
+    if (Rig.isModeCWAny()) Keyer.doPaddles();
+    TR.update(Rig.isModeCWAny(), Keyer.isDown());
+    //if (TR.transmitting()) return;
+  }
+
+  // Start out by forwarding any data sitting in the RX buffer.  We will
+  // do this as often as possible.
+  forwardData();
+
   if (sinceFrameMillis > frameIntervalMillis) {
     // Do stuff that we do once per frame--I/O.
     // TODO: debug output (frame skipping / utilization).
     sinceFrameMillis = 0;
 
+    // Update each of the subsystems, beginning with CAT control.
+    TS590.update();    
+    TR.update(Rig.isModeCWAny(), Keyer.isDown());
+    Rig.update();
+    DSP.update();
+
+    //if (Rig.isModeCWAny()) return;
+
 #ifdef DEBUG
     // For debugging, output some debug info every 1.0" (40 frames @ 40 Hz).
     frameCounter++;
     if (frameCounter % 40 == 0) {
+      Serial.println("======================================================================");
       Serial.print("DBG: Frame: ");
       Serial.print(frameCounter);
       if (isTX) {
@@ -489,6 +567,14 @@ void loop()
       } else {
         Serial.println(", TR State: RX");
       }
+      Serial.print("VFO A: ");
+      Serial.print(Rig.getFreqA());
+      Serial.print(", VFO B: ");
+      Serial.print(Rig.getFreqB());
+      Serial.print(", Data Size: ");
+      Serial.print(sizeof(UBitxRigState));
+      Serial.println();
+      Serial.println("----------------------------------------------------------------------");
       Serial.print("DBG: S-Meter Raw: ");
       Serial.print(Sensors.sMeterUnscaled());
       Serial.print(", S-Meter Scaled: ");
@@ -501,11 +587,30 @@ void loop()
       Serial.print(fwdPower, 2);
       Serial.print(", REV PWR: ");
       Serial.println(revPower, 2);
+      Serial.print("Audio Memory: ");
+      Serial.print(AudioMemoryUsage());
+      Serial.print(",");
+      Serial.println(AudioMemoryUsageMax());      
+      Serial.println("----------------------------------------------------------------------");
+      Serial.print("Enabled/Active: PTT: ");
+      Serial.print(TR.micPTTEnabled() ? "Y" : "N"); Serial.print("/"); Serial.print(TR.micPTTPressed() ? "Y" : "N");
+      Serial.print(", VOX: ");
+      Serial.print(TR.micVOXEnabled() ? "Y" : "N"); Serial.print("/"); Serial.print(TR.micVOXActivated() ? "Y" : "N");
+      Serial.print(", Key: ");
+      Serial.print(TR.linePTTEnabled() ? "Y" : "N"); Serial.print("/"); Serial.print(TR.linePTTPressed() ? "Y" : "N");
+      Serial.print(", CAT: ");
+      Serial.print(TR.catEnabled() ? "Y" : "N"); Serial.print("/"); Serial.print(TR.catActivated() ? "Y" : "N");      
+      Serial.println();
+      Serial.print("I2C Command/Response: ");
+      for (int i = 0x50; i <= 0x59; i++) {
+        Serial.print(i, HEX); Serial.print(": "); 
+        Serial.print(i2cCmdCounter[i - 0x50]); Serial.print("/");
+        Serial.print(i2cRespCounter[i - 0x50]); Serial.print(", ");
+      }
+      Serial.println();
     }
 #endif
 
-    TR.update();
-
     if (isTX) {
       calcVSWR = Sensors.VSWR();
       scaledVSWR = byte(Sensors.scaledVSWR());
@@ -521,14 +626,14 @@ void loop()
       // Send forward power.
       if (L_fwdPower != fwdPower) {
         L_fwdPower = fwdPower;
-        sendCommandL('m', fwdPower * 100);  // watts x 100?
+        sendCommandL('m', int(fwdPower * 100.0));  // watts x 100?
         sendCommand1Num('m', 2);
       }
 
       // Send reverse power.
       //if (L_revPower != revPower) {
       //  L_revPower = revPower;
-      //  sendCommandL('m', revPower * 100);  // watts x 100?
+      //  sendCommandL('m', int(revPower * 100.0));  // watts x 100?
       //  sendCommand1Num('m', 2);
       //}
 
@@ -566,6 +671,8 @@ void loop()
     forwardData();
   }
 
+  if (Rig.isModeCWAny()) return; // In CW, the ADC measurement messes with the timing.  So need to use interrupts on the Keyer, and/or continuous ADC.
+
   if (sinceADCMillis > adcIntervalMillis) {
     // Do stuff that we do once per ADC interval--ADC colllection.
     // TODO: debug output (frame skipping / utilization).
@@ -582,6 +689,8 @@ void loop()
     //forwardData();
   }
 
+  //if (Rig.isModeCWAny()) return;
+
   // Check Response Command
   if (responseCommand > 0 && sinceForward > LAST_TIME_INTERVAL)
   {