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

[9x stock] Issue 7 fixed.

Browse Source 
[9x stock / gruvin9x] All prompts renumbered!
This commit is contained in:
bsongis@gmail.com
2013-03-29 21:15:14 +00:00
parent 0a49777e6d
commit 7d5543f5a7
20 changed files with 210 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/translations/tts_de.cpp
+16 -16
View File
@@ -102,7 +102,7 @@ PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att)
*/
if (number < 0) {
PUSH_PROMPT(PROMPT_MINUS);
PUSH_NUMBER_PROMPT(PROMPT_MINUS);
number = -number;
}
int8_t mode = MODE(att);
@@ -110,9 +110,9 @@ PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att)
div_t qr = div(number, (mode == 1 ? 10 : 100));
if (qr.rem > 0) {
PLAY_NUMBER(qr.quot, 0, 0);
PUSH_PROMPT(PROMPT_COMMA);
PUSH_NUMBER_PROMPT(PROMPT_COMMA);
if (mode==2 && qr.rem < 10)
PUSH_PROMPT(PROMPT_NULL);
PUSH_NUMBER_PROMPT(PROMPT_NULL);
PLAY_NUMBER(qr.rem, unit, 0);
}
else {
@@ -124,9 +124,9 @@ PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att)
if (number >= 1000) {
if (number >= 1100) {
PLAY_NUMBER(number / 1000, 0, 0);
PUSH_PROMPT(PROMPT_TAUSEND);
PUSH_NUMBER_PROMPT(PROMPT_TAUSEND);
} else {
PUSH_PROMPT(PROMPT_TAUSEND);
PUSH_NUMBER_PROMPT(PROMPT_TAUSEND);
}
number %= 1000;
if (number == 0)
@@ -134,23 +134,23 @@ PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att)
}
if (number >= 100) {
if (number >= 200)
PUSH_PROMPT(PROMPT_NULL + number/100);
PUSH_PROMPT(PROMPT_HUNDERT);
PUSH_NUMBER_PROMPT(PROMPT_NULL + number/100);
PUSH_NUMBER_PROMPT(PROMPT_HUNDERT);
number %= 100;
if (number == 0)
number = -1;
}
PUSH_PROMPT(PROMPT_NULL+number);
PUSH_NUMBER_PROMPT(PROMPT_NULL+number);
if (unit) {
PUSH_PROMPT(PROMPT_UNITS_BASE+unit-1);
PUSH_NUMBER_PROMPT(PROMPT_UNITS_BASE+unit-1);
}
}
PLAY_FUNCTION(playDuration, int16_t seconds)
{
if (seconds < 0) {
PUSH_PROMPT(PROMPT_MINUS);
PUSH_NUMBER_PROMPT(PROMPT_MINUS);
seconds = -seconds;
}
@@ -159,7 +159,7 @@ PLAY_FUNCTION(playDuration, int16_t seconds)
seconds %= 3600;
if (tmp > 0) {
PLAY_NUMBER(tmp, 0, 0);
PUSH_PROMPT(PROMPT_UHR);
PUSH_NUMBER_PROMPT(PROMPT_UHR);
}
tmp = seconds / 60;
@@ -167,17 +167,17 @@ PLAY_FUNCTION(playDuration, int16_t seconds)
if (tmp > 0 || ore >0) {
PLAY_NUMBER(tmp, 0, 0);
if (tmp != 1) {
PUSH_PROMPT(PROMPT_MINUTEN);
PUSH_NUMBER_PROMPT(PROMPT_MINUTEN);
} else {
PUSH_PROMPT(PROMPT_MINUTE);
PUSH_NUMBER_PROMPT(PROMPT_MINUTE);
}
PUSH_PROMPT(PROMPT_UND);
PUSH_NUMBER_PROMPT(PROMPT_UND);
}
PLAY_NUMBER(seconds, 0, 0);
if (seconds != 1) {
PUSH_PROMPT(PROMPT_SECUNDEN);
PUSH_NUMBER_PROMPT(PROMPT_SECUNDEN);
} else {
PUSH_PROMPT(PROMPT_SECUNDE);
PUSH_NUMBER_PROMPT(PROMPT_SECUNDE);
}
}