fix(lua): playNumber with PREC2 - last decimal digit missing (#7364)

This commit is contained in:
Alex K
2026-08-31 10:25:44 +10:00
committed by GitHub
parent 3c4384c916
commit 3f7f6b6db0
19 changed files with 180 additions and 103 deletions
+8 -2
View File
@@ -52,13 +52,19 @@ I18N_PLAY_FUNCTION(cn, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(CN_PROMPT_POINT_BASE + qr.rem); PUSH_NUMBER_PROMPT(CN_PROMPT_POINT_BASE + qr.rem);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
number = -1; number = -1;
} }
else { else {
+8 -3
View File
@@ -66,11 +66,14 @@ I18N_PLAY_FUNCTION(cz, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, FEMALE); PLAY_NUMBER(qr.quot, 0, FEMALE);
if (qr.quot < 2) { if (qr.quot < 2) {
PUSH_NUMBER_PROMPT(CZ_PROMPT_CELA); PUSH_NUMBER_PROMPT(CZ_PROMPT_CELA);
@@ -82,6 +85,9 @@ I18N_PLAY_FUNCTION(cz, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
PUSH_NUMBER_PROMPT(CZ_PROMPT_CELYCH); PUSH_NUMBER_PROMPT(CZ_PROMPT_CELYCH);
}; };
PLAY_NUMBER(qr.rem, 0, FEMALE); PLAY_NUMBER(qr.rem, 0, FEMALE);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, FEMALE);
}
PUSH_UNIT_PROMPT(unit, 3); PUSH_UNIT_PROMPT(unit, 3);
return; return;
} }
@@ -187,4 +193,3 @@ I18N_PLAY_FUNCTION(cz, playDuration, int seconds PLAY_DURATION_ATT)
} }
LANGUAGE_PACK_DECLARE(cz, STR_VOICE_CZECH); LANGUAGE_PACK_DECLARE(cz, STR_VOICE_CZECH);
+9 -5
View File
@@ -30,7 +30,7 @@ enum DanishPrompts {
DA_PROMPT_MINUS = DA_PROMPT_NUMBERS_BASE+111, DA_PROMPT_MINUS = DA_PROMPT_NUMBERS_BASE+111,
DA_PROMPT_POINT = DA_PROMPT_NUMBERS_BASE+112, DA_PROMPT_POINT = DA_PROMPT_NUMBERS_BASE+112,
DA_PROMPT_UNITS_BASE = 113, DA_PROMPT_UNITS_BASE = 113,
DA_PROMPT_POINT_BASE = 165, //.0 - .9 DA_PROMPT_POINT_BASE = 167, //.0 - .9
}; };
@@ -51,16 +51,21 @@ I18N_PLAY_FUNCTION(da, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
number = -number; number = -number;
} }
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(DA_PROMPT_POINT_BASE + qr.rem); PUSH_NUMBER_PROMPT(DA_PROMPT_POINT_BASE + qr.rem);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
number = -1; number = -1;
} }
else { else {
@@ -125,4 +130,3 @@ I18N_PLAY_FUNCTION(da, playDuration, int seconds PLAY_DURATION_ATT)
} }
LANGUAGE_PACK_DECLARE(da, STR_VOICE_DANISH); LANGUAGE_PACK_DECLARE(da, STR_VOICE_DANISH);
+10 -6
View File
@@ -66,17 +66,21 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem || (mode == 2 && rem2)) {
if (qr.rem > 0) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(DE_PROMPT_COMMA); PUSH_NUMBER_PROMPT(DE_PROMPT_COMMA);
PUSH_NUMBER_PROMPT(DE_PROMPT_NUMBERS_BASE + qr.rem); PUSH_NUMBER_PROMPT(DE_PROMPT_NUMBERS_BASE + qr.rem);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
number = -1; // force secondary unit if unit has one number = -1; // force secondary unit if unit has one
// skips the following integer processing // skips the following integer processing
} }
@@ -133,8 +137,9 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
// no secondary unit -> regular number // no secondary unit -> regular number
} }
if(unit) if(unit) {
DE_PUSH_UNIT_PROMPT(unit, number); DE_PUSH_UNIT_PROMPT(unit, number);
}
} }
I18N_PLAY_FUNCTION(de, playDuration, int seconds PLAY_DURATION_ATT) I18N_PLAY_FUNCTION(de, playDuration, int seconds PLAY_DURATION_ATT)
@@ -171,4 +176,3 @@ I18N_PLAY_FUNCTION(de, playDuration, int seconds PLAY_DURATION_ATT)
} }
LANGUAGE_PACK_DECLARE(de, STR_VOICE_DEUTSCH); LANGUAGE_PACK_DECLARE(de, STR_VOICE_DEUTSCH);
+8 -3
View File
@@ -49,16 +49,21 @@ I18N_PLAY_FUNCTION(en, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
PUSH_NUMBER_PROMPT(EN_PROMPT_MINUS); PUSH_NUMBER_PROMPT(EN_PROMPT_MINUS);
number = -number; number = -number;
} }
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(EN_PROMPT_POINT_BASE + qr.rem); PUSH_NUMBER_PROMPT(EN_PROMPT_POINT_BASE + qr.rem);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
number = -1; number = -1;
} }
else { else {
+11 -9
View File
@@ -95,25 +95,27 @@ I18N_PLAY_FUNCTION(es, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
PUSH_NUMBER_PROMPT(ES_PROMPT_MENO); PUSH_NUMBER_PROMPT(ES_PROMPT_MENO);
number = -number; number = -number;
} }
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem > 0) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(ES_PROMPT_VIRGOLA); PUSH_NUMBER_PROMPT(ES_PROMPT_VIRGOLA);
if (mode==2 && qr.rem < 10) PLAY_NUMBER(qr.rem, 0, 0);
PUSH_NUMBER_PROMPT(ES_PROMPT_ZERO); if (mode == 2 && rem2) {
PLAY_NUMBER(qr.rem, unit, 0); PLAY_NUMBER(rem2, 0, 0);
}
number = -1;
} }
else { else {
PLAY_NUMBER(qr.quot, unit, 0); number = qr.quot;
} }
return;
} }
if (number >= 1000) { if (number >= 1000) {
+8 -4
View File
@@ -77,17 +77,21 @@ I18N_PLAY_FUNCTION(fr, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
PUSH_NUMBER_PROMPT(FR_PROMPT_MOINS); PUSH_NUMBER_PROMPT(FR_PROMPT_MOINS);
number = -number; number = -number;
} }
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(FR_PROMPT_VIRGULE_BASE + qr.rem); PUSH_NUMBER_PROMPT(FR_PROMPT_VIRGULE_BASE + qr.rem);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
number = -1; number = -1;
} }
else { else {
+8 -4
View File
@@ -50,17 +50,21 @@ I18N_PLAY_FUNCTION(he, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
PUSH_NUMBER_PROMPT(HE_PROMPT_MINUS); PUSH_NUMBER_PROMPT(HE_PROMPT_MINUS);
number = -number; number = -number;
} }
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(HE_PROMPT_POINT_BASE + qr.rem); PUSH_NUMBER_PROMPT(HE_PROMPT_POINT_BASE + qr.rem);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
number = -1; number = -1;
} }
else { else {
+9 -5
View File
@@ -30,7 +30,7 @@ enum HungarianPrompts {
HU_PROMPT_MINUS = HU_PROMPT_NUMBERS_BASE+111, HU_PROMPT_MINUS = HU_PROMPT_NUMBERS_BASE+111,
HU_PROMPT_POINT = HU_PROMPT_NUMBERS_BASE+112, HU_PROMPT_POINT = HU_PROMPT_NUMBERS_BASE+112,
HU_PROMPT_UNITS_BASE = 113, HU_PROMPT_UNITS_BASE = 113,
HU_PROMPT_POINT_BASE = 165, //.0 - .9 HU_PROMPT_POINT_BASE = 167, //.0 - .9
}; };
@@ -50,17 +50,21 @@ I18N_PLAY_FUNCTION(hu, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
PUSH_NUMBER_PROMPT(HU_PROMPT_MINUS); PUSH_NUMBER_PROMPT(HU_PROMPT_MINUS);
number = -number; number = -number;
} }
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(HU_PROMPT_POINT_BASE + qr.rem); PUSH_NUMBER_PROMPT(HU_PROMPT_POINT_BASE + qr.rem);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
number = -1; number = -1;
} }
else { else {
+8 -5
View File
@@ -89,16 +89,20 @@ I18N_PLAY_FUNCTION(it, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem > 0) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(IT_PROMPT_VIRGOLA); PUSH_NUMBER_PROMPT(IT_PROMPT_VIRGOLA);
if (mode==2 && qr.rem < 10)
PUSH_NUMBER_PROMPT(IT_PROMPT_ZERO);
PLAY_NUMBER(qr.rem, 0, 0); PLAY_NUMBER(qr.rem, 0, 0);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
} }
else { else {
if (qr.quot==1) { if (qr.quot==1) {
@@ -180,4 +184,3 @@ I18N_PLAY_FUNCTION(it, playDuration, int seconds PLAY_DURATION_ATT)
} }
LANGUAGE_PACK_DECLARE(it, STR_VOICE_ITALIANO); LANGUAGE_PACK_DECLARE(it, STR_VOICE_ITALIANO);
+8 -5
View File
@@ -50,17 +50,21 @@ I18N_PLAY_FUNCTION(jp, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
PUSH_NUMBER_PROMPT(JP_PROMPT_MINUS); PUSH_NUMBER_PROMPT(JP_PROMPT_MINUS);
number = -number; number = -number;
} }
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(JP_PROMPT_POINT_BASE + qr.rem); PUSH_NUMBER_PROMPT(JP_PROMPT_POINT_BASE + qr.rem);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
number = -1; number = -1;
} }
else { else {
@@ -130,4 +134,3 @@ I18N_PLAY_FUNCTION(jp, playDuration, int seconds PLAY_DURATION_ATT)
} }
LANGUAGE_PACK_DECLARE(jp, STR_VOICE_JAPANESE); LANGUAGE_PACK_DECLARE(jp, STR_VOICE_JAPANESE);
+8 -4
View File
@@ -50,16 +50,21 @@ I18N_PLAY_FUNCTION(ko, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
PUSH_NUMBER_PROMPT(KO_PROMPT_MINUS); PUSH_NUMBER_PROMPT(KO_PROMPT_MINUS);
number = -number; number = -number;
} }
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(KO_PROMPT_POINT_BASE + qr.rem); PUSH_NUMBER_PROMPT(KO_PROMPT_POINT_BASE + qr.rem);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
number = -1; number = -1;
} else { } else {
number = qr.quot; number = qr.quot;
@@ -126,4 +131,3 @@ I18N_PLAY_FUNCTION(ko, playDuration, int seconds PLAY_DURATION_ATT)
} }
LANGUAGE_PACK_DECLARE(ko, STR_VOICE_KOREAN); LANGUAGE_PACK_DECLARE(ko, STR_VOICE_KOREAN);
+8 -5
View File
@@ -52,17 +52,21 @@ I18N_PLAY_FUNCTION(nl, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
PUSH_NUMBER_PROMPT(NL_PROMPT_MINUS); PUSH_NUMBER_PROMPT(NL_PROMPT_MINUS);
number = -number; number = -number;
} }
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(NL_PROMPT_POINT_BASE + qr.rem); PUSH_NUMBER_PROMPT(NL_PROMPT_POINT_BASE + qr.rem);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
number = -1; number = -1;
} }
else { else {
@@ -132,4 +136,3 @@ I18N_PLAY_FUNCTION(nl, playDuration, int seconds PLAY_DURATION_ATT)
} }
LANGUAGE_PACK_DECLARE(nl, STR_VOICE_DUTCH); LANGUAGE_PACK_DECLARE(nl, STR_VOICE_DUTCH);
+8 -5
View File
@@ -94,21 +94,25 @@ I18N_PLAY_FUNCTION(pl, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
PUSH_NUMBER_PROMPT(PL_PROMPT_MINUS); PUSH_NUMBER_PROMPT(PL_PROMPT_MINUS);
number = -number; number = -number;
} }
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, ZENSKI); PLAY_NUMBER(qr.quot, 0, ZENSKI);
if (qr.quot == 0) if (qr.quot == 0)
PUSH_NUMBER_PROMPT(PL_PROMPT_CALA); PUSH_NUMBER_PROMPT(PL_PROMPT_CALA);
else else
PL_PUSH_UNIT_PROMPT(PL_PROMPT_CALA, qr.quot); PL_PUSH_UNIT_PROMPT(PL_PROMPT_CALA, qr.quot);
PLAY_NUMBER(qr.rem, 0, ZENSKI); PLAY_NUMBER(qr.rem, 0, ZENSKI);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
PUSH_NUMBER_PROMPT(PL_PROMPT_UNITS_BASE+((unit-1)*4)+3); PUSH_NUMBER_PROMPT(PL_PROMPT_UNITS_BASE+((unit-1)*4)+3);
return; return;
} }
@@ -235,4 +239,3 @@ I18N_PLAY_FUNCTION(pl, playDuration, int seconds PLAY_DURATION_ATT)
} }
LANGUAGE_PACK_DECLARE(pl, STR_VOICE_POLISH); LANGUAGE_PACK_DECLARE(pl, STR_VOICE_POLISH);
+11 -7
View File
@@ -80,19 +80,24 @@ I18N_PLAY_FUNCTION(pt, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
PUSH_NUMBER_PROMPT(PT_PROMPT_MENOS); PUSH_NUMBER_PROMPT(PT_PROMPT_MENOS);
number = -number; number = -number;
} }
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem > 0) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(PT_PROMPT_VIRGULA); PUSH_NUMBER_PROMPT(PT_PROMPT_VIRGULA);
if (mode==2 && qr.rem < 10) if (mode == 2 && rem2) {
PUSH_NUMBER_PROMPT(PT_PROMPT_ZERO); PLAY_NUMBER(qr.rem, 0, 0);
PLAY_NUMBER(qr.rem, unit, 0); PLAY_NUMBER(rem2, unit, 0);
} else {
PLAY_NUMBER(qr.rem, unit, 0);
}
} }
else { else {
PLAY_NUMBER(qr.quot, unit, 0); PLAY_NUMBER(qr.quot, unit, 0);
@@ -185,4 +190,3 @@ I18N_PLAY_FUNCTION(pt, playDuration, int seconds PLAY_DURATION_ATT)
} }
LANGUAGE_PACK_DECLARE(pt, STR_VOICE_PORTUGUES); LANGUAGE_PACK_DECLARE(pt, STR_VOICE_PORTUGUES);
+10 -4
View File
@@ -77,13 +77,20 @@ I18N_PLAY_FUNCTION(ru, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
int8_t mode = MODE(att); int8_t mode = MODE(att);
uint8_t rem2 = 0;
if (mode > 0 && att != RU_FEMALE_UNIT) { if (mode > 0 && att != RU_FEMALE_UNIT) {
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
if (qr.rem) { qr = div((int)number, 10);
if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(RU_PROMPT_POINT_BASE + qr.rem); PUSH_NUMBER_PROMPT(RU_PROMPT_POINT_BASE + qr.rem);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
number = -1; number = -1;
} }
else { else {
@@ -144,7 +151,7 @@ I18N_PLAY_FUNCTION(ru, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
} }
if (unit) { if (unit) {
if (mode > 0 && qr.rem) // number with decimal point if (mode > 0 && (qr.rem || rem2)) // number with decimal point
RU_PUSH_UNIT_PROMPT(unit, -1); // force 2 units form, if float value RU_PUSH_UNIT_PROMPT(unit, -1); // force 2 units form, if float value
else else
RU_PUSH_UNIT_PROMPT(unit, tmp); RU_PUSH_UNIT_PROMPT(unit, tmp);
@@ -189,4 +196,3 @@ I18N_PLAY_FUNCTION(ru, playDuration, int seconds PLAY_DURATION_ATT)
} }
LANGUAGE_PACK_DECLARE(ru, STR_VOICE_RUSSIAN); LANGUAGE_PACK_DECLARE(ru, STR_VOICE_RUSSIAN);
+9 -6
View File
@@ -30,7 +30,7 @@ enum SwedishPrompts {
SE_PROMPT_MINUS = SE_PROMPT_NUMBERS_BASE+111, SE_PROMPT_MINUS = SE_PROMPT_NUMBERS_BASE+111,
SE_PROMPT_POINT = SE_PROMPT_NUMBERS_BASE+112, SE_PROMPT_POINT = SE_PROMPT_NUMBERS_BASE+112,
SE_PROMPT_UNITS_BASE = 113, SE_PROMPT_UNITS_BASE = 113,
SE_PROMPT_POINT_BASE = 165, //.0 - .9 SE_PROMPT_POINT_BASE = 167, //.0 - .9
}; };
@@ -50,17 +50,21 @@ I18N_PLAY_FUNCTION(se, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
PUSH_NUMBER_PROMPT(SE_PROMPT_MINUS); PUSH_NUMBER_PROMPT(SE_PROMPT_MINUS);
number = -number; number = -number;
} }
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(SE_PROMPT_POINT_BASE + qr.rem); PUSH_NUMBER_PROMPT(SE_PROMPT_POINT_BASE + qr.rem);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
number = -1; number = -1;
} }
else { else {
@@ -125,4 +129,3 @@ I18N_PLAY_FUNCTION(se, playDuration, int seconds PLAY_DURATION_ATT)
} }
LANGUAGE_PACK_DECLARE(se, STR_VOICE_SWEDISH); LANGUAGE_PACK_DECLARE(se, STR_VOICE_SWEDISH);
+8 -5
View File
@@ -63,21 +63,25 @@ I18N_PLAY_FUNCTION(sk, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
PUSH_NUMBER_PROMPT(SK_PROMPT_MINUS); PUSH_NUMBER_PROMPT(SK_PROMPT_MINUS);
number = -number; number = -number;
} }
int8_t mode = MODE(att); int8_t mode = MODE(att);
if (mode > 0) { if (mode > 0) {
uint8_t rem2 = 0;
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
if (qr.rem) { if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, ZENSKY); PLAY_NUMBER(qr.quot, 0, ZENSKY);
if (qr.quot == 0) if (qr.quot == 0)
PUSH_NUMBER_PROMPT(SK_PROMPT_CELA); PUSH_NUMBER_PROMPT(SK_PROMPT_CELA);
else else
SK_PUSH_UNIT_PROMPT(SK_PROMPT_CELA, qr.quot); SK_PUSH_UNIT_PROMPT(SK_PROMPT_CELA, qr.quot);
PLAY_NUMBER(qr.rem, 0, ZENSKY); PLAY_NUMBER(qr.rem, 0, ZENSKY);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
PUSH_NUMBER_PROMPT(SK_PROMPT_UNITS_BASE+((unit-1)*4)+3); PUSH_NUMBER_PROMPT(SK_PROMPT_UNITS_BASE+((unit-1)*4)+3);
return; return;
} }
@@ -185,4 +189,3 @@ I18N_PLAY_FUNCTION(sk, playDuration, int seconds PLAY_DURATION_ATT)
} }
LANGUAGE_PACK_DECLARE(sk, STR_VOICE_SLOVAK); LANGUAGE_PACK_DECLARE(sk, STR_VOICE_SLOVAK);
+10 -3
View File
@@ -76,13 +76,20 @@ I18N_PLAY_FUNCTION(ua, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
div_t qr = div((int)number, 10); div_t qr = div((int)number, 10);
int8_t mode = MODE(att); int8_t mode = MODE(att);
uint8_t rem2 = 0;
if (mode > 0 && att != UA_FEMALE_UNIT) { if (mode > 0 && att != UA_FEMALE_UNIT) {
if (mode == 2) { if (mode == 2) {
number /= 10; div_t qr2 = div((int)number, 10);
number = qr2.quot;
rem2 = qr2.rem;
} }
if (qr.rem) { qr = div((int)number, 10);
if (qr.rem || (mode == 2 && rem2)) {
PLAY_NUMBER(qr.quot, 0, 0); PLAY_NUMBER(qr.quot, 0, 0);
PUSH_NUMBER_PROMPT(UA_PROMPT_POINT_BASE + qr.rem); PUSH_NUMBER_PROMPT(UA_PROMPT_POINT_BASE + qr.rem);
if (mode == 2 && rem2) {
PLAY_NUMBER(rem2, 0, 0);
}
number = -1; number = -1;
} }
else { else {
@@ -143,7 +150,7 @@ I18N_PLAY_FUNCTION(ua, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
} }
if (unit) { if (unit) {
if (mode > 0 && qr.rem) // number with decimal point if (mode > 0 && (qr.rem || rem2)) // number with decimal point
UA_PUSH_UNIT_PROMPT(unit, -1); // force 2 units form, if float value UA_PUSH_UNIT_PROMPT(unit, -1); // force 2 units form, if float value
else else
UA_PUSH_UNIT_PROMPT(unit, tmp); UA_PUSH_UNIT_PROMPT(unit, tmp);