diff --git a/k3ng_keyer/k3ng_keyer.ino b/k3ng_keyer/k3ng_keyer.ino index 704e851..f235c7e 100644 --- a/k3ng_keyer/k3ng_keyer.ino +++ b/k3ng_keyer/k3ng_keyer.ino @@ -708,6 +708,10 @@ Recent Update History 2017.05.09.02 Updated FEATURE_4x4_KEYPAD and FEATURE_3x4_KEYPAD to allow memory stacking + 2017.05.12.01 + Fixed bug with \< and \> commands and carriage returns, and now handle serial number sending through the send buffer rather than direct sending + Fixed issue with non-English characters in Wordsworth by implementing OPTION_NON_ENGLISH_EXTENSIONS within Wordsworth + This code is currently maintained for and compiled with Arduino 1.8.1. Your mileage may vary with other versions. ATTENTION: LIBRARY FILES MUST BE PUT IN LIBRARIES DIRECTORIES AND NOT THE INO SKETCH DIRECTORY !!!! @@ -723,7 +727,7 @@ Recent Update History */ -#define CODE_VERSION "2017.05.09.02" +#define CODE_VERSION "2017.05.12.01" #define eeprom_magic_number 26 #include @@ -10982,7 +10986,7 @@ void serial_wordsworth_menu(PRIMARY_SERIAL_CLS * port_to_use){ while (port_to_use->available() > 0) { // clear out the buffer if anything is there port_to_use->read(); } -//zzzzzz + port_to_use->println(F("\r\n\nWordsworth Menu\n")); port_to_use->println(F("2 - Two Letter Words")); port_to_use->println(F("3 - Three Letter Words")); @@ -11120,12 +11124,30 @@ void wordsworth_practice(PRIMARY_SERIAL_CLS * port_to_use,byte practice_type) #if defined(DEBUG_WORDSWORTH) debug_serial_port->print("wordsworth_practice: send_char:"); - debug_serial_port->println(word_buffer[x]); + debug_serial_port->print(word_buffer[x]); + debug_serial_port->print(" "); + debug_serial_port->println((byte)word_buffer[x]); #endif - word_buffer[x] = toUpperCase(word_buffer[x]); - send_char(word_buffer[x],KEYER_NORMAL); - x++; + //word_buffer[x] = toUpperCase(word_buffer[x]); +//zzzzzz + + #if defined(OPTION_NON_ENGLISH_EXTENSIONS) + if (((byte)word_buffer[x] == 195) || ((byte)word_buffer[x] == 197)){ // do we have a unicode character? + x++; + if ((word_buffer[x] != 0) && (x < 10)){ + send_char(convert_unicode_to_send_char_code((byte)word_buffer[x-1],(byte)word_buffer[x]),KEYER_NORMAL); + x++; + } + } else { + send_char(word_buffer[x],KEYER_NORMAL); + x++; + } + #else //OPTION_NON_ENGLISH_EXTENSIONS + send_char(word_buffer[x],KEYER_NORMAL); + x++; + #endif //OPTION_NON_ENGLISH_EXTENSIONS + not_printed = 1; if ((word_buffer[x] == 0) || (x > 9)){ // are we at the end of the word? @@ -12000,33 +12022,40 @@ void send_serial_number(byte cut_numbers,int increment_serial_number){ serial_number_string = String(serial_number, DEC); if (serial_number_string.length() < 3 ) { if (cut_numbers){ - if (keyer_machine_mode != KEYER_COMMAND_MODE){display_serial_number_character('T');} //Display the SN as well as play it unless playing back after programming for verification(WD9DMP) - send_char('T',KEYER_NORMAL); + //if (keyer_machine_mode != KEYER_COMMAND_MODE){display_serial_number_character('T');} //Display the SN as well as play it unless playing back after programming for verification(WD9DMP) + //send_char('T',KEYER_NORMAL); + add_to_send_buffer('T'); } else { - if (keyer_machine_mode != KEYER_COMMAND_MODE){display_serial_number_character('0');} //Display the SN as well as play it unless playing back after programming for verification(WD9DMP) - send_char('0',KEYER_NORMAL); + //if (keyer_machine_mode != KEYER_COMMAND_MODE){display_serial_number_character('0');} //Display the SN as well as play it unless playing back after programming for verification(WD9DMP) + //send_char('0',KEYER_NORMAL); + add_to_send_buffer('0'); } } if (serial_number_string.length() == 1) { if (cut_numbers){ - if (keyer_machine_mode != KEYER_COMMAND_MODE){display_serial_number_character('T');} //Display the SN as well as play it unless playing back after programming for verification(WD9DMP) - send_char('T',KEYER_NORMAL); + //if (keyer_machine_mode != KEYER_COMMAND_MODE){display_serial_number_character('T');} //Display the SN as well as play it unless playing back after programming for verification(WD9DMP) + //send_char('T',KEYER_NORMAL); + add_to_send_buffer('T'); } else { - if (keyer_machine_mode != KEYER_COMMAND_MODE){display_serial_number_character('0');} //Display the SN as well as play it unless playing back after programming for verification(WD9DMP) - send_char('0',KEYER_NORMAL); + //if (keyer_machine_mode != KEYER_COMMAND_MODE){display_serial_number_character('0');} //Display the SN as well as play it unless playing back after programming for verification(WD9DMP) + //send_char('0',KEYER_NORMAL); + add_to_send_buffer('0'); } } for (unsigned int a = 0; a < serial_number_string.length(); a++) { if ((serial_number_string[a] == '0') && (cut_numbers)){ - if (keyer_machine_mode != KEYER_COMMAND_MODE){display_serial_number_character('T');} //Display the SN as well as play it unless playing back after programming for verification(WD9DMP) - send_char('T',KEYER_NORMAL); + //if (keyer_machine_mode != KEYER_COMMAND_MODE){display_serial_number_character('T');} //Display the SN as well as play it unless playing back after programming for verification(WD9DMP) + //send_char('T',KEYER_NORMAL); + add_to_send_buffer('T'); } else { if ((serial_number_string[a] == '9') && (cut_numbers)) { - if (keyer_machine_mode != KEYER_COMMAND_MODE){display_serial_number_character('N');} //Display the SN as well as play it unless playing back after programming for verification(WD9DMP) - send_char('N',KEYER_NORMAL); + //if (keyer_machine_mode != KEYER_COMMAND_MODE){display_serial_number_character('N');} //Display the SN as well as play it unless playing back after programming for verification(WD9DMP) + //send_char('N',KEYER_NORMAL); + add_to_send_buffer('N'); } else { - if (keyer_machine_mode != KEYER_COMMAND_MODE){display_serial_number_character(serial_number_string[a]);} //Display the SN as well as play it unless playing back after programming for verification(WD9DMP) - send_char(serial_number_string[a],KEYER_NORMAL); + //if (keyer_machine_mode != KEYER_COMMAND_MODE){display_serial_number_character(serial_number_string[a]);} //Display the SN as well as play it unless playing back after programming for verification(WD9DMP) + //send_char(serial_number_string[a],KEYER_NORMAL); + add_to_send_buffer(serial_number_string[a]); } } } @@ -16916,3 +16945,37 @@ void service_millis_rollover(){ last_millis = millis(); } +//------------------------------------------------------------------------------------------------------- +#ifdef OPTION_NON_ENGLISH_EXTENSIONS +byte convert_unicode_to_send_char_code(byte first_byte,byte second_byte){ + + + if (first_byte == 195){ + switch(second_byte){ + case 133: return 197; // Å AA_capital (OZ, LA, SM) + case 134: return 198; // Æ (OZ, LA) + case 152: return 216; // Ø (OZ, LA) + case 128: return 192; // À - A accent + case 132: return 196; // Ä - A_umlaut (D, SM, OH, ...) + case 145: return 209; // Ñ - (EA) + case 150: return 214; // Ö – O_umlaut (D, SM, OH, ...) + case 146: return 211; // Ò - O accent + case 156: return 220; // Ü - U_umlaut (D, ...) + case 135: return 199; // Ç + case 144: return 208; // Ð + case 136: return 200; // È + case 137: return 201; // É + } + + if (first_byte == 197){ + switch(second_byte){ + case 189: return 142; // Ž + } + } + + } + + return(0); + +} +#endif \ No newline at end of file diff --git a/k3ng_keyer/keyer_dependencies.h b/k3ng_keyer/keyer_dependencies.h index 347dc74..a8c5d90 100644 --- a/k3ng_keyer/keyer_dependencies.h +++ b/k3ng_keyer/keyer_dependencies.h @@ -35,3 +35,7 @@ #if defined(FEATURE_4x4_KEYPAD) && defined(FEATURE_3x4_KEYPAD) #error "You can't use both FEATURE_4x4_KEYPAD and FEATURE_3x4_KEYPAD simultaneously" #endif + +#if defined(FEATURE_TRAINING_COMMAND_LINE_INTERFACE) && defined(OPTION_WORDSWORTH_NORSK) && !defined(OPTION_NON_ENGLISH_EXTENSIONS) + #define OPTION_NON_ENGLISH_EXTENSIONS +#endif diff --git a/k3ng_keyer/keyer_training_text_czech.h b/k3ng_keyer/keyer_training_text_czech.h index f080f5e..488fb54 100644 --- a/k3ng_keyer/keyer_training_text_czech.h +++ b/k3ng_keyer/keyer_training_text_czech.h @@ -6,30 +6,30 @@ // https://sourceforge.net/projects/kb1oiq-k1ig-wordsworth/ // two letter word array -const char s2_1[] PROGMEM = "do"; -const char s2_2[] PROGMEM = "na"; -const char s2_3[] PROGMEM = "po"; -const char s2_4[] PROGMEM = "my"; -const char s2_5[] PROGMEM = "to"; -const char s2_6[] PROGMEM = "ne"; -const char s2_7[] PROGMEM = "vy"; -const char s2_8[] PROGMEM = "ze"; -const char s2_9[] PROGMEM = "ve"; -const char s2_10[] PROGMEM = "ja"; -const char s2_11[] PROGMEM = "ty"; -const char s2_12[] PROGMEM = "by"; -const char s2_13[] PROGMEM = "on"; -const char s2_14[] PROGMEM = "se"; -const char s2_15[] PROGMEM = "az"; -const char s2_16[] PROGMEM = "tu"; -const char s2_17[] PROGMEM = "ti"; -const char s2_18[] PROGMEM = "za"; -const char s2_19[] PROGMEM = "ci"; -const char s2_20[] PROGMEM = "co"; -const char s2_21[] PROGMEM = "ji"; -const char s2_22[] PROGMEM = "mu"; -const char s2_23[] PROGMEM = "je"; -const char s2_24[] PROGMEM = "uz"; +const char s2_1[] PROGMEM = "DO"; +const char s2_2[] PROGMEM = "NA"; +const char s2_3[] PROGMEM = "PO"; +const char s2_4[] PROGMEM = "MY"; +const char s2_5[] PROGMEM = "TO"; +const char s2_6[] PROGMEM = "NE"; +const char s2_7[] PROGMEM = "VY"; +const char s2_8[] PROGMEM = "ZE"; +const char s2_9[] PROGMEM = "VE"; +const char s2_10[] PROGMEM = "JA"; +const char s2_11[] PROGMEM = "TY"; +const char s2_12[] PROGMEM = "BY"; +const char s2_13[] PROGMEM = "ON"; +const char s2_14[] PROGMEM = "SE"; +const char s2_15[] PROGMEM = "AZ"; +const char s2_16[] PROGMEM = "TU"; +const char s2_17[] PROGMEM = "TI"; +const char s2_18[] PROGMEM = "ZA"; +const char s2_19[] PROGMEM = "CI"; +const char s2_20[] PROGMEM = "CO"; +const char s2_21[] PROGMEM = "JI"; +const char s2_22[] PROGMEM = "MU"; +const char s2_23[] PROGMEM = "JE"; +const char s2_24[] PROGMEM = "UZ"; const byte s2_size = 24; const char* const s2_table[] PROGMEM = {s2_1,s2_2,s2_3,s2_4,s2_5,s2_6,s2_7,s2_8,s2_9,s2_10, @@ -37,45 +37,45 @@ const char* const s2_table[] PROGMEM = s2_21,s2_22,s2_23,s2_24}; // three letter word array -const char s3_1[] PROGMEM = "dva"; -const char s3_2[] PROGMEM = "tri"; -const char s3_3[] PROGMEM = "muj"; -const char s3_4[] PROGMEM = "nas"; -const char s3_5[] PROGMEM = "ona"; -const char s3_6[] PROGMEM = "oni"; -const char s3_7[] PROGMEM = "ono"; -const char s3_8[] PROGMEM = "vas"; -const char s3_9[] PROGMEM = "vse"; -const char s3_10[] PROGMEM = "pod"; -const char s3_11[] PROGMEM = "nad"; -const char s3_12[] PROGMEM = "kde"; -const char s3_13[] PROGMEM = "kdy"; -const char s3_14[] PROGMEM = "kam"; -const char s3_15[] PROGMEM = "kus"; -const char s3_16[] PROGMEM = "den"; -const char s3_17[] PROGMEM = "tam"; -const char s3_18[] PROGMEM = "dat"; -const char s3_19[] PROGMEM = "dam"; -const char s3_20[] PROGMEM = "das"; -const char s3_21[] PROGMEM = "mit"; -const char s3_22[] PROGMEM = "jit"; -const char s3_23[] PROGMEM = "nez"; -const char s3_24[] PROGMEM = "rok"; -const char s3_25[] PROGMEM = "pak"; -const char s3_26[] PROGMEM = "dik"; -const char s3_27[] PROGMEM = "dum"; -const char s3_28[] PROGMEM = "pro"; -const char s3_29[] PROGMEM = "pri"; -const char s3_30[] PROGMEM = "oko"; -const char s3_31[] PROGMEM = "cas"; -const char s3_32[] PROGMEM = "caj"; -const char s3_33[] PROGMEM = "cil"; -const char s3_34[] PROGMEM = "cop"; -const char s3_35[] PROGMEM = "muz"; -const char s3_36[] PROGMEM = "asi"; -const char s3_37[] PROGMEM = "bez"; -const char s3_38[] PROGMEM = "boj"; -const char s3_39[] PROGMEM = "buh"; +const char s3_1[] PROGMEM = "DVA"; +const char s3_2[] PROGMEM = "TRI"; +const char s3_3[] PROGMEM = "MUJ"; +const char s3_4[] PROGMEM = "NAS"; +const char s3_5[] PROGMEM = "ONA"; +const char s3_6[] PROGMEM = "ONI"; +const char s3_7[] PROGMEM = "ONO"; +const char s3_8[] PROGMEM = "VAS"; +const char s3_9[] PROGMEM = "VSE"; +const char s3_10[] PROGMEM = "POD"; +const char s3_11[] PROGMEM = "NAD"; +const char s3_12[] PROGMEM = "KDE"; +const char s3_13[] PROGMEM = "KDY"; +const char s3_14[] PROGMEM = "KAM"; +const char s3_15[] PROGMEM = "KUS"; +const char s3_16[] PROGMEM = "DEN"; +const char s3_17[] PROGMEM = "TAM"; +const char s3_18[] PROGMEM = "DAT"; +const char s3_19[] PROGMEM = "DAM"; +const char s3_20[] PROGMEM = "DAS"; +const char s3_21[] PROGMEM = "MIT"; +const char s3_22[] PROGMEM = "JIT"; +const char s3_23[] PROGMEM = "NEZ"; +const char s3_24[] PROGMEM = "ROK"; +const char s3_25[] PROGMEM = "PAK"; +const char s3_26[] PROGMEM = "DIK"; +const char s3_27[] PROGMEM = "DUM"; +const char s3_28[] PROGMEM = "PRO"; +const char s3_29[] PROGMEM = "PRI"; +const char s3_30[] PROGMEM = "OKO"; +const char s3_31[] PROGMEM = "CAS"; +const char s3_32[] PROGMEM = "CAJ"; +const char s3_33[] PROGMEM = "CIL"; +const char s3_34[] PROGMEM = "COP"; +const char s3_35[] PROGMEM = "MUZ"; +const char s3_36[] PROGMEM = "ASI"; +const char s3_37[] PROGMEM = "BEZ"; +const char s3_38[] PROGMEM = "BOJ"; +const char s3_39[] PROGMEM = "BUH"; const byte s3_size = 39; const char* const s3_table[] PROGMEM = {s3_1,s3_2,s3_3,s3_4,s3_5,s3_6,s3_7,s3_8,s3_9,s3_10, @@ -84,39 +84,39 @@ const char* const s3_table[] PROGMEM = s3_31,s3_32,s3_33,s3_34,s3_35,s3_36,s3_37,s3_38,s3_39}; // four letter word array -const char s4_1[] PROGMEM = "tato"; -const char s4_2[] PROGMEM = "tito"; -const char s4_3[] PROGMEM = "toto"; -const char s4_4[] PROGMEM = "doma"; -const char s4_5[] PROGMEM = "stat"; -const char s4_6[] PROGMEM = "tady"; -const char s4_7[] PROGMEM = "doba"; -const char s4_8[] PROGMEM = "take"; -const char s4_9[] PROGMEM = "pred"; -const char s4_10[] PROGMEM = "svet"; -const char s4_11[] PROGMEM = "brzy"; -const char s4_12[] PROGMEM = "tvuj"; -const char s4_13[] PROGMEM = "tata"; -const char s4_14[] PROGMEM = "mama"; -const char s4_15[] PROGMEM = "psik"; -const char s4_16[] PROGMEM = "zena"; -const char s4_17[] PROGMEM = "dite"; -const char s4_18[] PROGMEM = "deti"; -const char s4_19[] PROGMEM = "kone"; -const char s4_20[] PROGMEM = "duha"; -const char s4_21[] PROGMEM = "ruka"; -const char s4_22[] PROGMEM = "noha"; -const char s4_23[] PROGMEM = "prst"; -const char s4_24[] PROGMEM = "pole"; -const char s4_25[] PROGMEM = "more"; -const char s4_26[] PROGMEM = "vitr"; -const char s4_27[] PROGMEM = "mlha"; -const char s4_28[] PROGMEM = "voda"; -const char s4_29[] PROGMEM = "vaha"; -const char s4_30[] PROGMEM = "pivo"; -const char s4_31[] PROGMEM = "hrat"; -const char s4_32[] PROGMEM = "rada"; -const char s4_33[] PROGMEM = "pani"; +const char s4_1[] PROGMEM = "TATO"; +const char s4_2[] PROGMEM = "TITO"; +const char s4_3[] PROGMEM = "TOTO"; +const char s4_4[] PROGMEM = "DOMA"; +const char s4_5[] PROGMEM = "STAT"; +const char s4_6[] PROGMEM = "TADY"; +const char s4_7[] PROGMEM = "DOBA"; +const char s4_8[] PROGMEM = "TAKE"; +const char s4_9[] PROGMEM = "PRED"; +const char s4_10[] PROGMEM = "SVET"; +const char s4_11[] PROGMEM = "BRZY"; +const char s4_12[] PROGMEM = "TVUJ"; +const char s4_13[] PROGMEM = "TATA"; +const char s4_14[] PROGMEM = "MAMA"; +const char s4_15[] PROGMEM = "PSIK"; +const char s4_16[] PROGMEM = "ZENA"; +const char s4_17[] PROGMEM = "DITE"; +const char s4_18[] PROGMEM = "DETI"; +const char s4_19[] PROGMEM = "KONE"; +const char s4_20[] PROGMEM = "DUHA"; +const char s4_21[] PROGMEM = "RUKA"; +const char s4_22[] PROGMEM = "NOHA"; +const char s4_23[] PROGMEM = "PRST"; +const char s4_24[] PROGMEM = "POLE"; +const char s4_25[] PROGMEM = "MORE"; +const char s4_26[] PROGMEM = "VITR"; +const char s4_27[] PROGMEM = "MLHA"; +const char s4_28[] PROGMEM = "VODA"; +const char s4_29[] PROGMEM = "VAHA"; +const char s4_30[] PROGMEM = "PIVO"; +const char s4_31[] PROGMEM = "HRAT"; +const char s4_32[] PROGMEM = "RADA"; +const char s4_33[] PROGMEM = "PANI"; const byte s4_size = 33; const char* const s4_table[] PROGMEM = {s4_1,s4_2,s4_3,s4_4,s4_5,s4_6,s4_7,s4_8,s4_9,s4_10, @@ -126,55 +126,55 @@ const char* const s4_table[] PROGMEM = -const char name_1[] PROGMEM = "Andy"; -const char name_2[] PROGMEM = "Josef"; -const char name_3[] PROGMEM = "Jiri"; -const char name_4[] PROGMEM = "Karel"; -const char name_5[] PROGMEM = "Honza"; -const char name_6[] PROGMEM = "Franta"; -const char name_7[] PROGMEM = "Petr"; -const char name_8[] PROGMEM = "Pavel"; -const char name_9[] PROGMEM = "Jindra"; -const char name_10[] PROGMEM = "Filip"; -const char name_11[] PROGMEM = "Milan"; -const char name_12[] PROGMEM = "Martin"; -const char name_13[] PROGMEM = "David"; -const char name_14[] PROGMEM = "Tomas"; -const char name_15[] PROGMEM = "Hanka"; -const char name_16[] PROGMEM = "Sasa"; -const char name_17[] PROGMEM = "Ivan"; -const char name_18[] PROGMEM = "Bert"; -const char name_19[] PROGMEM = "Vasek"; -const char name_20[] PROGMEM = "Alan"; -const char name_21[] PROGMEM = "Jirka"; -const char name_22[] PROGMEM = "Jerry"; -const char name_23[] PROGMEM = "Pepa"; -const char name_24[] PROGMEM = "Jirina"; -const char name_25[] PROGMEM = "Risa"; -const char name_26[] PROGMEM = "Dan"; -const char name_27[] PROGMEM = "Lubos"; -const char name_28[] PROGMEM = "Tonda"; -const char name_29[] PROGMEM = "Lada"; -const char name_30[] PROGMEM = "Vlada"; -const char name_31[] PROGMEM = "Jenda"; -const char name_32[] PROGMEM = "Cyril"; -const char name_33[] PROGMEM = "Bohous"; -const char name_34[] PROGMEM = "Kamil"; -const char name_35[] PROGMEM = "Rene"; -const char name_36[] PROGMEM = "Patrik"; -const char name_37[] PROGMEM = "Simon"; -const char name_38[] PROGMEM = "Alex"; -const char name_39[] PROGMEM = "Lojza"; -const char name_40[] PROGMEM = "Matej"; -const char name_41[] PROGMEM = "Ferda"; -const char name_42[] PROGMEM = "Marie"; -const char name_43[] PROGMEM = "Zdenek"; -const char name_44[] PROGMEM = "Julek"; -const char name_45[] PROGMEM = "Standa"; -const char name_46[] PROGMEM = "Slavek"; -const char name_47[] PROGMEM = "Vilda"; -const char name_48[] PROGMEM = "Vera"; -const char name_49[] PROGMEM = "Gusta"; +const char name_1[] PROGMEM = "ANDY"; +const char name_2[] PROGMEM = "JOSEF"; +const char name_3[] PROGMEM = "JIRI"; +const char name_4[] PROGMEM = "KAREL"; +const char name_5[] PROGMEM = "HONZA"; +const char name_6[] PROGMEM = "FRANTA"; +const char name_7[] PROGMEM = "PETR"; +const char name_8[] PROGMEM = "PAVEL"; +const char name_9[] PROGMEM = "JINDRA"; +const char name_10[] PROGMEM = "FILIP"; +const char name_11[] PROGMEM = "MILAN"; +const char name_12[] PROGMEM = "MARTIN"; +const char name_13[] PROGMEM = "DAVID"; +const char name_14[] PROGMEM = "TOMAS"; +const char name_15[] PROGMEM = "HANKA"; +const char name_16[] PROGMEM = "SASA"; +const char name_17[] PROGMEM = "IVAN"; +const char name_18[] PROGMEM = "BERT"; +const char name_19[] PROGMEM = "VASEK"; +const char name_20[] PROGMEM = "ALAN"; +const char name_21[] PROGMEM = "JIRKA"; +const char name_22[] PROGMEM = "JERRY"; +const char name_23[] PROGMEM = "PEPA"; +const char name_24[] PROGMEM = "JIRINA"; +const char name_25[] PROGMEM = "RISA"; +const char name_26[] PROGMEM = "DAN"; +const char name_27[] PROGMEM = "LUBOS"; +const char name_28[] PROGMEM = "TONDA"; +const char name_29[] PROGMEM = "LADA"; +const char name_30[] PROGMEM = "VLADA"; +const char name_31[] PROGMEM = "JENDA"; +const char name_32[] PROGMEM = "CYRIL"; +const char name_33[] PROGMEM = "BOHOUS"; +const char name_34[] PROGMEM = "KAMIL"; +const char name_35[] PROGMEM = "RENE"; +const char name_36[] PROGMEM = "PATRIK"; +const char name_37[] PROGMEM = "SIMON"; +const char name_38[] PROGMEM = "ALEX"; +const char name_39[] PROGMEM = "LOJZA"; +const char name_40[] PROGMEM = "MATEJ"; +const char name_41[] PROGMEM = "FERDA"; +const char name_42[] PROGMEM = "MARIE"; +const char name_43[] PROGMEM = "ZDENEK"; +const char name_44[] PROGMEM = "JULEK"; +const char name_45[] PROGMEM = "STANDA"; +const char name_46[] PROGMEM = "SLAVEK"; +const char name_47[] PROGMEM = "VILDA"; +const char name_48[] PROGMEM = "VERA"; +const char name_49[] PROGMEM = "GUSTA"; const byte name_size = 49; const char* const name_table[] PROGMEM = {name_1,name_2,name_3,name_4,name_5,name_6,name_7,name_8,name_9,name_10, diff --git a/k3ng_keyer/keyer_training_text_english.h b/k3ng_keyer/keyer_training_text_english.h index 5768d48..bb9f35c 100644 --- a/k3ng_keyer/keyer_training_text_english.h +++ b/k3ng_keyer/keyer_training_text_english.h @@ -4,30 +4,30 @@ // https://sourceforge.net/projects/kb1oiq-k1ig-wordsworth/ // two letter word array -const char s2_1[] PROGMEM = "to"; -const char s2_2[] PROGMEM = "in"; -const char s2_3[] PROGMEM = "it"; -const char s2_4[] PROGMEM = "is"; -const char s2_5[] PROGMEM = "be"; -const char s2_6[] PROGMEM = "as"; -const char s2_7[] PROGMEM = "at"; -const char s2_8[] PROGMEM = "so"; -const char s2_9[] PROGMEM = "we"; -const char s2_10[] PROGMEM = "he"; -const char s2_11[] PROGMEM = "by"; -const char s2_12[] PROGMEM = "or"; -const char s2_13[] PROGMEM = "on"; -const char s2_14[] PROGMEM = "do"; -const char s2_15[] PROGMEM = "if"; -const char s2_16[] PROGMEM = "me"; -const char s2_17[] PROGMEM = "my"; -const char s2_18[] PROGMEM = "up"; -const char s2_19[] PROGMEM = "an"; -const char s2_20[] PROGMEM = "go"; -const char s2_21[] PROGMEM = "no"; -const char s2_22[] PROGMEM = "us"; -const char s2_23[] PROGMEM = "am"; -const char s2_24[] PROGMEM = "of"; +const char s2_1[] PROGMEM = "TO"; +const char s2_2[] PROGMEM = "IN"; +const char s2_3[] PROGMEM = "IT"; +const char s2_4[] PROGMEM = "IS"; +const char s2_5[] PROGMEM = "BE"; +const char s2_6[] PROGMEM = "AS"; +const char s2_7[] PROGMEM = "AT"; +const char s2_8[] PROGMEM = "SO"; +const char s2_9[] PROGMEM = "WE"; +const char s2_10[] PROGMEM = "HE"; +const char s2_11[] PROGMEM = "BY"; +const char s2_12[] PROGMEM = "OR"; +const char s2_13[] PROGMEM = "ON"; +const char s2_14[] PROGMEM = "DO"; +const char s2_15[] PROGMEM = "IF"; +const char s2_16[] PROGMEM = "ME"; +const char s2_17[] PROGMEM = "MY"; +const char s2_18[] PROGMEM = "UP"; +const char s2_19[] PROGMEM = "AN"; +const char s2_20[] PROGMEM = "GO"; +const char s2_21[] PROGMEM = "NO"; +const char s2_22[] PROGMEM = "US"; +const char s2_23[] PROGMEM = "AM"; +const char s2_24[] PROGMEM = "OF"; const byte s2_size = 24; const char* const s2_table[] PROGMEM = {s2_1,s2_2,s2_3,s2_4,s2_5,s2_6,s2_7,s2_8,s2_9,s2_10, @@ -35,45 +35,45 @@ const char* const s2_table[] PROGMEM = s2_21,s2_22,s2_23,s2_24}; // three letter word array -const char s3_1[] PROGMEM = "the"; -const char s3_2[] PROGMEM = "and"; -const char s3_3[] PROGMEM = "for"; -const char s3_4[] PROGMEM = "are"; -const char s3_5[] PROGMEM = "but"; -const char s3_6[] PROGMEM = "not"; -const char s3_7[] PROGMEM = "you"; -const char s3_8[] PROGMEM = "all"; -const char s3_9[] PROGMEM = "any"; -const char s3_10[] PROGMEM = "can"; -const char s3_11[] PROGMEM = "had"; -const char s3_12[] PROGMEM = "her"; -const char s3_13[] PROGMEM = "was"; -const char s3_14[] PROGMEM = "one"; -const char s3_15[] PROGMEM = "our"; -const char s3_16[] PROGMEM = "out"; -const char s3_17[] PROGMEM = "day"; -const char s3_18[] PROGMEM = "get"; -const char s3_19[] PROGMEM = "has"; -const char s3_20[] PROGMEM = "him"; -const char s3_21[] PROGMEM = "his"; -const char s3_22[] PROGMEM = "how"; -const char s3_23[] PROGMEM = "man"; -const char s3_24[] PROGMEM = "new"; -const char s3_25[] PROGMEM = "now"; -const char s3_26[] PROGMEM = "old"; -const char s3_27[] PROGMEM = "see"; -const char s3_28[] PROGMEM = "two"; -const char s3_29[] PROGMEM = "way"; -const char s3_30[] PROGMEM = "who"; -const char s3_31[] PROGMEM = "boy"; -const char s3_32[] PROGMEM = "did"; -const char s3_33[] PROGMEM = "its"; -const char s3_34[] PROGMEM = "let"; -const char s3_35[] PROGMEM = "put"; -const char s3_36[] PROGMEM = "say"; -const char s3_37[] PROGMEM = "she"; -const char s3_38[] PROGMEM = "too"; -const char s3_39[] PROGMEM = "use"; +const char s3_1[] PROGMEM = "THE"; +const char s3_2[] PROGMEM = "AND"; +const char s3_3[] PROGMEM = "FOR"; +const char s3_4[] PROGMEM = "ARE"; +const char s3_5[] PROGMEM = "BUT"; +const char s3_6[] PROGMEM = "NOT"; +const char s3_7[] PROGMEM = "YOU"; +const char s3_8[] PROGMEM = "ALL"; +const char s3_9[] PROGMEM = "ANY"; +const char s3_10[] PROGMEM = "CAN"; +const char s3_11[] PROGMEM = "HAD"; +const char s3_12[] PROGMEM = "HER"; +const char s3_13[] PROGMEM = "WAS"; +const char s3_14[] PROGMEM = "ONE"; +const char s3_15[] PROGMEM = "OUR"; +const char s3_16[] PROGMEM = "OUT"; +const char s3_17[] PROGMEM = "DAY"; +const char s3_18[] PROGMEM = "GET"; +const char s3_19[] PROGMEM = "HAS"; +const char s3_20[] PROGMEM = "HIM"; +const char s3_21[] PROGMEM = "HIS"; +const char s3_22[] PROGMEM = "HOW"; +const char s3_23[] PROGMEM = "MAN"; +const char s3_24[] PROGMEM = "NEW"; +const char s3_25[] PROGMEM = "NOW"; +const char s3_26[] PROGMEM = "OLD"; +const char s3_27[] PROGMEM = "SEE"; +const char s3_28[] PROGMEM = "TWO"; +const char s3_29[] PROGMEM = "WAY"; +const char s3_30[] PROGMEM = "WHO"; +const char s3_31[] PROGMEM = "BOY"; +const char s3_32[] PROGMEM = "DID"; +const char s3_33[] PROGMEM = "ITS"; +const char s3_34[] PROGMEM = "LET"; +const char s3_35[] PROGMEM = "PUT"; +const char s3_36[] PROGMEM = "SAY"; +const char s3_37[] PROGMEM = "SHE"; +const char s3_38[] PROGMEM = "TOO"; +const char s3_39[] PROGMEM = "USE"; const byte s3_size = 39; const char* const s3_table[] PROGMEM = {s3_1,s3_2,s3_3,s3_4,s3_5,s3_6,s3_7,s3_8,s3_9,s3_10, @@ -82,39 +82,39 @@ const char* const s3_table[] PROGMEM = s3_31,s3_32,s3_33,s3_34,s3_35,s3_36,s3_37,s3_38,s3_39}; // four letter word array -const char s4_1[] PROGMEM = "that"; -const char s4_2[] PROGMEM = "with"; -const char s4_3[] PROGMEM = "have"; -const char s4_4[] PROGMEM = "this"; -const char s4_5[] PROGMEM = "will"; -const char s4_6[] PROGMEM = "your"; -const char s4_7[] PROGMEM = "from"; -const char s4_8[] PROGMEM = "they"; -const char s4_9[] PROGMEM = "know"; -const char s4_10[] PROGMEM = "want"; -const char s4_11[] PROGMEM = "been"; -const char s4_12[] PROGMEM = "good"; -const char s4_13[] PROGMEM = "much"; -const char s4_14[] PROGMEM = "some"; -const char s4_15[] PROGMEM = "time"; -const char s4_16[] PROGMEM = "very"; -const char s4_17[] PROGMEM = "when"; -const char s4_18[] PROGMEM = "come"; -const char s4_19[] PROGMEM = "here"; -const char s4_20[] PROGMEM = "just"; -const char s4_21[] PROGMEM = "like"; -const char s4_22[] PROGMEM = "long"; -const char s4_23[] PROGMEM = "make"; -const char s4_24[] PROGMEM = "many"; -const char s4_25[] PROGMEM = "more"; -const char s4_26[] PROGMEM = "only"; -const char s4_27[] PROGMEM = "over"; -const char s4_28[] PROGMEM = "such"; -const char s4_29[] PROGMEM = "take"; -const char s4_30[] PROGMEM = "than"; -const char s4_31[] PROGMEM = "them"; -const char s4_32[] PROGMEM = "well"; -const char s4_33[] PROGMEM = "were"; +const char s4_1[] PROGMEM = "THAT"; +const char s4_2[] PROGMEM = "WITH"; +const char s4_3[] PROGMEM = "HAVE"; +const char s4_4[] PROGMEM = "THIS"; +const char s4_5[] PROGMEM = "WILL"; +const char s4_6[] PROGMEM = "YOUR"; +const char s4_7[] PROGMEM = "FROM"; +const char s4_8[] PROGMEM = "THEY"; +const char s4_9[] PROGMEM = "KNOW"; +const char s4_10[] PROGMEM = "WANT"; +const char s4_11[] PROGMEM = "BEEN"; +const char s4_12[] PROGMEM = "GOOD"; +const char s4_13[] PROGMEM = "MUCH"; +const char s4_14[] PROGMEM = "SOME"; +const char s4_15[] PROGMEM = "TIME"; +const char s4_16[] PROGMEM = "VERY"; +const char s4_17[] PROGMEM = "WHEN"; +const char s4_18[] PROGMEM = "COME"; +const char s4_19[] PROGMEM = "HERE"; +const char s4_20[] PROGMEM = "JUST"; +const char s4_21[] PROGMEM = "LIKE"; +const char s4_22[] PROGMEM = "LONG"; +const char s4_23[] PROGMEM = "MAKE"; +const char s4_24[] PROGMEM = "MANY"; +const char s4_25[] PROGMEM = "MORE"; +const char s4_26[] PROGMEM = "ONLY"; +const char s4_27[] PROGMEM = "OVER"; +const char s4_28[] PROGMEM = "SUCH"; +const char s4_29[] PROGMEM = "TAKE"; +const char s4_30[] PROGMEM = "THAN"; +const char s4_31[] PROGMEM = "THEM"; +const char s4_32[] PROGMEM = "WELL"; +const char s4_33[] PROGMEM = "WERE"; const byte s4_size = 33; const char* const s4_table[] PROGMEM = {s4_1,s4_2,s4_3,s4_4,s4_5,s4_6,s4_7,s4_8,s4_9,s4_10, @@ -124,55 +124,55 @@ const char* const s4_table[] PROGMEM = -const char name_1[] PROGMEM = "Andy"; -const char name_2[] PROGMEM = "Bob"; -const char name_3[] PROGMEM = "Bill"; -const char name_4[] PROGMEM = "John"; -const char name_5[] PROGMEM = "George"; -const char name_6[] PROGMEM = "Tom"; -const char name_7[] PROGMEM = "Rich"; -const char name_8[] PROGMEM = "Steve"; -const char name_9[] PROGMEM = "Tim"; -const char name_10[] PROGMEM = "Scott"; -const char name_11[] PROGMEM = "Fred"; -const char name_12[] PROGMEM = "Doug"; -const char name_13[] PROGMEM = "Dave"; -const char name_14[] PROGMEM = "Gary"; -const char name_15[] PROGMEM = "Jim"; -const char name_16[] PROGMEM = "Chris"; -const char name_17[] PROGMEM = "Mike"; -const char name_18[] PROGMEM = "Ed"; -const char name_19[] PROGMEM = "Al"; -const char name_20[] PROGMEM = "Alan"; -const char name_21[] PROGMEM = "Ron"; -const char name_22[] PROGMEM = "Jerry"; -const char name_23[] PROGMEM = "Art"; -const char name_24[] PROGMEM = "Greg"; -const char name_25[] PROGMEM = "Rick"; -const char name_26[] PROGMEM = "Dan"; -const char name_27[] PROGMEM = "Ken"; -const char name_28[] PROGMEM = "Tony"; -const char name_29[] PROGMEM = "Carl"; -const char name_30[] PROGMEM = "Phil"; -const char name_31[] PROGMEM = "Joe"; -const char name_32[] PROGMEM = "Jon"; -const char name_33[] PROGMEM = "Larry"; -const char name_34[] PROGMEM = "Don"; -const char name_35[] PROGMEM = "Dick"; -const char name_36[] PROGMEM = "Paul"; -const char name_37[] PROGMEM = "Serge"; -const char name_38[] PROGMEM = "Alex"; -const char name_39[] PROGMEM = "Vlad"; -const char name_40[] PROGMEM = "Jeff"; -const char name_41[] PROGMEM = "Chas"; -const char name_42[] PROGMEM = "Jack"; -const char name_43[] PROGMEM = "Gene"; -const char name_44[] PROGMEM = "Bert"; -const char name_45[] PROGMEM = "Oleg"; -const char name_46[] PROGMEM = "Pete"; -const char name_47[] PROGMEM = "Pat"; -const char name_48[] PROGMEM = "Juan"; -const char name_49[] PROGMEM = "Gus"; +const char name_1[] PROGMEM = "ANDY"; +const char name_2[] PROGMEM = "BOB"; +const char name_3[] PROGMEM = "BILL"; +const char name_4[] PROGMEM = "JOHN"; +const char name_5[] PROGMEM = "GEORGE"; +const char name_6[] PROGMEM = "TOM"; +const char name_7[] PROGMEM = "RICH"; +const char name_8[] PROGMEM = "STEVE"; +const char name_9[] PROGMEM = "TIM"; +const char name_10[] PROGMEM = "SCOTT"; +const char name_11[] PROGMEM = "FRED"; +const char name_12[] PROGMEM = "DOUG"; +const char name_13[] PROGMEM = "DAVE"; +const char name_14[] PROGMEM = "GARY"; +const char name_15[] PROGMEM = "JIM"; +const char name_16[] PROGMEM = "CHRIS"; +const char name_17[] PROGMEM = "MIKE"; +const char name_18[] PROGMEM = "ED"; +const char name_19[] PROGMEM = "AL"; +const char name_20[] PROGMEM = "ALAN"; +const char name_21[] PROGMEM = "RON"; +const char name_22[] PROGMEM = "JERRY"; +const char name_23[] PROGMEM = "ART"; +const char name_24[] PROGMEM = "GREG"; +const char name_25[] PROGMEM = "RICK"; +const char name_26[] PROGMEM = "DAN"; +const char name_27[] PROGMEM = "KEN"; +const char name_28[] PROGMEM = "TONY"; +const char name_29[] PROGMEM = "CARL"; +const char name_30[] PROGMEM = "PHIL"; +const char name_31[] PROGMEM = "JOE"; +const char name_32[] PROGMEM = "JON"; +const char name_33[] PROGMEM = "LARRY"; +const char name_34[] PROGMEM = "DON"; +const char name_35[] PROGMEM = "DICK"; +const char name_36[] PROGMEM = "PAUL"; +const char name_37[] PROGMEM = "SERGE"; +const char name_38[] PROGMEM = "ALEX"; +const char name_39[] PROGMEM = "VLAD"; +const char name_40[] PROGMEM = "JEFF"; +const char name_41[] PROGMEM = "CHAS"; +const char name_42[] PROGMEM = "JACK"; +const char name_43[] PROGMEM = "GENE"; +const char name_44[] PROGMEM = "BERT"; +const char name_45[] PROGMEM = "OLEG"; +const char name_46[] PROGMEM = "PETE"; +const char name_47[] PROGMEM = "PAT"; +const char name_48[] PROGMEM = "JUAN"; +const char name_49[] PROGMEM = "GUS"; const byte name_size = 49; const char* const name_table[] PROGMEM = {name_1,name_2,name_3,name_4,name_5,name_6,name_7,name_8,name_9,name_10, diff --git a/k3ng_keyer/keyer_training_text_norsk.h b/k3ng_keyer/keyer_training_text_norsk.h index 33e9421..6e9d29c 100644 --- a/k3ng_keyer/keyer_training_text_norsk.h +++ b/k3ng_keyer/keyer_training_text_norsk.h @@ -6,28 +6,28 @@ // https://sourceforge.net/projects/kb1oiq-k1ig-wordsworth/ // two letter word array -const char s2_1[] PROGMEM = "og"; -const char s2_2[] PROGMEM = "på"; -const char s2_3[] PROGMEM = "gå"; -const char s2_4[] PROGMEM = "er"; -const char s2_5[] PROGMEM = "en"; -const char s2_6[] PROGMEM = "av"; -const char s2_7[] PROGMEM = "at"; -const char s2_8[] PROGMEM = "de"; -const char s2_9[] PROGMEM = "et"; -const char s2_10[] PROGMEM = "så"; -const char s2_11[] PROGMEM = "vi"; -const char s2_12[] PROGMEM = "du"; -const char s2_13[] PROGMEM = "da"; -const char s2_14[] PROGMEM = "ut"; -const char s2_15[] PROGMEM = "sa"; -const char s2_16[] PROGMEM = "nå"; -const char s2_17[] PROGMEM = "ny"; -const char s2_18[] PROGMEM = "ha"; -const char s2_19[] PROGMEM = "år"; -const char s2_20[] PROGMEM = "få"; -const char s2_21[] PROGMEM = "to"; -const char s2_22[] PROGMEM = "se"; +const char s2_1[] PROGMEM = "OG"; +const char s2_2[] PROGMEM = "PÅ"; +const char s2_3[] PROGMEM = "GÅ"; +const char s2_4[] PROGMEM = "ER"; +const char s2_5[] PROGMEM = "EN"; +const char s2_6[] PROGMEM = "AV"; +const char s2_7[] PROGMEM = "AT"; +const char s2_8[] PROGMEM = "DE"; +const char s2_9[] PROGMEM = "ET"; +const char s2_10[] PROGMEM = "SÅ"; +const char s2_11[] PROGMEM = "VI"; +const char s2_12[] PROGMEM = "DU"; +const char s2_13[] PROGMEM = "DA"; +const char s2_14[] PROGMEM = "UT"; +const char s2_15[] PROGMEM = "SA"; +const char s2_16[] PROGMEM = "NÅ"; +const char s2_17[] PROGMEM = "NY"; +const char s2_18[] PROGMEM = "HA"; +const char s2_19[] PROGMEM = "ÅR"; +const char s2_20[] PROGMEM = "FÅ"; +const char s2_21[] PROGMEM = "TO"; +const char s2_22[] PROGMEM = "SE"; const byte s2_size = 22; const char* const s2_table[] PROGMEM = {s2_1,s2_2,s2_3,s2_4,s2_5,s2_6,s2_7,s2_8,s2_9,s2_10, @@ -35,44 +35,44 @@ const char* const s2_table[] PROGMEM = s2_21,s2_22}; // three letter word array -const char s3_1[] PROGMEM = "det"; -const char s3_2[] PROGMEM = "som"; -const char s3_3[] PROGMEM = "han"; -const char s3_4[] PROGMEM = "for"; -const char s3_5[] PROGMEM = "med"; -const char s3_6[] PROGMEM = "var"; -const char s3_7[] PROGMEM = "den"; -const char s3_8[] PROGMEM = "har"; -const char s3_9[] PROGMEM = "jeg"; -const char s3_10[] PROGMEM = "men"; -const char s3_11[] PROGMEM = "seg"; -const char s3_12[] PROGMEM = "hun"; -const char s3_13[] PROGMEM = "vår"; -const char s3_14[] PROGMEM = "fra"; -const char s3_15[] PROGMEM = "kan"; -const char s3_16[] PROGMEM = "ble"; -const char s3_17[] PROGMEM = "vil"; -const char s3_18[] PROGMEM = "ham"; -const char s3_19[] PROGMEM = "ved"; -const char s3_20[] PROGMEM = "noe"; -const char s3_21[] PROGMEM = "meg"; -const char s3_22[] PROGMEM = "mot"; -const char s3_23[] PROGMEM = "opp"; -const char s3_24[] PROGMEM = "der"; -const char s3_25[] PROGMEM = "når"; -const char s3_26[] PROGMEM = "inn"; -const char s3_27[] PROGMEM = "dem"; -const char s3_28[] PROGMEM = "sin"; -const char s3_29[] PROGMEM = "kom"; -const char s3_30[] PROGMEM = "enn"; -const char s3_31[] PROGMEM = "bli"; -const char s3_32[] PROGMEM = "før"; -const char s3_33[] PROGMEM = "går"; -const char s3_34[] PROGMEM = "her"; -const char s3_35[] PROGMEM = "mer"; -const char s3_36[] PROGMEM = "hva"; -const char s3_37[] PROGMEM = "alt"; -const char s3_38[] PROGMEM = "oss"; +const char s3_1[] PROGMEM = "DET"; +const char s3_2[] PROGMEM = "SOM"; +const char s3_3[] PROGMEM = "HAN"; +const char s3_4[] PROGMEM = "FOR"; +const char s3_5[] PROGMEM = "MED"; +const char s3_6[] PROGMEM = "VAR"; +const char s3_7[] PROGMEM = "DEN"; +const char s3_8[] PROGMEM = "HAR"; +const char s3_9[] PROGMEM = "JEG"; +const char s3_10[] PROGMEM = "MEN"; +const char s3_11[] PROGMEM = "SEG"; +const char s3_12[] PROGMEM = "HUN"; +const char s3_13[] PROGMEM = "VÅR"; +const char s3_14[] PROGMEM = "FRA"; +const char s3_15[] PROGMEM = "KAN"; +const char s3_16[] PROGMEM = "BLE"; +const char s3_17[] PROGMEM = "VIL"; +const char s3_18[] PROGMEM = "HAM"; +const char s3_19[] PROGMEM = "VED"; +const char s3_20[] PROGMEM = "NOE"; +const char s3_21[] PROGMEM = "MEG"; +const char s3_22[] PROGMEM = "MOT"; +const char s3_23[] PROGMEM = "OPP"; +const char s3_24[] PROGMEM = "DER"; +const char s3_25[] PROGMEM = "NÅR"; +const char s3_26[] PROGMEM = "INN"; +const char s3_27[] PROGMEM = "DEM"; +const char s3_28[] PROGMEM = "SIN"; +const char s3_29[] PROGMEM = "KOM"; +const char s3_30[] PROGMEM = "ENN"; +const char s3_31[] PROGMEM = "BLI"; +const char s3_32[] PROGMEM = "FØR"; +const char s3_33[] PROGMEM = "GÅR"; +const char s3_34[] PROGMEM = "HER"; +const char s3_35[] PROGMEM = "MER"; +const char s3_36[] PROGMEM = "HVA"; +const char s3_37[] PROGMEM = "ALT"; +const char s3_38[] PROGMEM = "OSS"; const byte s3_size = 38; const char* const s3_table[] PROGMEM = {s3_1,s3_2,s3_3,s3_4,s3_5,s3_6,s3_7,s3_8,s3_9,s3_10, @@ -81,22 +81,22 @@ const char* const s3_table[] PROGMEM = s3_31,s3_32,s3_33,s3_34,s3_35,s3_36,s3_37,s3_38}; // four letter word array -const char s4_1[] PROGMEM = "ikke"; -const char s4_2[] PROGMEM = "over"; -const char s4_3[] PROGMEM = "også"; -const char s4_4[] PROGMEM = "bare"; -const char s4_5[] PROGMEM = "være"; -const char s4_6[] PROGMEM = "blir"; -const char s4_7[] PROGMEM = "alle"; -const char s4_8[] PROGMEM = "noen"; -const char s4_9[] PROGMEM = "selv"; -const char s4_10[] PROGMEM = "sier"; -const char s4_11[] PROGMEM = "hans"; -const char s4_12[] PROGMEM = "gikk"; -const char s4_13[] PROGMEM = "fikk"; -const char s4_14[] PROGMEM = "dash"; -const char s4_15[] PROGMEM = "hvor"; -const char s4_16[] PROGMEM = "hele"; +const char s4_1[] PROGMEM = "IKKE"; +const char s4_2[] PROGMEM = "OVER"; +const char s4_3[] PROGMEM = "OGSÅ"; +const char s4_4[] PROGMEM = "BARE"; +const char s4_5[] PROGMEM = "VÆRE"; +const char s4_6[] PROGMEM = "BLIR"; +const char s4_7[] PROGMEM = "ALLE"; +const char s4_8[] PROGMEM = "NOEN"; +const char s4_9[] PROGMEM = "SELV"; +const char s4_10[] PROGMEM = "SIER"; +const char s4_11[] PROGMEM = "HANS"; +const char s4_12[] PROGMEM = "GIKK"; +const char s4_13[] PROGMEM = "FIKK"; +const char s4_14[] PROGMEM = "DASH"; +const char s4_15[] PROGMEM = "HVOR"; +const char s4_16[] PROGMEM = "HELE"; const byte s4_size = 16; const char* const s4_table[] PROGMEM = {s4_1,s4_2,s4_3,s4_4,s4_5,s4_6,s4_7,s4_8,s4_9,s4_10, @@ -104,56 +104,56 @@ const char* const s4_table[] PROGMEM = // common names -const char name_1[] PROGMEM = "Jan"; -const char name_2[] PROGMEM = "Per"; -const char name_3[] PROGMEM = "Bjørn"; -const char name_4[] PROGMEM = "Ole"; -const char name_5[] PROGMEM = "Kjell"; -const char name_6[] PROGMEM = "Lars"; -const char name_7[] PROGMEM = "Arne"; -const char name_8[] PROGMEM = "Knut"; -const char name_9[] PROGMEM = "Svein"; -const char name_10[] PROGMEM = "Hans"; -const char name_11[] PROGMEM = "Odd"; -const char name_12[] PROGMEM = "Tor"; -const char name_13[] PROGMEM = "Geir"; -const char name_14[] PROGMEM = "Terje"; -const char name_15[] PROGMEM = "Thomas"; -const char name_16[] PROGMEM = "Morten"; -const char name_17[] PROGMEM = "John"; -const char name_18[] PROGMEM = "Erik"; -const char name_19[] PROGMEM = "Anders"; -const char name_20[] PROGMEM = "Rune"; -const char name_21[] PROGMEM = "Martin"; -const char name_22[] PROGMEM = "Andreas"; -const char name_23[] PROGMEM = "Trond"; -const char name_24[] PROGMEM = "Tore"; -const char name_25[] PROGMEM = "Harald"; -const char name_26[] PROGMEM = "Olav"; -const char name_27[] PROGMEM = "Gunnar"; -const char name_28[] PROGMEM = "Jon"; -const char name_29[] PROGMEM = "Rolf"; -const char name_30[] PROGMEM = "Leif"; -const char name_31[] PROGMEM = "Tom"; -const char name_32[] PROGMEM = "Stian"; -const char name_33[] PROGMEM = "Kristian"; -const char name_34[] PROGMEM = "Nils"; -const char name_35[] PROGMEM = "Øyvind"; -const char name_36[] PROGMEM = "Helge"; -const char name_37[] PROGMEM = "Espen"; -const char name_38[] PROGMEM = "Einar"; -const char name_39[] PROGMEM = "Marius"; -const char name_40[] PROGMEM = "Kåre"; -const char name_41[] PROGMEM = "Daniel"; -const char name_42[] PROGMEM = "Magnus"; -const char name_43[] PROGMEM = "Fredrik"; -const char name_44[] PROGMEM = "Christian"; -const char name_45[] PROGMEM = "Steinar"; -const char name_46[] PROGMEM = "Eirik"; -const char name_47[] PROGMEM = "Håkon"; -const char name_48[] PROGMEM = "Øystein"; -const char name_49[] PROGMEM = "Henrik"; -const char name_50[] PROGMEM = "Karl"; +const char name_1[] PROGMEM = "JAN"; +const char name_2[] PROGMEM = "PER"; +const char name_3[] PROGMEM = "BJØRN"; +const char name_4[] PROGMEM = "OLE"; +const char name_5[] PROGMEM = "KJELL"; +const char name_6[] PROGMEM = "LARS"; +const char name_7[] PROGMEM = "ARNE"; +const char name_8[] PROGMEM = "KNUT"; +const char name_9[] PROGMEM = "SVEIN"; +const char name_10[] PROGMEM = "HANS"; +const char name_11[] PROGMEM = "ODD"; +const char name_12[] PROGMEM = "TOR"; +const char name_13[] PROGMEM = "GEIR"; +const char name_14[] PROGMEM = "TERJE"; +const char name_15[] PROGMEM = "THOMAS"; +const char name_16[] PROGMEM = "MORTEN"; +const char name_17[] PROGMEM = "JOHN"; +const char name_18[] PROGMEM = "ERIK"; +const char name_19[] PROGMEM = "ANDERS"; +const char name_20[] PROGMEM = "RUNE"; +const char name_21[] PROGMEM = "MARTIN"; +const char name_22[] PROGMEM = "ANDREAS"; +const char name_23[] PROGMEM = "TROND"; +const char name_24[] PROGMEM = "TORE"; +const char name_25[] PROGMEM = "HARALD"; +const char name_26[] PROGMEM = "OLAV"; +const char name_27[] PROGMEM = "GUNNAR"; +const char name_28[] PROGMEM = "JON"; +const char name_29[] PROGMEM = "ROLF"; +const char name_30[] PROGMEM = "LEIF"; +const char name_31[] PROGMEM = "TOM"; +const char name_32[] PROGMEM = "STIAN"; +const char name_33[] PROGMEM = "KRISTIAN"; +const char name_34[] PROGMEM = "NILS"; +const char name_35[] PROGMEM = "ØYVIND"; +const char name_36[] PROGMEM = "HELGE"; +const char name_37[] PROGMEM = "ESPEN"; +const char name_38[] PROGMEM = "EINAR"; +const char name_39[] PROGMEM = "MARIUS"; +const char name_40[] PROGMEM = "KÅRE"; +const char name_41[] PROGMEM = "DANIEL"; +const char name_42[] PROGMEM = "MAGNUS"; +const char name_43[] PROGMEM = "FREDRIK"; +const char name_44[] PROGMEM = "CHRISTIAN"; +const char name_45[] PROGMEM = "STEINAR"; +const char name_46[] PROGMEM = "EIRIK"; +const char name_47[] PROGMEM = "HÅKON"; +const char name_48[] PROGMEM = "ØYSTEIN"; +const char name_49[] PROGMEM = "HENRIK"; +const char name_50[] PROGMEM = "KARL"; const byte name_size = 50; const char* const name_table[] PROGMEM = {name_1,name_2,name_3,name_4,name_5,name_6,name_7,name_8,name_9,name_10,