Merge pull request afarhan#2 from reedbn/one_stop_settings

Merging one stop settings branch

Author: reedbn

keyer.cpp

@@ -1,4 +1,5 @@
 #include <Arduino.h>
+#include "settings.h"
 #include "ubitx.h"
 
 /**
@@ -28,86 +29,38 @@
  */
 
  //CW ADC Range
-int cwAdcSTFrom = 0;
-int cwAdcSTTo = 50;
-int cwAdcBothFrom = 51;
-int cwAdcBothTo = 300;
-int cwAdcDotFrom = 301;
-int cwAdcDotTo = 600;
-int cwAdcDashFrom = 601;
-int cwAdcDashTo = 800;
-//byte cwKeyType = 0; //0: straight, 1 : iambica, 2: iambicb
+static const unsigned int cwAdcSTFrom = 0;
+static const unsigned int cwAdcSTTo = 50;
+static const unsigned int cwAdcBothFrom = cwAdcSTTo + 1;
+static const unsigned int cwAdcBothTo = 300;
+static const unsigned int cwAdcDotFrom = cwAdcBothTo + 1;
+static const unsigned int cwAdcDotTo = 600;
+static const unsigned int cwAdcDashFrom = cwAdcDotTo + 1;
+static const unsigned int cwAdcDashTo = 800;
 
-byte delayBeforeCWStartTime = 50;
+static const unsigned int delayBeforeCWStartTime = 50;
 
-
-
-
-// in milliseconds, this is the parameter that determines how long the tx will hold between cw key downs
-//#define CW_TIMEOUT (600l)   //Change to CW Delaytime for value save to eeprom
-#define PADDLE_DOT 1
-#define PADDLE_DASH 2
-#define PADDLE_BOTH 3
-#define PADDLE_STRAIGHT 4
-
-//we store the last padde's character 
-//to alternatively send dots and dashes 
-//when both are simultaneously pressed
-char lastPaddle = 0;
-
-/*
-//reads the analog keyer pin and reports the paddle
-byte getPaddle(){
-  int paddle = analogRead(ANALOG_KEYER);
-  //handle the ptt as the straight key 
-
-  if (digitalRead(PTT) == 0)
-     return PADDLE_STRAIGHT;
-
-  if (paddle > 800)         // above 4v is up
-    return 0;
-
-  if (!Iambic_Key)
-    return PADDLE_STRAIGHT;
-    
-  if (paddle > 600)    // 4-3v is dot
-    return PADDLE_DASH;
-  else if (paddle > 300)    //1-2v is dash
-    return PADDLE_DOT;
-  else if (paddle > 50)
-    return PADDLE_BOTH;     //both are between 1 and 2v
-  else
-    return PADDLE_STRAIGHT; //less than 1v is the straight key
-}
-*/
 /**
  * Starts transmitting the carrier with the sidetone
  * It assumes that we have called cwTxStart and not called cwTxStop
  * each time it is called, the cwTimeOut is pushed further into the future
  */
 void cwKeydown(){
+  tone(CW_TONE, globalSettings.cwSideToneFreq);
+  digitalWrite(CW_KEY, 1);
 
-  keyDown = 1;                  //tracks the CW_KEY
-  tone(CW_TONE, (int)sideTone); 
-  digitalWrite(CW_KEY, 1);     
-
-  //Modified by KD8CEC, for CW Delay Time save to eeprom
-  //cwTimeout = millis() + CW_TIMEOUT;
-  cwTimeout = millis() + cwDelayTime * 10;  
+  globalSettings.cwExpirationTimeMs = millis() + globalSettings.cwActiveTimeoutMs;
 }
 
 /**
  * Stops the cw carrier transmission along with the sidetone
  * Pushes the cwTimeout further into the future
  */
 void cwKeyUp(){
-  keyDown = 0;    //tracks the CW_KEY
   noTone(CW_TONE);
-  digitalWrite(CW_KEY, 0);    
+  digitalWrite(CW_KEY, 0);
 
-  //Modified by KD8CEC, for CW Delay Time save to eeprom
-  //cwTimeout = millis() + CW_TIMEOUT;
-  cwTimeout = millis() + cwDelayTime * 10;
+  globalSettings.cwExpirationTimeMs = millis() + globalSettings.cwActiveTimeoutMs;
 }
 
 //Variables for Ron's new logic
