diff --git a/radio/src/translations/tts_en.cpp b/radio/src/translations/tts_en.cpp index f35691641..9670b596f 100644 --- a/radio/src/translations/tts_en.cpp +++ b/radio/src/translations/tts_en.cpp @@ -44,35 +44,8 @@ enum EnglishPrompts { EN_PROMPT_AND = EN_PROMPT_NUMBERS_BASE+110, EN_PROMPT_MINUS = EN_PROMPT_NUMBERS_BASE+111, EN_PROMPT_POINT = EN_PROMPT_NUMBERS_BASE+112, - EN_PROMPT_UNITS_BASE = 115, - EN_PROMPT_VOLTS = EN_PROMPT_UNITS_BASE+UNIT_VOLTS, //(one)volt,(two)volts - EN_PROMPT_AMPS = EN_PROMPT_UNITS_BASE+(UNIT_AMPS*2), - EN_PROMPT_METERS_PER_SECOND = EN_PROMPT_UNITS_BASE+(UNIT_METERS_PER_SECOND*2), - EN_PROMPT_SPARE1 = EN_PROMPT_UNITS_BASE+(UNIT_RAW*2), - EN_PROMPT_KMH = EN_PROMPT_UNITS_BASE+(UNIT_SPEED*2), - EN_PROMPT_METERS = EN_PROMPT_UNITS_BASE+(UNIT_DIST*2), - EN_PROMPT_DEGREES = EN_PROMPT_UNITS_BASE+(UNIT_TEMPERATURE*2), - EN_PROMPT_PERCENT = EN_PROMPT_UNITS_BASE+(UNIT_PERCENT*2), - EN_PROMPT_MILLIAMPS = EN_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*2), - EN_PROMPT_MAH = EN_PROMPT_UNITS_BASE+(UNIT_MAH*2), - EN_PROMPT_WATTS = EN_PROMPT_UNITS_BASE+(UNIT_WATTS*2), - EN_PROMPT_DB = EN_PROMPT_UNITS_BASE+(UNIT_DBM*2), - EN_PROMPT_FEET = EN_PROMPT_UNITS_BASE+(UNIT_FEET*2), - EN_PROMPT_MPH = EN_PROMPT_UNITS_BASE+(UNIT_KTS*2), - EN_PROMPT_HOURS = EN_PROMPT_UNITS_BASE+(UNIT_HOURS*2), - EN_PROMPT_MINUTES = EN_PROMPT_UNITS_BASE+(UNIT_MINUTES*2), - EN_PROMPT_SECONDS = EN_PROMPT_UNITS_BASE+(UNIT_SECONDS*2), - EN_PROMPT_RPMS = EN_PROMPT_UNITS_BASE+(UNIT_RPMS*2), - EN_PROMPT_G = EN_PROMPT_UNITS_BASE+(UNIT_G*2), -#if defined(CPUARM) - EN_PROMPT_MILLILITERS = EN_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2), - EN_PROMPT_FLOZ = EN_PROMPT_UNITS_BASE+(UNIT_FLOZ*2), - EN_PROMPT_FEET_PER_SECOND = EN_PROMPT_UNITS_BASE+(UNIT_FEET_PER_SECOND*2), -#endif - EN_PROMPT_POINT_BASE = 165, //.0 - .9 - }; #if defined(VOICE) diff --git a/radio/util/tts.py b/radio/util/tts.py index b955cad15..e5804085d 100644 --- a/radio/util/tts.py +++ b/radio/util/tts.py @@ -133,8 +133,7 @@ def ttsEn(): systemSounds.append((str(100*(i+1)), filename(PROMPT_SYSTEM_BASE+100+i))) for i, s in enumerate(["thousand", "and", "minus", "point"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+109+i))) - for i, s in enumerate(["", "", - "volt", "volts", + for i, s in enumerate(["volt", "volts", "amp", "amps", "milliamp", "milliamps", "knot", "knots",