Change audio generation files accordingly (#3717)
* Change audio generation files accordingly New way of working : units files are ALWAYS named in english based on the names in audio_arm.cpp names. multiple form (singular, plural(s) are ammended with 0 to 4 suffix, according to languages rules. example : meter1.wav for first form of plural of meter unit,. This filename needs to be the same for all languages (in their respective directories of course) * Care for gruin9x * Better form * Other languages * Cosmetics
This commit is contained in:
@@ -135,6 +135,37 @@ const int16_t sineValues[] =
|
||||
};
|
||||
|
||||
#if defined(SDCARD)
|
||||
|
||||
const char * const unitsFilenames[] = {
|
||||
"",
|
||||
"volt",
|
||||
"amp",
|
||||
"mamp",
|
||||
"knot",
|
||||
"mps",
|
||||
"fps",
|
||||
"kph",
|
||||
"mph",
|
||||
"meter",
|
||||
"foot",
|
||||
"celsius",
|
||||
"fahr",
|
||||
"percent",
|
||||
"mamph",
|
||||
"watt",
|
||||
"mwatt",
|
||||
"db",
|
||||
"rpm",
|
||||
"g",
|
||||
"degree",
|
||||
"radian",
|
||||
"ml",
|
||||
"founce",
|
||||
"hour",
|
||||
"minute",
|
||||
"second",
|
||||
};
|
||||
|
||||
const char * const audioFilenames[] = {
|
||||
"hello",
|
||||
"bye",
|
||||
@@ -1235,6 +1266,22 @@ void audioEvent(unsigned int index)
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(SDCARD)
|
||||
void pushUnit(uint8_t unit, uint8_t idx, uint8_t id)
|
||||
{
|
||||
if (unit < DIM(unitsFilenames)) {
|
||||
char path[AUDIO_FILENAME_MAXLEN+1];
|
||||
char *tmp = strAppendSystemAudioPath(path);
|
||||
tmp = strAppendStringWithIndex(tmp, unitsFilenames[unit], idx);
|
||||
strcpy(tmp, SOUNDS_EXT);
|
||||
audioQueue.playFile(path, 0, id);
|
||||
}
|
||||
else {
|
||||
TRACE("pushUnit: out of bounds unit : %d", unit); // We should never get here, but given the nature of TTS files, this prevent segfault in case of bug there.
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
void pushPrompt(uint16_t prompt, uint8_t id)
|
||||
{
|
||||
#if defined(SDCARD)
|
||||
|
||||
@@ -359,11 +359,13 @@ enum AutomaticPromptsEvents {
|
||||
};
|
||||
|
||||
void pushPrompt(uint16_t prompt, uint8_t id=0);
|
||||
void pushUnit(uint8_t unit, uint8_t idx, uint8_t id);
|
||||
void playModelName();
|
||||
|
||||
#define I18N_PLAY_FUNCTION(lng, x, ...) void lng ## _ ## x(__VA_ARGS__, uint8_t id)
|
||||
#define PLAY_FUNCTION(x, ...) void x(__VA_ARGS__, uint8_t id)
|
||||
#define PUSH_NUMBER_PROMPT(p) pushPrompt((p), id)
|
||||
#define PUSH_UNIT_PROMPT(p, i) pushUnit((p), (i), id)
|
||||
#define PLAY_NUMBER(n, u, a) playNumber((n), (u), (a), id)
|
||||
#define PLAY_DURATION(d, att) playDuration((d), (att), id)
|
||||
#define PLAY_DURATION_ATT , uint8_t flags
|
||||
|
||||
@@ -54,12 +54,22 @@ enum CzechPrompts {
|
||||
|
||||
I18N_PLAY_FUNCTION(cz, pushUnitPrompt, int16_t number, uint8_t unitprompt)
|
||||
{
|
||||
#if defined(CPUARM)
|
||||
if (number == 1)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 0);
|
||||
else if (number > 1 && number < 5)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 1);
|
||||
else
|
||||
PUSH_UNIT_PROMPT(unitprompt, 2);
|
||||
#else
|
||||
unitprompt = CZ_PROMPT_UNITS_BASE+((unitprompt-1)*4);
|
||||
if (number == 1)
|
||||
PUSH_NUMBER_PROMPT(unitprompt);
|
||||
else if (number > 1 && number < 5)
|
||||
PUSH_NUMBER_PROMPT(unitprompt+1);
|
||||
else
|
||||
PUSH_NUMBER_PROMPT(unitprompt+2);
|
||||
#endif
|
||||
}
|
||||
|
||||
I18N_PLAY_FUNCTION(cz, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
@@ -196,7 +206,7 @@ I18N_PLAY_FUNCTION(cz, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
}
|
||||
|
||||
if (unit) {
|
||||
CZ_PUSH_UNIT_PROMPT(tmp, (CZ_PROMPT_UNITS_BASE+((unit-1)*4)));
|
||||
CZ_PUSH_UNIT_PROMPT(tmp, unit);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -210,17 +220,17 @@ I18N_PLAY_FUNCTION(cz, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
uint8_t tmp = seconds / 3600;
|
||||
seconds %= 3600;
|
||||
if (tmp > 0 || IS_PLAY_TIME()) {
|
||||
PLAY_NUMBER(tmp, UNIT_HOURS+1, ZENSKY);
|
||||
PLAY_NUMBER(tmp, UNIT_HOURS, ZENSKY);
|
||||
}
|
||||
|
||||
tmp = seconds / 60;
|
||||
seconds %= 60;
|
||||
if (tmp > 0) {
|
||||
PLAY_NUMBER(tmp, UNIT_MINUTES+1, ZENSKY);
|
||||
PLAY_NUMBER(tmp, UNIT_MINUTES, ZENSKY);
|
||||
}
|
||||
|
||||
if (seconds > 0) {
|
||||
PLAY_NUMBER(seconds, UNIT_SECONDS+1, ZENSKY);
|
||||
PLAY_NUMBER(seconds, UNIT_SECONDS, ZENSKY);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -66,6 +66,21 @@ enum GermanPrompts {
|
||||
};
|
||||
|
||||
#if defined(VOICE)
|
||||
#if defined(CPUARM)
|
||||
#define DE_PUSH_UNIT_PROMPT(u) de_pushUnitPrompt((u), id)
|
||||
#else
|
||||
#define DE_PUSH_UNIT_PROMPT(u) pushUnitPrompt((u))
|
||||
#endif
|
||||
|
||||
I18N_PLAY_FUNCTION(de, pushUnitPrompt, uint8_t unitprompt)
|
||||
{
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 0);
|
||||
#else
|
||||
unitprompt = DE_PROMPT_UNITS_BASE + unitprompt*2
|
||||
PUSH_NUMBER_PROMPT(unitprompt);
|
||||
#endif
|
||||
}
|
||||
|
||||
I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
{
|
||||
@@ -145,7 +160,7 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
PUSH_NUMBER_PROMPT(DE_PROMPT_NULL+number);
|
||||
|
||||
if (unit) {
|
||||
PUSH_NUMBER_PROMPT(DE_PROMPT_UNITS_BASE+unit);
|
||||
DE_PUSH_UNIT_PROMPT(unit);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -160,8 +175,7 @@ I18N_PLAY_FUNCTION(de, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
uint8_t tmp = seconds / 3600;
|
||||
seconds %= 3600;
|
||||
if (tmp > 0 || IS_PLAY_TIME()) {
|
||||
PLAY_NUMBER(tmp, 0, 0);
|
||||
PUSH_NUMBER_PROMPT(DE_PROMPT_UHR);
|
||||
PLAY_NUMBER(tmp, UNIT_HOURS, 0);
|
||||
}
|
||||
|
||||
tmp = seconds / 60;
|
||||
@@ -169,17 +183,29 @@ I18N_PLAY_FUNCTION(de, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
if (tmp > 0 || ore >0) {
|
||||
PLAY_NUMBER(tmp, 0, 0);
|
||||
if (tmp != 1) {
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(UNIT_MINUTES, 1);
|
||||
} else {
|
||||
PUSH_UNIT_PROMPT(UNIT_MINUTES, 0);
|
||||
#else
|
||||
PUSH_NUMBER_PROMPT(DE_PROMPT_MINUTEN);
|
||||
} else {
|
||||
PUSH_NUMBER_PROMPT(DE_PROMPT_MINUTE);
|
||||
#endif
|
||||
}
|
||||
PUSH_NUMBER_PROMPT(DE_PROMPT_UND);
|
||||
}
|
||||
PLAY_NUMBER(seconds, 0, 0);
|
||||
if (seconds != 1) {
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(UNIT_SECONDS, 1);
|
||||
} else {
|
||||
PUSH_UNIT_PROMPT(UNIT_SECONDS, 0);
|
||||
#else
|
||||
PUSH_NUMBER_PROMPT(DE_PROMPT_SECUNDEN);
|
||||
} else {
|
||||
PUSH_NUMBER_PROMPT(DE_PROMPT_SECUNDE);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -58,10 +58,18 @@ enum EnglishPrompts {
|
||||
|
||||
I18N_PLAY_FUNCTION(en, pushUnitPrompt, int16_t number, uint8_t unitprompt)
|
||||
{
|
||||
#if defined(CPUARM)
|
||||
if (number == 1)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 0);
|
||||
else
|
||||
PUSH_UNIT_PROMPT(unitprompt, 1);
|
||||
#else
|
||||
unitprompt = EN_PROMPT_UNITS_BASE + unitprompt*2;
|
||||
if (number == 1)
|
||||
PUSH_NUMBER_PROMPT(unitprompt);
|
||||
else
|
||||
PUSH_NUMBER_PROMPT(unitprompt+1);
|
||||
#endif
|
||||
}
|
||||
|
||||
I18N_PLAY_FUNCTION(en, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
@@ -127,7 +135,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*2);
|
||||
EN_PUSH_UNIT_PROMPT(tmp, unit);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -90,6 +90,21 @@ enum SpanishPrompts {
|
||||
};
|
||||
|
||||
#if defined(VOICE)
|
||||
#if defined(CPUARM)
|
||||
#define ES_PUSH_UNIT_PROMPT(u) es_pushUnitPrompt((u), id)
|
||||
#else
|
||||
#define ES_PUSH_UNIT_PROMPT(u) pushUnitPrompt((u))
|
||||
#endif
|
||||
|
||||
I18N_PLAY_FUNCTION(es, pushUnitPrompt, uint8_t unitprompt)
|
||||
{
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 0);
|
||||
#else
|
||||
unitprompt = ES_PROMPT_UNITS_BASE + unitprompt*2;
|
||||
PUSH_NUMBER_PROMPT(unitprompt);
|
||||
#endif
|
||||
}
|
||||
|
||||
I18N_PLAY_FUNCTION(es, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
{
|
||||
@@ -173,7 +188,7 @@ I18N_PLAY_FUNCTION(es, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
}
|
||||
|
||||
if (unit) {
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_UNITS_BASE+unit-1);
|
||||
ES_PUSH_UNIT_PROMPT(unit);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -191,11 +206,19 @@ I18N_PLAY_FUNCTION(es, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
ore = tmp;
|
||||
if (tmp > 1) {
|
||||
PLAY_NUMBER(tmp, 0, 0);
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(UNIT_HOURS, 1);
|
||||
}
|
||||
else {
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_UNA);
|
||||
PUSH_UNIT_PROMPT(UNIT_HOURS, 0);
|
||||
#else
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_HORAS);
|
||||
}
|
||||
else {
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_UNA);
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_HORA);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -204,20 +227,38 @@ I18N_PLAY_FUNCTION(es, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
if (tmp > 0 || ore >0) {
|
||||
if (tmp != 1) {
|
||||
PLAY_NUMBER(tmp, 0, 0);
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(UNIT_MINUTES, 1);
|
||||
}
|
||||
else {
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_UNA);
|
||||
PUSH_UNIT_PROMPT(UNIT_MINUTES, 0);
|
||||
#else
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_MINUTOS);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_UN);
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_MINUTO);
|
||||
#endif
|
||||
}
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_Y);
|
||||
}
|
||||
|
||||
if (seconds != 1) {
|
||||
PLAY_NUMBER(seconds, 0, 0);
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(UNIT_SECONDS, 1);
|
||||
}
|
||||
else {
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_UNA);
|
||||
PUSH_UNIT_PROMPT(UNIT_SECONDS, 0);
|
||||
#else
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_SEGUNDOS);
|
||||
} else {
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_UN);
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_SEGUNDO);
|
||||
}
|
||||
else {
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_UN);
|
||||
PUSH_NUMBER_PROMPT(ES_PROMPT_SEGUNDO);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+200
-187
@@ -1,187 +1,200 @@
|
||||
/*
|
||||
* Authors (alphabetical order)
|
||||
* - Andre Bernet <bernet.andre@gmail.com>
|
||||
* - Bertrand Songis <bsongis@gmail.com>
|
||||
*
|
||||
* opentx is based on code named
|
||||
* gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/,
|
||||
* er9x by Erez Raviv: http://code.google.com/p/er9x/,
|
||||
* and the original (and ongoing) project by
|
||||
* Thomas Husterer, th9x: http://code.google.com/p/th9x/
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "opentx.h"
|
||||
|
||||
enum FrenchPrompts {
|
||||
FR_PROMPT_NUMBERS_BASE = 0,
|
||||
FR_PROMPT_ZERO = FR_PROMPT_NUMBERS_BASE+0,
|
||||
FR_PROMPT_CENT = FR_PROMPT_NUMBERS_BASE+100,
|
||||
FR_PROMPT_DEUX_CENT = FR_PROMPT_CENT+1,
|
||||
FR_PROMPT_MILLE = FR_PROMPT_CENT+9,
|
||||
|
||||
FR_PROMPT_UNE = 110,
|
||||
FR_PROMPT_ONZE,
|
||||
FR_PROMPT_VINGT_ET_UNE,
|
||||
FR_PROMPT_TRENTE_ET_UNE,
|
||||
FR_PROMPT_QUARANTE_ET_UNE,
|
||||
FR_PROMPT_CINQUANTE_ET_UNE,
|
||||
FR_PROMPT_SOIXANTE_ET_UNE,
|
||||
FR_PROMPT_SOIXANTE_ET_ONZE,
|
||||
FR_PROMPT_QUATRE_VINGT_UNE,
|
||||
|
||||
FR_PROMPT_VIRGULE = 119,
|
||||
FR_PROMPT_ET = 120,
|
||||
FR_PROMPT_MOINS = 121,
|
||||
FR_PROMPT_MINUIT = 122,
|
||||
FR_PROMPT_MIDI = 123,
|
||||
|
||||
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_VIRGULE_BASE = 180, //,0 - ,9
|
||||
};
|
||||
|
||||
#if defined(VOICE)
|
||||
|
||||
#define FEMININ 0x80
|
||||
|
||||
I18N_PLAY_FUNCTION(fr, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
{
|
||||
/* if digit >= 1000000000:
|
||||
temp_digit, digit = divmod(digit, 1000000000)
|
||||
prompts.extend(self.getNumberPrompt(temp_digit))
|
||||
prompts.append(Prompt(GUIDE_00_BILLION, dir=2))
|
||||
if digit >= 1000000:
|
||||
temp_digit, digit = divmod(digit, 1000000)
|
||||
prompts.extend(self.getNumberPrompt(temp_digit))
|
||||
prompts.append(Prompt(GUIDE_00_MILLION, dir=2))
|
||||
*/
|
||||
|
||||
if (number < 0) {
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MOINS);
|
||||
number = -number;
|
||||
}
|
||||
|
||||
#if !defined(CPUARM)
|
||||
if (unit) {
|
||||
unit--;
|
||||
convertUnit(number, unit);
|
||||
if (IS_IMPERIAL_ENABLE()) {
|
||||
if (unit == UNIT_DIST) {
|
||||
unit = UNIT_FEET;
|
||||
}
|
||||
if (unit == UNIT_SPEED) {
|
||||
unit = UNIT_KTS;
|
||||
}
|
||||
}
|
||||
unit++;
|
||||
}
|
||||
#endif
|
||||
|
||||
int8_t mode = MODE(att);
|
||||
if (mode > 0) {
|
||||
#if defined(CPUARM)
|
||||
if (mode == 2) {
|
||||
number /= 10;
|
||||
}
|
||||
#else
|
||||
// we assume that we are PREC1
|
||||
#endif
|
||||
div_t qr = div(number, 10);
|
||||
if (qr.rem) {
|
||||
PLAY_NUMBER(qr.quot, 0, 0);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_VIRGULE_BASE + qr.rem);
|
||||
number = -1;
|
||||
}
|
||||
else {
|
||||
number = qr.quot;
|
||||
}
|
||||
}
|
||||
|
||||
if (number >= 1000) {
|
||||
if (number >= 2000)
|
||||
PLAY_NUMBER(number / 1000, 0, 0);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MILLE);
|
||||
number %= 1000;
|
||||
if (number == 0)
|
||||
number = -1;
|
||||
}
|
||||
if (number >= 100) {
|
||||
if (number >= 200)
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_ZERO + number/100);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_CENT);
|
||||
number %= 100;
|
||||
if (number == 0)
|
||||
number = -1;
|
||||
}
|
||||
if (((number % 10) == 1) && number < 90 && (att & FEMININ)) {
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_UNE+(number/10));
|
||||
}
|
||||
else if (number >= 0) {
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_ZERO+number);
|
||||
}
|
||||
|
||||
if (unit) {
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_UNITS_BASE+unit);
|
||||
}
|
||||
}
|
||||
|
||||
I18N_PLAY_FUNCTION(fr, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
{
|
||||
if (seconds == 0) {
|
||||
PLAY_NUMBER(0, 0, FEMININ);
|
||||
return;
|
||||
}
|
||||
|
||||
if (seconds < 0) {
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MOINS);
|
||||
seconds = -seconds;
|
||||
}
|
||||
|
||||
uint8_t tmp = seconds / 3600;
|
||||
seconds %= 3600;
|
||||
if (IS_PLAY_TIME() && tmp==0) {
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MINUIT);
|
||||
}
|
||||
else if (IS_PLAY_TIME() && tmp==12) {
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MIDI);
|
||||
}
|
||||
else if (tmp > 0) {
|
||||
PLAY_NUMBER(tmp, 0, FEMININ);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_HEURE);
|
||||
}
|
||||
|
||||
tmp = seconds / 60;
|
||||
seconds %= 60;
|
||||
if (tmp > 0) {
|
||||
if (IS_PLAY_TIME()) {
|
||||
PLAY_NUMBER(tmp, 0, tmp==1 ? FEMININ : 0);
|
||||
}
|
||||
else {
|
||||
PLAY_NUMBER(tmp, 0, FEMININ);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MINUTE);
|
||||
if (seconds > 0)
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_ET);
|
||||
}
|
||||
}
|
||||
|
||||
if (!IS_PLAY_TIME() && seconds > 0) {
|
||||
PLAY_NUMBER(seconds, 0, FEMININ);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_SECONDE);
|
||||
}
|
||||
}
|
||||
|
||||
LANGUAGE_PACK_DECLARE(fr, "Francais");
|
||||
|
||||
#endif
|
||||
/*
|
||||
* Authors (alphabetical order)
|
||||
* - Andre Bernet <bernet.andre@gmail.com>
|
||||
* - Bertrand Songis <bsongis@gmail.com>
|
||||
*
|
||||
* opentx is based on code named
|
||||
* gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/,
|
||||
* er9x by Erez Raviv: http://code.google.com/p/er9x/,
|
||||
* and the original (and ongoing) project by
|
||||
* Thomas Husterer, th9x: http://code.google.com/p/th9x/
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "opentx.h"
|
||||
|
||||
enum FrenchPrompts {
|
||||
FR_PROMPT_NUMBERS_BASE = 0,
|
||||
FR_PROMPT_ZERO = FR_PROMPT_NUMBERS_BASE+0,
|
||||
FR_PROMPT_CENT = FR_PROMPT_NUMBERS_BASE+100,
|
||||
FR_PROMPT_DEUX_CENT = FR_PROMPT_CENT+1,
|
||||
FR_PROMPT_MILLE = FR_PROMPT_CENT+9,
|
||||
|
||||
FR_PROMPT_UNE = 110,
|
||||
FR_PROMPT_ONZE,
|
||||
FR_PROMPT_VINGT_ET_UNE,
|
||||
FR_PROMPT_TRENTE_ET_UNE,
|
||||
FR_PROMPT_QUARANTE_ET_UNE,
|
||||
FR_PROMPT_CINQUANTE_ET_UNE,
|
||||
FR_PROMPT_SOIXANTE_ET_UNE,
|
||||
FR_PROMPT_SOIXANTE_ET_ONZE,
|
||||
FR_PROMPT_QUATRE_VINGT_UNE,
|
||||
|
||||
FR_PROMPT_VIRGULE = 119,
|
||||
FR_PROMPT_ET = 120,
|
||||
FR_PROMPT_MOINS = 121,
|
||||
FR_PROMPT_MINUIT = 122,
|
||||
FR_PROMPT_MIDI = 123,
|
||||
|
||||
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_VIRGULE_BASE = 180, //,0 - ,9
|
||||
};
|
||||
|
||||
#if defined(VOICE)
|
||||
|
||||
#if defined(CPUARM)
|
||||
#define FR_PUSH_UNIT_PROMPT(u) fr_pushUnitPrompt((u), id)
|
||||
#else
|
||||
#define FR_PUSH_UNIT_PROMPT(u) pushUnitPrompt((u))
|
||||
#endif
|
||||
|
||||
I18N_PLAY_FUNCTION(fr, pushUnitPrompt, uint8_t unitprompt)
|
||||
{
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 0);
|
||||
#else
|
||||
unitprompt = FR_PROMPT_UNITS_BASE + unitprompt*2;
|
||||
PUSH_NUMBER_PROMPT(unitprompt);
|
||||
#endif
|
||||
}
|
||||
|
||||
#define FEMININ 0x80
|
||||
|
||||
I18N_PLAY_FUNCTION(fr, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
{
|
||||
/* if digit >= 1000000000:
|
||||
temp_digit, digit = divmod(digit, 1000000000)
|
||||
prompts.extend(self.getNumberPrompt(temp_digit))
|
||||
prompts.append(Prompt(GUIDE_00_BILLION, dir=2))
|
||||
if digit >= 1000000:
|
||||
temp_digit, digit = divmod(digit, 1000000)
|
||||
prompts.extend(self.getNumberPrompt(temp_digit))
|
||||
prompts.append(Prompt(GUIDE_00_MILLION, dir=2))
|
||||
*/
|
||||
|
||||
if (number < 0) {
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MOINS);
|
||||
number = -number;
|
||||
}
|
||||
|
||||
#if !defined(CPUARM)
|
||||
if (unit) {
|
||||
unit--;
|
||||
convertUnit(number, unit);
|
||||
if (IS_IMPERIAL_ENABLE()) {
|
||||
if (unit == UNIT_DIST) {
|
||||
unit = UNIT_FEET;
|
||||
}
|
||||
if (unit == UNIT_SPEED) {
|
||||
unit = UNIT_KTS;
|
||||
}
|
||||
}
|
||||
unit++;
|
||||
}
|
||||
#endif
|
||||
|
||||
int8_t mode = MODE(att);
|
||||
if (mode > 0) {
|
||||
#if defined(CPUARM)
|
||||
if (mode == 2) {
|
||||
number /= 10;
|
||||
}
|
||||
#else
|
||||
// we assume that we are PREC1
|
||||
#endif
|
||||
div_t qr = div(number, 10);
|
||||
if (qr.rem) {
|
||||
PLAY_NUMBER(qr.quot, 0, 0);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_VIRGULE_BASE + qr.rem);
|
||||
number = -1;
|
||||
}
|
||||
else {
|
||||
number = qr.quot;
|
||||
}
|
||||
}
|
||||
|
||||
if (number >= 1000) {
|
||||
if (number >= 2000)
|
||||
PLAY_NUMBER(number / 1000, 0, 0);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MILLE);
|
||||
number %= 1000;
|
||||
if (number == 0)
|
||||
number = -1;
|
||||
}
|
||||
if (number >= 100) {
|
||||
if (number >= 200)
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_ZERO + number/100);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_CENT);
|
||||
number %= 100;
|
||||
if (number == 0)
|
||||
number = -1;
|
||||
}
|
||||
if (((number % 10) == 1) && number < 90 && (att & FEMININ)) {
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_UNE+(number/10));
|
||||
}
|
||||
else if (number >= 0) {
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_ZERO+number);
|
||||
}
|
||||
|
||||
if (unit) {
|
||||
FR_PUSH_UNIT_PROMPT(unit);
|
||||
}
|
||||
}
|
||||
|
||||
I18N_PLAY_FUNCTION(fr, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
{
|
||||
if (seconds == 0) {
|
||||
PLAY_NUMBER(0, 0, FEMININ);
|
||||
return;
|
||||
}
|
||||
|
||||
if (seconds < 0) {
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MOINS);
|
||||
seconds = -seconds;
|
||||
}
|
||||
|
||||
uint8_t tmp = seconds / 3600;
|
||||
seconds %= 3600;
|
||||
if (IS_PLAY_TIME() && tmp==0) {
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MINUIT);
|
||||
}
|
||||
else if (IS_PLAY_TIME() && tmp==12) {
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MIDI);
|
||||
}
|
||||
else if (tmp > 0) {
|
||||
PLAY_NUMBER(tmp, UNIT_HOURS, FEMININ);
|
||||
}
|
||||
|
||||
tmp = seconds / 60;
|
||||
seconds %= 60;
|
||||
if (tmp > 0) {
|
||||
if (IS_PLAY_TIME()) {
|
||||
PLAY_NUMBER(tmp, 0, tmp==1 ? FEMININ : 0);
|
||||
}
|
||||
else {
|
||||
PLAY_NUMBER(tmp, UNIT_MINUTES, FEMININ);
|
||||
if (seconds > 0)
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_ET);
|
||||
}
|
||||
}
|
||||
|
||||
if (!IS_PLAY_TIME() && seconds > 0) {
|
||||
PLAY_NUMBER(seconds, UNIT_SECONDS, FEMININ);
|
||||
}
|
||||
}
|
||||
|
||||
LANGUAGE_PACK_DECLARE(fr, "Francais");
|
||||
|
||||
#endif
|
||||
|
||||
@@ -58,10 +58,18 @@ enum HungarianPrompts {
|
||||
|
||||
I18N_PLAY_FUNCTION(hu, pushUnitPrompt, int16_t number, uint8_t unitprompt)
|
||||
{
|
||||
#if defined(CPUARM)
|
||||
if (number == 1)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 0);
|
||||
else
|
||||
PUSH_UNIT_PROMPT(unitprompt, 1);
|
||||
#else
|
||||
unitprompt = HU_PROMPT_UNITS_BASE + unitprompt*2;
|
||||
if (number == 1)
|
||||
PUSH_NUMBER_PROMPT(unitprompt);
|
||||
else
|
||||
PUSH_NUMBER_PROMPT(unitprompt+1);
|
||||
#endif
|
||||
}
|
||||
|
||||
I18N_PLAY_FUNCTION(hu, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
@@ -127,7 +135,7 @@ I18N_PLAY_FUNCTION(hu, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
}
|
||||
|
||||
if (unit) {
|
||||
HU_PUSH_UNIT_PROMPT(tmp, HU_PROMPT_UNITS_BASE + unit*2);
|
||||
HU_PUSH_UNIT_PROMPT(tmp, unit);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -62,6 +62,28 @@ enum ItalianPrompts {
|
||||
};
|
||||
|
||||
#if defined(VOICE)
|
||||
#if defined(CPUARM)
|
||||
#define IT_PUSH_UNIT_PROMPT(p, u) it_pushUnitPrompt((p), (u), id)
|
||||
#else
|
||||
#define IT_PUSH_UNIT_PROMPT(p, u) pushUnitPrompt((p), (u))
|
||||
#endif
|
||||
|
||||
I18N_PLAY_FUNCTION(it, pushUnitPrompt, int16_t number, uint8_t unitprompt)
|
||||
{
|
||||
#if defined(CPUARM)
|
||||
if (number == 1)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 0);
|
||||
else
|
||||
PUSH_UNIT_PROMPT(unitprompt, 1);
|
||||
#else
|
||||
unitprompt = IT_PROMPT_UNITS_BASE + unitprompt*2;
|
||||
if (number == 1)
|
||||
PUSH_NUMBER_PROMPT(unitprompt);
|
||||
else
|
||||
PUSH_NUMBER_PROMPT(unitprompt+1);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
I18N_PLAY_FUNCTION(it, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
{
|
||||
@@ -151,11 +173,7 @@ I18N_PLAY_FUNCTION(it, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
}
|
||||
}
|
||||
if (unit) {
|
||||
if (orignumber == 1) {
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_UNITS_BASE+(unit*2));
|
||||
} else {
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_UNITS_BASE+(unit*2)+1);
|
||||
}
|
||||
IT_PUSH_UNIT_PROMPT(orignumber, unit);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -172,11 +190,15 @@ I18N_PLAY_FUNCTION(it, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
if (tmp > 0) {
|
||||
ore=tmp;
|
||||
if (tmp > 1 || IS_PLAY_TIME()) {
|
||||
#if defined(CPUARM)
|
||||
PLAY_NUMBER(tmp, UNIT_HOURS, 0);
|
||||
#else
|
||||
PLAY_NUMBER(tmp, 0, 0);
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_ORE);
|
||||
} else {
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_UN);
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_ORA);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
if (seconds>0) {
|
||||
@@ -187,11 +209,15 @@ I18N_PLAY_FUNCTION(it, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
}
|
||||
if (tmp > 0) {
|
||||
if (tmp != 1) {
|
||||
#if defined(CPUARM)
|
||||
PLAY_NUMBER(tmp, UNIT_MINUTES, 0);
|
||||
#else
|
||||
PLAY_NUMBER(tmp, 0, 0);
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_MINUTI);
|
||||
} else {
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_UN);
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_MINUTO);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
if ((tmp>0 || ore>0) && seconds>0) {
|
||||
@@ -200,11 +226,15 @@ I18N_PLAY_FUNCTION(it, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
}
|
||||
if (seconds != 0 || (ore==0 && tmp==0)) {
|
||||
if (seconds != 1) {
|
||||
#if defined(CPUARM)
|
||||
PLAY_NUMBER(tmp, UNIT_SECONDS, 0);
|
||||
#else
|
||||
PLAY_NUMBER(seconds, 0, 0);
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_SECONDI);
|
||||
} else {
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_UN);
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_SECONDO);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,70 +37,30 @@ enum DutchPrompts {
|
||||
|
||||
#if defined(VOICE)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#if defined(CPUARM)
|
||||
#define NL_PUSH_UNIT_PROMPT(p, u) en_pushUnitPrompt((p), (u), id)
|
||||
#else
|
||||
#define NL_PUSH_UNIT_PROMPT(p, u) pushUnitPrompt((p), (u))
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
I18N_PLAY_FUNCTION(nl, pushUnitPrompt, int16_t number, uint8_t unitprompt)
|
||||
{
|
||||
#if defined(CPUARM)
|
||||
if (number == 1)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 0);
|
||||
else
|
||||
PUSH_UNIT_PROMPT(unitprompt, 1);
|
||||
#else
|
||||
unitprompt = NL_PROMPT_UNITS_BASE + unitprompt*2;
|
||||
if (number == 1)
|
||||
PUSH_NUMBER_PROMPT(unitprompt);
|
||||
else
|
||||
PUSH_NUMBER_PROMPT(unitprompt+1);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
I18N_PLAY_FUNCTION(nl, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
{
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if (number < 0) {
|
||||
PUSH_NUMBER_PROMPT(NL_PROMPT_MINUS);
|
||||
number = -number;
|
||||
@@ -136,24 +96,16 @@ I18N_PLAY_FUNCTION(nl, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
PLAY_NUMBER(qr.quot, 0, 0);
|
||||
PUSH_NUMBER_PROMPT(NL_PROMPT_POINT_BASE + qr.rem);
|
||||
number = -1;
|
||||
|
||||
|
||||
|
||||
}
|
||||
else {
|
||||
number = qr.quot;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
int16_t tmp = number;
|
||||
|
||||
if (number >= 1000) {
|
||||
|
||||
PLAY_NUMBER(number / 1000, 0, 0);
|
||||
|
||||
|
||||
PUSH_NUMBER_PROMPT(NL_PROMPT_THOUSAND);
|
||||
|
||||
number %= 1000;
|
||||
@@ -161,9 +113,7 @@ I18N_PLAY_FUNCTION(nl, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
number = -1;
|
||||
}
|
||||
if (number >= 100) {
|
||||
|
||||
PUSH_NUMBER_PROMPT(NL_PROMPT_HUNDRED + (number/100)-1);
|
||||
|
||||
number %= 100;
|
||||
if (number == 0)
|
||||
number = -1;
|
||||
@@ -172,9 +122,8 @@ I18N_PLAY_FUNCTION(nl, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
PUSH_NUMBER_PROMPT(NL_PROMPT_ZERO + number);
|
||||
}
|
||||
|
||||
|
||||
if (unit) {
|
||||
NL_PUSH_UNIT_PROMPT(tmp, NL_PROMPT_UNITS_BASE + unit*2);
|
||||
NL_PUSH_UNIT_PROMPT(tmp, unit);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -190,12 +139,10 @@ I18N_PLAY_FUNCTION(nl, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
seconds = -seconds;
|
||||
}
|
||||
|
||||
|
||||
uint8_t tmp = seconds / 3600;
|
||||
seconds %= 3600;
|
||||
if (tmp > 0 || IS_PLAY_TIME()) {
|
||||
PLAY_NUMBER(tmp, UNIT_HOURS, 0);
|
||||
|
||||
}
|
||||
|
||||
tmp = seconds / 60;
|
||||
@@ -203,20 +150,10 @@ I18N_PLAY_FUNCTION(nl, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
if (tmp > 0) {
|
||||
PLAY_NUMBER(tmp, UNIT_MINUTES, 0);
|
||||
if (seconds > 0)
|
||||
|
||||
PUSH_NUMBER_PROMPT(NL_PROMPT_AND);
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
if (seconds > 0) {
|
||||
PLAY_NUMBER(seconds, UNIT_SECONDS, 0);
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -79,6 +79,23 @@ enum PolishPrompts {
|
||||
|
||||
I18N_PLAY_FUNCTION(pl, pushUnitPrompt, int16_t number, uint8_t unitprompt)
|
||||
{
|
||||
#if defined(CPUARM)
|
||||
if (number == 1)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 0);
|
||||
else if (number > 1 && number < 5)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 1);
|
||||
else {
|
||||
int test_2 =0;
|
||||
test_2 =number % 10;
|
||||
int ten=0;
|
||||
ten=(number - (number % 10))/10;
|
||||
if ((test_2 > 1 && test_2 < 5) && ten >=2)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 1);
|
||||
else
|
||||
PUSH_UNIT_PROMPT(unitprompt, 2);
|
||||
}
|
||||
#else
|
||||
unitprompt = PL_PROMPT_UNITS_BASE + unitprompt*4;
|
||||
if (number == 1)
|
||||
PUSH_NUMBER_PROMPT(unitprompt);
|
||||
else if (number > 1 && number < 5)
|
||||
@@ -93,6 +110,7 @@ I18N_PLAY_FUNCTION(pl, pushUnitPrompt, int16_t number, uint8_t unitprompt)
|
||||
else
|
||||
PUSH_NUMBER_PROMPT(unitprompt+2);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
I18N_PLAY_FUNCTION(pl, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
@@ -190,10 +208,6 @@ I18N_PLAY_FUNCTION(pl, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
number = -1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if (number >= 1000) {
|
||||
if (number >= 2000)
|
||||
PLAY_NUMBER(number / 1000, 0, 0);
|
||||
@@ -229,7 +243,7 @@ I18N_PLAY_FUNCTION(pl, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
}
|
||||
|
||||
if (unit) {
|
||||
PL_PUSH_UNIT_PROMPT(tmp, (PL_PROMPT_UNITS_BASE+((unit-1)*4)));
|
||||
PL_PUSH_UNIT_PROMPT(tmp, unit);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -85,6 +85,22 @@ enum PortuguesePrompts {
|
||||
|
||||
#if defined(VOICE)
|
||||
|
||||
#if defined(CPUARM)
|
||||
#define PT_PUSH_UNIT_PROMPT(u) pt_pushUnitPrompt((u), id)
|
||||
#else
|
||||
#define PT_PUSH_UNIT_PROMPT(u) pushUnitPrompt((u))
|
||||
#endif
|
||||
|
||||
I18N_PLAY_FUNCTION(pt, pushUnitPrompt, uint8_t unitprompt)
|
||||
{
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 0);
|
||||
#else
|
||||
unitprompt = PT_PROMPT_UNITS_BASE + unitprompt*2;
|
||||
PUSH_NUMBER_PROMPT(unitprompt);
|
||||
#endif
|
||||
}
|
||||
|
||||
I18N_PLAY_FUNCTION(pt, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
{
|
||||
if (number < 0) {
|
||||
@@ -151,7 +167,7 @@ I18N_PLAY_FUNCTION(pt, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_ZERO+number);
|
||||
|
||||
if (unit) {
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_UNITS_BASE+unit-1);
|
||||
PT_PUSH_UNIT_PROMPT(unit);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -169,13 +185,25 @@ I18N_PLAY_FUNCTION(pt, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
ore=tmp;
|
||||
if (tmp > 2) {
|
||||
PLAY_NUMBER(tmp, 0, 0);
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(UNIT_HOURS, 1);
|
||||
#else
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_HORAS);
|
||||
#endif
|
||||
} else if (tmp==2) {
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_DUAS);
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(UNIT_HOURS, 1);
|
||||
#else
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_HORAS);
|
||||
} else if (tmp==1) {
|
||||
#endif
|
||||
} else if (tmp==1) {
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_UMA);
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_HORA);
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(UNIT_HOURS, 0);
|
||||
#else
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_HORAS);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -184,20 +212,36 @@ I18N_PLAY_FUNCTION(pt, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
if (tmp > 0 || ore >0) {
|
||||
if (tmp != 1) {
|
||||
PLAY_NUMBER(tmp, 0, 0);
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(UNIT_MINUTES, 1);
|
||||
#else
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_MINUTOS);
|
||||
#endif
|
||||
} else {
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_NUMBERS_BASE+1);
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(UNIT_MINUTES, 0);
|
||||
#else
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_MINUTO);
|
||||
#endif
|
||||
}
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_E);
|
||||
}
|
||||
|
||||
if (seconds != 1) {
|
||||
PLAY_NUMBER(seconds, 0, 0);
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(UNIT_SECONDS, 1);
|
||||
#else
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_SEGUNDOS);
|
||||
#endif
|
||||
} else {
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_NUMBERS_BASE+1);
|
||||
#if defined(CPUARM)
|
||||
PUSH_UNIT_PROMPT(UNIT_SECONDS, 0);
|
||||
#else
|
||||
PUSH_NUMBER_PROMPT(PT_PROMPT_SEGUNDO);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -51,6 +51,28 @@ enum SwedishPrompts {
|
||||
|
||||
#if defined(VOICE)
|
||||
|
||||
#if defined(CPUARM)
|
||||
#define SE_PUSH_UNIT_PROMPT(p, u) se_pushUnitPrompt((p), (u), id)
|
||||
#else
|
||||
#define SE_PUSH_UNIT_PROMPT(p, u) pushUnitPrompt((p), (u))
|
||||
#endif
|
||||
|
||||
I18N_PLAY_FUNCTION(se, pushUnitPrompt, int16_t number, uint8_t unitprompt)
|
||||
{
|
||||
#if defined(CPUARM)
|
||||
if (number == 1)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 0);
|
||||
else
|
||||
PUSH_UNIT_PROMPT(unitprompt, 1);
|
||||
#else
|
||||
unitprompt = SE_PROMPT_UNITS_BASE + unitprompt*2;
|
||||
if (number == 1)
|
||||
PUSH_NUMBER_PROMPT(unitprompt);
|
||||
else
|
||||
PUSH_NUMBER_PROMPT(unitprompt+1);
|
||||
#endif
|
||||
}
|
||||
|
||||
I18N_PLAY_FUNCTION(se, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
{
|
||||
if (number < 0) {
|
||||
@@ -114,10 +136,7 @@ I18N_PLAY_FUNCTION(se, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
}
|
||||
|
||||
if (unit) {
|
||||
if (tmpNumber == 1 )
|
||||
PUSH_NUMBER_PROMPT(SE_PROMPT_UNITS_BASE+unit*2); // Singular prompts
|
||||
else
|
||||
PUSH_NUMBER_PROMPT(SE_PROMPT_UNITS_BASE+unit*2+1); // Plural prompts
|
||||
SE_PUSH_UNIT_PROMPT(tmpNumber, unit);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -69,12 +69,22 @@ enum SlovakPrompts {
|
||||
|
||||
I18N_PLAY_FUNCTION(sk, pushUnitPrompt, int16_t number, uint8_t unitprompt)
|
||||
{
|
||||
#if defined(CPUARM)
|
||||
if (number == 1)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 0);
|
||||
else if (number > 1 && number < 5)
|
||||
PUSH_UNIT_PROMPT(unitprompt, 1);
|
||||
else
|
||||
PUSH_UNIT_PROMPT(unitprompt, 2);
|
||||
#else
|
||||
unitprompt = SK_PROMPT_UNITS_BASE + unitprompt*4;
|
||||
if (number == 1)
|
||||
PUSH_NUMBER_PROMPT(unitprompt);
|
||||
else if (number > 1 && number < 5)
|
||||
PUSH_NUMBER_PROMPT(unitprompt+1);
|
||||
else
|
||||
PUSH_NUMBER_PROMPT(unitprompt+2);
|
||||
#endif
|
||||
}
|
||||
|
||||
I18N_PLAY_FUNCTION(sk, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
@@ -214,7 +224,7 @@ I18N_PLAY_FUNCTION(sk, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
}
|
||||
|
||||
if (unit) {
|
||||
SK_PUSH_UNIT_PROMPT(tmp, (SK_PROMPT_UNITS_BASE+((unit-1)*4)));
|
||||
SK_PUSH_UNIT_PROMPT(tmp, unit);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -228,17 +238,17 @@ I18N_PLAY_FUNCTION(sk, playDuration, int seconds PLAY_DURATION_ATT)
|
||||
uint8_t tmp = seconds / 3600;
|
||||
seconds %= 3600;
|
||||
if (tmp > 0 || IS_PLAY_TIME()) {
|
||||
PLAY_NUMBER(tmp, UNIT_HOURS+1, ZENSKY);
|
||||
PLAY_NUMBER(tmp, UNIT_HOURS, ZENSKY);
|
||||
}
|
||||
|
||||
tmp = seconds / 60;
|
||||
seconds %= 60;
|
||||
if (tmp > 0) {
|
||||
PLAY_NUMBER(tmp, UNIT_MINUTES+1, ZENSKY);
|
||||
PLAY_NUMBER(tmp, UNIT_MINUTES, ZENSKY);
|
||||
}
|
||||
|
||||
if (seconds > 0) {
|
||||
PLAY_NUMBER(seconds, UNIT_SECONDS+1, ZENSKY);
|
||||
PLAY_NUMBER(seconds, UNIT_SECONDS, ZENSKY);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user