From 6b4dba947a3940224e880ad4e0d76118cc769731 Mon Sep 17 00:00:00 2001 From: bsongis Date: Fri, 9 May 2014 16:38:22 +0200 Subject: [PATCH] Issue #1065 - FW part done --- radio/src/audio_arm.h | 7 +++++-- radio/src/eeprom_conversions.cpp | 3 +++ radio/src/gui/menu_model.cpp | 5 +++-- radio/src/gui/menus.cpp | 10 ++++++---- radio/src/gui/view_main.cpp | 2 +- radio/src/lcd.cpp | 21 ++++++++++++++++----- radio/src/lcd.h | 3 ++- radio/src/myeeprom.h | 28 ++++++++++++++++++---------- radio/src/opentx.cpp | 19 ++++++++++++++++++- radio/src/targets/gruvin9x/somo14d.h | 5 ++++- radio/src/targets/stock/voice.h | 5 ++++- radio/src/translations.h | 8 ++++---- radio/src/translations/cz.h.txt | 4 +++- radio/src/translations/de.h.txt | 6 ++++-- radio/src/translations/en.h.txt | 8 +++++--- radio/src/translations/es.h.txt | 4 +++- radio/src/translations/fi.h.txt | 4 +++- radio/src/translations/fr.h.txt | 20 +++++++++++++------- radio/src/translations/it.h.txt | 4 +++- radio/src/translations/pl.h.txt | 4 +++- radio/src/translations/pt.h.txt | 4 +++- radio/src/translations/se.h.txt | 6 ++++-- radio/src/translations/tts_cz.cpp | 4 ++-- radio/src/translations/tts_de.cpp | 4 ++-- radio/src/translations/tts_en.cpp | 4 ++-- radio/src/translations/tts_es.cpp | 9 +++++---- radio/src/translations/tts_fr.cpp | 25 +++++++++++++++++++------ radio/src/translations/tts_it.cpp | 4 ++-- radio/src/translations/tts_pl.cpp | 4 ++-- radio/src/translations/tts_pt.cpp | 4 ++-- radio/src/translations/tts_se.cpp | 4 ++-- radio/src/translations/tts_sk.cpp | 4 ++-- radio/util/tts.py | 2 +- 33 files changed, 169 insertions(+), 79 deletions(-) diff --git a/radio/src/audio_arm.h b/radio/src/audio_arm.h index 825f82fd7..70a63825e 100644 --- a/radio/src/audio_arm.h +++ b/radio/src/audio_arm.h @@ -251,7 +251,7 @@ void audioStart(); #if defined(VOICE) #define AUDIO_ERROR_MESSAGE(e) audioEvent(e) - #define AUDIO_TIMER_MINUTE(t) playDuration(t, 0) + #define AUDIO_TIMER_MINUTE(t) playDuration(t, 0, 0) #else #define AUDIO_ERROR_MESSAGE(e) audioEvent(AU_ERROR) #define AUDIO_TIMER_MINUTE(t) audioDefevent(AU_WARNING1) @@ -317,7 +317,10 @@ void pushPrompt(uint16_t prompt, uint8_t id=0); #define PLAY_FUNCTION(x, ...) void x(__VA_ARGS__, uint8_t id) #define PUSH_NUMBER_PROMPT(p) pushPrompt((p), id) #define PLAY_NUMBER(n, u, a) playNumber((n), (u), (a), id) -#define PLAY_DURATION(d) playDuration((d), id) +#define PLAY_DURATION(d, att) playDuration((d), (att), id) +#define PLAY_DURATION_ATT , uint8_t flags +#define PLAY_TIME 1 +#define IS_PLAY_TIME() (flags&PLAY_TIME) #define IS_PLAYING(id) audioQueue.isPlaying((id)) #define PLAY_VALUE(v, id) playValue((v), (id)) #define PLAY_FILE(f, flags, id) audioQueue.playFile((f), (flags), (id)) diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp index 6d7c8dbd7..4da6e0fe1 100644 --- a/radio/src/eeprom_conversions.cpp +++ b/radio/src/eeprom_conversions.cpp @@ -332,6 +332,9 @@ void ConvertGeneralSettings_215_to_216(EEGeneral &settings) int ConvertTelemetrySource_215_to_216(int source) { + // TELEM_TX_TIME and 5 spare added + if (source >= TELEM_TX_TIME) + source += 6; // TELEM_RSSI_TX added if (source >= TELEM_RSSI_TX) source += 1; diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index 3f12a67bf..d72d4c1e7 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -4348,7 +4348,7 @@ void menuModelLogicalSwitchOne(uint8_t event) CHECK_INCDEC_MODELVAR(event, cs->v3, 0, 222 - cs->v2); break; } - v2_min=-129; v2_max = 122; + v2_min = -129; v2_max = 122; } else if (cstate == LS_FAMILY_COMP) { putsMixerSource(CSWONE_2ND_COLUMN, y, cs->v2, attr); @@ -4646,7 +4646,8 @@ void menuModelLogicalSwitches(uint8_t event) v2_max = maxTelemValue(v1_val - MIXSRC_FIRST_TELEM + 1); #if defined(CPUARM) v2_min = minTelemValue(v1_val - MIXSRC_FIRST_TELEM + 1); - INCDEC_SET_FLAG(INCDEC_REP10 | NO_INCDEC_MARKS); + if (horz == 2 && v2_max-v2_min > 1000) + INCDEC_SET_FLAG(INCDEC_REP10 | NO_INCDEC_MARKS); if (cs->v2 < v2_min || cs->v2 > v2_max) { cs->v2 = 0; eeDirty(EE_MODEL); diff --git a/radio/src/gui/menus.cpp b/radio/src/gui/menus.cpp index b9453d73a..bd505626f 100644 --- a/radio/src/gui/menus.cpp +++ b/radio/src/gui/menus.cpp @@ -123,13 +123,13 @@ int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, ui else if (DBLKEYS_PRESSED_RGT_UP(in)) { newval = (i_max > 100 ? 100 : i_max); #if defined(CPUARM) - if(i_flags & DBLKEYS_1000) newval *= 10; + if (i_flags & DBLKEYS_1000) newval *= 10; #endif } else if (DBLKEYS_PRESSED_LFT_DWN(in)) { newval = (i_min < -100 ? -100 : i_min); #if defined(CPUARM) - if(i_flags & DBLKEYS_1000) newval *= 10; + if (i_flags & DBLKEYS_1000) newval *= 10; #endif } else if (DBLKEYS_PRESSED_UP_DWN(in)) @@ -141,7 +141,6 @@ int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, ui #endif - if (dblkey) { killEvents(KEY_UP); killEvents(KEY_DOWN); @@ -1434,7 +1433,10 @@ bool isTelemetrySourceAvailable(int source) if (source >= TELEM_RESERVE6 && source <= TELEM_RESERVE10) return false; - + + if (source >= TELEM_RESERVE11 && source <= TELEM_RESERVE15) + return false; + if (source == TELEM_DTE) return false; diff --git a/radio/src/gui/view_main.cpp b/radio/src/gui/view_main.cpp index e089b14c2..04001a5ce 100644 --- a/radio/src/gui/view_main.cpp +++ b/radio/src/gui/view_main.cpp @@ -318,7 +318,7 @@ void displayTopBar() /* RTC time */ struct gtm t; gettime(&t); - putsTime(BAR_TIME_X+1, BAR_Y+1, t, true); + putsTime(BAR_TIME_X+1, BAR_Y+1, t, TIMEBLINK); /* The background */ lcd_filled_rect(BAR_X, BAR_Y, BAR_W, BAR_H, SOLID, FILL_WHITE|GREY_DEFAULT|ROUND); diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp index 020d17842..cf0d760f7 100644 --- a/radio/src/lcd.cpp +++ b/radio/src/lcd.cpp @@ -867,13 +867,14 @@ void lcdDrawTelemetryTopBar() #endif #if defined(PCBTARANIS) -void putsTime(xcoord_t x, uint8_t y, struct gtm t, bool blink) +void putsTime(xcoord_t x, uint8_t y, struct gtm t, LcdFlags att) { - if (blink && (t.tm_sec%2)) { - lcd_putcAtt(x, y, ':', 0); + LcdFlags att2 = (att & (INVERS|BLINK)) | LEADING0; + lcd_outdezNAtt(x, y, t.tm_hour, att2, 2); + if (!(att&TIMEBLINK) || (t.tm_sec%2)) { + lcd_putcAtt(x, y, ':', att); } - lcd_outdezNAtt(x, y, t.tm_hour, LEADING0, 2); - lcd_outdezNAtt(x+3*FWNUM-2, y, t.tm_min, LEADING0, 2); + lcd_outdezNAtt(x+3*FWNUM-2, y, t.tm_min, att2, 2); } #endif @@ -1197,6 +1198,16 @@ const pm_uint8_t bchunit_ar[] PROGMEM = { void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val, uint8_t att) { switch (channel) { +#if defined(CPUARM) + case TELEM_TX_TIME-1: + { + gtm t; + t.tm_hour = val / 60; + t.tm_min = val % 60; + putsTime(x+2*FWNUM, y, t, att); + break; + } +#endif case TELEM_TM1-1: case TELEM_TM2-1: att &= ~NO_UNIT; diff --git a/radio/src/lcd.h b/radio/src/lcd.h index 21552bfb6..6a930e82e 100644 --- a/radio/src/lcd.h +++ b/radio/src/lcd.h @@ -113,6 +113,7 @@ #define SMLSIZE 0x0200 #define TINSIZE 0x0400 #define STREXPANDED 0x0800 + #define TIMEBLINK 0x1000 #else #define MIDSIZE DBLSIZE #define SMLSIZE 0x00 @@ -202,7 +203,7 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val, #define putstime_t int16_t #endif -void putsTime(xcoord_t x, uint8_t y, struct gtm t, bool blink=false); +void putsTime(xcoord_t x, uint8_t y, struct gtm t, LcdFlags att); void putsTimer(xcoord_t x, uint8_t y, putstime_t tme, LcdFlags att, LcdFlags att2); #define SOLID 0xff diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 223591cdd..15686e836 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -1002,6 +1002,14 @@ PACK(typedef struct t_FrSkyChannelData { enum TelemetrySource { TELEM_NONE, TELEM_TX_VOLTAGE, +#if defined(CPUARM) + TELEM_TX_TIME, + TELEM_RESERVE1, + TELEM_RESERVE2, + TELEM_RESERVE3, + TELEM_RESERVE4, + TELEM_RESERVE5, +#endif TELEM_TM1, TELEM_TM2, #if defined(CPUARM) @@ -1040,11 +1048,11 @@ enum TelemetrySource { TELEM_ASPEED, TELEM_DTE, #if defined(CPUARM) - TELEM_RESERVE1, - TELEM_RESERVE2, - TELEM_RESERVE3, - TELEM_RESERVE4, - TELEM_RESERVE5, + TELEM_RESERVE6, + TELEM_RESERVE7, + TELEM_RESERVE8, + TELEM_RESERVE9, + TELEM_RESERVE10, #endif TELEM_MIN_A1, TELEM_MIN_A2, @@ -1066,11 +1074,11 @@ enum TelemetrySource { TELEM_MAX_CURRENT, TELEM_MAX_POWER, #if defined(CPUARM) - TELEM_RESERVE6, - TELEM_RESERVE7, - TELEM_RESERVE8, - TELEM_RESERVE9, - TELEM_RESERVE10, + TELEM_RESERVE11, + TELEM_RESERVE12, + TELEM_RESERVE13, + TELEM_RESERVE14, + TELEM_RESERVE15, #endif TELEM_ACC, TELEM_GPS_TIME, diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 520853308..10af7719f 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -1298,6 +1298,13 @@ getvalue_t getValue(uint8_t i) #endif else if (i==MIXSRC_FIRST_TELEM-1+TELEM_TX_VOLTAGE) return g_vbat100mV; +#if defined(CPUARM) + else if (i==MIXSRC_FIRST_TELEM-1+TELEM_TX_TIME) { + struct gtm t; + gettime(&t); + return t.tm_hour*60 + t.tm_min; + } +#endif else if (i<=MIXSRC_FIRST_TELEM-1+TELEM_TM2) return timersStates[i-MIXSRC_FIRST_TELEM+1-TELEM_TM1].val; #if defined(FRSKY) #if defined(CPUARM) @@ -2040,6 +2047,7 @@ ls_telemetry_value_t minTelemValue(uint8_t channel) switch (channel) { case TELEM_FUEL: #if defined(CPUARM) + case TELEM_TX_TIME: case TELEM_SWR: #endif case TELEM_RSSI_TX: @@ -2060,6 +2068,10 @@ ls_telemetry_value_t minTelemValue(uint8_t channel) ls_telemetry_value_t maxTelemValue(uint8_t channel) { switch (channel) { +#if defined(CPUARM) + case TELEM_TX_TIME: + return 24*60-1; +#endif case TELEM_FUEL: #if defined(CPUARM) case TELEM_SWR: @@ -3277,12 +3289,17 @@ PLAY_FUNCTION(playValue, uint8_t idx) getvalue_t val = getValue(idx); switch (idx) { +#if defined(CPUARM) + case MIXSRC_FIRST_TELEM+TELEM_TX_TIME-1: + PLAY_DURATION(val*60, PLAY_TIME); + break; +#endif case MIXSRC_FIRST_TELEM+TELEM_TX_VOLTAGE-1: PLAY_NUMBER(val, 1+UNIT_VOLTS, PREC1); break; case MIXSRC_FIRST_TELEM+TELEM_TM1-1: case MIXSRC_FIRST_TELEM+TELEM_TM2-1: - PLAY_DURATION(val); + PLAY_DURATION(val, 0); break; #if defined(CPUARM) case MIXSRC_FIRST_TELEM+TELEM_SWR-1: diff --git a/radio/src/targets/gruvin9x/somo14d.h b/radio/src/targets/gruvin9x/somo14d.h index 4195042cb..1e0f9c579 100644 --- a/radio/src/targets/gruvin9x/somo14d.h +++ b/radio/src/targets/gruvin9x/somo14d.h @@ -47,7 +47,10 @@ extern bool isPlaying(); #define PUSH_NUMBER_PROMPT(p) pushPrompt(PROMPT_I18N_BASE+(p)) #define PUSH_SYSTEM_PROMPT(p) pushPrompt(PROMPT_SYSTEM_BASE+(p)) #define PLAY_NUMBER(n, u, a) playNumber((n), (u), (a)) -#define PLAY_DURATION(d) playDuration((d)) +#define PLAY_DURATION(d, att) playDuration((d)) +#define PLAY_DURATION_ATT +#define PLAY_TIME +#define IS_PLAY_TIME() (0) #define IS_PLAYING(id) isPlaying() #define PLAY_VALUE(v, id) playValue((v)) diff --git a/radio/src/targets/stock/voice.h b/radio/src/targets/stock/voice.h index 8a092bb3f..fecf240c1 100644 --- a/radio/src/targets/stock/voice.h +++ b/radio/src/targets/stock/voice.h @@ -134,6 +134,9 @@ inline bool isPlaying() #define PUSH_NUMBER_PROMPT(p) pushNumberPrompt((p)) #define PUSH_SYSTEM_PROMPT(p) pushNumberPrompt(PROMPT_SYSTEM_BASE-PROMPT_I18N_BASE+(p)) #define PLAY_NUMBER(n, u, a) playNumber((n), (u), (a)) -#define PLAY_DURATION(d) playDuration((d)) +#define PLAY_DURATION(d, att) playDuration((d)) +#define PLAY_DURATION_ATT +#define PLAY_TIME +#define IS_PLAY_TIME() (0) #define IS_PLAYING(id) (0) /* isPlaying() */ #define PLAY_VALUE(v, id) playValue((v)) diff --git a/radio/src/translations.h b/radio/src/translations.h index 2fff18ae0..952c6aad5 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -625,16 +625,16 @@ extern const pm_char STR_EEBACKUP[]; struct LanguagePack { const char *id; const char *name; - void (*playNumber)(getvalue_t number, uint8_t unit, uint8_t att, uint8_t id); - void (*playDuration)(int16_t seconds, uint8_t id); + void (*playNumber)(getvalue_t number, uint8_t unit, uint8_t flags, uint8_t id); + void (*playDuration)(int16_t seconds, uint8_t flags, uint8_t id); }; extern LanguagePack * languagePacks[]; extern LanguagePack * currentLanguagePack; extern uint8_t currentLanguagePackIdx; #define LANGUAGE_PACK_DECLARE(lng, name) LanguagePack lng ## LanguagePack = { #lng, name, lng ## _ ## playNumber, lng ## _ ## playDuration } #define LANGUAGE_PACK_DECLARE_DEFAULT(lng, name) LANGUAGE_PACK_DECLARE(lng, name); LanguagePack * currentLanguagePack = & lng ## LanguagePack; uint8_t currentLanguagePackIdx - inline PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att) { currentLanguagePack->playNumber(number, unit, att, id); } - inline PLAY_FUNCTION(playDuration, int16_t seconds) { currentLanguagePack->playDuration(seconds, id); } + inline PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t flags) { currentLanguagePack->playNumber(number, unit, flags, id); } + inline PLAY_FUNCTION(playDuration, int16_t seconds, uint8_t flags) { currentLanguagePack->playDuration(seconds, flags, id); } #elif defined(VOICE) PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att); PLAY_FUNCTION(playDuration, int16_t seconds); diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 0e1fab4eb..75b93cf6a 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -282,12 +282,14 @@ #if defined(CPUARM) #define TR_TELEM_RESERVE "[--]" + #define TR_TELEM_TIME "Time" #define TR_SWR "SWR\0" #define TR_RX_BATT "RxBt" #define TR_A3_A4 "A3\0 ""A4\0 " #define TR_A3_A4_MIN "A3-\0""A4-\0" #else #define TR_TELEM_RESERVE + #define TR_TELEM_TIME #define TR_SWR #define TR_RX_BATT #define TR_A3_A4 @@ -296,7 +298,7 @@ #define TR_ASPD_MAX "ASp+" -#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Bat\0" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" #define LENGTH_UNIT_IMP "ft\0" #define SPEED_UNIT_IMP "mph" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index f5fb0d533..c42ff513d 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -282,12 +282,14 @@ #if defined(CPUARM) #define TR_TELEM_RESERVE TR("[--]", "[---]") + #define TR_TELEM_TIME TR("Time", "Time\0") #define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RX_BATT TR("RxBt", "RxBat") #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #else #define TR_TELEM_RESERVE + #define TR_TELEM_TIME #define TR_SWR #define TR_RX_BATT #define TR_A3_A4 @@ -297,9 +299,9 @@ #define TR_ASPD_MAX TR("ASp+", "ASpd+") #if LCD_W >= 212 - #define TR_VTELEMCHNS "---\0 ""Batt\0""Tmr1\0""Tmr2\0" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0 ""Rpm\0 ""Fuel\0""T1\0 ""T2\0 ""Spd\0 ""Dist\0""GAlt\0""Cell\0""Cells""Vfas\0""Curr\0""Cnsp\0""Powr\0""AccX\0""AccY\0""AccZ\0""Hdg\0 ""VSpd\0""ASpd\0""dTE\0 " TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0 ""A2-\0 " TR_A3_A4_MIN "Alt-\0""Alt+\0""Rpm+\0""T1+\0 ""T2+\0 ""Spd+\0""Dst+\0" TR_ASPD_MAX "Cell-""Cels-""Vfas-""Curr+""Powr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0 ""Time\0" + #define TR_VTELEMCHNS "---\0 ""Batt\0" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Tmr1\0""Tmr2\0" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0 ""Rpm\0 ""Fuel\0""T1\0 ""T2\0 ""Spd\0 ""Dist\0""GAlt\0""Cell\0""Cells""Vfas\0""Curr\0""Cnsp\0""Powr\0""AccX\0""AccY\0""AccZ\0""Hdg\0 ""VSpd\0""ASpd\0""dTE\0 " TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0 ""A2-\0 " TR_A3_A4_MIN "Alt-\0""Alt+\0""Rpm+\0""T1+\0 ""T2+\0 ""Spd+\0""Dst+\0" TR_ASPD_MAX "Cell-""Cels-""Vfas-""Curr+""Powr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0 ""Time\0" #else - #define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" + #define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" #endif #define LENGTH_UNIT_IMP "ft\0" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 7aebfceb5..407aaa5d0 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -281,13 +281,15 @@ #define LEN_VTELEMCHNS TR("\004", "\005") #if defined(CPUARM) - #define TR_TELEM_RESERVE TR("[--]", "[---]") + #define TR_TELEM_RESERVE TR("[--]", "[---]") + #define TR_TELEM_TIME TR("Time", "Time\0") #define TR_SWR TR("SWR\0", "SWR\0 ") #define TR_RX_BATT TR("RxBt", "RxBat") #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #else #define TR_TELEM_RESERVE + #define TR_TELEM_TIME #define TR_SWR #define TR_RX_BATT #define TR_A3_A4 @@ -297,9 +299,9 @@ #define TR_ASPD_MAX TR("ASp+", "ASpd+") #if LCD_W >= 212 - #define TR_VTELEMCHNS "---\0 ""Batt\0""Tmr1\0""Tmr2\0" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0 ""Rpm\0 ""Fuel\0""T1\0 ""T2\0 ""Spd\0 ""Dist\0""GAlt\0""Cell\0""Cells""Vfas\0""Curr\0""Cnsp\0""Powr\0""AccX\0""AccY\0""AccZ\0""Hdg\0 ""VSpd\0""ASpd\0""dTE\0 " TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0 ""A2-\0 " TR_A3_A4_MIN "Alt-\0""Alt+\0""Rpm+\0""T1+\0 ""T2+\0 ""Spd+\0""Dst+\0" TR_ASPD_MAX "Cell-""Cels-""Vfas-""Curr+""Powr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0 ""Time\0" + #define TR_VTELEMCHNS "---\0 ""Batt\0" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Tmr1\0""Tmr2\0" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0 ""Rpm\0 ""Fuel\0""T1\0 ""T2\0 ""Spd\0 ""Dist\0""GAlt\0""Cell\0""Cells""Vfas\0""Curr\0""Cnsp\0""Powr\0""AccX\0""AccY\0""AccZ\0""Hdg\0 ""VSpd\0""ASpd\0""dTE\0 " TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0 ""A2-\0 " TR_A3_A4_MIN "Alt-\0""Alt+\0""Rpm+\0""T1+\0 ""T2+\0 ""Spd+\0""Dst+\0" TR_ASPD_MAX "Cell-""Cels-""Vfas-""Curr+""Powr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0 ""Time\0" #else - #define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" + #define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" #endif #define LENGTH_UNIT_IMP "ft\0" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 2a7d40e1e..ccef208d5 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -282,12 +282,14 @@ #if defined(CPUARM) #define TR_TELEM_RESERVE "[--]" + #define TR_TELEM_TIME "Time" #define TR_SWR "SWR\0" #define TR_RX_BATT "RxBt" #define TR_A3_A4 "A3\0 ""A4\0 " #define TR_A3_A4_MIN "A3-\0""A4-\0" #else #define TR_TELEM_RESERVE + #define TR_TELEM_TIME #define TR_SWR #define TR_RX_BATT #define TR_A3_A4 @@ -296,7 +298,7 @@ #define TR_ASPD_MAX "ASp+" -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Hora" +#define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Hora" #define LENGTH_UNIT_IMP "ft\0" #define SPEED_UNIT_IMP "mph" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index e79743fb0..8760491c0 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -282,12 +282,14 @@ #if defined(CPUARM) #define TR_TELEM_RESERVE "[--]" + #define TR_TELEM_TIME "Time" #define TR_SWR "SWR\0" #define TR_RX_BATT "RxBt" #define TR_A3_A4 "A3\0 ""A4\0 " #define TR_A3_A4_MIN "A3-\0""A4-\0" #else #define TR_TELEM_RESERVE + #define TR_TELEM_TIME #define TR_SWR #define TR_RX_BATT #define TR_A3_A4 @@ -296,7 +298,7 @@ #define TR_ASPD_MAX "ASp+" -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" #define LENGTH_UNIT_IMP "ft\0" #define SPEED_UNIT_IMP "mph" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index fc414f78b..f35f472eb 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -278,16 +278,18 @@ #define LEN_FUNCSOUNDS TR("\004", "\006") #define TR_FUNCSOUNDS TR("Bp1\0""Bp2\0""Bp3\0""Wrn1""Wrn2""Chee""Rata""Tick""Sirn""Ring""SciF""Robt""Chrp""Tada""Crck""Alrm", "Beep1 ""Beep2 ""Beep3 ""Warn1 ""Warn2 ""Cheep ""Ratata""Tick ""Siren ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""AlmClk") -#define LEN_VTELEMCHNS "\004" +#define LEN_VTELEMCHNS TR("\004", "\005") #if defined(CPUARM) - #define TR_TELEM_RESERVE "[--]" - #define TR_SWR "SWR\0" - #define TR_RX_BATT "RxBt" - #define TR_A3_A4 "A3\0 ""A4\0 " - #define TR_A3_A4_MIN "A3-\0""A4-\0" + #define TR_TELEM_RESERVE TR("[--]", "[---]") + #define TR_TELEM_TIME TR("Heur", "Heure") + #define TR_SWR TR("SWR\0", "SWR\0 ") + #define TR_RX_BATT TR("RxBt", "RxBat") + #define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ") + #define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ") #else #define TR_TELEM_RESERVE + #define TR_TELEM_TIME #define TR_SWR #define TR_RX_BATT #define TR_A3_A4 @@ -296,7 +298,11 @@ #define TR_ASPD_MAX "ViA+" -#define TR_VTELEMCHNS "---\0""Batt""Chr1""Chr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vit\0""Dist""AltG""Elem""Velm""Vfas""Cour""Cnsm""Puis""AccX""AccY""AccZ""Cap\0""VitV""VitA""dET\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vit+""Dst+" TR_ASPD_MAX "Elm-""Els-""Vfs-""Cur+""Pui+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Tmps" +#if LCD_W >= 212 + #define TR_VTELEMCHNS "---\0 ""Batt\0" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Chr1\0""Chr2\0" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0 ""Rpm\0 ""Carbu""T1\0 ""T2\0 ""Vit\0 ""Dist\0""AltG""Elem\0""Velm\0""Vfas\0""Cour\0""Consm""Puiss""AccX\0""AccY\0""AccZ\0""Cap\0 ""VitV\0""VitA\0""dET\0 " TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0 ""A2-\0 " TR_A3_A4_MIN "Alt-\0""Alt+\0""Rpm+\0""T1+\0 ""T2+\0 ""Vit+\0""Dst+\0" TR_ASPD_MAX "Elem-""Els-\0""Vfas-""Curr+""Puis+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Accel""Temps" +#else + #define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Chr1""Chr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vit\0""Dist""AltG""Elem""Velm""Vfas""Cour""Cnsm""Puis""AccX""AccY""AccZ""Cap\0""VitV""VitA""dET\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vit+""Dst+" TR_ASPD_MAX "Elm-""Els-""Vfs-""Cur+""Pui+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Tmps" +#endif #define LENGTH_UNIT_IMP "ft\0" #define SPEED_UNIT_IMP "mph" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 52851102a..3c6aa3606 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -282,12 +282,14 @@ #if defined(CPUARM) #define TR_TELEM_RESERVE "[--]" + #define TR_TELEM_TIME "Time" #define TR_SWR "SWR\0" #define TR_RX_BATT "RxBt" #define TR_A3_A4 "A3\0 ""A4\0 " #define TR_A3_A4_MIN "A3-\0""A4-\0" #else #define TR_TELEM_RESERVE + #define TR_TELEM_TIME #define TR_SWR #define TR_RX_BATT #define TR_A3_A4 @@ -296,7 +298,7 @@ #define TR_ASPD_MAX "ASp+" -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vel\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsm""Powr""AccX""AccY""AccZ""Dir\0""VelV""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Carb""T1\0 ""T2\0 ""Vel\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsm""Powr""AccX""AccY""AccZ""Dir\0""VelV""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" #define LENGTH_UNIT_IMP "ft\0" #define SPEED_UNIT_IMP "mph" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index d6187ef9e..0f2d7d4f9 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -282,12 +282,14 @@ #if defined(CPUARM) #define TR_TELEM_RESERVE "[--]" + #define TR_TELEM_TIME "Time" #define TR_SWR "SWR\0" #define TR_RX_BATT "RxBt" #define TR_A3_A4 "A3\0 ""A4\0 " #define TR_A3_A4_MIN "A3-\0""A4-\0" #else #define TR_TELEM_RESERVE + #define TR_TELEM_TIME #define TR_SWR #define TR_RX_BATT #define TR_A3_A4 @@ -296,7 +298,7 @@ #define TR_ASPD_MAX "ASp+" -#define TR_VTELEMCHNS "---\0""Bat\0""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Wys\0""Rpm\0""Pali""T1\0 ""T2\0 ""Spd\0""Dyst""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Moc\0""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Wys-""Wys+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Moc+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" +#define TR_VTELEMCHNS "---\0""Bat\0" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Wys\0""Rpm\0""Pali""T1\0 ""T2\0 ""Spd\0""Dyst""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Moc\0""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Wys-""Wys+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Moc+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" #define LENGTH_UNIT_IMP "ft\0" #define SPEED_UNIT_IMP "mph" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index ed7e02950..c0e14452c 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -282,12 +282,14 @@ #if defined(CPUARM) #define TR_TELEM_RESERVE "[--]" + #define TR_TELEM_TIME "Time" #define TR_SWR "SWR\0" #define TR_RX_BATT "RxBt" #define TR_A3_A4 "A3\0 ""A4\0 " #define TR_A3_A4_MIN "A3-\0""A4-\0" #else #define TR_TELEM_RESERVE + #define TR_TELEM_TIME #define TR_SWR #define TR_RX_BATT #define TR_A3_A4 @@ -296,7 +298,7 @@ #define TR_ASPD_MAX "ASp+" -#define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VVel""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Hora" +#define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VVel""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Vel+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Hora" #define LENGTH_UNIT_IMP "ft\0" #define SPEED_UNIT_IMP "mph" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index bfa971b40..1f68577ce 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -282,12 +282,14 @@ #if defined(CPUARM) #define TR_TELEM_RESERVE "[--]" + #define TR_TELEM_TIME "Time" #define TR_SWR "SWR\0" #define TR_RX_BATT "RxBt" #define TR_A3_A4 "A3\0 ""A4\0 " #define TR_A3_A4_MIN "A3-\0""A4-\0" #else #define TR_TELEM_RESERVE + #define TR_TELEM_TIME #define TR_SWR #define TR_RX_BATT #define TR_A3_A4 @@ -297,9 +299,9 @@ #define TR_ASPD_MAX TR("ASp+", "ASpd+") #if LCD_W >= 212 - #define TR_VTELEMCHNS "---\0 ""Batt\0""Tmr1\0""Tmr2\0" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0 ""Rpm\0 ""Fuel\0""T1\0 ""T2\0 ""Spd\0 ""Dist\0""GAlt\0""Cell\0""Cells""Vfas\0""Curr\0""Cnsp\0""Powr\0""AccX\0""AccY\0""AccZ\0""Hdg\0 ""VSpd\0""ASpd\0""dTE\0 " TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0 ""A2-\0 " TR_A3_A4_MIN "Alt-\0""Alt+\0""Rpm+\0""T1+\0 ""T2+\0 ""Spd+\0""Dst+\0" TR_ASPD_MAX "Cell-""Cels-""Vfas-""Curr+""Powr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0 ""Time\0" + #define TR_VTELEMCHNS "---\0 ""Batt\0" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Tmr1\0""Tmr2\0" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0 ""Rpm\0 ""Fuel\0""T1\0 ""T2\0 ""Spd\0 ""Dist\0""GAlt\0""Cell\0""Cells""Vfas\0""Curr\0""Cnsp\0""Powr\0""AccX\0""AccY\0""AccZ\0""Hdg\0 ""VSpd\0""ASpd\0""dTE\0 " TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0 ""A2-\0 " TR_A3_A4_MIN "Alt-\0""Alt+\0""Rpm+\0""T1+\0 ""T2+\0 ""Spd+\0""Dst+\0" TR_ASPD_MAX "Cell-""Cels-""Vfas-""Curr+""Powr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0 ""Time\0" #else - #define TR_VTELEMCHNS "---\0""Batt""Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" + #define TR_VTELEMCHNS "---\0""Batt" TR_TELEM_TIME TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Tmr1""Tmr2" TR_SWR "Tx\0 ""Rx\0 " TR_RX_BATT "A1\0 ""A2\0 " TR_A3_A4 "Alt\0""Rpm\0""Fuel""T1\0 ""T2\0 ""Spd\0""Dist""GAlt""Cell""Cels""Vfas""Curr""Cnsp""Powr""AccX""AccY""AccZ""Hdg\0""VSpd""ASpd""dTE\0" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "A1-\0""A2-\0" TR_A3_A4_MIN "Alt-""Alt+""Rpm+""T1+\0""T2+\0""Spd+""Dst+" TR_ASPD_MAX "Cel-""Cls-""Vfs-""Cur+""Pwr+" TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE TR_TELEM_RESERVE "Acc\0""Time" #endif #define LENGTH_UNIT_IMP "ft\0" diff --git a/radio/src/translations/tts_cz.cpp b/radio/src/translations/tts_cz.cpp index 1fcfd0e82..9440c725b 100644 --- a/radio/src/translations/tts_cz.cpp +++ b/radio/src/translations/tts_cz.cpp @@ -219,7 +219,7 @@ I18N_PLAY_FUNCTION(cz, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } -I18N_PLAY_FUNCTION(cz, playDuration, int16_t seconds) +I18N_PLAY_FUNCTION(cz, playDuration, int16_t seconds PLAY_DURATION_ATT) { if (seconds < 0) { PUSH_NUMBER_PROMPT(CZ_PROMPT_MINUS); @@ -228,7 +228,7 @@ I18N_PLAY_FUNCTION(cz, playDuration, int16_t seconds) uint8_t tmp = seconds / 3600; seconds %= 3600; - if (tmp > 0) { + if (tmp > 0 || IS_PLAY_TIME()) { PLAY_NUMBER(tmp, UNIT_HOURS+1, ZENSKY); } diff --git a/radio/src/translations/tts_de.cpp b/radio/src/translations/tts_de.cpp index 067de6cca..bb7e88f08 100644 --- a/radio/src/translations/tts_de.cpp +++ b/radio/src/translations/tts_de.cpp @@ -168,7 +168,7 @@ I18N_PLAY_FUNCTION(de, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } -I18N_PLAY_FUNCTION(de, playDuration, int16_t seconds) +I18N_PLAY_FUNCTION(de, playDuration, int16_t seconds PLAY_DURATION_ATT) { if (seconds < 0) { PUSH_NUMBER_PROMPT(DE_PROMPT_MINUS); @@ -178,7 +178,7 @@ I18N_PLAY_FUNCTION(de, playDuration, int16_t seconds) uint8_t ore = 0; uint8_t tmp = seconds / 3600; seconds %= 3600; - if (tmp > 0) { + if (tmp > 0 || IS_PLAY_TIME()) { PLAY_NUMBER(tmp, 0, 0); PUSH_NUMBER_PROMPT(DE_PROMPT_UHR); } diff --git a/radio/src/translations/tts_en.cpp b/radio/src/translations/tts_en.cpp index 5810b4b3e..8d30536d7 100644 --- a/radio/src/translations/tts_en.cpp +++ b/radio/src/translations/tts_en.cpp @@ -151,7 +151,7 @@ I18N_PLAY_FUNCTION(en, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } -I18N_PLAY_FUNCTION(en, playDuration, int16_t seconds) +I18N_PLAY_FUNCTION(en, playDuration, int16_t seconds PLAY_DURATION_ATT) { if (seconds < 0) { PUSH_NUMBER_PROMPT(EN_PROMPT_MINUS); @@ -160,7 +160,7 @@ I18N_PLAY_FUNCTION(en, playDuration, int16_t seconds) uint8_t tmp = seconds / 3600; seconds %= 3600; - if (tmp > 0) { + if (tmp > 0 || IS_PLAY_TIME()) { PLAY_NUMBER(tmp, UNIT_HOURS+1 , 0); } diff --git a/radio/src/translations/tts_es.cpp b/radio/src/translations/tts_es.cpp index bc949c377..c0993e16d 100644 --- a/radio/src/translations/tts_es.cpp +++ b/radio/src/translations/tts_es.cpp @@ -190,7 +190,7 @@ I18N_PLAY_FUNCTION(es, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } -I18N_PLAY_FUNCTION(es, playDuration, int16_t seconds) +I18N_PLAY_FUNCTION(es, playDuration, int16_t seconds PLAY_DURATION_ATT) { if (seconds < 0) { PUSH_NUMBER_PROMPT(ES_PROMPT_MENO); @@ -200,12 +200,13 @@ I18N_PLAY_FUNCTION(es, playDuration, int16_t seconds) uint8_t ore = 0; uint8_t tmp = seconds / 3600; seconds %= 3600; - if (tmp > 0) { - ore=tmp; + if (tmp > 0 || IS_PLAY_TIME()) { + ore = tmp; if (tmp > 1) { PLAY_NUMBER(tmp, 0, 0); PUSH_NUMBER_PROMPT(ES_PROMPT_HORAS); - } else { + } + else { PUSH_NUMBER_PROMPT(ES_PROMPT_UNA); PUSH_NUMBER_PROMPT(ES_PROMPT_HORA); } diff --git a/radio/src/translations/tts_fr.cpp b/radio/src/translations/tts_fr.cpp index 4bcaa0723..31ede7b62 100644 --- a/radio/src/translations/tts_fr.cpp +++ b/radio/src/translations/tts_fr.cpp @@ -42,6 +42,8 @@ enum FrenchPrompts { FR_PROMPT_VIRGULE = 119, FR_PROMPT_ET = 120, FR_PROMPT_MOINS = 121, + FR_PROMPT_MINUIT = 122, + FR_PROMPT_MIDI = 123, FR_PROMPT_UNITS_BASE = 125, FR_PROMPT_VOLTS = FR_PROMPT_UNITS_BASE+UNIT_VOLTS, @@ -174,7 +176,7 @@ I18N_PLAY_FUNCTION(fr, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } -I18N_PLAY_FUNCTION(fr, playDuration, int16_t seconds) +I18N_PLAY_FUNCTION(fr, playDuration, int16_t seconds PLAY_DURATION_ATT) { if (seconds < 0) { PUSH_NUMBER_PROMPT(FR_PROMPT_MOINS); @@ -183,7 +185,13 @@ I18N_PLAY_FUNCTION(fr, playDuration, int16_t seconds) uint8_t tmp = seconds / 3600; seconds %= 3600; - if (tmp > 0) { + if (IS_PLAY_TIME() && tmp==0) { + PUSH_NUMBER_PROMPT(FR_PROMPT_MINUIT); + } + else if (IS_PLAY_TIME() && tmp==12) { + PUSH_NUMBER_PROMPT(FR_PROMPT_MIDI); + } + else if (tmp > 0) { PLAY_NUMBER(tmp, 0, FEMININ); PUSH_NUMBER_PROMPT(FR_PROMPT_HEURE); } @@ -191,10 +199,15 @@ I18N_PLAY_FUNCTION(fr, playDuration, int16_t seconds) tmp = seconds / 60; seconds %= 60; if (tmp > 0) { - PLAY_NUMBER(tmp, 0, FEMININ); - PUSH_NUMBER_PROMPT(FR_PROMPT_MINUTE); - if (seconds > 0) - PUSH_NUMBER_PROMPT(FR_PROMPT_ET); + if (IS_PLAY_TIME()) { + PLAY_NUMBER(tmp, 0, tmp==1 ? FEMININ : 0); + } + else { + PLAY_NUMBER(tmp, 0, FEMININ); + PUSH_NUMBER_PROMPT(FR_PROMPT_MINUTE); + if (seconds > 0) + PUSH_NUMBER_PROMPT(FR_PROMPT_ET); + } } if (seconds > 0) { diff --git a/radio/src/translations/tts_it.cpp b/radio/src/translations/tts_it.cpp index e729f4452..45630cdda 100644 --- a/radio/src/translations/tts_it.cpp +++ b/radio/src/translations/tts_it.cpp @@ -164,7 +164,7 @@ I18N_PLAY_FUNCTION(it, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } -I18N_PLAY_FUNCTION(it, playDuration, int16_t seconds) +I18N_PLAY_FUNCTION(it, playDuration, int16_t seconds PLAY_DURATION_ATT) { if (seconds < 0) { PUSH_NUMBER_PROMPT(IT_PROMPT_MENO); @@ -176,7 +176,7 @@ I18N_PLAY_FUNCTION(it, playDuration, int16_t seconds) seconds %= 3600; if (tmp > 0) { ore=tmp; - if (tmp > 1) { + if (tmp > 1 || IS_PLAY_TIME()) { PLAY_NUMBER(tmp, 0, 0); PUSH_NUMBER_PROMPT(IT_PROMPT_ORE); } else { diff --git a/radio/src/translations/tts_pl.cpp b/radio/src/translations/tts_pl.cpp index 9b0bef745..096e81e30 100644 --- a/radio/src/translations/tts_pl.cpp +++ b/radio/src/translations/tts_pl.cpp @@ -239,7 +239,7 @@ I18N_PLAY_FUNCTION(pl, playNumber, getvalue_t number, uint8_t unit, uint8_t att) // The whole funtion has to be changed -I18N_PLAY_FUNCTION(pl, playDuration, int16_t seconds) +I18N_PLAY_FUNCTION(pl, playDuration, int16_t seconds PLAY_DURATION_ATT) { if (seconds < 0) { PUSH_NUMBER_PROMPT(PL_PROMPT_MINUS); @@ -248,7 +248,7 @@ I18N_PLAY_FUNCTION(pl, playDuration, int16_t seconds) uint8_t tmp = seconds / 3600; seconds %= 3600; - if (tmp > 0) { + if (tmp > 0 || IS_PLAY_TIME()) { PLAY_NUMBER(tmp, UNIT_HOURS+1, ZENSKI); } diff --git a/radio/src/translations/tts_pt.cpp b/radio/src/translations/tts_pt.cpp index cee09ac7b..b3c4ce0bd 100644 --- a/radio/src/translations/tts_pt.cpp +++ b/radio/src/translations/tts_pt.cpp @@ -175,7 +175,7 @@ I18N_PLAY_FUNCTION(pt, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } -I18N_PLAY_FUNCTION(pt, playDuration, int16_t seconds) +I18N_PLAY_FUNCTION(pt, playDuration, int16_t seconds PLAY_DURATION_ATT) { if (seconds < 0) { PUSH_NUMBER_PROMPT(PT_PROMPT_MENOS); @@ -185,7 +185,7 @@ I18N_PLAY_FUNCTION(pt, playDuration, int16_t seconds) uint8_t ore = 0; uint8_t tmp = seconds / 3600; seconds %= 3600; - if (tmp > 0) { + if (tmp > 0 || IS_PLAY_TIME()) { ore=tmp; if (tmp > 2) { PLAY_NUMBER(tmp, 0, 0); diff --git a/radio/src/translations/tts_se.cpp b/radio/src/translations/tts_se.cpp index d8b029d62..df1f6e9f0 100644 --- a/radio/src/translations/tts_se.cpp +++ b/radio/src/translations/tts_se.cpp @@ -141,7 +141,7 @@ I18N_PLAY_FUNCTION(se, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } -I18N_PLAY_FUNCTION(se, playDuration, int16_t seconds) +I18N_PLAY_FUNCTION(se, playDuration, int16_t seconds PLAY_DURATION_ATT) { if (seconds < 0) { PUSH_NUMBER_PROMPT(SE_PROMPT_MINUS); @@ -150,7 +150,7 @@ I18N_PLAY_FUNCTION(se, playDuration, int16_t seconds) uint8_t tmp = seconds / 3600; seconds %= 3600; - if (tmp > 0) { + if (tmp > 0 || IS_PLAY_TIME()) { PLAY_NUMBER(tmp, UNIT_HOURS+1 , 0); } diff --git a/radio/src/translations/tts_sk.cpp b/radio/src/translations/tts_sk.cpp index 9dc3191c1..2b6951e3f 100644 --- a/radio/src/translations/tts_sk.cpp +++ b/radio/src/translations/tts_sk.cpp @@ -235,7 +235,7 @@ I18N_PLAY_FUNCTION(sk, playNumber, getvalue_t number, uint8_t unit, uint8_t att) } } -I18N_PLAY_FUNCTION(sk, playDuration, int16_t seconds) +I18N_PLAY_FUNCTION(sk, playDuration, int16_t seconds PLAY_DURATION_ATT) { if (seconds < 0) { PUSH_NUMBER_PROMPT(SK_PROMPT_MINUS); @@ -244,7 +244,7 @@ I18N_PLAY_FUNCTION(sk, playDuration, int16_t seconds) uint8_t tmp = seconds / 3600; seconds %= 3600; - if (tmp > 0) { + if (tmp > 0 || IS_PLAY_TIME()) { PLAY_NUMBER(tmp, UNIT_HOURS+1, ZENSKY); } diff --git a/radio/util/tts.py b/radio/util/tts.py index fa44b0b93..74daffc05 100644 --- a/radio/util/tts.py +++ b/radio/util/tts.py @@ -242,7 +242,7 @@ def ttsFr(): systemSounds.append((str(100*(i+1)), filename(PROMPT_SYSTEM_BASE+100+i))) for i, s in enumerate(["une", "onze", "vingt et une", "trente et une", "quarante et une", "cinquante et une", "soixante et une", "soixante et onze", "quatre vingt une"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+110+i))) - for i, s in enumerate(["virgule", "et", "moins"]): + for i, s in enumerate(["virgule", "et", "moins", "minuit", "midi"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+119+i))) for i, s in enumerate(["volts", u"ampères", u"mètres seconde", "", "kilomètre heure", u"mètres", u"degrés", "pourcents", u"milli ampères", u"milli ampères / heure", "watt", "db", "pieds", "miles par heure", "heure", "minute", "seconde", "tours par minute", "g"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+125+i)))