From 438090536bb76d6a92e42ad33600aa6d644aaedc Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Wed, 25 Mar 2015 21:03:03 +0400 Subject: [PATCH] TTS for new units --- radio/src/translations/tts_cz.cpp | 2 ++ radio/src/translations/tts_de.cpp | 4 +++- radio/src/translations/tts_en.cpp | 2 ++ radio/src/translations/tts_es.cpp | 4 +++- radio/src/translations/tts_fr.cpp | 4 ++++ radio/src/translations/tts_hu.cpp | 2 ++ radio/src/translations/tts_it.cpp | 2 ++ radio/src/translations/tts_pl.cpp | 2 ++ radio/src/translations/tts_pt.cpp | 2 ++ radio/src/translations/tts_se.cpp | 2 ++ radio/src/translations/tts_sk.cpp | 2 ++ radio/util/tts.py | 14 ++++++++------ 12 files changed, 34 insertions(+), 8 deletions(-) diff --git a/radio/src/translations/tts_cz.cpp b/radio/src/translations/tts_cz.cpp index 4f45c212c..0d8dc068f 100644 --- a/radio/src/translations/tts_cz.cpp +++ b/radio/src/translations/tts_cz.cpp @@ -56,6 +56,8 @@ enum CzechPrompts { 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), + CZ_PROMPT_MILLILITERS = CZ_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*4), + CZ_PROMPT_FLOZ = CZ_PROMPT_UNITS_BASE+(UNIT_FLOZ*4), }; diff --git a/radio/src/translations/tts_de.cpp b/radio/src/translations/tts_de.cpp index 4fcc5567b..a15f12f6f 100644 --- a/radio/src/translations/tts_de.cpp +++ b/radio/src/translations/tts_de.cpp @@ -56,7 +56,9 @@ enum GermanPrompts { DE_PROMPT_MINUTES = DE_PROMPT_UNITS_BASE+UNIT_MINUTES, DE_PROMPT_SECONDS = DE_PROMPT_UNITS_BASE+UNIT_SECONDS, DE_PROMPT_RPMS = DE_PROMPT_UNITS_BASE+UNIT_RPMS, - DE_PROMPT_G= DE_PROMPT_UNITS_BASE+UNIT_G, + DE_PROMPT_G = DE_PROMPT_UNITS_BASE+UNIT_G, + DE_PROMPT_MILLILITERS = DE_PROMPT_UNITS_BASE+UNIT_MILLILITERS, + DE_PROMPT_FLOZ = DE_PROMPT_UNITS_BASE+UNIT_FLOZ, }; diff --git a/radio/src/translations/tts_en.cpp b/radio/src/translations/tts_en.cpp index c72ed749a..0287f4299 100644 --- a/radio/src/translations/tts_en.cpp +++ b/radio/src/translations/tts_en.cpp @@ -65,6 +65,8 @@ enum EnglishPrompts { EN_PROMPT_SECONDS = EN_PROMPT_UNITS_BASE+(UNIT_SECONDS*2), EN_PROMPT_RPMS = EN_PROMPT_UNITS_BASE+(UNIT_RPMS*2), EN_PROMPT_G = EN_PROMPT_UNITS_BASE+(UNIT_G*2), + EN_PROMPT_MILLILITERS = EN_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2), + EN_PROMPT_FLOZ = EN_PROMPT_UNITS_BASE+(UNIT_FLOZ*2), EN_PROMPT_POINT_BASE = 160, //.0 - .9 diff --git a/radio/src/translations/tts_es.cpp b/radio/src/translations/tts_es.cpp index 4aed68a5c..f86a98a0f 100644 --- a/radio/src/translations/tts_es.cpp +++ b/radio/src/translations/tts_es.cpp @@ -80,7 +80,9 @@ enum SpanishPrompts { ES_PROMPT_MINUTES = ES_PROMPT_UNITS_BASE+UNIT_MINUTES, ES_PROMPT_SECONDS = ES_PROMPT_UNITS_BASE+UNIT_SECONDS, ES_PROMPT_RPMS = ES_PROMPT_UNITS_BASE+UNIT_RPMS, - ES_PROMPT_G= ES_PROMPT_UNITS_BASE+UNIT_G, + ES_PROMPT_G = ES_PROMPT_UNITS_BASE+UNIT_G, + ES_PROMPT_MILLILITERS = ES_PROMPT_UNITS_BASE+UNIT_MILLILITERS, + ES_PROMPT_FLOZ = ES_PROMPT_UNITS_BASE+UNIT_FLOZ, }; diff --git a/radio/src/translations/tts_fr.cpp b/radio/src/translations/tts_fr.cpp index 402fd3d39..a88fa3297 100644 --- a/radio/src/translations/tts_fr.cpp +++ b/radio/src/translations/tts_fr.cpp @@ -62,6 +62,10 @@ enum FrenchPrompts { FR_PROMPT_HEURE = FR_PROMPT_UNITS_BASE+UNIT_HOURS, FR_PROMPT_MINUTE = FR_PROMPT_UNITS_BASE+UNIT_MINUTES, FR_PROMPT_SECONDE = FR_PROMPT_UNITS_BASE+UNIT_SECONDS, + FR_PROMPT_RPMS = FR_PROMPT_UNITS_BASE+UNIT_RPMS, + FR_PROMPT_G = FR_PROMPT_UNITS_BASE+UNIT_G, + FR_PROMPT_MILLILITERS = FR_PROMPT_UNITS_BASE+UNIT_MILLILITERS, + FR_PROMPT_FLOZ = FR_PROMPT_UNITS_BASE+UNIT_FLOZ, FR_PROMPT_VIRGULE_BASE = 180, //,0 - ,9 }; diff --git a/radio/src/translations/tts_hu.cpp b/radio/src/translations/tts_hu.cpp index 1c1763232..7d370dc87 100644 --- a/radio/src/translations/tts_hu.cpp +++ b/radio/src/translations/tts_hu.cpp @@ -65,6 +65,8 @@ enum HungarianPrompts { HU_PROMPT_SECONDS = HU_PROMPT_UNITS_BASE+(UNIT_SECONDS*2), HU_PROMPT_RPMS = HU_PROMPT_UNITS_BASE+(UNIT_RPMS*2), HU_PROMPT_G = HU_PROMPT_UNITS_BASE+(UNIT_G*2), + HU_PROMPT_MILLILITERS = HU_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2), + HU_PROMPT_FLOZ = HU_PROMPT_UNITS_BASE+(UNIT_FLOZ*2), HU_PROMPT_POINT_BASE = 160, //.0 - .9 diff --git a/radio/src/translations/tts_it.cpp b/radio/src/translations/tts_it.cpp index 4e5dc6f5a..ad88fe816 100644 --- a/radio/src/translations/tts_it.cpp +++ b/radio/src/translations/tts_it.cpp @@ -53,6 +53,8 @@ enum ItalianPrompts { IT_PROMPT_WATTS = IT_PROMPT_UNITS_BASE+UNIT_WATTS, IT_PROMPT_FEET = IT_PROMPT_UNITS_BASE+UNIT_FEET, IT_PROMPT_KTS = IT_PROMPT_UNITS_BASE+UNIT_KTS, + IT_PROMPT_MILLILITERS = IT_PROMPT_UNITS_BASE+UNIT_MILLILITERS, + IT_PROMPT_FLOZ = IT_PROMPT_UNITS_BASE+UNIT_FLOZ, }; diff --git a/radio/src/translations/tts_pl.cpp b/radio/src/translations/tts_pl.cpp index faac6283b..9d0694ce3 100644 --- a/radio/src/translations/tts_pl.cpp +++ b/radio/src/translations/tts_pl.cpp @@ -58,6 +58,8 @@ enum PolishPrompts { PL_PROMPT_SECONDS = PL_PROMPT_UNITS_BASE+(UNIT_SECONDS*4), PL_PROMPT_RPMS = PL_PROMPT_UNITS_BASE+(UNIT_RPMS*4), PL_PROMPT_G = PL_PROMPT_UNITS_BASE+(UNIT_G*4), + PL_PROMPT_MILLILITERS = PL_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*4), + PL_PROMPT_FLOZ = PL_PROMPT_UNITS_BASE+(UNIT_FLOZ*4), }; #if defined(VOICE) diff --git a/radio/src/translations/tts_pt.cpp b/radio/src/translations/tts_pt.cpp index 024b20095..7b3ab5dcd 100644 --- a/radio/src/translations/tts_pt.cpp +++ b/radio/src/translations/tts_pt.cpp @@ -76,6 +76,8 @@ enum PortuguesePrompts { PT_PROMPT_WATTS = PT_PROMPT_UNITS_BASE+UNIT_WATTS, PT_PROMPT_FEET = PT_PROMPT_UNITS_BASE+UNIT_FEET, PT_PROMPT_KTS = PT_PROMPT_UNITS_BASE+UNIT_KTS, + PT_PROMPT_MILLILITERS = PT_PROMPT_UNITS_BASE+UNIT_MILLILITERS, + PT_PROMPT_FLOZ = PT_PROMPT_UNITS_BASE+UNIT_FLOZ, }; #if defined(VOICE) diff --git a/radio/src/translations/tts_se.cpp b/radio/src/translations/tts_se.cpp index b187338a5..e464e729d 100644 --- a/radio/src/translations/tts_se.cpp +++ b/radio/src/translations/tts_se.cpp @@ -66,6 +66,8 @@ enum SwedishPrompts { SE_PROMPT_SECONDS = SE_PROMPT_UNITS_BASE+(UNIT_SECONDS*2), SE_PROMPT_RPMS = SE_PROMPT_UNITS_BASE+(UNIT_RPMS*2), SE_PROMPT_G = SE_PROMPT_UNITS_BASE+(UNIT_G*2), + SE_PROMPT_MILLILITERS = SE_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2), + SE_PROMPT_FLOZ = SE_PROMPT_UNITS_BASE+(UNIT_FLOZ*2), SE_PROMPT_POINT_BASE = 160, //.0 - .9 diff --git a/radio/src/translations/tts_sk.cpp b/radio/src/translations/tts_sk.cpp index fdea697cc..14ee57485 100644 --- a/radio/src/translations/tts_sk.cpp +++ b/radio/src/translations/tts_sk.cpp @@ -71,6 +71,8 @@ enum SlovakPrompts { 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), + SK_PROMPT_MILLILITERS = SK_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*4), + SK_PROMPT_FLOZ = SK_PROMPT_UNITS_BASE+(UNIT_FLOZ*4), }; diff --git a/radio/util/tts.py b/radio/util/tts.py index 4e9ed32fa..79cfd0909 100644 --- a/radio/util/tts.py +++ b/radio/util/tts.py @@ -151,7 +151,9 @@ def ttsEn(): "minute", "minutes", "second", "seconds", "r p m", "r p m", - "g", "g"]): + "g", "g" + "milliliter", "milliliters" + "fluid ounce", "fluid ounces"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+115+i))) for i, s in enumerate(["point zero", "point one", "point two", "point three", "point four", "point five", "point six", @@ -246,7 +248,7 @@ def ttsFr(): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+110+i))) for i, s in enumerate(["virgule", "et", "moins", "minuit", "midi"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+119+i))) - for i, s in enumerate(["volts", u"ampères", u"mètres seconde", "", u"kilomètre heure", u"mètres", u"degrés", "pourcents", u"milli ampères", u"milli ampères / heure", "watt", "db", "pieds", "miles par heure", "heure", "minute", "seconde", "tours minute", "g"]): + for i, s in enumerate(["volts", u"ampères", u"mètres seconde", "", u"kilomètre heure", u"mètres", u"degrés", "pourcents", u"milli ampères", u"milli ampères / heure", "watt", "db", "pieds", "miles par heure", "heure", "minute", "seconde", "tours minute", "g", "millilitres", "onces"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+125+i))) for i, s in enumerate(["timer", "", "tension", "tension", u"émission", u"réception", "altitude", "moteur", "essence", u"température", u"température", "vitesse", "distance", "altitude", u"élément lipo", @@ -306,7 +308,7 @@ def ttsIt(): systemSounds.append(("mille", filename(PROMPT_SYSTEM_BASE+102))) for i, s in enumerate(["virgola", "un", "e", "meno", "ora", "ore", "minuto", "minuti", "secondo", "secondi"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+103+i))) - for i, s in enumerate(["volt", "ampere", "metri per secondo", "", "chilometri/ora", "metri", "gradi", "percento", "milliampere", "milliampere/ora", "watt", "db", "piedi", "nodi", "ore", "minuti", "secondi", "R P M", "g"]): + for i, s in enumerate(["volt", "ampere", "metri per secondo", "", "chilometri/ora", "metri", "gradi", "percento", "milliampere", "milliampere/ora", "watt", "db", "piedi", "nodi", "ore", "minuti", "secondi", "R P M", "g", "millilitri", "once"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+113+i))) for s, f, a in [(u"radio inattiva controllare", "inactiv", 486), (u"batteria della radio scarica", "lowbatt", 485), @@ -388,7 +390,7 @@ def ttsPt(): systemSounds.append(("mil", filename(PROMPT_SYSTEM_BASE+110))) for i, s in enumerate(["virgula", "uma", "duas", "e", "menos", "hora", "horas", "minuto", "minutos", "segundo", "segundos"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+111+i))) - for i, s in enumerate([u"Volt", u"ampére", u"metros por segundo", u"", u"quilômetros por hora", u"metros", u"graus", u"cento", u"miliamperes", u"miliamperes por hora", u"watt", u"db", u"pés", u"nós", u"horas", u"minutos", u"segundos", u"RPM", u"g"]): + for i, s in enumerate([u"Volt", u"ampére", u"metros por segundo", u"", u"quilômetros por hora", u"metros", u"graus", u"cento", u"miliamperes", u"miliamperes por hora", u"watt", u"db", u"pés", u"nós", u"horas", u"minutos", u"segundos", u"RPM", u"g", u"mililitri", u"onças"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+122+i))) for s, f, a in [(u"atenção, o rádio foi esquecido ligado, por favor desligue-o", "inactiv", 486), (u"bateria do rádio fraca", "lowbatt", 485), @@ -468,7 +470,7 @@ def ttsEs(): systemSounds.append(("mil", filename(PROMPT_SYSTEM_BASE+110))) for i, s in enumerate(["coma", "un", "una", "y", "meno", "hora", "horas", "minuto", "minutos", "segundo", "segundos"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+111+i))) - for i, s in enumerate([u"Voltio", u"ampério", u"metros por segundo", u"", u"kilómetro por hora", u"metros", u"grados", u"por ciento", u"miliamperios", u"miliamperios por hora", u"vatio", u"db", u"pés", u"nós", u"horas", u"minutos", u"segundos", u"RPM", u"g"]): + for i, s in enumerate([u"Voltio", u"ampério", u"metros por segundo", u"", u"kilómetro por hora", u"metros", u"grados", u"por ciento", u"miliamperios", u"miliamperios por hora", u"vatio", u"db", u"pés", u"nós", u"horas", u"minutos", u"segundos", u"RPM", u"g", u"mililitro", u"onzas"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+122+i))) for s, f, a in [(u"me tienes abandonada", "inactiv", 486), (u"batería del transmisor baja", "lowbatt", 485), @@ -541,7 +543,7 @@ def ttsDe(): systemSounds.append(("tausend", filename(PROMPT_SYSTEM_BASE+101))) for i, s in enumerate(["comma", "und", "minus", "uhr", "minute", "minuten", "sekunde", "sekunden"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+102+i))) - for i, s in enumerate(["Volt", "Ampere", "Meter pro sekunde", "", "kilometer pro stunde", "Meter", "Grad", "Prozent", "Milliampere", "Milliampere pro stunde", "Watt", "db", "Fuesse", "Knoten", "Uhr", "Minuten", "Secunden", "R P M", "g"]): + for i, s in enumerate(["Volt", "Ampere", "Meter pro sekunde", "", "kilometer pro stunde", "Meter", "Grad", "Prozent", "Milliampere", "Milliampere pro stunde", "Watt", "db", "Fuesse", "Knoten", "Uhr", "Minuten", "Secunden", "R P M", "g", "Milliliter", "Unze"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+110+i))) for s, f, a in [(u"Sender ist inaktiv,bitte Ueberpruefen Sie", "inactiv", 486), (u"Senderakku niedrig", "lowbatt", 485),