Merge branch 'master' into morse-menu

This commit is contained in:
Reed Nightingale 2020-01-30 20:25:30 -08:00
commit 03406f62cc
3 changed files with 2 additions and 2 deletions

View File

@ -167,7 +167,7 @@ void cwKeyer(void){
case KEYED: case KEYED:
if (millis() > ktimer) { // are we at end of key down ? if (millis() > ktimer) { // are we at end of key down ?
cwKeyUp(); cwKeyUp();
ktimer = millis() + (globalSettings.cwDitDurationMs / 10); // inter-element time ktimer = millis() + globalSettings.cwDitDurationMs; // inter-element time
keyerState = INTER_ELEMENT; // next state keyerState = INTER_ELEMENT; // next state
} }
else if(KeyerMode_e::KEYER_IAMBIC_B == globalSettings.keyerMode){ else if(KeyerMode_e::KEYER_IAMBIC_B == globalSettings.keyerMode){

View File

@ -1,4 +1,4 @@
#include "version.h" #include "version.h"
const char VERSION_STRING_PRIVATE [] PROGMEM = "R1.1.1"; const char VERSION_STRING_PRIVATE [] PROGMEM = "R1.1.2";
const char* const VERSION_STRING = VERSION_STRING_PRIVATE; const char* const VERSION_STRING = VERSION_STRING_PRIVATE;