Different numbers for Voice Prompts

Diff functions in Custom Switches
This commit is contained in:
bsongis
2012-08-14 17:09:03 +00:00
parent b94b11d466
commit 8f103ecee3
14 changed files with 207 additions and 168 deletions
+26 -19
View File
@@ -37,23 +37,24 @@ enum FrenchPrompts {
PROMPT_NUMBERS_BASE = 0,
PROMPT_ZERO = PROMPT_NUMBERS_BASE+0,
PROMPT_CENT = PROMPT_NUMBERS_BASE+100,
PROMPT_MILLE = PROMPT_NUMBERS_BASE+101,
PROMPT_DEUX_CENT = PROMPT_CENT+1,
PROMPT_MILLE = PROMPT_CENT+9,
PROMPT_UNE = 102,
PROMPT_ONZE = 103,
PROMPT_VINGT_ET_UNE = 104,
PROMPT_TRENTE_ET_UNE = 105,
PROMPT_QUARANTE_ET_UNE = 106,
PROMPT_CINQUANTE_ET_UNE = 107,
PROMPT_SOIXANTE_ET_UNE = 108,
PROMPT_SOIXANTE_ET_ONZE = 109,
PROMPT_QUATRE_VINGT_UNE = 110,
PROMPT_UNE = 110,
PROMPT_ONZE,
PROMPT_VINGT_ET_UNE,
PROMPT_TRENTE_ET_UNE,
PROMPT_QUARANTE_ET_UNE,
PROMPT_CINQUANTE_ET_UNE,
PROMPT_SOIXANTE_ET_UNE,
PROMPT_SOIXANTE_ET_ONZE,
PROMPT_QUATRE_VINGT_UNE,
PROMPT_VIRGULE = 116,
PROMPT_ET = 117,
PROMPT_MOINS = 118,
PROMPT_VIRGULE = 119,
PROMPT_ET = 120,
PROMPT_MOINS = 121,
PROMPT_UNITS_BASE = 120,
PROMPT_UNITS_BASE = 125,
PROMPT_VOLTS = PROMPT_UNITS_BASE+UNIT_VOLTS,
PROMPT_AMPS = PROMPT_UNITS_BASE+UNIT_AMPS,
PROMPT_METERS_PER_SECOND = PROMPT_UNITS_BASE+UNIT_METERS_PER_SECOND,
@@ -71,7 +72,7 @@ enum FrenchPrompts {
PROMPT_MINUTE = PROMPT_UNITS_BASE+UNIT_MINUTES,
PROMPT_SECONDE = PROMPT_UNITS_BASE+UNIT_SECONDS,
PROMPT_LABELS_BASE = 140,
PROMPT_LABELS_BASE = 145,
PROMPT_TIMER1 = PROMPT_LABELS_BASE+TELEM_TM1,
PROMPT_TIMER2 = PROMPT_LABELS_BASE+TELEM_TM2,
PROMPT_A1 = PROMPT_LABELS_BASE+TELEM_A1,
@@ -97,7 +98,6 @@ enum FrenchPrompts {
PROMPT_ACCELz = PROMPT_LABELS_BASE+TELEM_ACCz,
PROMPT_HDG = PROMPT_LABELS_BASE+TELEM_HDG,
PROMPT_VARIO = PROMPT_LABELS_BASE+TELEM_VSPD,
};
#if defined(VOICE)
@@ -119,9 +119,16 @@ void playNumber(int16_t number, uint8_t unit, uint8_t att)
int8_t mode = MODE(att);
if (mode > 0) {
div_t qr = div(number, (mode == 1 ? 10 : 100));
playNumber(qr.quot);
pushPrompt(PROMPT_VIRGULE);
playNumber(qr.rem, unit);
if (qr.rem > 0) {
playNumber(qr.quot);
pushPrompt(PROMPT_VIRGULE);
if (mode==2 && qr.rem < 10)
pushPrompt(PROMPT_ZERO);
playNumber(qr.rem, unit);
}
else {
playNumber(qr.quot, unit);
}
return;
}