Merge pull request #653 from opentx/mhotar/layout_alignments_Issue#584

Mhotar/layout alignments issue#584
This commit is contained in:
Bertrand Songis
2014-02-04 11:51:48 -08:00
19 changed files with 103 additions and 129 deletions
+5 -7
View File
@@ -1037,19 +1037,17 @@ void menuGeneralVersion(uint8_t event)
{ {
SIMPLE_MENU(STR_MENUVERSION, menuTabDiag, e_Vers, 1); SIMPLE_MENU(STR_MENUVERSION, menuTabDiag, e_Vers, 1);
lcd_putsLeft(2*FH, stamp1); lcd_putsLeft(2*FH, vers_stamp);
lcd_putsLeft(3*FH, stamp2);
lcd_putsLeft(4*FH, stamp3);
#if defined(PCBSKY9X) && !defined(REVA) #if defined(PCBSKY9X) && !defined(REVA)
if (Coproc_valid == 1) { if (Coproc_valid == 1) {
lcd_putsLeft(5*FH, PSTR("CoPr:")); lcd_putsLeft(6*FH, PSTR("CoPr:"));
lcd_outdez8(10*FW, 5*FH, Coproc_read); lcd_outdez8(10*FW, 6*FH, Coproc_read);
} }
else { else {
lcd_putsLeft(5*FH, PSTR("CoPr: ---")); lcd_putsLeft(6*FH, PSTR("CoPr: ---"));
} }
#endif #endif
lcd_putsLeft(7*FH, eeprom_stamp);
} }
void displayKeyState(uint8_t x, uint8_t y, EnumKeys key) void displayKeyState(uint8_t x, uint8_t y, EnumKeys key)
+19 -8
View File
@@ -2271,7 +2271,8 @@ void DrawCurve(uint8_t offset=0)
uint8_t i = 0; uint8_t i = 0;
do { do {
point_t point = getPoint(i++); point_t point = getPoint(i);
i++;
if (point.x == 0) break; if (point.x == 0) break;
lcd_filled_rect(point.x-offset, point.y-1, 3, 3, SOLID, FORCE); // do markup square lcd_filled_rect(point.x-offset, point.y-1, 3, 3, SOLID, FORCE); // do markup square
} while(1); } while(1);
@@ -3239,7 +3240,7 @@ static uint8_t s_copySrcCh;
#define MIX_LINE_SRC_POS 4*FW-1 #define MIX_LINE_SRC_POS 4*FW-1
#if LCD_W >= 212 #if LCD_W >= 212
#define EXPO_LINE_WEIGHT_POS 8*FW+1 #define EXPO_LINE_WEIGHT_POS 8*FW+3
#define EXPO_LINE_SRC_POS 9*FW-2 #define EXPO_LINE_SRC_POS 9*FW-2
#define EXPO_LINE_CURVE_POS 12*FW+4 #define EXPO_LINE_CURVE_POS 12*FW+4
#define EXPO_LINE_SWITCH_POS 17*FW-1 #define EXPO_LINE_SWITCH_POS 17*FW-1
@@ -3251,7 +3252,7 @@ static uint8_t s_copySrcCh;
#define MIX_LINE_SWITCH_POS 16*FW+1 #define MIX_LINE_SWITCH_POS 16*FW+1
#define MIX_LINE_DELAY_POS 19*FW+2 #define MIX_LINE_DELAY_POS 19*FW+2
#elif defined(CPUARM) #elif defined(CPUARM)
#define EXPO_LINE_WEIGHT_POS 7*FW-1 #define EXPO_LINE_WEIGHT_POS 7*FW+1
#define EXPO_LINE_EXPO_POS 10*FW+5 #define EXPO_LINE_EXPO_POS 10*FW+5
#define EXPO_LINE_SWITCH_POS 11*FW+2 #define EXPO_LINE_SWITCH_POS 11*FW+2
#define EXPO_LINE_SIDE_POS 14*FW+2 #define EXPO_LINE_SIDE_POS 14*FW+2
@@ -3263,7 +3264,7 @@ static uint8_t s_copySrcCh;
#define MIX_LINE_SWITCH_POS 16*FW #define MIX_LINE_SWITCH_POS 16*FW
#define MIX_LINE_DELAY_POS 19*FW+7 #define MIX_LINE_DELAY_POS 19*FW+7
#else #else
#define EXPO_LINE_WEIGHT_POS 7*FW-1 #define EXPO_LINE_WEIGHT_POS 7*FW+1
#define EXPO_LINE_EXPO_POS 11*FW #define EXPO_LINE_EXPO_POS 11*FW
#define EXPO_LINE_SWITCH_POS 11*FW+4 #define EXPO_LINE_SWITCH_POS 11*FW+4
#if MAX_PHASES == 6 #if MAX_PHASES == 6
@@ -4735,12 +4736,9 @@ void menuModelCustomFunctions(uint8_t event)
uint8_t func_displayed; uint8_t func_displayed;
if (CFN_FUNC(sd) < FUNC_TRAINER) { if (CFN_FUNC(sd) < FUNC_TRAINER) {
func_displayed = 0; func_displayed = 0;
putsChn(MODEL_CUSTOM_FUNC_2ND_COLUMN+6*FW, y, CFN_CH_NUMBER(sd)+1, attr);
} }
else if (CFN_FUNC(sd) <= FUNC_TRAINER + NUM_STICKS) { else if (CFN_FUNC(sd) <= FUNC_TRAINER + NUM_STICKS) {
func_displayed = 1; func_displayed = 1;
if (CFN_FUNC(sd) != FUNC_TRAINER)
putsMixerSource(MODEL_CUSTOM_FUNC_2ND_COLUMN+7*FW, y, MIXSRC_Rud+CFN_FUNC(sd)-FUNC_TRAINER-1, attr);
} }
#if defined(DEBUG) #if defined(DEBUG)
else if (CFN_FUNC(sd) == FUNC_TEST) { else if (CFN_FUNC(sd) == FUNC_TEST) {
@@ -4754,13 +4752,26 @@ void menuModelCustomFunctions(uint8_t event)
#if defined(GVARS) #if defined(GVARS)
else if (CFN_FUNC(sd) >= FUNC_ADJUST_GV1) { else if (CFN_FUNC(sd) >= FUNC_ADJUST_GV1) {
func_displayed = FUNC_ADJUST_GV1 - FUNC_TRAINER - NUM_STICKS + 1; func_displayed = FUNC_ADJUST_GV1 - FUNC_TRAINER - NUM_STICKS + 1;
putsStrIdx(MODEL_CUSTOM_FUNC_2ND_COLUMN+7*FW, y, STR_GV, CFN_FUNC(sd)-FUNC_ADJUST_GV1+1, attr);
} }
#endif #endif
else { else {
func_displayed = 2 + CFN_FUNC(sd) - FUNC_TRAINER - NUM_STICKS - 1; func_displayed = 2 + CFN_FUNC(sd) - FUNC_TRAINER - NUM_STICKS - 1;
} }
lcd_putsiAtt(MODEL_CUSTOM_FUNC_2ND_COLUMN, y, STR_VFSWFUNC, func_displayed, attr); lcd_putsiAtt(MODEL_CUSTOM_FUNC_2ND_COLUMN, y, STR_VFSWFUNC, func_displayed, attr);
if (CFN_FUNC(sd) < FUNC_TRAINER) {
putsChn(lcdNextPos, y, CFN_CH_NUMBER(sd)+1, attr);
}
else if (CFN_FUNC(sd) <= FUNC_TRAINER + NUM_STICKS) {
if (CFN_FUNC(sd) != FUNC_TRAINER)
putsMixerSource(lcdNextPos, y, MIXSRC_Rud+CFN_FUNC(sd)-FUNC_TRAINER-1, attr);
}
#if defined(GVARS)
else if (CFN_FUNC(sd) >= FUNC_ADJUST_GV1) {
putsStrIdx(lcdNextPos, y, STR_GV, CFN_FUNC(sd)-FUNC_ADJUST_GV1+1, attr);
}
#endif
if (active) { if (active) {
#if defined(CPUARM) #if defined(CPUARM)
CHECK_INCDEC_MODELVAR_ZERO(event, CFN_FUNC(sd), FUNC_MAX-1); CHECK_INCDEC_MODELVAR_ZERO(event, CFN_FUNC(sd), FUNC_MAX-1);
+1 -3
View File
@@ -57,15 +57,13 @@ void menuStatisticsView(uint8_t event)
return; return;
} }
lcd_puts( 1*FW, FH*1, STR_TM1TM2); lcd_puts( 1*FW, FH*0, STR_TOTTM1TM2THRTHP);
putsTime( 5*FW+5*FWNUM+1, FH*1, timersStates[0].val, 0, 0); putsTime( 5*FW+5*FWNUM+1, FH*1, timersStates[0].val, 0, 0);
putsTime( 12*FW+5*FWNUM+1, FH*1, timersStates[1].val, 0, 0); putsTime( 12*FW+5*FWNUM+1, FH*1, timersStates[1].val, 0, 0);
lcd_puts( 1*FW, FH*2, STR_THRTHP);
putsTime( 5*FW+5*FWNUM+1, FH*2, s_timeCumThr, 0, 0); putsTime( 5*FW+5*FWNUM+1, FH*2, s_timeCumThr, 0, 0);
putsTime( 12*FW+5*FWNUM+1, FH*2, s_timeCum16ThrP/16, 0, 0); putsTime( 12*FW+5*FWNUM+1, FH*2, s_timeCum16ThrP/16, 0, 0);
lcd_puts( 17*FW, FH*0, STR_TOT);
putsTime( 12*FW+5*FWNUM+1, FH*0, s_timeCumTot, 0, 0); putsTime( 12*FW+5*FWNUM+1, FH*0, s_timeCumTot, 0, 0);
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
+10 -13
View File
@@ -64,7 +64,8 @@ void lcd_img(xcoord_t x, uint8_t y, const pm_uchar * img, uint8_t idx, LcdFlags
for (uint8_t yb = 0; yb < hb; yb++) { for (uint8_t yb = 0; yb < hb; yb++) {
uint8_t *p = &displayBuf[ (y / 8 + yb) * LCD_W + x ]; uint8_t *p = &displayBuf[ (y / 8 + yb) * LCD_W + x ];
for (xcoord_t i=0; i<w; i++){ for (xcoord_t i=0; i<w; i++){
uint8_t b = pgm_read_byte(q++); uint8_t b = pgm_read_byte(q);
q++;
ASSERT_IN_DISPLAY(p); ASSERT_IN_DISPLAY(p);
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
uint8_t val = inv ? ~b : b; uint8_t val = inv ? ~b : b;
@@ -199,7 +200,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags)
b1 = ~b1; b1 = ~b1;
b2 = ~b2; b2 = ~b2;
} }
uint8_t ym8 = (y & 0x07); const uint8_t ym8 = (y & 0x07);
if (&p[LCD_W+1] < DISPLAY_END) { if (&p[LCD_W+1] < DISPLAY_END) {
LCD_BYTE_FILTER(p, ~(0xff << ym8), b1 << ym8); LCD_BYTE_FILTER(p, ~(0xff << ym8), b1 << ym8);
uint8_t *r = p + LCD_W; uint8_t *r = p + LCD_W;
@@ -220,7 +221,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags)
} }
else if (flags & SMLSIZE) { else if (flags & SMLSIZE) {
q = (c < 0xC0) ? &font_4x6[(c-0x20)*5] : &font_4x6_extra[(c-0xC0)*5]; q = (c < 0xC0) ? &font_4x6[(c-0x20)*5] : &font_4x6_extra[(c-0xC0)*5];
uint8_t ym8 = (y & 0x07); const uint8_t ym8 = (y & 0x07);
for (int8_t i=0; i<=6; i++) { for (int8_t i=0; i<=6; i++) {
uint8_t b = 0; uint8_t b = 0;
if (!i) { if (!i) {
@@ -247,7 +248,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags)
} }
else if (flags & TINSIZE) { else if (flags & TINSIZE) {
q = &font_3x5[((uint16_t)c-0x2D)*3]; q = &font_3x5[((uint16_t)c-0x2D)*3];
uint8_t ym8 = (y & 0x07); const uint8_t ym8 = (y & 0x07);
for (int8_t i=0; i<=4; i++) { for (int8_t i=0; i<=4; i++) {
uint8_t b = 0; uint8_t b = 0;
if (!i) { if (!i) {
@@ -273,7 +274,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags)
} }
#endif #endif
else { else {
uint8_t ym8 = (y & 0x07); const uint8_t ym8 = (y & 0x07);
#if defined(BOLD_FONT) && defined(CPUM64) && !defined(EXTSTD) #if defined(BOLD_FONT) && defined(CPUM64) && !defined(EXTSTD)
uint8_t bb = 0; uint8_t bb = 0;
if (inv) bb = 0xff; if (inv) bb = 0xff;
@@ -360,11 +361,9 @@ void lcd_putsiAtt(xcoord_t x, uint8_t y,const pm_char * s,uint8_t idx, LcdFlags
void lcd_putsnAtt(xcoord_t x, uint8_t y, const pm_char * s, uint8_t len, LcdFlags mode) void lcd_putsnAtt(xcoord_t x, uint8_t y, const pm_char * s, uint8_t len, LcdFlags mode)
{ {
#if defined(CPUARM)
xcoord_t orig_x = x; xcoord_t orig_x = x;
#endif
bool setx = false; bool setx = false;
while(len!=0) { while(len--) {
unsigned char c; unsigned char c;
switch (mode & (BSS+ZCHAR)) { switch (mode & (BSS+ZCHAR)) {
case BSS: case BSS:
@@ -394,21 +393,20 @@ void lcd_putsnAtt(xcoord_t x, uint8_t y, const pm_char * s, uint8_t len, LcdFlag
else if (c == 0x1F) { //X-coord prefix else if (c == 0x1F) { //X-coord prefix
setx = true; setx = true;
} }
#if defined(CPUARM)
else if (c == 0x1E) { //NEWLINE else if (c == 0x1E) { //NEWLINE
x = orig_x; x = orig_x;
y += FH; y += FH;
#if defined(CPUARM)
if (mode & DBLSIZE) y += FH; if (mode & DBLSIZE) y += FH;
else if (mode & MIDSIZE) y += 4; else if (mode & MIDSIZE) y += 4;
else if (mode & SMLSIZE) y--; else if (mode & SMLSIZE) y--;
#endif
if (y >= LCD_H) break; if (y >= LCD_H) break;
} }
#endif
else { else {
x += (c*FW/2); //EXTENDED SPACE x += (c*FW/2); //EXTENDED SPACE
} }
s++; s++;
len--;
} }
lcdLastPos = x; lcdLastPos = x;
lcdNextPos = x; lcdNextPos = x;
@@ -671,7 +669,7 @@ void lcd_hlineStip(xcoord_t x, uint8_t y, xcoord_t w, uint8_t pat, LcdFlags att)
uint8_t *p = &displayBuf[ y / 8 * LCD_W + x ]; uint8_t *p = &displayBuf[ y / 8 * LCD_W + x ];
uint8_t msk = BITMASK(y%8); uint8_t msk = BITMASK(y%8);
while(w) { while(w--) {
if(pat&1) { if(pat&1) {
lcd_mask(p, msk, att); lcd_mask(p, msk, att);
pat = (pat >> 1) | 0x80; pat = (pat >> 1) | 0x80;
@@ -679,7 +677,6 @@ void lcd_hlineStip(xcoord_t x, uint8_t y, xcoord_t w, uint8_t pat, LcdFlags att)
else { else {
pat = pat >> 1; pat = pat >> 1;
} }
w--;
p++; p++;
} }
} }
+3 -5
View File
@@ -4884,8 +4884,9 @@ void stack_paint()
p = (unsigned char *) STACKPTR ; p = (unsigned char *) STACKPTR ;
q = &__bss_end ; q = &__bss_end ;
p -= 2 ; p -= 2 ;
while ( p > q ) while ( p > q ) {
*p-- = 0x55 ; *p-- = 0x55 ;
}
} }
uint16_t stack_free() uint16_t stack_free()
@@ -4893,10 +4894,7 @@ uint16_t stack_free()
unsigned char *p ; unsigned char *p ;
p = &__bss_end + 1 ; p = &__bss_end + 1 ;
while ( *p == 0x55 ) while ( *p++ == 0x55 );
{
p+= 1 ;
}
return p - &__bss_end ; return p - &__bss_end ;
} }
#endif #endif
+1 -4
View File
@@ -1192,10 +1192,7 @@ extern int8_t calcRESXto100(int16_t x);
#define TMR_VAROFS 5 #define TMR_VAROFS 5
extern const char stamp1[]; extern const char vers_stamp[];
extern const char stamp2[];
extern const char stamp3[];
extern const char eeprom_stamp[];
extern uint8_t g_vbat100mV; extern uint8_t g_vbat100mV;
#define g_blinkTmr10ms (*(uint8_t*)&g_tmr10ms) #define g_blinkTmr10ms (*(uint8_t*)&g_tmr10ms)
+2 -5
View File
@@ -40,11 +40,8 @@
#define STR2(s) #s #define STR2(s) #s
#define DEFNUMSTR(s) STR2(s) #define DEFNUMSTR(s) STR2(s)
const pm_char stamp1[] PROGMEM = "VERS: " VERS_STR;
const pm_char stamp2[] PROGMEM = "DATE: " DATE_STR;
const pm_char stamp3[] PROGMEM = "TIME: " TIME_STR;
#if defined(PCBSTD) #if defined(PCBSTD)
const pm_char eeprom_stamp[] PROGMEM = "EEPR: " DEFNUMSTR(EEPROM_VER) "-" DEFNUMSTR(EEPROM_VARIANT); const pm_char vers_stamp[] PROGMEM = "VERS\037\033: " VERS_STR "\036DATE\037\033: " DATE_STR"\036TIME\037\033: " TIME_STR "\036EEPR\037\033: " DEFNUMSTR(EEPROM_VER) "-" DEFNUMSTR(EEPROM_VARIANT);
#else #else
const pm_char eeprom_stamp[] PROGMEM = "EEPR: " DEFNUMSTR(EEPROM_VER); const pm_char vers_stamp[] PROGMEM = "VERS\037\033: " VERS_STR "\036DATE\037\033: " DATE_STR"\036TIME\037\033: " TIME_STR "\036EEPR\037\033: " DEFNUMSTR(EEPROM_VER);
#endif #endif
+1 -3
View File
@@ -245,9 +245,7 @@ const pm_char STR_RXBATT[] PROGMEM = TR_RXBATT;
const pm_char STR_TX[] PROGMEM = TR_TXnRX; const pm_char STR_TX[] PROGMEM = TR_TXnRX;
const pm_char STR_ACCEL[] PROGMEM = TR_ACCEL; const pm_char STR_ACCEL[] PROGMEM = TR_ACCEL;
const pm_char STR_NODATA[] PROGMEM = TR_NODATA; const pm_char STR_NODATA[] PROGMEM = TR_NODATA;
const pm_char STR_TM1TM2[] PROGMEM = TR_TM1TM2; const pm_char STR_TOTTM1TM2THRTHP[] PROGMEM = TR_TOTTM1TM2THRTHP;
const pm_char STR_THRTHP[] PROGMEM = TR_THRTHP;
const pm_char STR_TOT[] PROGMEM = TR_TOT;
const pm_char STR_TMR1LATMAXUS[] PROGMEM = TR_TMR1LATMAXUS; const pm_char STR_TMR1LATMAXUS[] PROGMEM = TR_TMR1LATMAXUS;
const pm_char STR_TMR1LATMINUS[] PROGMEM = TR_TMR1LATMINUS; const pm_char STR_TMR1LATMINUS[] PROGMEM = TR_TMR1LATMINUS;
const pm_char STR_TMR1JITTERUS[] PROGMEM = TR_TMR1JITTERUS; const pm_char STR_TMR1JITTERUS[] PROGMEM = TR_TMR1JITTERUS;
+1 -3
View File
@@ -399,9 +399,7 @@ extern const pm_char STR_TX[];
#define STR_RX (STR_TX+OFS_RX) #define STR_RX (STR_TX+OFS_RX)
extern const pm_char STR_ACCEL[]; extern const pm_char STR_ACCEL[];
extern const pm_char STR_NODATA[]; extern const pm_char STR_NODATA[];
extern const pm_char STR_TM1TM2[]; extern const pm_char STR_TOTTM1TM2THRTHP[];
extern const pm_char STR_THRTHP[];
extern const pm_char STR_TOT[];
extern const pm_char STR_TMR1LATMAXUS[]; extern const pm_char STR_TMR1LATMAXUS[];
extern const pm_char STR_TMR1LATMINUS[]; extern const pm_char STR_TMR1LATMINUS[];
extern const pm_char STR_TMR1JITTERUS[]; extern const pm_char STR_TMR1JITTERUS[];
+6 -8
View File
@@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu"" Exit"" Dolů""Nhoru""Vprvo""Vlevo", " Menu"" Exit""Enter"" Page"" Plus""Mínus") #define TR_VKEYS TR("Menu\0""Exit\0""Dolů\0""Nhoru""Vprvo""Vlevo", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Mínus")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@@ -494,17 +494,15 @@
#define TR_CAL "Kal." #define TR_CAL "Kal."
#define TR_VTRIM "Trim- +" #define TR_VTRIM "Trim- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\007" TR_ENTER " = START" #define TR_MENUTOSTART CENTER "\010" TR_ENTER " = START"
#define TR_SETMIDPOINT TR(CENTER "\001Nastav páky na střed", CENTER "\002Nastav páky na střed") #define TR_SETMIDPOINT TR(CENTER "\003Nastav páky na střed", CENTER "\004Nastav páky na střed")
#define TR_MOVESTICKSPOTS TR(CENTER "\004Hýbej pákami/poty", "\007Hýbej pákami i potenciometry") #define TR_MOVESTICKSPOTS TR(CENTER "\005Hýbej pákami/poty", "\010Hýbej pákami i potenciometry")
#define TR_RXBATT "Rx Bat.:" #define TR_RXBATT "Rx Bat.:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "NO DATA" #define TR_NODATA CENTER "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
+7 -9
View File
@@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu"" Exit"" Down"" Up""Right"" Left", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define TR_VKEYS TR("Menu\0""Exit\0""Down\0""Up\0 ""Right""Left\0", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "DGa""DGb" //Digitalgeber a und b = Drehgeber #define TR_VRENCODERS "DGa""DGb" //Digitalgeber a und b = Drehgeber
@@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER"\010[EXIT]" #define TR_POPUPS TR_ENTER"\010[EXIT]"
#define OFS_EXIT sizeof(TR_ENTER) #define OFS_EXIT sizeof(TR_ENTER)
#define TR_MENUWHENDONE CENTER"\006"TR_ENTER" > Weiter" #define TR_MENUWHENDONE CENTER"\010"TR_ENTER" > Weiter"
#define TR_FREE "frei" #define TR_FREE "frei"
#define TR_DELETEMODEL "Modell l\203schen?" #define TR_DELETEMODEL "Modell l\203schen?"
#define TR_COPYINGMODEL "Kopiere Modell" #define TR_COPYINGMODEL "Kopiere Modell"
@@ -494,17 +494,15 @@
#define TR_CAL "Kal." #define TR_CAL "Kal."
#define TR_VTRIM "Trim- +" #define TR_VTRIM "Trim- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER"\006"TR_ENTER" zum Start" #define TR_MENUTOSTART CENTER"\007"TR_ENTER" zum Start"
#define TR_SETMIDPOINT CENTER"Sticks+Potis auf Mitte" #define TR_SETMIDPOINT CENTER"\002Sticks+Potis auf Mitte"
#define TR_MOVESTICKSPOTS CENTER"Sticks+Potis bewegen" #define TR_MOVESTICKSPOTS CENTER"\003Sticks+Potis bewegen"
#define TR_RXBATT "Rx Batt:" #define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER"NO DATA" #define TR_NODATA CENTER"NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
+5 -7
View File
@@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0" #define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu"" Exit"" Down"" Up""Right"" Left", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define TR_VKEYS TR("Menu\0""Exit\0""Down\0""Up\0 ""Right""Left\0", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@@ -494,17 +494,15 @@
#define TR_CAL "Cal" #define TR_CAL "Cal"
#define TR_VTRIM "Trim- +" #define TR_VTRIM "Trim- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\006" TR_ENTER " TO START" #define TR_MENUTOSTART CENTER "\010" TR_ENTER " TO START"
#define TR_SETMIDPOINT TR(CENTER "\003SET STICKS MIDPOINT",CENTER "\003CENTER STICKS/SLIDERS") #define TR_SETMIDPOINT TR(CENTER "\004SET STICKS MIDPOINT",CENTER "\004CENTER STICKS/SLIDERS")
#define TR_MOVESTICKSPOTS CENTER "\006MOVE STICKS/POTS" #define TR_MOVESTICKSPOTS CENTER "\006MOVE STICKS/POTS"
#define TR_RXBATT "Rx Batt:" #define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "NO DATA" #define TR_NODATA CENTER "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
+7 -9
View File
@@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0" #define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu""Salir""Abajo""Arrib""Dcha.""Izqd.", " Menu""Salir""Enter""Pgna.""Mas ""Menos") #define TR_VKEYS TR("Menu\0""Salir""Abajo""Arrib""Dcha.""Izqd.", "Menu\0""Salir""Enter""Pgna.""Mas\0 ""Menos")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER "\010[SALIR]" #define TR_POPUPS TR_ENTER "\010[SALIR]"
#define OFS_EXIT sizeof(TR_ENTER) #define OFS_EXIT sizeof(TR_ENTER)
#define TR_MENUWHENDONE CENTER "\006" TR_ENTER "AL ACABAR " #define TR_MENUWHENDONE CENTER "\007" TR_ENTER " AL ACABAR "
#define TR_FREE "libre" #define TR_FREE "libre"
#define TR_DELETEMODEL "BORRAR MODELO" #define TR_DELETEMODEL "BORRAR MODELO"
#define TR_COPYINGMODEL "Copiando modelo.." #define TR_COPYINGMODEL "Copiando modelo.."
@@ -494,17 +494,15 @@
#define TR_CAL "Cal" #define TR_CAL "Cal"
#define TR_VTRIM "Trim- +" #define TR_VTRIM "Trim- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\006" TR_ENTER "EMPEZAR" #define TR_MENUTOSTART CENTER "\010" TR_ENTER " EMPEZAR"
#define TR_SETMIDPOINT CENTER "\003STICKS AL CENTRO" #define TR_SETMIDPOINT TR(CENTER "\007STICKS AL CENTRO",CENTER "\010STICKS AL CENTRO")
#define TR_MOVESTICKSPOTS CENTER "\006MOVER STICKS/POTS" #define TR_MOVESTICKSPOTS CENTER "\006MOVER STICKS/POTS"
#define TR_RXBATT "Rx Batt:" #define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "SIN DATOS" #define TR_NODATA CENTER "SIN DATOS"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
@@ -527,7 +525,7 @@
#define TR_EEPROMLOWMEM "EEPROM mem.baja" #define TR_EEPROMLOWMEM "EEPROM mem.baja"
#define TR_ALERT "\016ALERTA" #define TR_ALERT "\016ALERTA"
#define TR_PRESSANYKEYTOSKIP "Pulsar tecla omitir" #define TR_PRESSANYKEYTOSKIP "Pulsar tecla omitir"
#define TR_THROTTLENOTIDLE "Aceler.Activado" #define TR_THROTTLENOTIDLE "Aceler. Activado"
#define TR_ALARMSDISABLED "Alarmas Desact." #define TR_ALARMSDISABLED "Alarmas Desact."
#define TR_PRESSANYKEY TR("\010Pulsa una Tecla", "Pulsa una Tecla") #define TR_PRESSANYKEY TR("\010Pulsa una Tecla", "Pulsa una Tecla")
#define TR_BADEEPROMDATA "Datos EEprom mal" #define TR_BADEEPROMDATA "Datos EEprom mal"
+3 -5
View File
@@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu"" Exit"" Bas"" Haut""Droit""Gauch", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define TR_VKEYS TR("Menu\0""Exit\0""Bas\0 ""Haut\0""Droit""Gauch", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@@ -502,9 +502,7 @@
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA "NO DATA" #define TR_NODATA "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
+7 -9
View File
@@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menù"" EXIT"" DN "" UP"" SX"" DX", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define TR_VKEYS TR("Menù\0""EXIT\0""DN\0 ""UP\0 ""SX\0 ""DX\0 ", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER"\004[EXIT]" #define TR_POPUPS TR_ENTER"\004[EXIT]"
#define OFS_EXIT sizeof(TR_ENTER) #define OFS_EXIT sizeof(TR_ENTER)
#define TR_MENUWHENDONE CENTER"\006"TR_ENTER" Conferma" #define TR_MENUWHENDONE CENTER"\007"TR_ENTER" Conferma"
#define TR_FREE " Disp." #define TR_FREE " Disp."
#define TR_DELETEMODEL "Elimina modello?" #define TR_DELETEMODEL "Elimina modello?"
#define TR_COPYINGMODEL "Copia in corso.." #define TR_COPYINGMODEL "Copia in corso.."
@@ -494,17 +494,15 @@
#define TR_CAL "Cal" #define TR_CAL "Cal"
#define TR_VTRIM "Trim- +" #define TR_VTRIM "Trim- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER"\006" TR_ENTER " per Cal." #define TR_MENUTOSTART CENTER"\011" TR_ENTER " per Cal."
#define TR_SETMIDPOINT CENTER"\011SETTA CENTRO" #define TR_SETMIDPOINT CENTER"\012SETTA CENTRO"
#define TR_MOVESTICKSPOTS CENTER"\006MUOVI STICK/POT" #define TR_MOVESTICKSPOTS CENTER"\010MUOVI STICK/POT"
#define TR_RXBATT "Rx Batt:" #define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER"DATI ASSENTI" #define TR_NODATA CENTER"DATI ASSENTI"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
+7 -9
View File
@@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu""Wyjdź""W dół""Wgórę""Wpraw""Wlewo", " Menu""Wyjdź""W dół""Wgórę""Wpraw""Wlewo") #define TR_VKEYS TR("Menu\0""Wyjdź""W dół""Wgórę""Wpraw""Wlewo", "Menu\0""Wyjdź""W dół""Wgórę""Wpraw""Wlewo")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER"\010[WYJŚCIE]" #define TR_POPUPS TR_ENTER"\010[WYJŚCIE]"
#define OFS_EXIT sizeof(TR_ENTER) #define OFS_EXIT sizeof(TR_ENTER)
#define TR_MENUWHENDONE CENTER "\007"TR_ENTER" > DALEJ" #define TR_MENUWHENDONE CENTER "\012"TR_ENTER" > DALEJ"
#define TR_FREE TR("wolne:", "wolne") #define TR_FREE TR("wolne:", "wolne")
#define TR_DELETEMODEL "SKASUJ MODEL" #define TR_DELETEMODEL "SKASUJ MODEL"
#define TR_COPYINGMODEL "Kopiuj model.." #define TR_COPYINGMODEL "Kopiuj model.."
@@ -494,17 +494,15 @@
#define TR_CAL "Kal." #define TR_CAL "Kal."
#define TR_VTRIM "Trymer- +" #define TR_VTRIM "Trymer- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\007" TR_ENTER " = START" #define TR_MENUTOSTART CENTER "\011" TR_ENTER " = START"
#define TR_SETMIDPOINT TR(CENTER "\001Ustaw drążki/potencj na środku","\005Ustaw drązki/potencj na środku") #define TR_SETMIDPOINT TR(CENTER "\002Ustaw drążki/potencj","\010Ustaw drązki/potencj na środku")
#define TR_MOVESTICKSPOTS TR(CENTER "\004Poruszaj drążkami i potenc.","\010Poruszaj drążkami i potenc.") #define TR_MOVESTICKSPOTS TR(CENTER "Poruszaj drążkami i pot","\014Poruszaj drążkami i potenc.")
#define TR_RXBATT "Rx Bat.:" #define TR_RXBATT "Rx Bat.:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "NO DATA" #define TR_NODATA CENTER "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+12) #define STR_US (STR_TMR1LATMAXUS+12)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
+6 -8
View File
@@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu"" Sair""Desce"" Sobe""Direi""Esqda", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define TR_VKEYS TR("Menu\0""Sair\0""Desce""Sobe\0""Direi""Esqda", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@@ -494,17 +494,15 @@
#define TR_CAL "Cal" #define TR_CAL "Cal"
#define TR_VTRIM "Trim- +" #define TR_VTRIM "Trim- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER"\006" TR_ENTER " INICIAR" #define TR_MENUTOSTART CENTER"\011" TR_ENTER " INICIAR"
#define TR_SETMIDPOINT CENTER"\005CENTRAR STICK/POT" #define TR_SETMIDPOINT TR(CENTER"\005CENTRAR STICK/POT",CENTER"\006CENTRAR STICK/POT")
#define TR_MOVESTICKSPOTS CENTER"\005MOVER STICKS/POTs" #define TR_MOVESTICKSPOTS TR(CENTER"\005MOVER STICKS/POTs",CENTER"\006MOVER STICKS/POTs")
#define TR_RXBATT "Rx Batt:" #define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER"SEM DADOS" #define TR_NODATA CENTER"SEM DADOS"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
+7 -9
View File
@@ -35,7 +35,7 @@
*/ */
/* Formatting octal codes available in TR_ strings: /* Formatting octal codes available in TR_ strings:
* \037\x -sets LCD x-coord (x value in octal) * \037\x -sets LCD x-coord (x value in octal)
* \036 -newline (ARM boards only) * \036 -newline
* \001 to \035 -extended spacing (value * FW/2) * \001 to \035 -extended spacing (value * FW/2)
* \0 -ends actual string * \0 -ends actual string
*/ */
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0" #define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#define LEN_VKEYS "\005" #define LEN_VKEYS "\005"
#define TR_VKEYS TR(" Menu"" Exit"" Ned"" Upp""Höger""Vänst", " Menu"" Exit""Enter"" Page"" Plus""Minus") #define TR_VKEYS TR("Menu\0""Exit\0""Ned\0 ""Upp\0 ""Höger""Vänst", "Menu\0""Exit\0""Enter""Page\0""Plus\0""Minus")
#define LEN_VRENCODERS "\003" #define LEN_VRENCODERS "\003"
#define TR_VRENCODERS "REa""REb" #define TR_VRENCODERS "REa""REb"
@@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER"\010[EXIT]" #define TR_POPUPS TR_ENTER"\010[EXIT]"
#define OFS_EXIT sizeof(TR_ENTER) #define OFS_EXIT sizeof(TR_ENTER)
#define TR_MENUWHENDONE CENTER "\006" TR_ENTER " Avslutar " #define TR_MENUWHENDONE CENTER "\011" TR_ENTER " Avslutar "
#define TR_FREE "kvar" #define TR_FREE "kvar"
#define TR_DELETEMODEL "Radera Modell" #define TR_DELETEMODEL "Radera Modell"
#define TR_COPYINGMODEL "Kopierar Modell " #define TR_COPYINGMODEL "Kopierar Modell "
@@ -494,17 +494,15 @@
#define TR_CAL "Kalib." #define TR_CAL "Kalib."
#define TR_VTRIM "Trim- +" #define TR_VTRIM "Trim- +"
#define TR_BG "BG:" #define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\006" TR_ENTER " Startar " #define TR_MENUTOSTART CENTER "\011" TR_ENTER " Startar "
#define TR_SETMIDPOINT CENTER "\010Centrera Allt" #define TR_SETMIDPOINT TR(CENTER "\012Centrera Allt",CENTER "\013Centrera Allt")
#define TR_MOVESTICKSPOTS CENTER "\004Rör Rattar/Spakar" #define TR_MOVESTICKSPOTS TR(CENTER "\005Rör Rattar/Spakar",CENTER "\006Rör Rattar/Spakar")
#define TR_RXBATT "Rx Batt:" #define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:" #define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4 #define OFS_RX 4
#define TR_ACCEL "Acc:" #define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "NO DATA" #define TR_NODATA CENTER "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2" #define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us" #define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13) #define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us" #define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"