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

Swedish TTS fixes by HakanBastedt

Browse Source
This commit is contained in:
Andre Bernet
2015-11-26 13:07:41 +04:00
parent f19815ee26
commit ab99740e1b
1 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/translations/tts_se.cpp
+7 -34
View File
@@ -45,35 +45,8 @@ enum SwedishPrompts {
SE_PROMPT_AND = SE_PROMPT_NUMBERS_BASE+110,
SE_PROMPT_MINUS = SE_PROMPT_NUMBERS_BASE+111,
SE_PROMPT_POINT = SE_PROMPT_NUMBERS_BASE+112,
SE_PROMPT_UNITS_BASE = 115,
SE_PROMPT_VOLTS = SE_PROMPT_UNITS_BASE+UNIT_VOLTS, //(one)volt,(two)volts
SE_PROMPT_AMPS = SE_PROMPT_UNITS_BASE+(UNIT_AMPS*2),
SE_PROMPT_METERS_PER_SECOND = SE_PROMPT_UNITS_BASE+(UNIT_METERS_PER_SECOND*2),
SE_PROMPT_SPARE1 = SE_PROMPT_UNITS_BASE+(UNIT_RAW*2),
SE_PROMPT_KMH = SE_PROMPT_UNITS_BASE+(UNIT_SPEED*2),
SE_PROMPT_METERS = SE_PROMPT_UNITS_BASE+(UNIT_DIST*2),
SE_PROMPT_DEGREES = SE_PROMPT_UNITS_BASE+(UNIT_TEMPERATURE*2),
SE_PROMPT_PERCENT = SE_PROMPT_UNITS_BASE+(UNIT_PERCENT*2),
SE_PROMPT_MILLIAMPS = SE_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*2),
SE_PROMPT_MAH = SE_PROMPT_UNITS_BASE+(UNIT_MAH*2),
SE_PROMPT_WATTS = SE_PROMPT_UNITS_BASE+(UNIT_WATTS*2),
SE_PROMPT_DB = SE_PROMPT_UNITS_BASE+(UNIT_DB*2),
SE_PROMPT_FEET = SE_PROMPT_UNITS_BASE+(UNIT_FEET*2),
SE_PROMPT_KTS = SE_PROMPT_UNITS_BASE+(UNIT_KTS*2),
SE_PROMPT_HOURS = SE_PROMPT_UNITS_BASE+(UNIT_HOURS*2),
SE_PROMPT_MINUTES = SE_PROMPT_UNITS_BASE+(UNIT_MINUTES*2),
SE_PROMPT_SECONDS = SE_PROMPT_UNITS_BASE+(UNIT_SECONDS*2),
SE_PROMPT_RPMS = SE_PROMPT_UNITS_BASE+(UNIT_RPMS*2),
SE_PROMPT_G = SE_PROMPT_UNITS_BASE+(UNIT_G*2),
#if defined(CPUARM)
SE_PROMPT_MILLILITERS = SE_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2),
SE_PROMPT_FLOZ = SE_PROMPT_UNITS_BASE+(UNIT_FLOZ*2),
SE_PROMPT_FEET_PER_SECOND = SE_PROMPT_UNITS_BASE+(UNIT_FEET_PER_SECOND*2),
#endif
SE_PROMPT_POINT_BASE = 160, //.0 - .9
SE_PROMPT_UNITS_BASE = 113,
SE_PROMPT_POINT_BASE = 165, //.0 - .9
};
#if defined(VOICE)
@@ -142,9 +115,9 @@ I18N_PLAY_FUNCTION(se, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
if (unit) {
if (tmpNumber == 1 )
PUSH_NUMBER_PROMPT(SE_PROMPT_UNITS_BASE+((unit-1)*2)); // Singular prompts
PUSH_NUMBER_PROMPT(SE_PROMPT_UNITS_BASE+unit*2); // Singular prompts
else
PUSH_NUMBER_PROMPT(SE_PROMPT_UNITS_BASE+((unit-1)*2)+1); // Plural prompts
PUSH_NUMBER_PROMPT(SE_PROMPT_UNITS_BASE+unit*2+1); // Plural prompts
}
}
@@ -158,19 +131,19 @@ I18N_PLAY_FUNCTION(se, playDuration, int seconds PLAY_DURATION_ATT)
uint8_t tmp = seconds / 3600;
seconds %= 3600;
if (tmp > 0 || IS_PLAY_TIME()) {
PLAY_NUMBER(tmp, UNIT_HOURS+1 , 0);
PLAY_NUMBER(tmp, UNIT_HOURS, 0);
}
tmp = seconds / 60;
seconds %= 60;
if (tmp > 0) {
PLAY_NUMBER(tmp, UNIT_MINUTES+1 , 0);
PLAY_NUMBER(tmp, UNIT_MINUTES, 0);
if (seconds > 0)
PUSH_NUMBER_PROMPT(SE_PROMPT_AND);
}
if (seconds > 0) {
PLAY_NUMBER(seconds, UNIT_SECONDS+1 , 0);
PLAY_NUMBER(seconds, UNIT_SECONDS, 0);
}
}