scrape/ubitx-v5d
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add function adjust CW ADC Range

Browse Source
This commit is contained in:
phdlee
2018-01-27 16:39:54 +09:00
parent 4506ff1c1b
commit cc7dd752e6
2 changed files with 37 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
ubitx_20/ubitx_20.ino
View File

@@ -161,14 +161,17 @@ int count = 0; //to generally count ticks, loops, etc
#define TUNING_STEP 342 //TUNING STEP * 6 (index 1 + STEPS 5) #define TUNING_STEP 342 //TUNING STEP * 6 (index 1 + STEPS 5)
//for reduce cw key error, eeprom address //for reduce cw key error, eeprom address
#define CW_ADC_ST_FROM 348 //CW ADC Range STRAIGHT KEY from #define CW_ADC_MOST_BIT1 348 //most 2bits of DOT_TO , DOT_FROM, ST_TO, ST_FROM
#define CW_ADC_ST_TO 349 //CW ADC Range STRAIGHT KEY to #define CW_ADC_ST_FROM 349 //CW ADC Range STRAIGHT KEY from (Lower 8 bit)
#define CW_ADC_DOT_FROM 350 //CW ADC Range DOT from #define CW_ADC_ST_TO 350 //CW ADC Range STRAIGHT KEY to (Lower 8 bit)
#define CW_ADC_DOT_TO 351 //CW ADC Range DOT to #define CW_ADC_DOT_FROM 351 //CW ADC Range DOT from (Lower 8 bit)
#define CW_ADC_DASH_FROM 352 //CW ADC Range DASH from #define CW_ADC_DOT_TO 352 //CW ADC Range DOT to (Lower 8 bit)
#define CW_ADC_DASH_TO 353 //CW ADC Range DASH to
#define CW_ADC_BOTH_FROM 354 //CW ADC Range BOTH from #define CW_ADC_MOST_BIT2 353 //most 2bits of BOTH_TO, BOTH_FROM, DASH_TO, DASH_FROM
#define CW_ADC_BOTH_TO 355 //CW ADC Range BOTH to #define CW_ADC_DASH_FROM 354 //CW ADC Range DASH from (Lower 8 bit)
#define CW_ADC_DASH_TO 355 //CW ADC Range DASH to (Lower 8 bit)
#define CW_ADC_BOTH_FROM 356 //CW ADC Range BOTH from (Lower 8 bit)
#define CW_ADC_BOTH_TO 357 //CW ADC Range BOTH to (Lower 8 bit)
//Check Firmware type and version //Check Firmware type and version
#define FIRMWAR_ID_ADDR 776 //776 : 0x59, 777 :0x58, 778 : 0x68 : Id Number, if not found id, erase eeprom(32~1023) for prevent system error. #define FIRMWAR_ID_ADDR 776 //776 : 0x59, 777 :0x58, 778 : 0x68 : Id Number, if not found id, erase eeprom(32~1023) for prevent system error.
@@ -256,14 +259,14 @@ byte arTuneStep[5];
byte tuneStepIndex; //default Value 0, start Offset is 0 because of check new user byte tuneStepIndex; //default Value 0, start Offset is 0 because of check new user
//CW ADC Range //CW ADC Range
byte cwAdcSTFrom = 0; int cwAdcSTFrom = 0;
byte cwAdcSTTo = 0; int cwAdcSTTo = 0;
byte cwAdcDotFrom = 0; int cwAdcDotFrom = 0;
byte cwAdcDotTo = 0; int cwAdcDotTo = 0;
byte cwAdcDashtFrom = 0; int cwAdcDashFrom = 0;
byte cwAdcDashTo = 0; int cwAdcDashTo = 0;
byte cwAdcBothFrom = 0; int cwAdcBothFrom = 0;
byte cwAdcBothTo = 0; int cwAdcBothTo = 0;
//Variables for auto cw mode //Variables for auto cw mode
byte isCWAutoMode = 0; //0 : none, 1 : CW_AutoMode_Menu_Selection, 2 : CW_AutoMode Sending byte isCWAutoMode = 0; //0 : none, 1 : CW_AutoMode_Menu_Selection, 2 : CW_AutoMode Sending
@@ -813,17 +816,18 @@ void initSettings(){
//CW Key ADC Range ======= adjust set value for reduce cw keying error //CW Key ADC Range ======= adjust set value for reduce cw keying error
//by KD8CEC //by KD8CEC
EEPROM.get(CW_ADC_ST_FROM, cwAdcSTFrom); unsigned int tmpMostBits = 0;
EEPROM.get(CW_ADC_ST_TO, cwAdcSTTo); tmpMostBits = EEPROM.read(CW_ADC_MOST_BIT1);
cwAdcSTFrom = EEPROM.read(CW_ADC_ST_FROM) | ((tmpMostBits & 0x03) << 8);
cwAdcSTTo = EEPROM.read(CW_ADC_ST_TO) | ((tmpMostBits & 0x0C) << 6);
cwAdcDotFrom = EEPROM.read(CW_ADC_DOT_FROM) | ((tmpMostBits & 0x30) << 4);
cwAdcDotTo = EEPROM.read(CW_ADC_DOT_TO) | ((tmpMostBits & 0xC0) << 2);
EEPROM.get(CW_ADC_DOT_FROM, cwAdcDotFrom); tmpMostBits = EEPROM.read(CW_ADC_MOST_BIT2);
EEPROM.get(CW_ADC_DOT_TO, cwAdcDotTo); cwAdcDashFrom = EEPROM.read(CW_ADC_DASH_FROM) | ((tmpMostBits & 0x03) << 8);
cwAdcDashTo = EEPROM.read(CW_ADC_DASH_TO) | ((tmpMostBits & 0x0C) << 6);
EEPROM.get(CW_ADC_DASH_FROM, cwAdcDashtFrom); cwAdcBothFrom = EEPROM.read(CW_ADC_BOTH_FROM) | ((tmpMostBits & 0x30) << 4);
EEPROM.get(CW_ADC_DASH_TO, cwAdcDashTo); cwAdcBothTo = EEPROM.read(CW_ADC_BOTH_TO) | ((tmpMostBits & 0xC0) << 2);
EEPROM.get(CW_ADC_BOTH_FROM, cwAdcBothFrom);
EEPROM.get(CW_ADC_BOTH_TO, cwAdcBothTo);
//default Value (for original hardware) //default Value (for original hardware)
if (cwAdcSTFrom >= cwAdcSTTo) if (cwAdcSTFrom >= cwAdcSTTo)
@@ -843,12 +847,12 @@ void initSettings(){
cwAdcDotFrom = 301; cwAdcDotFrom = 301;
cwAdcDotTo = 600; cwAdcDotTo = 600;
} }
if (cwAdcDashtFrom >= cwAdcDashTo) if (cwAdcDashFrom >= cwAdcDashTo)
{ {
cwAdcDashtFrom = 601; cwAdcDashFrom = 601;
cwAdcDashTo = 800; cwAdcDashTo = 800;
} }
//end of CW Keying Variables
if (cwDelayTime < 1 || cwDelayTime > 250) if (cwDelayTime < 1 || cwDelayTime > 250)
cwDelayTime = 60; cwDelayTime = 60;

