From 53a77a5bdb55cc18e52797352e3dc8cbbd10c561 Mon Sep 17 00:00:00 2001 From: mhotar Date: Sat, 1 Aug 2015 12:46:52 +0200 Subject: [PATCH 1/3] #2610 cz tts --- radio/src/translations/tts_cz.cpp | 53 ++++++++++++++++--------------- radio/util/tts.py | 28 ++++++++++------ 2 files changed, 45 insertions(+), 36 deletions(-) diff --git a/radio/src/translations/tts_cz.cpp b/radio/src/translations/tts_cz.cpp index e27e4cc7e..f99df2d9d 100644 --- a/radio/src/translations/tts_cz.cpp +++ b/radio/src/translations/tts_cz.cpp @@ -36,31 +36,7 @@ enum CzechPrompts { CZ_PROMPT_CELYCH = CZ_PROMPT_NUMBERS_BASE+116, CZ_PROMPT_MINUS = CZ_PROMPT_NUMBERS_BASE+117, - CZ_PROMPT_UNITS_BASE = 118, - CZ_PROMPT_VOLTS = CZ_PROMPT_UNITS_BASE+UNIT_VOLTS, //(jeden)volt,(dva)volty,(pet)voltu,(desetina)voltu - CZ_PROMPT_AMPS = CZ_PROMPT_UNITS_BASE+(UNIT_AMPS*4), - CZ_PROMPT_METERS_PER_SECOND = CZ_PROMPT_UNITS_BASE+(UNIT_METERS_PER_SECOND*4), - CZ_PROMPT_SPARE1 = CZ_PROMPT_UNITS_BASE+(UNIT_RAW*4), - CZ_PROMPT_KMH = CZ_PROMPT_UNITS_BASE+(UNIT_SPEED*4), - CZ_PROMPT_METERS = CZ_PROMPT_UNITS_BASE+(UNIT_DIST*4), - CZ_PROMPT_DEGREES = CZ_PROMPT_UNITS_BASE+(UNIT_TEMPERATURE*4), - CZ_PROMPT_PERCENT = CZ_PROMPT_UNITS_BASE+(UNIT_PERCENT*4), - CZ_PROMPT_MILLIAMPS = CZ_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*4), - CZ_PROMPT_MAH = CZ_PROMPT_UNITS_BASE+(UNIT_MAH*4), - CZ_PROMPT_WATTS = CZ_PROMPT_UNITS_BASE+(UNIT_WATTS*4), - CZ_PROMPT_DB = CZ_PROMPT_UNITS_BASE+(UNIT_DB*4), - CZ_PROMPT_FEET = CZ_PROMPT_UNITS_BASE+(UNIT_FEET*4), - CZ_PROMPT_KTS = CZ_PROMPT_UNITS_BASE+(UNIT_KTS*4), - CZ_PROMPT_HOURS = CZ_PROMPT_UNITS_BASE+(UNIT_HOURS*4), - CZ_PROMPT_MINUTES = CZ_PROMPT_UNITS_BASE+(UNIT_MINUTES*4), - CZ_PROMPT_SECONDS = CZ_PROMPT_UNITS_BASE+(UNIT_SECONDS*4), - CZ_PROMPT_RPMS = CZ_PROMPT_UNITS_BASE+(UNIT_RPMS*4), - CZ_PROMPT_G = CZ_PROMPT_UNITS_BASE+(UNIT_G*4), -#if defined(CPUARM) - CZ_PROMPT_MILLILITERS = CZ_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*4), - CZ_PROMPT_FLOZ = CZ_PROMPT_UNITS_BASE+(UNIT_FLOZ*4), - CZ_PROMPT_FEET_PER_SECOND = CZ_PROMPT_UNITS_BASE+(UNIT_FEET_PER_SECOND*4), -#endif + CZ_PROMPT_UNITS_BASE = 118, //(jeden)volt,(dva)volty,(pet)voltu,(desetina)voltu }; @@ -135,13 +111,37 @@ I18N_PLAY_FUNCTION(cz, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } int16_t tmp = number; - +#if defined(CPUARM) + switch(unit) { + case 0: + break; + case 6: + case 8: + case 10: + case 14: + case 17: + case 21: + case 22: + case 23: + case 24: + att = ZENSKY; + break; + case 13: + case 18: + att = STREDNI; + break; + default: + att = MUZSKY; + break; + } +#else switch(unit) { case 0: break; case 4: case 10: case 13: + case 14: case 15: case 16: case 17: @@ -156,6 +156,7 @@ I18N_PLAY_FUNCTION(cz, playNumber, getvalue_t number, uint8_t unit, uint8_t att) att = MUZSKY; break; } +#endif if ((number == 1) && (att == MUZSKY)) { PUSH_NUMBER_PROMPT(CZ_PROMPT_JEDEN); diff --git a/radio/util/tts.py b/radio/util/tts.py index d0cf30f72..da6998110 100644 --- a/radio/util/tts.py +++ b/radio/util/tts.py @@ -662,23 +662,29 @@ def ttsCz(): for i, s in enumerate(["volt", "volty", u"voltů", "voltu", u"ampér", u"ampéry", u"ampérů", u"ampéru", - "metr za sekundu", "metry za sekundu", u"metrů za sekundu", "metru za sekundu", - "jednotka", "jednotky", "jednotek", "jednotky", - "kilometr za hodinu", "kilometry za hodinu", u"kilometrů za hodinu", "kilometru za hodinu", - "metr", "metry", u"metrů", "metru", - u"stupeň", u"stupně", u"stupňů", u"stupně", - "procento", "procenta", "procento", "procenta", u"miliampér", u"miliampéry", u"miliampérů", u"miliampéru", + u"uzel", u"uzly", u"uzlů", u"uzlu", + "metr za sekundu", "metry za sekundu", u"metrů za sekundu", "metru za sekundu", + "stopa za sekundu", "stopy za sekundu", "stop za sekundu", "stopy za sekundu", + "kilometr za hodinu", "kilometry za hodinu", u"kilometrů za hodinu", "kilometru za hodinu", + "míle za hodinu", "míle za hodinu", u"mil za hodinu", "míle za hodinu", + "metr", "metry", u"metrů", "metru", + "stopa", "stopy", "stop", "stopy", + u"stupeň celsia", u"stupně celsia", u"stupňů celsia", u"stupně celsia", + u"stupeň fahrenheita", u"stupně fahrenheita", u"stupňů fahrenheita", u"stupně fahrenheita", + "procento", "procenta", "procento", "procenta", u"miliampérhodina", u"miliampérhodiny", u"miliampérhodin", u"miliampérhodiny", "vat", "vaty", u"vatů", "vatu", "decibel", "decibely", u"decibelů", "decibelu", - "stopa", "stopy", "stop", "stopy", - u"míle za hodinu", u"míle za hodinu", u"mil za hodinu", "míle za hodinu", + u"otáčka za minutu", u"otáčky za minutu", u"otáček za minutu", u"otáčky za minutu", + u"gé", u"gé", u"gé", u"gé" + u"stupeň", u"stupně", u"stupňů", u"stupně", + u"mililitr", u"mililitry", u"mililitrů", "mililitru", + u"dutá unce", u"duté unce", u"dutých uncí", "duté unce", "hodina", "hodiny", "hodin", "hodiny", "minuta", "minuty", "minut", "minuty", "sekunda", "sekundy", "sekund", "sekundy", - u"otáčka za minutu", u"otáčky za minutu", u"otáček za minutu", u"otáčky za minutu", - u"gé", u"gé", u"gé", u"gé"]): + ]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+118+i))) for s, f, a in [(u"střed trimu", "midtrim", 495), @@ -704,6 +710,8 @@ def ttsCz(): (u"problém s anténou rádia", "swr_red", NO_ALTERNATE), (u"telemetrie ztracena", "telemko", NO_ALTERNATE), (u"telemetrie je funkční", "telemok", NO_ALTERNATE), + (u"trenér port odpojen", "trainko", NO_ALTERNATE), + (u"trenér port připojen", "trainok", NO_ALTERNATE), ]: systemSounds.append((s, filename(f, a))) for i, (s, f) in enumerate([ From 8a202f0ecc14e6c7d50980a9f6689aeb7ab5262f Mon Sep 17 00:00:00 2001 From: mhotar Date: Sat, 1 Aug 2015 13:08:45 +0200 Subject: [PATCH 2/3] #2610 sk tts --- radio/src/translations/tts_sk.cpp | 52 ++++++++++++++++--------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/radio/src/translations/tts_sk.cpp b/radio/src/translations/tts_sk.cpp index 056454769..17b212d0c 100644 --- a/radio/src/translations/tts_sk.cpp +++ b/radio/src/translations/tts_sk.cpp @@ -51,31 +51,7 @@ enum SlovakPrompts { SK_PROMPT_CELYCH = SK_PROMPT_NUMBERS_BASE+116, SK_PROMPT_MINUS = SK_PROMPT_NUMBERS_BASE+117, - SK_PROMPT_UNITS_BASE = 118, - SK_PROMPT_VOLTS = SK_PROMPT_UNITS_BASE+UNIT_VOLTS, //(jeden)volt,(dva)volty,(pet)voltu,(desetina)voltu - SK_PROMPT_AMPS = SK_PROMPT_UNITS_BASE+(UNIT_AMPS*4), - SK_PROMPT_METERS_PER_SECOND = SK_PROMPT_UNITS_BASE+(UNIT_METERS_PER_SECOND*4), - SK_PROMPT_SPARE1 = SK_PROMPT_UNITS_BASE+(UNIT_RAW*4), - SK_PROMPT_KMH = SK_PROMPT_UNITS_BASE+(UNIT_SPEED*4), - SK_PROMPT_METERS = SK_PROMPT_UNITS_BASE+(UNIT_DIST*4), - SK_PROMPT_DEGREES = SK_PROMPT_UNITS_BASE+(UNIT_TEMPERATURE*4), - SK_PROMPT_PERCENT = SK_PROMPT_UNITS_BASE+(UNIT_PERCENT*4), - SK_PROMPT_MILLIAMPS = SK_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*4), - SK_PROMPT_MAH = SK_PROMPT_UNITS_BASE+(UNIT_MAH*4), - SK_PROMPT_WATTS = SK_PROMPT_UNITS_BASE+(UNIT_WATTS*4), - SK_PROMPT_DB = SK_PROMPT_UNITS_BASE+(UNIT_DB*4), - SK_PROMPT_FEET = SK_PROMPT_UNITS_BASE+(UNIT_FEET*4), - SK_PROMPT_KTS = SK_PROMPT_UNITS_BASE+(UNIT_KTS*4), - SK_PROMPT_HOURS = SK_PROMPT_UNITS_BASE+(UNIT_HOURS*4), - SK_PROMPT_MINUTES = SK_PROMPT_UNITS_BASE+(UNIT_MINUTES*4), - SK_PROMPT_SECONDS = SK_PROMPT_UNITS_BASE+(UNIT_SECONDS*4), - SK_PROMPT_RPMS = SK_PROMPT_UNITS_BASE+(UNIT_RPMS*4), - SK_PROMPT_G = SK_PROMPT_UNITS_BASE+(UNIT_G*4), -#if defined(CPUARM) - SK_PROMPT_MILLILITERS = SK_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*4), - SK_PROMPT_FLOZ = SK_PROMPT_UNITS_BASE+(UNIT_FLOZ*4), - SK_PROMPT_FEET_PER_SECOND = SK_PROMPT_UNITS_BASE+(UNIT_FEET_PER_SECOND*4), -#endif + SK_PROMPT_UNITS_BASE = 118, //(jeden)volt,(dva)volty,(pet)voltu,(desetina)voltu }; @@ -152,12 +128,37 @@ I18N_PLAY_FUNCTION(sk, playNumber, getvalue_t number, uint8_t unit, uint8_t att) int16_t tmp = number; +#if defined(CPUARM) + switch(unit) { + case 0: + break; + case 6: + case 8: + case 10: + case 14: + case 17: + case 21: + case 22: + case 23: + case 24: + att = ZENSKY; + break; + case 13: + case 18: + att = STREDNI; + break; + default: + att = MUZSKY; + break; + } +#else switch(unit) { case 0: break; case 4: case 10: case 13: + case 14: case 15: case 16: case 17: @@ -172,6 +173,7 @@ I18N_PLAY_FUNCTION(sk, playNumber, getvalue_t number, uint8_t unit, uint8_t att) att = MUZSKY; break; } +#endif if ((number == 1) && (att == MUZSKY)) { PUSH_NUMBER_PROMPT(SK_PROMPT_JEDEN); From 3cbbcf18c85cb20948a10ccccacb1ce3e3b64f3c Mon Sep 17 00:00:00 2001 From: mhotar Date: Sat, 1 Aug 2015 17:23:20 +0200 Subject: [PATCH 3/3] #2610 CZ unicode fix in tts.py --- radio/util/tts.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/util/tts.py b/radio/util/tts.py index da6998110..46d35178e 100644 --- a/radio/util/tts.py +++ b/radio/util/tts.py @@ -667,12 +667,12 @@ def ttsCz(): "metr za sekundu", "metry za sekundu", u"metrů za sekundu", "metru za sekundu", "stopa za sekundu", "stopy za sekundu", "stop za sekundu", "stopy za sekundu", "kilometr za hodinu", "kilometry za hodinu", u"kilometrů za hodinu", "kilometru za hodinu", - "míle za hodinu", "míle za hodinu", u"mil za hodinu", "míle za hodinu", + u"míle za hodinu", u"míle za hodinu", u"mil za hodinu", u"míle za hodinu", "metr", "metry", u"metrů", "metru", "stopa", "stopy", "stop", "stopy", u"stupeň celsia", u"stupně celsia", u"stupňů celsia", u"stupně celsia", u"stupeň fahrenheita", u"stupně fahrenheita", u"stupňů fahrenheita", u"stupně fahrenheita", - "procento", "procenta", "procento", "procenta", + "procento", "procenta", "procent", "procenta", u"miliampérhodina", u"miliampérhodiny", u"miliampérhodin", u"miliampérhodiny", "vat", "vaty", u"vatů", "vatu", "decibel", "decibely", u"decibelů", "decibelu", @@ -680,7 +680,7 @@ def ttsCz(): u"gé", u"gé", u"gé", u"gé" u"stupeň", u"stupně", u"stupňů", u"stupně", u"mililitr", u"mililitry", u"mililitrů", "mililitru", - u"dutá unce", u"duté unce", u"dutých uncí", "duté unce", + u"dutá unce", u"duté unce", u"dutých uncí", u"duté unce", "hodina", "hodiny", "hodin", "hodiny", "minuta", "minuty", "minut", "minuty", "sekunda", "sekundy", "sekund", "sekundy",