piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

TTS fixes

Browse Source
This commit is contained in:
bsongis
2015-07-05 13:09:17 +02:00
parent 79e36b8711
commit 6bd9717315
3 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/translations/tts_en.cpp
+2 -2
View File
@@ -44,7 +44,7 @@ enum EnglishPrompts {
EN_PROMPT_AND = EN_PROMPT_NUMBERS_BASE+110,
EN_PROMPT_MINUS = EN_PROMPT_NUMBERS_BASE+111,
EN_PROMPT_POINT = EN_PROMPT_NUMBERS_BASE+112,
EN_PROMPT_UNITS_BASE = 115,
EN_PROMPT_UNITS_BASE = 113,
EN_PROMPT_POINT_BASE = 165, //.0 - .9
};
@@ -127,7 +127,7 @@ I18N_PLAY_FUNCTION(en, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
}
if (unit) {
EN_PUSH_UNIT_PROMPT(tmp, (EN_PROMPT_UNITS_BASE+((unit-1)*2)));
EN_PUSH_UNIT_PROMPT(tmp, EN_PROMPT_UNITS_BASE + unit*2);
}
}
radio/src/translations/tts_fr.cpp
+2 -23
View File
@@ -45,31 +45,10 @@ enum FrenchPrompts {
FR_PROMPT_MINUIT = 122,
FR_PROMPT_MIDI = 123,
FR_PROMPT_UNITS_BASE = 125,
FR_PROMPT_VOLTS = FR_PROMPT_UNITS_BASE+UNIT_VOLTS,
FR_PROMPT_AMPS = FR_PROMPT_UNITS_BASE+UNIT_AMPS,
FR_PROMPT_METERS_PER_SECOND = FR_PROMPT_UNITS_BASE+UNIT_METERS_PER_SECOND,
FR_PROMPT_SPARE1 = FR_PROMPT_UNITS_BASE+UNIT_RAW,
FR_PROMPT_KMH = FR_PROMPT_UNITS_BASE+UNIT_SPEED,
FR_PROMPT_METERS = FR_PROMPT_UNITS_BASE+UNIT_DIST,
FR_PROMPT_DEGREES = FR_PROMPT_UNITS_BASE+UNIT_TEMPERATURE,
FR_PROMPT_PERCENT = FR_PROMPT_UNITS_BASE+UNIT_PERCENT,
FR_PROMPT_MILLIAMPS = FR_PROMPT_UNITS_BASE+UNIT_MILLIAMPS,
FR_PROMPT_MAH = FR_PROMPT_UNITS_BASE+UNIT_MAH,
FR_PROMPT_WATTS = FR_PROMPT_UNITS_BASE+UNIT_WATTS,
FR_PROMPT_FEET = FR_PROMPT_UNITS_BASE+UNIT_FEET,
FR_PROMPT_KTS = FR_PROMPT_UNITS_BASE+UNIT_KTS,
FR_PROMPT_UNITS_BASE = 124,
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,
#if defined(CPUARM)
FR_PROMPT_MILLILITERS = FR_PROMPT_UNITS_BASE+UNIT_MILLILITERS,
FR_PROMPT_FLOZ = FR_PROMPT_UNITS_BASE+UNIT_FLOZ,
FR_PROMPT_FEET_PER_SECOND = FR_PROMPT_UNITS_BASE+UNIT_FEET_PER_SECOND,
#endif
FR_PROMPT_VIRGULE_BASE = 180, //,0 - ,9
};
@@ -154,7 +133,7 @@ I18N_PLAY_FUNCTION(fr, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
}
if (unit) {
PUSH_NUMBER_PROMPT(FR_PROMPT_UNITS_BASE+unit-1);
PUSH_NUMBER_PROMPT(FR_PROMPT_UNITS_BASE+unit);
}
}
radio/util/tts.py
+5 -5
View File
@@ -254,11 +254,11 @@ def ttsFr():
systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+119+i)))
for i, s in enumerate(["volts", u"ampères", u"milli ampères", u"knots", u"mètres seconde", u"pieds par seconde", u"kilomètre heure", u"miles par heure", u"mètres", "pieds", u"degrés", u"degrés fahrenheit", "pourcents", u"milli ampères / heure", "watt", "db", "tours minute", "g", u"degrés", "millilitres", "onces", "heure", "minute", "seconde"]):
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",
"total lipo", "tension", "courant", "consommation", "puissance", u"accelération X", u"accelération Y", u"accelération Z",
"orientation", "vario"]):
systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+146+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",
# "total lipo", "tension", "courant", "consommation", "puissance", u"accelération X", u"accelération Y", u"accelération Z",
# "orientation", "vario"]):
# systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+146+i)))
for i, s in enumerate(["virgule 0", "virgule 1", "virgule 2", "virgule 3", "virgule 4", "virgule 5", "virgule 6", "virgule 7", "virgule 8", "virgule 9"]):
systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+180+i)))
for s, f, a in [(u"Batterie radio faible !", "lowbatt", 485),