58
ubitx_20/ubitx_keyer.ino
View File

@@ -98,20 +98,15 @@ unsigned char keyerState = IDLE;
//Below is a test to reduce the keying error. do not delete lines //Below is a test to reduce the keying error. do not delete lines
//create by KD8CEC for compatible with new CW Logic //create by KD8CEC for compatible with new CW Logic
char update_PaddleLatch(byte isUpdateKeyState) { char update_PaddleLatch(byte isUpdateKeyState) {
int paddle = analogRead(ANALOG_KEYER);
unsigned char tmpKeyerControl; unsigned char tmpKeyerControl;
int paddle = analogRead(ANALOG_KEYER);
//if (paddle > 800) // above 4v is up if (paddle > cwAdcDashFrom && paddle < cwAdcDashTo)
// tmpKeyerControl = 0;
//else if (paddle > 600) // 4-3v is DASH
if (paddle > cwAdcDashtFrom && cwAdcDashTo < 700) // 4-3v is DASH
tmpKeyerControl |= DAH_L; tmpKeyerControl |= DAH_L;
//else if (paddle > 300) //1-2v is DOT else if (paddle > cwAdcDotFrom && paddle < cwAdcDotTo)
else if (paddle > cwAdcDotFrom && paddle < cwAdcDotTo) //1-2v is DOT
tmpKeyerControl |= DIT_L; tmpKeyerControl |= DIT_L;
//else if (paddle > 50)
else if (paddle > cwAdcBothFrom && paddle < cwAdcBothTo) else if (paddle > cwAdcBothFrom && paddle < cwAdcBothTo)
tmpKeyerControl |= (DAH_L | DIT_L) ; //both are between 1 and 2v tmpKeyerControl |= (DAH_L | DIT_L) ;
else else
{ {
if (Iambic_Key) if (Iambic_Key)
@@ -122,52 +117,11 @@ char update_PaddleLatch(byte isUpdateKeyState) {
tmpKeyerControl = 0 ; tmpKeyerControl = 0 ;
} }
tmpKeyerControl = 0 ; //STRAIGHT KEY in original code
//keyerControl |= (DAH_L | DIT_L) ; //STRAIGHT KEY in original code
if (isUpdateKeyState == 1) {
keyerControl |= tmpKeyerControl;
}
byte buff[17];
sprintf(buff, "Key : %d", paddle);
if (tmpKeyerControl > 0)
printLine2(buff);
return tmpKeyerControl;
//if (analogRead(ANALOG_DOT) < 600 ) keyerControl |= DIT_L;
//if (analogRead(ANALOG_DASH) < 600 ) keyerControl |= DAH_L;
}
/*
//create by KD8CEC for compatible with new CW Logic
char update_PaddleLatch(byte isUpdateKeyState) {
int paddle = analogRead(ANALOG_KEYER);
unsigned char tmpKeyerControl;
if (paddle > 800) // above 4v is up
tmpKeyerControl = 0;
else if (paddle > 600) // 4-3v is DASH
tmpKeyerControl |= DAH_L;
else if (paddle > 300) //1-2v is DOT
tmpKeyerControl |= DIT_L;
else if (paddle > 50)
tmpKeyerControl |= (DAH_L | DIT_L) ; //both are between 1 and 2v
else
{ //STRAIGHT KEY in original code
if (Iambic_Key)
tmpKeyerControl = 0 ;
else
tmpKeyerControl = DIT_L ;
}
if (isUpdateKeyState == 1) if (isUpdateKeyState == 1)
keyerControl |= tmpKeyerControl; keyerControl |= tmpKeyerControl;
return tmpKeyerControl; return tmpKeyerControl;
} }
*/
/***************************************************************************** /*****************************************************************************
// New logic, by RON // New logic, by RON
@@ -187,10 +141,6 @@ while(continue_loop){
tmpKeyControl = update_PaddleLatch(0); tmpKeyControl = update_PaddleLatch(0);
if ( tmpKeyControl == DAH_L || tmpKeyControl == DIT_L || if ( tmpKeyControl == DAH_L || tmpKeyControl == DIT_L ||
tmpKeyControl == (DAH_L | DIT_L) || (keyerControl & 0x03)) { tmpKeyControl == (DAH_L | DIT_L) || (keyerControl & 0x03)) {
//DIT or DASH or current state DIT & DASH
//(analogRead(ANALOG_DOT) < 600) || //DIT
//(analogRead(ANALOG_DASH) < 600) || //DIT
// (keyerControl & 0x03)) {
update_PaddleLatch(1); update_PaddleLatch(1);
keyerState = CHK_DIT; keyerState = CHK_DIT;
}else{ }else{