odie/ubitxv6
1
0
Fork 0
mirror of https://codeberg.org/mclemens/ubitxv6.git synced 2025-07-26 12:14:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

De-duplicate keyer strings

Browse Source
This commit is contained in:
Reed Nightingale 2020-01-17 22:22:06 -08:00
parent ebaf7c44de
commit e0bc5999c8
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
setup.cpp
View File

@ -188,24 +188,27 @@ void setupCwDelay(){
active_delay(500); active_delay(500);
} }
void setupKeyer(){ void formatKeyerEnum(char* output, const KeyerMode_e mode)
displayDialog(F("Set CW Keyer"),F("Press tune to Save")); {
if(KeyerMode_e::KEYER_STRAIGHT == mode){
if(KeyerMode_e::KEYER_STRAIGHT == globalSettings.keyerMode){ strcpy_P(output,(const char*)F("< Hand Key >"));
strcpy_P(c,(const char*)F("< Hand Key >"));
displayText(c, LAYOUT_SETTING_VALUE_X, LAYOUT_SETTING_VALUE_Y, LAYOUT_SETTING_VALUE_WIDTH, LAYOUT_SETTING_VALUE_HEIGHT, COLOR_TEXT, COLOR_SETTING_BACKGROUND, COLOR_BACKGROUND);
} }
else if(KeyerMode_e::KEYER_IAMBIC_A == globalSettings.keyerMode){ else if(KeyerMode_e::KEYER_IAMBIC_A == mode){
strcpy_P(c,(const char*)F("< Iambic A >")); strcpy_P(output,(const char*)F("< Iambic A >"));
displayText(c, LAYOUT_SETTING_VALUE_X, LAYOUT_SETTING_VALUE_Y, LAYOUT_SETTING_VALUE_WIDTH, LAYOUT_SETTING_VALUE_HEIGHT, COLOR_TEXT, COLOR_SETTING_BACKGROUND, COLOR_BACKGROUND);
} }
else{ else{
strcpy_P(c,(const char*)F("< Iambic B >")); strcpy_P(output,(const char*)F("< Iambic B >"));
displayText(c, LAYOUT_SETTING_VALUE_X, LAYOUT_SETTING_VALUE_Y, LAYOUT_SETTING_VALUE_WIDTH, LAYOUT_SETTING_VALUE_HEIGHT, COLOR_TEXT, COLOR_SETTING_BACKGROUND, COLOR_BACKGROUND);
} }
}
void setupKeyer(){
displayDialog(F("Set CW Keyer"),F("Press tune to Save"));
int knob = 0; int knob = 0;
uint32_t tmp_mode = globalSettings.keyerMode; uint32_t tmp_mode = globalSettings.keyerMode;
formatKeyerEnum(c, tmp_mode);
displayText(c, LAYOUT_SETTING_VALUE_X, LAYOUT_SETTING_VALUE_Y, LAYOUT_SETTING_VALUE_WIDTH, LAYOUT_SETTING_VALUE_HEIGHT, COLOR_TEXT, COLOR_SETTING_BACKGROUND, COLOR_BACKGROUND);
while (!btnDown()) while (!btnDown())
{ {
knob = enc_read(); knob = enc_read();
@ -220,18 +223,8 @@ void setupKeyer(){
tmp_mode++; tmp_mode++;
} }
if (KeyerMode_e::KEYER_STRAIGHT == tmp_mode){ formatKeyerEnum(c,tmp_mode);
strcpy_P(c,(const char*)F("< Hand Key >")); displayText(c, LAYOUT_SETTING_VALUE_X, LAYOUT_SETTING_VALUE_Y, LAYOUT_SETTING_VALUE_WIDTH, LAYOUT_SETTING_VALUE_HEIGHT, COLOR_TEXT, COLOR_SETTING_BACKGROUND, COLOR_BACKGROUND);
displayText(c, LAYOUT_SETTING_VALUE_X, LAYOUT_SETTING_VALUE_Y, LAYOUT_SETTING_VALUE_WIDTH, LAYOUT_SETTING_VALUE_HEIGHT, COLOR_TEXT, COLOR_SETTING_BACKGROUND, COLOR_BACKGROUND);
}
else if(KeyerMode_e::KEYER_IAMBIC_A == tmp_mode){
strcpy_P(c,(const char*)F("< Iambic A >"));
displayText(c, LAYOUT_SETTING_VALUE_X, LAYOUT_SETTING_VALUE_Y, LAYOUT_SETTING_VALUE_WIDTH, LAYOUT_SETTING_VALUE_HEIGHT, COLOR_TEXT, COLOR_SETTING_BACKGROUND, COLOR_BACKGROUND);
}
else if (KeyerMode_e::KEYER_IAMBIC_B == tmp_mode){
strcpy_P(c,(const char*)F("< Iambic B >"));
displayText(c, LAYOUT_SETTING_VALUE_X, LAYOUT_SETTING_VALUE_Y, LAYOUT_SETTING_VALUE_WIDTH, LAYOUT_SETTING_VALUE_HEIGHT, COLOR_TEXT, COLOR_SETTING_BACKGROUND, COLOR_BACKGROUND);
}
} }
active_delay(500); active_delay(500);