[Taranis] New board revision. Betas are PCBREV=REV4a, production are PCB=REV4
[Taranis] FrSky module alarms removed [Taranis/sky9x] Multilanguages (only en, fr, it) [sky9x] Compilation error fixed
This commit is contained in:
+78
-76
@@ -23,79 +23,79 @@
|
||||
#include "../opentx.h"
|
||||
|
||||
enum FrenchPrompts {
|
||||
PROMPT_NUMBERS_BASE = 0,
|
||||
PROMPT_ZERO = PROMPT_NUMBERS_BASE+0,
|
||||
PROMPT_CENT = PROMPT_NUMBERS_BASE+100,
|
||||
PROMPT_DEUX_CENT = PROMPT_CENT+1,
|
||||
PROMPT_MILLE = PROMPT_CENT+9,
|
||||
FR_PROMPT_NUMBERS_BASE = 0,
|
||||
FR_PROMPT_ZERO = FR_PROMPT_NUMBERS_BASE+0,
|
||||
FR_PROMPT_CENT = FR_PROMPT_NUMBERS_BASE+100,
|
||||
FR_PROMPT_DEUX_CENT = FR_PROMPT_CENT+1,
|
||||
FR_PROMPT_MILLE = FR_PROMPT_CENT+9,
|
||||
|
||||
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,
|
||||
FR_PROMPT_UNE = 110,
|
||||
FR_PROMPT_ONZE,
|
||||
FR_PROMPT_VINGT_ET_UNE,
|
||||
FR_PROMPT_TRENTE_ET_UNE,
|
||||
FR_PROMPT_QUARANTE_ET_UNE,
|
||||
FR_PROMPT_CINQUANTE_ET_UNE,
|
||||
FR_PROMPT_SOIXANTE_ET_UNE,
|
||||
FR_PROMPT_SOIXANTE_ET_ONZE,
|
||||
FR_PROMPT_QUATRE_VINGT_UNE,
|
||||
|
||||
PROMPT_VIRGULE = 119,
|
||||
PROMPT_ET = 120,
|
||||
PROMPT_MOINS = 121,
|
||||
FR_PROMPT_VIRGULE = 119,
|
||||
FR_PROMPT_ET = 120,
|
||||
FR_PROMPT_MOINS = 121,
|
||||
|
||||
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,
|
||||
PROMPT_SPARE1 = PROMPT_UNITS_BASE+UNIT_RAW,
|
||||
PROMPT_KMH = PROMPT_UNITS_BASE+UNIT_KMH,
|
||||
PROMPT_METERS = PROMPT_UNITS_BASE+UNIT_METERS,
|
||||
PROMPT_DEGREES = PROMPT_UNITS_BASE+UNIT_DEGREES,
|
||||
PROMPT_PERCENT = PROMPT_UNITS_BASE+UNIT_PERCENT,
|
||||
PROMPT_MILLIAMPS = PROMPT_UNITS_BASE+UNIT_MILLIAMPS,
|
||||
PROMPT_MAH = PROMPT_UNITS_BASE+UNIT_MAH,
|
||||
PROMPT_WATTS = PROMPT_UNITS_BASE+UNIT_WATTS,
|
||||
PROMPT_FEET = PROMPT_UNITS_BASE+UNIT_FEET,
|
||||
PROMPT_KTS = PROMPT_UNITS_BASE+UNIT_KTS,
|
||||
PROMPT_HEURE = PROMPT_UNITS_BASE+UNIT_HOURS,
|
||||
PROMPT_MINUTE = PROMPT_UNITS_BASE+UNIT_MINUTES,
|
||||
PROMPT_SECONDE = PROMPT_UNITS_BASE+UNIT_SECONDS,
|
||||
FR_PROMPT_UNITS_BASE = 125,
|
||||
FR_PROMPT_VOLTS = FR_PROMPT_UNITS_BASE+UNIT_VOLTS,
|
||||
FR_PROMPT_AMPS = FR_PROMPT_UNITS_BASE+UNIT_AMPS,
|
||||
FR_PROMPT_METERS_PER_SECOND = FR_PROMPT_UNITS_BASE+UNIT_METERS_PER_SECOND,
|
||||
FR_PROMPT_SPARE1 = FR_PROMPT_UNITS_BASE+UNIT_RAW,
|
||||
FR_PROMPT_KMH = FR_PROMPT_UNITS_BASE+UNIT_KMH,
|
||||
FR_PROMPT_METERS = FR_PROMPT_UNITS_BASE+UNIT_METERS,
|
||||
FR_PROMPT_DEGREES = FR_PROMPT_UNITS_BASE+UNIT_DEGREES,
|
||||
FR_PROMPT_PERCENT = FR_PROMPT_UNITS_BASE+UNIT_PERCENT,
|
||||
FR_PROMPT_MILLIAMPS = FR_PROMPT_UNITS_BASE+UNIT_MILLIAMPS,
|
||||
FR_PROMPT_MAH = FR_PROMPT_UNITS_BASE+UNIT_MAH,
|
||||
FR_PROMPT_WATTS = FR_PROMPT_UNITS_BASE+UNIT_WATTS,
|
||||
FR_PROMPT_FEET = FR_PROMPT_UNITS_BASE+UNIT_FEET,
|
||||
FR_PROMPT_KTS = FR_PROMPT_UNITS_BASE+UNIT_KTS,
|
||||
FR_PROMPT_HEURE = FR_PROMPT_UNITS_BASE+UNIT_HOURS,
|
||||
FR_PROMPT_MINUTE = FR_PROMPT_UNITS_BASE+UNIT_MINUTES,
|
||||
FR_PROMPT_SECONDE = FR_PROMPT_UNITS_BASE+UNIT_SECONDS,
|
||||
|
||||
PROMPT_LABELS_BASE = 145,
|
||||
PROMPT_TIMER1 = PROMPT_LABELS_BASE+TELEM_TM1,
|
||||
PROMPT_TIMER2 = PROMPT_LABELS_BASE+TELEM_TM2,
|
||||
PROMPT_RSSI_TX = PROMPT_LABELS_BASE+TELEM_RSSI_TX,
|
||||
PROMPT_RSSI_RX = PROMPT_LABELS_BASE+TELEM_RSSI_RX,
|
||||
PROMPT_A1 = PROMPT_LABELS_BASE+TELEM_A1,
|
||||
PROMPT_A2 = PROMPT_LABELS_BASE+TELEM_A2,
|
||||
PROMPT_ALTITUDE = PROMPT_LABELS_BASE+TELEM_ALT,
|
||||
PROMPT_RPM = PROMPT_LABELS_BASE+TELEM_RPM,
|
||||
PROMPT_ESSENCE = PROMPT_LABELS_BASE+TELEM_FUEL,
|
||||
PROMPT_T1 = PROMPT_LABELS_BASE+TELEM_T1,
|
||||
PROMPT_T2 = PROMPT_LABELS_BASE+TELEM_T2,
|
||||
PROMPT_VITESSE = PROMPT_LABELS_BASE+TELEM_SPEED,
|
||||
PROMPT_DISTANCE = PROMPT_LABELS_BASE+TELEM_DIST,
|
||||
PROMPT_GPSALTITUDE = PROMPT_LABELS_BASE+TELEM_GPSALT,
|
||||
PROMPT_ELEMENTS_LIPO = PROMPT_LABELS_BASE+TELEM_CELL,
|
||||
PROMPT_TOTAL_LIPO = PROMPT_LABELS_BASE+TELEM_CELLS_SUM,
|
||||
PROMPT_VFAS = PROMPT_LABELS_BASE+TELEM_VFAS,
|
||||
PROMPT_COURANT = PROMPT_LABELS_BASE+TELEM_CURRENT,
|
||||
PROMPT_CONSOMMATION = PROMPT_LABELS_BASE+TELEM_CONSUMPTION,
|
||||
PROMPT_PUISSANCE = PROMPT_LABELS_BASE+TELEM_POWER,
|
||||
PROMPT_ACCELx = PROMPT_LABELS_BASE+TELEM_ACCx,
|
||||
PROMPT_ACCELy = PROMPT_LABELS_BASE+TELEM_ACCy,
|
||||
PROMPT_ACCELz = PROMPT_LABELS_BASE+TELEM_ACCz,
|
||||
PROMPT_HDG = PROMPT_LABELS_BASE+TELEM_HDG,
|
||||
PROMPT_VARIO = PROMPT_LABELS_BASE+TELEM_VSPD,
|
||||
FR_PROMPT_LABELS_BASE = 145,
|
||||
FR_PROMPT_TIMER1 = FR_PROMPT_LABELS_BASE+TELEM_TM1,
|
||||
FR_PROMPT_TIMER2 = FR_PROMPT_LABELS_BASE+TELEM_TM2,
|
||||
FR_PROMPT_RSSI_TX = FR_PROMPT_LABELS_BASE+TELEM_RSSI_TX,
|
||||
FR_PROMPT_RSSI_RX = FR_PROMPT_LABELS_BASE+TELEM_RSSI_RX,
|
||||
FR_PROMPT_A1 = FR_PROMPT_LABELS_BASE+TELEM_A1,
|
||||
FR_PROMPT_A2 = FR_PROMPT_LABELS_BASE+TELEM_A2,
|
||||
FR_PROMPT_ALTITUDE = FR_PROMPT_LABELS_BASE+TELEM_ALT,
|
||||
FR_PROMPT_RPM = FR_PROMPT_LABELS_BASE+TELEM_RPM,
|
||||
FR_PROMPT_ESSENCE = FR_PROMPT_LABELS_BASE+TELEM_FUEL,
|
||||
FR_PROMPT_T1 = FR_PROMPT_LABELS_BASE+TELEM_T1,
|
||||
FR_PROMPT_T2 = FR_PROMPT_LABELS_BASE+TELEM_T2,
|
||||
FR_PROMPT_VITESSE = FR_PROMPT_LABELS_BASE+TELEM_SPEED,
|
||||
FR_PROMPT_DISTANCE = FR_PROMPT_LABELS_BASE+TELEM_DIST,
|
||||
FR_PROMPT_GPSALTITUDE = FR_PROMPT_LABELS_BASE+TELEM_GPSALT,
|
||||
FR_PROMPT_ELEMENTS_LIPO = FR_PROMPT_LABELS_BASE+TELEM_CELL,
|
||||
FR_PROMPT_TOTAL_LIPO = FR_PROMPT_LABELS_BASE+TELEM_CELLS_SUM,
|
||||
FR_PROMPT_VFAS = FR_PROMPT_LABELS_BASE+TELEM_VFAS,
|
||||
FR_PROMPT_COURANT = FR_PROMPT_LABELS_BASE+TELEM_CURRENT,
|
||||
FR_PROMPT_CONSOMMATION = FR_PROMPT_LABELS_BASE+TELEM_CONSUMPTION,
|
||||
FR_PROMPT_PUISSANCE = FR_PROMPT_LABELS_BASE+TELEM_POWER,
|
||||
FR_PROMPT_ACCELx = FR_PROMPT_LABELS_BASE+TELEM_ACCx,
|
||||
FR_PROMPT_ACCELy = FR_PROMPT_LABELS_BASE+TELEM_ACCy,
|
||||
FR_PROMPT_ACCELz = FR_PROMPT_LABELS_BASE+TELEM_ACCz,
|
||||
FR_PROMPT_HDG = FR_PROMPT_LABELS_BASE+TELEM_HDG,
|
||||
FR_PROMPT_VARIO = FR_PROMPT_LABELS_BASE+TELEM_VSPD,
|
||||
|
||||
PROMPT_VIRGULE_BASE = 180, //,0 - ,9
|
||||
FR_PROMPT_VIRGULE_BASE = 180, //,0 - ,9
|
||||
};
|
||||
|
||||
#if defined(VOICE)
|
||||
|
||||
#define FEMININ 0x80
|
||||
|
||||
PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
I18N_PLAY_FUNCTION(fr, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
{
|
||||
/* if digit >= 1000000000:
|
||||
temp_digit, digit = divmod(digit, 1000000000)
|
||||
@@ -108,7 +108,7 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
*/
|
||||
|
||||
if (number < 0) {
|
||||
PUSH_NUMBER_PROMPT(PROMPT_MOINS);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MOINS);
|
||||
number = -number;
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
div_t qr = div(number, 10);
|
||||
if (qr.rem) {
|
||||
PLAY_NUMBER(qr.quot, 0, 0);
|
||||
PUSH_NUMBER_PROMPT(PROMPT_VIRGULE_BASE + qr.rem);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_VIRGULE_BASE + qr.rem);
|
||||
number = -1;
|
||||
}
|
||||
else {
|
||||
@@ -140,35 +140,35 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
if (number >= 1000) {
|
||||
if (number >= 2000)
|
||||
PLAY_NUMBER(number / 1000, 0, 0);
|
||||
PUSH_NUMBER_PROMPT(PROMPT_MILLE);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MILLE);
|
||||
number %= 1000;
|
||||
if (number == 0)
|
||||
number = -1;
|
||||
}
|
||||
if (number >= 100) {
|
||||
if (number >= 200)
|
||||
PUSH_NUMBER_PROMPT(PROMPT_ZERO + number/100);
|
||||
PUSH_NUMBER_PROMPT(PROMPT_CENT);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_ZERO + number/100);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_CENT);
|
||||
number %= 100;
|
||||
if (number == 0)
|
||||
number = -1;
|
||||
}
|
||||
if (((number % 10) == 1) && number < 90 && (att & FEMININ)) {
|
||||
PUSH_NUMBER_PROMPT(PROMPT_UNE+(number/10));
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_UNE+(number/10));
|
||||
}
|
||||
else if (number >= 0) {
|
||||
PUSH_NUMBER_PROMPT(PROMPT_ZERO+number);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_ZERO+number);
|
||||
}
|
||||
|
||||
if (unit) {
|
||||
PUSH_NUMBER_PROMPT(PROMPT_UNITS_BASE+unit-1);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_UNITS_BASE+unit-1);
|
||||
}
|
||||
}
|
||||
|
||||
PLAY_FUNCTION(playDuration, int16_t seconds)
|
||||
I18N_PLAY_FUNCTION(fr, playDuration, int16_t seconds)
|
||||
{
|
||||
if (seconds < 0) {
|
||||
PUSH_NUMBER_PROMPT(PROMPT_MOINS);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MOINS);
|
||||
seconds = -seconds;
|
||||
}
|
||||
|
||||
@@ -176,22 +176,24 @@ PLAY_FUNCTION(playDuration, int16_t seconds)
|
||||
seconds %= 3600;
|
||||
if (tmp > 0) {
|
||||
PLAY_NUMBER(tmp, 0, FEMININ);
|
||||
PUSH_NUMBER_PROMPT(PROMPT_HEURE);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_HEURE);
|
||||
}
|
||||
|
||||
tmp = seconds / 60;
|
||||
seconds %= 60;
|
||||
if (tmp > 0) {
|
||||
PLAY_NUMBER(tmp, 0, FEMININ);
|
||||
PUSH_NUMBER_PROMPT(PROMPT_MINUTE);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_MINUTE);
|
||||
if (seconds > 0)
|
||||
PUSH_NUMBER_PROMPT(PROMPT_ET);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_ET);
|
||||
}
|
||||
|
||||
if (seconds > 0) {
|
||||
PLAY_NUMBER(seconds, 0, FEMININ);
|
||||
PUSH_NUMBER_PROMPT(PROMPT_SECONDE);
|
||||
PUSH_NUMBER_PROMPT(FR_PROMPT_SECONDE);
|
||||
}
|
||||
}
|
||||
|
||||
LANGUAGE_PACK_DECLARE(fr, "french");
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user