mirror of
https://codeberg.org/mclemens/ubitxv6.git
synced 2024-10-04 17:04:06 -04:00
Merge pull request #8 from reedbn/cw-tx-issues
CW RX->TX responsiveness issues
This commit is contained in:
commit
fbc718b2ee
12
keyer.cpp
12
keyer.cpp
@ -38,8 +38,6 @@ static const unsigned int cwAdcDotTo = 600;
|
|||||||
static const unsigned int cwAdcDashFrom = cwAdcDotTo + 1;
|
static const unsigned int cwAdcDashFrom = cwAdcDotTo + 1;
|
||||||
static const unsigned int cwAdcDashTo = 800;
|
static const unsigned int cwAdcDashTo = 800;
|
||||||
|
|
||||||
static const unsigned int delayBeforeCWStartTime = 50;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Starts transmitting the carrier with the sidetone
|
* Starts transmitting the carrier with the sidetone
|
||||||
* It assumes that we have called cwTxStart and not called cwTxStop
|
* It assumes that we have called cwTxStart and not called cwTxStop
|
||||||
@ -93,7 +91,7 @@ char update_PaddleLatch(bool isUpdateKeyState) {
|
|||||||
else{
|
else{
|
||||||
if (KeyerMode_e::KEYER_STRAIGHT != globalSettings.keyerMode)
|
if (KeyerMode_e::KEYER_STRAIGHT != globalSettings.keyerMode)
|
||||||
tmpKeyerControl = 0 ;
|
tmpKeyerControl = 0 ;
|
||||||
else if (paddle <= cwAdcSTTo)
|
else if (paddle <= cwAdcDashTo)
|
||||||
tmpKeyerControl = DIT_L ;
|
tmpKeyerControl = DIT_L ;
|
||||||
else
|
else
|
||||||
tmpKeyerControl = 0 ;
|
tmpKeyerControl = 0 ;
|
||||||
@ -156,8 +154,6 @@ void cwKeyer(void){
|
|||||||
case KEYED_PREP:
|
case KEYED_PREP:
|
||||||
//modified KD8CEC
|
//modified KD8CEC
|
||||||
if (!globalSettings.txActive){
|
if (!globalSettings.txActive){
|
||||||
//DelayTime Option
|
|
||||||
active_delay(delayBeforeCWStartTime * 2);
|
|
||||||
globalSettings.cwExpirationTimeMs = millis() + globalSettings.cwActiveTimeoutMs;
|
globalSettings.cwExpirationTimeMs = millis() + globalSettings.cwActiveTimeoutMs;
|
||||||
startTx(TuningMode_e::TUNE_CW);
|
startTx(TuningMode_e::TUNE_CW);
|
||||||
}
|
}
|
||||||
@ -205,11 +201,7 @@ void cwKeyer(void){
|
|||||||
// if we are here, it is only because the key is pressed
|
// if we are here, it is only because the key is pressed
|
||||||
if (!globalSettings.txActive){
|
if (!globalSettings.txActive){
|
||||||
startTx(TuningMode_e::TUNE_CW);
|
startTx(TuningMode_e::TUNE_CW);
|
||||||
|
globalSettings.cwExpirationTimeMs = millis() + globalSettings.cwActiveTimeoutMs;
|
||||||
//DelayTime Option
|
|
||||||
active_delay(delayBeforeCWStartTime * 2);
|
|
||||||
|
|
||||||
globalSettings.cwExpirationTimeMs = millis() + globalSettings.cwDitDurationMs;
|
|
||||||
}
|
}
|
||||||
cwKeydown();
|
cwKeydown();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user