From ad26e4acba56993be487867790ce44b47a7b691a Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Tue, 12 Jun 2018 14:21:34 +0200 Subject: [PATCH 1/2] Fix German timer tts --- radio/util/tts_de.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/util/tts_de.py b/radio/util/tts_de.py index d25944dea..c588d5003 100755 --- a/radio/util/tts_de.py +++ b/radio/util/tts_de.py @@ -77,9 +77,9 @@ for s, f, a in [("Inaktivitätsalarm", "inactiv", 486), ("servo overload", "servoko", NO_ALTERNATE), ("power overload", "rxko", NO_ALTERNATE), ("Empfänger noch verbunden", "modelpwr", NO_ALTERNATE), - ("timer 1 abgelaufen", "timovr1", NO_ALTERNATE), - ("timer 1 abgelaufen", "timovr2", NO_ALTERNATE), - ("timer 1 abgelaufen", "timovr3", NO_ALTERNATE), + ("timer eins abgelaufen", "timovr1", NO_ALTERNATE), + ("timer zwei abgelaufen", "timovr2", NO_ALTERNATE), + ("timer drei abgelaufen", "timovr3", NO_ALTERNATE), ("Sensor veloren", "sensorko", NO_ALTERNATE), ("Willkommen bei open te ix", "hello", 480), ]: From 6f116510da578f84a18fe019a72c6360293ba03d Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Tue, 12 Jun 2018 14:19:43 +0200 Subject: [PATCH 2/2] Fix tts for German number over 100 with decimal point --- radio/src/translations/tts_de.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/radio/src/translations/tts_de.cpp b/radio/src/translations/tts_de.cpp index d54ebe5d5..f1e71e383 100644 --- a/radio/src/translations/tts_de.cpp +++ b/radio/src/translations/tts_de.cpp @@ -131,9 +131,9 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att) #endif div_t qr = div((int)number, 10); if (qr.rem > 0) { - PUSH_NUMBER_PROMPT(qr.quot); + PLAY_NUMBER(qr.quot, 0, 0); PUSH_NUMBER_PROMPT(DE_PROMPT_COMMA); - PUSH_NUMBER_PROMPT(qr.rem); + PUSH_NUMBER_PROMPT(DE_PROMPT_NUMBERS_BASE + qr.rem); } else { if (qr.quot == 1) { @@ -143,7 +143,8 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att) PUSH_NUMBER_PROMPT(qr.quot); } } - DE_PUSH_UNIT_PROMPT(unit); + if(unit) + DE_PUSH_UNIT_PROMPT(unit); return; }