[9x stock] Issue 7 fixed.

[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
+19 -19
View File
@@ -126,7 +126,7 @@ PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att)
*/
if (number < 0) {
PUSH_PROMPT(PROMPT_MENO);
PUSH_NUMBER_PROMPT(PROMPT_MENO);
number = -number;
}
int8_t mode = MODE(att);
@@ -134,9 +134,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_VIRGOLA);
PUSH_NUMBER_PROMPT(PROMPT_VIRGOLA);
if (mode==2 && qr.rem < 10)
PUSH_PROMPT(PROMPT_ZERO);
PUSH_NUMBER_PROMPT(PROMPT_ZERO);
PLAY_NUMBER(qr.rem, unit, 0);
}
else {
@@ -148,31 +148,31 @@ PLAY_FUNCTION(playNumber, int16_t number, uint8_t unit, uint8_t att)
if (number >= 1000) {
if (number >= 2000) {
PLAY_NUMBER(number / 1000, 0, 0);
PUSH_PROMPT(PROMPT_MIL);
PUSH_NUMBER_PROMPT(PROMPT_MIL);
} else {
PUSH_PROMPT(PROMPT_MIL);
PUSH_NUMBER_PROMPT(PROMPT_MIL);
}
number %= 1000;
if (number == 0)
number = -1;
}
if (number >= 100) {
PUSH_PROMPT(PROMPT_CIENTO + number/100);
PUSH_NUMBER_PROMPT(PROMPT_CIENTO + number/100);
number %= 100;
if (number == 0)
number = -1;
}
PUSH_PROMPT(PROMPT_ZERO+number);
PUSH_NUMBER_PROMPT(PROMPT_ZERO+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_MENO);
PUSH_NUMBER_PROMPT(PROMPT_MENO);
seconds = -seconds;
}
@@ -183,10 +183,10 @@ PLAY_FUNCTION(playDuration, int16_t seconds)
ore=tmp;
if (tmp > 1) {
PLAY_NUMBER(tmp, 0, 0);
PUSH_PROMPT(PROMPT_HORAS);
PUSH_NUMBER_PROMPT(PROMPT_HORAS);
} else {
PUSH_PROMPT(PROMPT_UNA);
PUSH_PROMPT(PROMPT_HORA);
PUSH_NUMBER_PROMPT(PROMPT_UNA);
PUSH_NUMBER_PROMPT(PROMPT_HORA);
}
}
@@ -195,20 +195,20 @@ PLAY_FUNCTION(playDuration, int16_t seconds)
if (tmp > 0 || ore >0) {
if (tmp != 1) {
PLAY_NUMBER(tmp, 0, 0);
PUSH_PROMPT(PROMPT_MINUTOS);
PUSH_NUMBER_PROMPT(PROMPT_MINUTOS);
} else {
PUSH_PROMPT(PROMPT_UN);
PUSH_PROMPT(PROMPT_MINUTO);
PUSH_NUMBER_PROMPT(PROMPT_UN);
PUSH_NUMBER_PROMPT(PROMPT_MINUTO);
}
PUSH_PROMPT(PROMPT_Y);
PUSH_NUMBER_PROMPT(PROMPT_Y);
}
if (seconds != 1) {
PLAY_NUMBER(seconds, 0, 0);
PUSH_PROMPT(PROMPT_SEGUNDOS);
PUSH_NUMBER_PROMPT(PROMPT_SEGUNDOS);
} else {
PUSH_PROMPT(PROMPT_UN);
PUSH_PROMPT(PROMPT_SEGUNDO);
PUSH_NUMBER_PROMPT(PROMPT_UN);
PUSH_NUMBER_PROMPT(PROMPT_SEGUNDO);
}
}