[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:
bsongis@gmail.com
2013-05-10 20:24:25 +00:00
parent 4b7c16fc9f
commit 6217e1331a
18 changed files with 331 additions and 223 deletions
+43 -41
View File
@@ -37,45 +37,45 @@
#include "../opentx.h"
enum EnglishPrompts {
PROMPT_NUMBERS_BASE = 0,
PROMPT_ZERO = PROMPT_NUMBERS_BASE+0, //02-99
PROMPT_HUNDRED = PROMPT_NUMBERS_BASE+100, //100,200 .. 900
PROMPT_THOUSAND = PROMPT_NUMBERS_BASE+109, //1000
PROMPT_AND = PROMPT_NUMBERS_BASE+110,
PROMPT_MINUS = PROMPT_NUMBERS_BASE+111,
PROMPT_POINT = PROMPT_NUMBERS_BASE+112,
EN_PROMPT_NUMBERS_BASE = 0,
EN_PROMPT_ZERO = EN_PROMPT_NUMBERS_BASE+0, //02-99
EN_PROMPT_HUNDRED = EN_PROMPT_NUMBERS_BASE+100, //100,200 .. 900
EN_PROMPT_THOUSAND = EN_PROMPT_NUMBERS_BASE+109, //1000
EN_PROMPT_AND = EN_PROMPT_NUMBERS_BASE+110,
EN_PROMPT_MINUS = EN_PROMPT_NUMBERS_BASE+111,
EN_PROMPT_POINT = EN_PROMPT_NUMBERS_BASE+112,
PROMPT_UNITS_BASE = 115,
PROMPT_VOLTS = PROMPT_UNITS_BASE+UNIT_VOLTS, //(one)volt,(two)volts
PROMPT_AMPS = PROMPT_UNITS_BASE+(UNIT_AMPS*2),
PROMPT_METERS_PER_SECOND = PROMPT_UNITS_BASE+(UNIT_METERS_PER_SECOND*2),
PROMPT_SPARE1 = PROMPT_UNITS_BASE+(UNIT_RAW*2),
PROMPT_KMH = PROMPT_UNITS_BASE+(UNIT_KMH*2),
PROMPT_METERS = PROMPT_UNITS_BASE+(UNIT_METERS*2),
PROMPT_DEGREES = PROMPT_UNITS_BASE+(UNIT_DEGREES*2),
PROMPT_PERCENT = PROMPT_UNITS_BASE+(UNIT_PERCENT*2),
PROMPT_MILLIAMPS = PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*2),
PROMPT_MAH = PROMPT_UNITS_BASE+(UNIT_MAH*2),
PROMPT_WATTS = PROMPT_UNITS_BASE+(UNIT_WATTS*2),
PROMPT_DB = PROMPT_UNITS_BASE+(UNIT_DBM*2),
PROMPT_FEET = PROMPT_UNITS_BASE+(UNIT_FEET*2),
PROMPT_KTS = PROMPT_UNITS_BASE+(UNIT_KTS*2),
PROMPT_HOURS = PROMPT_UNITS_BASE+(UNIT_HOURS*2),
PROMPT_MINUTES = PROMPT_UNITS_BASE+(UNIT_MINUTES*2),
PROMPT_SECONDS = PROMPT_UNITS_BASE+(UNIT_SECONDS*2),
PROMPT_RPMS = PROMPT_UNITS_BASE+(UNIT_RPMS*2),
PROMPT_G = PROMPT_UNITS_BASE+(UNIT_G*2),
PROMPT_POINT_BASE = 160, //.0 - .9
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_KMH*2),
EN_PROMPT_METERS = EN_PROMPT_UNITS_BASE+(UNIT_METERS*2),
EN_PROMPT_DEGREES = EN_PROMPT_UNITS_BASE+(UNIT_DEGREES*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_KTS = 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),
EN_PROMPT_POINT_BASE = 160, //.0 - .9
};
#if defined(VOICE)
#if defined(CPUARM)
#define PUSH_UNIT_PROMPT(p, u) pushUnitPrompt((p), (u), id)
#define PUSH_UNIT_PROMPT(p, u) pushUnitPrompt((p), (u), id)
#else
#define PUSH_UNIT_PROMPT(p, u) pushUnitPrompt((p), (u))
#define PUSH_UNIT_PROMPT(p, u) pushUnitPrompt((p), (u))
#endif
PLAY_FUNCTION(pushUnitPrompt, int16_t number, uint8_t unitprompt)
@@ -86,10 +86,10 @@ PLAY_FUNCTION(pushUnitPrompt, int16_t number, uint8_t unitprompt)
PUSH_NUMBER_PROMPT(unitprompt+1);
}
PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att)
I18N_PLAY_FUNCTION(en, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
{
if (number < 0) {
PUSH_NUMBER_PROMPT(PROMPT_MINUS);
PUSH_NUMBER_PROMPT(EN_PROMPT_MINUS);
number = -number;
}
@@ -110,7 +110,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_POINT_BASE + qr.rem);
PUSH_NUMBER_PROMPT(EN_PROMPT_POINT_BASE + qr.rem);
number = -1;
}
else {
@@ -122,30 +122,30 @@ PLAY_FUNCTION(playNumber, getvalue_t number, uint8_t unit, uint8_t att)
if (number >= 1000) {
PLAY_NUMBER(number / 1000, 0, 0);
PUSH_NUMBER_PROMPT(PROMPT_THOUSAND);
PUSH_NUMBER_PROMPT(EN_PROMPT_THOUSAND);
number %= 1000;
if (number == 0)
number = -1;
}
if (number >= 100) {
PUSH_NUMBER_PROMPT(PROMPT_HUNDRED + (number/100)-1);
PUSH_NUMBER_PROMPT(EN_PROMPT_HUNDRED + (number/100)-1);
number %= 100;
if (number == 0)
number = -1;
}
if (number >= 0) {
PUSH_NUMBER_PROMPT(PROMPT_ZERO + number);
PUSH_NUMBER_PROMPT(EN_PROMPT_ZERO + number);
}
if (unit) {
PUSH_UNIT_PROMPT(tmp, (PROMPT_UNITS_BASE+((unit-1)*2)));
PUSH_UNIT_PROMPT(tmp, (+((unit-1)*2)));
}
}
PLAY_FUNCTION(playDuration, int16_t seconds)
I18N_PLAY_FUNCTION(en, playDuration, int16_t seconds)
{
if (seconds < 0) {
PUSH_NUMBER_PROMPT(PROMPT_MINUS);
PUSH_NUMBER_PROMPT(EN_PROMPT_MINUS);
seconds = -seconds;
}
@@ -160,7 +160,7 @@ PLAY_FUNCTION(playDuration, int16_t seconds)
if (tmp > 0) {
PLAY_NUMBER(tmp, UNIT_MINUTES+1 , 0);
if (seconds > 0)
PUSH_NUMBER_PROMPT(PROMPT_AND);
PUSH_NUMBER_PROMPT(EN_PROMPT_AND);
}
if (seconds > 0) {
@@ -168,4 +168,6 @@ PLAY_FUNCTION(playDuration, int16_t seconds)
}
}
LANGUAGE_PACK_DECLARE_DEFAULT(en, "english");
#endif