@@ -119,16 +72,14 @@ void cwKeyUp(){
 enum KSTYPE {IDLE, CHK_DIT, CHK_DAH, KEYED_PREP, KEYED, INTER_ELEMENT };
 static unsigned long ktimer;
 unsigned char keyerState = IDLE;
+uint8_t keyerControl = 0;
 
 //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) {
+char update_PaddleLatch(bool isUpdateKeyState) {
   unsigned char tmpKeyerControl = 0;
 
   int paddle = analogRead(ANALOG_KEYER);
-  //diagnostic, VU2ESE
-  //itoa(paddle, b, 10);
-  //printLine2(b);
 
   //use the PTT as the key for tune up, quick QSOs
   if (digitalRead(PTT) == 0)
@@ -138,18 +89,17 @@ char update_PaddleLatch(byte isUpdateKeyState) {
   else if (paddle >= cwAdcDotFrom && paddle <= cwAdcDotTo)
     tmpKeyerControl |= DIT_L;
   else if (paddle >= cwAdcBothFrom && paddle <= cwAdcBothTo)
-    tmpKeyerControl |= (DAH_L | DIT_L) ;     
-  else 
-  {
-    if (Iambic_Key)
+    tmpKeyerControl |= (DAH_L | DIT_L) ;
+  else{
+    if (KeyerMode_e::KEYER_STRAIGHT != globalSettings.keyerMode)
       tmpKeyerControl = 0 ;
     else if (paddle >= cwAdcSTFrom && paddle <= cwAdcSTTo)
       tmpKeyerControl = DIT_L ;
      else
-       tmpKeyerControl = 0 ; 
+       tmpKeyerControl = 0 ;
   }
 
-  if (isUpdateKeyState == 1)
+  if (isUpdateKeyState)
     keyerControl |= tmpKeyerControl;
 
   return tmpKeyerControl;
@@ -160,22 +110,24 @@ 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) {
+  if(KeyerMode_e::KEYER_STRAIGHT != globalSettings.keyerMode){
+    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);
+          if((tmpKeyControl == DAH_L)//Currently dah
+           ||(tmpKeyControl == DIT_L)//Currently dit
+           ||(tmpKeyControl == (DAH_L | DIT_L))//Currently both
+           ||( keyerControl  & (DAH_L | DIT_L))){//Resolving either
+             update_PaddleLatch(true);
              keyerState = CHK_DIT;
-          }else{
-            if (0 < cwTimeout && cwTimeout < millis()){
-              cwTimeout = 0;
+          }
+          else{
+            if (0 < globalSettings.cwExpirationTimeMs && globalSettings.cwExpirationTimeMs < millis()){
+              globalSettings.cwExpirationTimeMs = 0;
               stopTx();
             }
             continue_loop = false;
@@ -185,7 +137,7 @@ void cwKeyer(void){
         case CHK_DIT:
           if (keyerControl & DIT_L) {
             keyerControl |= DIT_PROC;
-            ktimer = cwSpeed;
+            ktimer = globalSettings.cwDitDurationMs;
             keyerState = KEYED_PREP;
           }else{
             keyerState = CHK_DAH;
@@ -194,7 +146,7 @@ void cwKeyer(void){
 
         case CHK_DAH:
           if (keyerControl & DAH_L) {
-            ktimer = cwSpeed*3;
+            ktimer = 3*globalSettings.cwDitDurationMs;
             keyerState = KEYED_PREP;
           }else{
             keyerState = IDLE;
@@ -203,13 +155,11 @@ void cwKeyer(void){
 
         case KEYED_PREP:
           //modified KD8CEC
-          if (!inTx){
+          if (!globalSettings.txActive){
             //DelayTime Option
             active_delay(delayBeforeCWStartTime * 2);
-            
-            keyDown = 0;
-            cwTimeout = millis() + cwDelayTime * 10;  //+ CW_TIMEOUT;
-            startTx(TX_CW);
+            globalSettings.cwExpirationTimeMs = millis() + globalSettings.cwActiveTimeoutMs;
+            startTx(TuningMode_e::TUNE_CW);
           }
           ktimer += millis(); // set ktimer to interval end time
           keyerControl &= ~(DIT_L + DAH_L); // clear both paddle latch bits
@@ -220,10 +170,11 @@ void cwKeyer(void){
 
         case KEYED:
           if (millis() > ktimer) { // are we at end of key down ?
-           cwKeyUp();
-           ktimer = millis() + cwSpeed; // inter-element time
+            cwKeyUp();
+            ktimer = millis() + (globalSettings.cwDitDurationMs / 10); // inter-element time
             keyerState = INTER_ELEMENT; // next state
-          }else if (keyerControl & IAMBICB) {
+          }
+          else if(KeyerMode_e::KEYER_IAMBIC_B == globalSettings.keyerMode){
             update_PaddleLatch(1); // early paddle latch in Iambic B mode
           }
           break;
@@ -246,20 +197,19 @@ void cwKeyer(void){
       checkCAT();
     } //end of while
   }
-  else{
+  else{//KEYER_STRAIGHT
     while(1){
      char state = update_PaddleLatch(0);
-     // Serial.println((int)state); 
+     // Serial.println((int)state);
       if (state == DIT_L) {
         // if we are here, it is only because the key is pressed
-        if (!inTx){
-          startTx(TX_CW);
+        if (!globalSettings.txActive){
+          startTx(TuningMode_e::TUNE_CW);
 
           //DelayTime Option
           active_delay(delayBeforeCWStartTime * 2);
-          
-          keyDown = 0;
-          cwTimeout = millis() + cwDelayTime * 10;  //+ CW_TIMEOUT; 
+
+          globalSettings.cwExpirationTimeMs = millis() + globalSettings.cwDitDurationMs;
         }
         cwKeydown();
 
@@ -269,24 +219,16 @@ void cwKeyer(void){
         cwKeyUp();
       }
       else{
-        if (0 < cwTimeout && cwTimeout < millis()){
-          cwTimeout = 0;
-          keyDown = 0;
+        if (0 < globalSettings.cwExpirationTimeMs && globalSettings.cwExpirationTimeMs < millis()){
+          globalSettings.cwExpirationTimeMs = 0;
           stopTx();
         }
-        //if (!cwTimeout) //removed by KD8CEC
-        //   return;
-        // got back to the beginning of the loop, if no further activity happens on straight key
-        // we will time out, and return out of this routine 
-        //delay(5);
-        //delay_background(5, 3); //removed by KD8CEC
-        //continue;               //removed by KD8CEC
-        return;                   //Tx stop control by Main Loop
+        return;//Tx stop control by Main Loop
       }
 
       checkCAT();
     } //end of while
-  }   //end of elese
+  }//end of else KEYER_STRAIGHT
 }
 
 

morse.cpp

@@ -1,19 +1,19 @@
 #include <Arduino.h>
 #include "ubitx.h"
+#include "settings.h"
 #include "morse.h"
+
+struct Morse {
+  char letter;
+  unsigned char code;
+};
+
 /*
  * Each byte of the morse table stores one letter. 
  * The 0 is a dot, a 1 is a dash 
  * From the Most significant byte onwards, the letter is padded with 1s. 
  * The first zero after the 1s indicates the start of the letter, it MUST be discarded
  */
-
-extern int cwSpeed;
-struct Morse {
-  char letter;
-  unsigned char code;  
-};
-
 static const PROGMEM struct Morse morse_table[] = { 
 {'a', 0xf9}, // 11111001
 {'b', 0xe8}, // 11101000
@@ -51,18 +51,18 @@ static const PROGMEM struct Morse morse_table[] = {
 {'8', 0xdc}, // 11011100
 {'9', 0xde}, // 11011110
 {'0', 0xdf}, // 11011111
-{'.', 0xd5}, // 110010101
-{',', 0xd3}, // 110110011 //AD7U 20191217 
-{'?', 0xcc}, // 11001100 //AD7U 20191217 - Added
+{'.', 0x95}, // 10010101
+{',', 0xb3}, // 10110011
+{'?', 0x8c}, // 10001100
 };
 
 static void morseLetter(char c){
   unsigned char mask = 0x80;
 
   //handle space character as three dashes
   if (c == ' '){
-    active_delay(cwSpeed * 9);
-    Serial.print(' ');
+    active_delay(9 * globalSettings.cwDitDurationMs);
+    //Serial.print(' ');
     return;
   }
 
@@ -79,22 +79,23 @@ static void morseLetter(char c){
       //now we are at the first zero, skip and carry on
       mask = mask >> 1;
       while(mask){
-        tone(CW_TONE, sideTone,10000);
+        tone(CW_TONE, globalSettings.cwSideToneFreq,10000);
         if (mask & code){
-          delay(3 * (int)cwSpeed);
+          delay(3 * globalSettings.cwDitDurationMs);
           //Serial.print('-');
         }
         else{
-          delay((int)cwSpeed);
+          delay(globalSettings.cwDitDurationMs);
           //Serial.print('.');
         }
         //Serial.print('#');
         noTone(CW_TONE);
-        delay((int)cwSpeed); // space between dots and dashes
+        delay(globalSettings.cwDitDurationMs); // space between dots and dashes
         mask = mask >> 1;
       }
       //Serial.println('@');
-      delay(200); // space between letters is a dash (3 dots), one dot's space has already been sent
+      delay(2*globalSettings.cwDitDurationMs); // space between letters is a dash (3 dots), one dot's space has already been sent
+      break;//We've played the letter, so don't bother checking the rest of the list
     }
   }
 }
@@ -107,7 +108,7 @@ void morseText(char *text){
   delay(1000);
 //  }
 
-  Serial.println(sideTone);
+  //Serial.println(globalSettings.cwSideToneFreq);
   while(*text){
     morseLetter(*text++);
   }