piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'origin/next'

Browse Source
This commit is contained in:
Kjell Kernen
2014-02-04 22:38:03 +01:00
parent 0ecadadeb4 cfa5382969
commit cf6a56b64a
21 changed files with 168 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DONATIONS.txt
+1
View File
@@ -313,3 +313,4 @@ Bradley Murchie
Richard Fahie
James Kaufman
Henry Deucker
Christian Fuchs
companion/src/translations/companion_pl.ts
+64 -322
View File
@@ -9570,282 +9570,162 @@ Mode 4:
<message>
<location filename="../simulatordialog.ui" line="1266"/>
<source>LS1</source>
<translation type="unfinished">PL1</translation>
<translation>PL1</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1297"/>
<source>LS2</source>
<translation type="unfinished">PL2</translation>
<translation>PL2</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1328"/>
<source>LS3</source>
<translation type="unfinished">PL3</translation>
<translation>PL3</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1359"/>
<source>LS4</source>
<translation type="unfinished">PL4</translation>
<translation>PL4</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1390"/>
<source>LS5</source>
<translation type="unfinished">PL5</translation>
<translation>PL5</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1421"/>
<source>LS6</source>
<translation type="unfinished">PL6</translation>
<translation>PL6</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1452"/>
<source>LS7</source>
<translation type="unfinished">PL7</translation>
<translation>PL7</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1483"/>
<source>LS8</source>
<translation type="unfinished">PL8</translation>
<translation>PL8</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1514"/>
<source>LS9</source>
<translation type="unfinished">PL9</translation>
<translation>PL9</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1545"/>
<source>LSA</source>
<translation type="unfinished">PLA</translation>
<translation>PLA</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1576"/>
<source>LSB</source>
<translation type="unfinished">PLB</translation>
<translation>PLB</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1607"/>
<source>LSC</source>
<translation type="unfinished">PLC</translation>
<translation>PLC</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1638"/>
<source>LSD</source>
<translation type="unfinished">PLD</translation>
<translation>PLD</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1669"/>
<source>LSE</source>
<translation type="unfinished">PLE</translation>
<translation>PLE</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1700"/>
<source>LSF</source>
<translation type="unfinished">PLF</translation>
<translation>PLF</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1731"/>
<source>LSG</source>
<translation type="unfinished">PLG</translation>
<translation>PLG</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1762"/>
<source>LSH</source>
<translation type="unfinished">PLH</translation>
<translation>PLH</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1793"/>
<source>LSI</source>
<translation type="unfinished">PLI</translation>
<translation>PLI</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1824"/>
<source>LSJ</source>
<translation type="unfinished">PLJ</translation>
<translation>PLJ</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1855"/>
<source>LSK</source>
<translation type="unfinished">PLK</translation>
<translation>PLK</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1886"/>
<source>LSL</source>
<translation type="unfinished">PLL</translation>
<translation>PLL</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1917"/>
<source>LSM</source>
<translation type="unfinished">PLM,</translation>
<translation>PLM,</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1948"/>
<source>LSN</source>
<translation type="unfinished">PLN</translation>
<translation>PLN</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="1979"/>
<source>LSO</source>
<translation type="unfinished">PLO</translation>
<translation>PLO</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="2010"/>
<source>LSP</source>
<translation type="unfinished">PLP</translation>
<translation>PLP</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="2041"/>
<source>LSQ</source>
<translation type="unfinished">PLQ</translation>
<translation>PLQ</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="2072"/>
<source>LSR</source>
<translation type="unfinished">PLR</translation>
<translation>PLR</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="2103"/>
<source>LSS</source>
<translation type="unfinished">PLS</translation>
<translation>PLS</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="2134"/>
<source>LST</source>
<translation type="unfinished">PLT</translation>
<translation>PLT</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="2165"/>
<source>LSU</source>
<translation type="unfinished">PLU</translation>
<translation>PLU</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="2196"/>
<source>LSV</source>
<translation type="unfinished">PLV</translation>
<translation>PLV</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="2227"/>
<source>LSW</source>
<translation type="unfinished">PLW</translation>
</message>
<message>
<source>CS1</source>
<translation type="obsolete">PL1</translation>
</message>
<message>
<source>CS2</source>
<translation type="obsolete">PL2</translation>
</message>
<message>
<source>CS3</source>
<translation type="obsolete">PL3</translation>
</message>
<message>
<source>CS4</source>
<translation type="obsolete">PL4</translation>
</message>
<message>
<source>CS5</source>
<translation type="obsolete">PL5</translation>
</message>
<message>
<source>CS6</source>
<translation type="obsolete">PL6</translation>
</message>
<message>
<source>CS7</source>
<translation type="obsolete">PL7</translation>
</message>
<message>
<source>CS8</source>
<translation type="obsolete">PL8</translation>
</message>
<message>
<source>CS9</source>
<translation type="obsolete">PL9</translation>
</message>
<message>
<source>CSA</source>
<translation type="obsolete">PLA</translation>
</message>
<message>
<source>CSB</source>
<translation type="obsolete">PLB</translation>
</message>
<message>
<source>CSC</source>
<translation type="obsolete">PLC</translation>
</message>
<message>
<source>CSD</source>
<translation type="obsolete">PLD</translation>
</message>
<message>
<source>CSE</source>
<translation type="obsolete">PLE</translation>
</message>
<message>
<source>CSF</source>
<translation type="obsolete">PLF</translation>
</message>
<message>
<source>CSG</source>
<translation type="obsolete">PLG</translation>
</message>
<message>
<source>CSH</source>
<translation type="obsolete">PLH</translation>
</message>
<message>
<source>CSI</source>
<translation type="obsolete">PLI</translation>
</message>
<message>
<source>CSJ</source>
<translation type="obsolete">PLJ</translation>
</message>
<message>
<source>CSL</source>
<translation type="obsolete">PLL</translation>
</message>
<message>
<source>CSM</source>
<translation type="obsolete">PLM</translation>
</message>
<message>
<source>CSN</source>
<translation type="obsolete">PLN</translation>
</message>
<message>
<source>CSO</source>
<translation type="obsolete">PLO</translation>
</message>
<message>
<source>CSP</source>
<translation type="obsolete">PLP</translation>
</message>
<message>
<source>CSQ</source>
<translation type="obsolete">PLQ</translation>
</message>
<message>
<source>CSR</source>
<translation type="obsolete">PLR</translation>
</message>
<message>
<source>CSS</source>
<translation type="obsolete">PLS</translation>
</message>
<message>
<source>CST</source>
<translation type="obsolete">PLT</translation>
</message>
<message>
<source>CSU</source>
<translation type="obsolete">PLU</translation>
</message>
<message>
<source>CSV</source>
<translation type="obsolete">PLV</translation>
<translation>PLW</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="807"/>
@@ -9857,16 +9737,6 @@ Mode 4:
<source>Companion Simulator</source>
<translation>Symulator Companion</translation>
</message>
<message>
<source>CSK</source>
<oldsource>SWK</oldsource>
<translation type="obsolete">PLK</translation>
</message>
<message>
<source>CSW</source>
<oldsource>SWW</oldsource>
<translation type="obsolete">PLW</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="2308"/>
<source>CH1</source>
@@ -10271,290 +10141,162 @@ Mode 4:
<message>
<location filename="../xsimulatordialog.ui" line="2897"/>
<source>LSK</source>
<translation type="unfinished">PLK</translation>
<translation>PLK</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="2928"/>
<source>LSC</source>
<translation type="unfinished">PLC</translation>
<translation>PLC</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="2959"/>
<source>LSD</source>
<translation type="unfinished">PLD</translation>
<translation>PLD</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="2990"/>
<source>LS7</source>
<translation type="unfinished">PL7</translation>
<translation>PL7</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3021"/>
<source>LSL</source>
<translation type="unfinished">PLL</translation>
<translation>PLL</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3052"/>
<source>LSB</source>
<translation type="unfinished">PLB</translation>
<translation>PLB</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3083"/>
<source>LS1</source>
<translation type="unfinished">PL1</translation>
<translation>PL1</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3114"/>
<source>LSH</source>
<translation type="unfinished">PLH</translation>
<translation>PLH</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3145"/>
<source>LSG</source>
<translation type="unfinished">PLG</translation>
<translation>PLG</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3176"/>
<source>LSE</source>
<translation type="unfinished">PLE</translation>
<translation>PLE</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3207"/>
<source>LSF</source>
<translation type="unfinished">PLF</translation>
<translation>PLF</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3238"/>
<source>LS8</source>
<translation type="unfinished">PL8</translation>
<translation>PL8</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3269"/>
<source>LS9</source>
<translation type="unfinished">PL9</translation>
<translation>PL9</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3300"/>
<source>LSA</source>
<translation type="unfinished">PLA</translation>
<translation>PLA</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3331"/>
<source>LSM</source>
<translation type="unfinished">PLM,</translation>
<translation>PLM,</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3362"/>
<source>LSJ</source>
<translation type="unfinished">PLJ</translation>
<translation>PLJ</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3393"/>
<source>LSI</source>
<translation type="unfinished">PLI</translation>
<translation>PLI</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3424"/>
<source>LS4</source>
<translation type="unfinished">PL4</translation>
<translation>PL4</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3455"/>
<source>LS5</source>
<translation type="unfinished">PL5</translation>
<translation>PL5</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3486"/>
<source>LS2</source>
<translation type="unfinished">PL2</translation>
<translation>PL2</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3517"/>
<source>LS3</source>
<translation type="unfinished">PL3</translation>
<translation>PL3</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3548"/>
<source>LS6</source>
<translation type="unfinished">PL6</translation>
<translation>PL6</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3579"/>
<source>LSN</source>
<translation type="unfinished">PLN</translation>
<translation>PLN</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3610"/>
<source>LSO</source>
<translation type="unfinished">PLO</translation>
<translation>PLO</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3641"/>
<source>LSP</source>
<translation type="unfinished">PLP</translation>
<translation>PLP</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3672"/>
<source>LSQ</source>
<translation type="unfinished">PLQ</translation>
<translation>PLQ</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3703"/>
<source>LSR</source>
<translation type="unfinished">PLR</translation>
<translation>PLR</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3734"/>
<source>LSS</source>
<translation type="unfinished">PLS</translation>
<translation>PLS</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3765"/>
<source>LST</source>
<translation type="unfinished">PLT</translation>
<translation>PLT</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3796"/>
<source>LSU</source>
<translation type="unfinished">PLU</translation>
<translation>PLU</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3827"/>
<source>LSV</source>
<translation type="unfinished">PLV</translation>
<translation>PLV</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="3858"/>
<source>LSW</source>
<translation type="unfinished">PLW</translation>
</message>
<message>
<source>CSK</source>
<translation type="obsolete">PLK</translation>
</message>
<message>
<source>CSC</source>
<translation type="obsolete">PLC</translation>
</message>
<message>
<source>CSD</source>
<translation type="obsolete">PLD</translation>
</message>
<message>
<source>CS7</source>
<translation type="obsolete">PL7</translation>
</message>
<message>
<source>CSL</source>
<translation type="obsolete">PLL</translation>
</message>
<message>
<source>CSB</source>
<translation type="obsolete">PLB</translation>
</message>
<message>
<source>CS1</source>
<translation type="obsolete">PL1</translation>
</message>
<message>
<source>CSH</source>
<translation type="obsolete">PLH</translation>
</message>
<message>
<source>CSG</source>
<translation type="obsolete">PLG</translation>
</message>
<message>
<source>CSE</source>
<translation type="obsolete">PLE</translation>
</message>
<message>
<source>CSF</source>
<translation type="obsolete">PLF</translation>
</message>
<message>
<source>CS8</source>
<translation type="obsolete">PL8</translation>
</message>
<message>
<source>CS9</source>
<translation type="obsolete">PL9</translation>
</message>
<message>
<source>CSA</source>
<translation type="obsolete">PLA</translation>
</message>
<message>
<source>CSM</source>
<translation type="obsolete">PLM</translation>
</message>
<message>
<source>CSJ</source>
<translation type="obsolete">PLJ</translation>
</message>
<message>
<source>CSI</source>
<translation type="obsolete">PLI</translation>
</message>
<message>
<source>CS4</source>
<translation type="obsolete">PL4</translation>
</message>
<message>
<source>CS5</source>
<translation type="obsolete">PL5</translation>
</message>
<message>
<source>CS2</source>
<translation type="obsolete">PL2</translation>
</message>
<message>
<source>CS3</source>
<translation type="obsolete">PL3</translation>
</message>
<message>
<source>CS6</source>
<translation type="obsolete">PL6</translation>
</message>
<message>
<source>CSN</source>
<translation type="obsolete">PLN</translation>
</message>
<message>
<source>CSO</source>
<translation type="obsolete">PLO</translation>
</message>
<message>
<source>CSP</source>
<translation type="obsolete">PLP</translation>
</message>
<message>
<source>CSQ</source>
<translation type="obsolete">PLQ</translation>
</message>
<message>
<source>CSR</source>
<translation type="obsolete">PLR</translation>
</message>
<message>
<source>CSS</source>
<translation type="obsolete">PLS</translation>
</message>
<message>
<source>CST</source>
<translation type="obsolete">PLT</translation>
</message>
<message>
<source>CSU</source>
<translation type="obsolete">PLU</translation>
</message>
<message>
<source>CSV</source>
<translation type="obsolete">PLV</translation>
</message>
<message>
<source>CSW</source>
<translation type="obsolete">PLW</translation>
<translation>PLW</translation>
</message>
<message>
<location filename="../xsimulatordialog.cpp" line="58"/>
radio/src/Makefile
+1 -1
View File
@@ -285,7 +285,7 @@ ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR))
ARCH = AVR
TRGT = avr-
MCU = atmega64
OPT = s
OPT = s
SDCARD = NO
THR_TRACE = NO
INCDIRS += targets/stock
radio/src/gui/menu_general.cpp
+6 -8
View File
@@ -1037,19 +1037,17 @@ void menuGeneralVersion(uint8_t event)
{
SIMPLE_MENU(STR_MENUVERSION, menuTabDiag, e_Vers, 1);
lcd_putsLeft(2*FH, stamp1);
lcd_putsLeft(3*FH, stamp2);
lcd_putsLeft(4*FH, stamp3);
lcd_putsLeft(2*FH, vers_stamp);
#if defined(PCBSKY9X) && !defined(REVA)
if (Coproc_valid == 1) {
lcd_putsLeft(5*FH, PSTR("CoPr:"));
lcd_outdez8(10*FW, 5*FH, Coproc_read);
lcd_putsLeft(6*FH, PSTR("CoPr:"));
lcd_outdez8(10*FW, 6*FH, Coproc_read);
}
else {
lcd_putsLeft(5*FH, PSTR("CoPr: ---"));
lcd_putsLeft(6*FH, PSTR("CoPr: ---"));
}
#endif
lcd_putsLeft(7*FH, eeprom_stamp);
#endif
}
void displayKeyState(uint8_t x, uint8_t y, EnumKeys key)
radio/src/gui/menu_model.cpp
+22 -11
View File
@@ -2271,7 +2271,8 @@ void DrawCurve(uint8_t offset=0)
uint8_t i = 0;
do {
point_t point = getPoint(i++);
point_t point = getPoint(i);
i++;
if (point.x == 0) break;
lcd_filled_rect(point.x-offset, point.y-1, 3, 3, SOLID, FORCE); // do markup square
} while(1);
@@ -3239,7 +3240,7 @@ static uint8_t s_copySrcCh;
#define MIX_LINE_SRC_POS 4*FW-1
#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_CURVE_POS 12*FW+4
#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_DELAY_POS 19*FW+2
#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_SWITCH_POS 11*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_DELAY_POS 19*FW+7
#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_SWITCH_POS 11*FW+4
#if MAX_PHASES == 6
@@ -4734,13 +4735,10 @@ void menuModelCustomFunctions(uint8_t event)
if (sd->swtch) {
uint8_t func_displayed;
if (CFN_FUNC(sd) < FUNC_TRAINER) {
func_displayed = 0;
putsChn(MODEL_CUSTOM_FUNC_2ND_COLUMN+6*FW, y, CFN_CH_NUMBER(sd)+1, attr);
func_displayed = 0;
}
else if (CFN_FUNC(sd) <= FUNC_TRAINER + NUM_STICKS) {
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);
func_displayed = 1;
}
#if defined(DEBUG)
else if (CFN_FUNC(sd) == FUNC_TEST) {
@@ -4753,14 +4751,27 @@ void menuModelCustomFunctions(uint8_t event)
#endif
#if defined(GVARS)
else if (CFN_FUNC(sd) >= FUNC_ADJUST_GV1) {
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);
func_displayed = FUNC_ADJUST_GV1 - FUNC_TRAINER - NUM_STICKS + 1;
}
#endif
else {
func_displayed = 2 + CFN_FUNC(sd) - FUNC_TRAINER - NUM_STICKS - 1;
}
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 defined(CPUARM)
CHECK_INCDEC_MODELVAR_ZERO(event, CFN_FUNC(sd), FUNC_MAX-1);
radio/src/gui/view_statistics.cpp
+1 -3
View File
@@ -57,15 +57,13 @@ void menuStatisticsView(uint8_t event)
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( 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( 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);
#if defined(PCBTARANIS)
radio/src/lcd.cpp
+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++) {
uint8_t *p = &displayBuf[ (y / 8 + yb) * LCD_W + x ];
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);
#if defined(PCBTARANIS)
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;
b2 = ~b2;
}
uint8_t ym8 = (y & 0x07);
const uint8_t ym8 = (y & 0x07);
if (&p[LCD_W+1] < DISPLAY_END) {
LCD_BYTE_FILTER(p, ~(0xff << ym8), b1 << ym8);
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) {
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++) {
uint8_t b = 0;
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) {
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++) {
uint8_t b = 0;
if (!i) {
@@ -273,7 +274,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags)
}
#endif
else {
uint8_t ym8 = (y & 0x07);
const uint8_t ym8 = (y & 0x07);
#if defined(BOLD_FONT) && defined(CPUM64) && !defined(EXTSTD)
uint8_t bb = 0;
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)
{
#if defined(CPUARM)
xcoord_t orig_x = x;
#endif
bool setx = false;
while(len!=0) {
while(len--) {
unsigned char c;
switch (mode & (BSS+ZCHAR)) {
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
setx = true;
}
#if defined(CPUARM)
else if (c == 0x1E) { //NEWLINE
x = orig_x;
y += FH;
#if defined(CPUARM)
if (mode & DBLSIZE) y += FH;
else if (mode & MIDSIZE) y += 4;
else if (mode & SMLSIZE) y--;
#endif
if (y >= LCD_H) break;
}
#endif
else {
x += (c*FW/2); //EXTENDED SPACE
}
s++;
len--;
}
lcdLastPos = 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 msk = BITMASK(y%8);
while(w) {
while(w--) {
if(pat&1) {
lcd_mask(p, msk, att);
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 {
pat = pat >> 1;
}
w--;
p++;
}
}
radio/src/opentx.cpp
+3 -5
View File
@@ -4884,8 +4884,9 @@ void stack_paint()
p = (unsigned char *) STACKPTR ;
q = &__bss_end ;
p -= 2 ;
while ( p > q )
while ( p > q ) {
*p-- = 0x55 ;
}
}
uint16_t stack_free()
@@ -4893,10 +4894,7 @@ uint16_t stack_free()
unsigned char *p ;
p = &__bss_end + 1 ;
while ( *p == 0x55 )
{
p+= 1 ;
}
while ( *p++ == 0x55 );
return p - &__bss_end ;
}
#endif
radio/src/opentx.h
+1 -4
View File
@@ -1192,10 +1192,7 @@ extern int8_t calcRESXto100(int16_t x);
#define TMR_VAROFS 5
extern const char stamp1[];
extern const char stamp2[];
extern const char stamp3[];
extern const char eeprom_stamp[];
extern const char vers_stamp[];
extern uint8_t g_vbat100mV;
#define g_blinkTmr10ms (*(uint8_t*)&g_tmr10ms)
radio/src/stamp.cpp
+2 -5
View File
@@ -40,11 +40,8 @@
#define STR2(s) #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)
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
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
radio/src/translations.cpp
+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_ACCEL[] PROGMEM = TR_ACCEL;
const pm_char STR_NODATA[] PROGMEM = TR_NODATA;
const pm_char STR_TM1TM2[] PROGMEM = TR_TM1TM2;
const pm_char STR_THRTHP[] PROGMEM = TR_THRTHP;
const pm_char STR_TOT[] PROGMEM = TR_TOT;
const pm_char STR_TOTTM1TM2THRTHP[] PROGMEM = TR_TOTTM1TM2THRTHP;
const pm_char STR_TMR1LATMAXUS[] PROGMEM = TR_TMR1LATMAXUS;
const pm_char STR_TMR1LATMINUS[] PROGMEM = TR_TMR1LATMINUS;
const pm_char STR_TMR1JITTERUS[] PROGMEM = TR_TMR1JITTERUS;
radio/src/translations.h
+1 -3
View File
@@ -399,9 +399,7 @@ extern const pm_char STR_TX[];
#define STR_RX (STR_TX+OFS_RX)
extern const pm_char STR_ACCEL[];
extern const pm_char STR_NODATA[];
extern const pm_char STR_TM1TM2[];
extern const pm_char STR_THRTHP[];
extern const pm_char STR_TOT[];
extern const pm_char STR_TOTTM1TM2THRTHP[];
extern const pm_char STR_TMR1LATMAXUS[];
extern const pm_char STR_TMR1LATMINUS[];
extern const pm_char STR_TMR1JITTERUS[];
radio/src/translations/cz.h.txt
+6 -8
View File
@@ -35,7 +35,7 @@
*/
/* Formatting octal codes available in TR_ strings:
* \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)
* \0 -ends actual string
*/
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#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 TR_VRENCODERS "REa""REb"
@@ -494,17 +494,15 @@
#define TR_CAL "Kal."
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\007" TR_ENTER " = START"
#define TR_SETMIDPOINT TR(CENTER "\001Nastav páky na střed", CENTER "\002Nastav páky na střed")
#define TR_MOVESTICKSPOTS TR(CENTER "\004Hýbej pákami/poty", "\007Hýbej pákami i potenciometry")
#define TR_MENUTOSTART CENTER "\010" TR_ENTER " = START"
#define TR_SETMIDPOINT TR(CENTER "\003Nastav páky na střed", CENTER "\004Nastav páky na střed")
#define TR_MOVESTICKSPOTS TR(CENTER "\005Hýbej pákami/poty", "\010Hýbej pákami i potenciometry")
#define TR_RXBATT "Rx Bat.:"
#define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4
#define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
radio/src/translations/de.h.txt
+7 -9
View File
@@ -35,7 +35,7 @@
*/
/* Formatting octal codes available in TR_ strings:
* \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)
* \0 -ends actual string
*/
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#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 TR_VRENCODERS "DGa""DGb" //Digitalgeber a und b = Drehgeber
@@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER"\010[EXIT]"
#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_DELETEMODEL "Modell l\203schen?"
#define TR_COPYINGMODEL "Kopiere Modell"
@@ -494,17 +494,15 @@
#define TR_CAL "Kal."
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_MENUTOSTART CENTER"\006"TR_ENTER" zum Start"
#define TR_SETMIDPOINT CENTER"Sticks+Potis auf Mitte"
#define TR_MOVESTICKSPOTS CENTER"Sticks+Potis bewegen"
#define TR_MENUTOSTART CENTER"\007"TR_ENTER" zum Start"
#define TR_SETMIDPOINT CENTER"\002Sticks+Potis auf Mitte"
#define TR_MOVESTICKSPOTS CENTER"\003Sticks+Potis bewegen"
#define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4
#define TR_ACCEL "Acc:"
#define TR_NODATA CENTER"NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
radio/src/translations/en.h
+5 -7
View File
@@ -35,7 +35,7 @@
*/
/* Formatting octal codes available in TR_ strings:
* \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)
* \0 -ends actual string
*/
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
#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 TR_VRENCODERS "REa""REb"
@@ -494,17 +494,15 @@
#define TR_CAL "Cal"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\006" TR_ENTER " TO START"
#define TR_SETMIDPOINT TR(CENTER "\003SET STICKS MIDPOINT",CENTER "\003CENTER STICKS/SLIDERS")
#define TR_MENUTOSTART CENTER "\010" TR_ENTER " TO START"
#define TR_SETMIDPOINT TR(CENTER "\004SET STICKS MIDPOINT",CENTER "\004CENTER STICKS/SLIDERS")
#define TR_MOVESTICKSPOTS CENTER "\006MOVE STICKS/POTS"
#define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4
#define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
radio/src/translations/es.h.txt
+7 -9
View File
@@ -35,7 +35,7 @@
*/
/* Formatting octal codes available in TR_ strings:
* \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)
* \0 -ends actual string
*/
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "---\0""120\0""120X""140\0""90\0"
#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 TR_VRENCODERS "REa""REb"
@@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER "\010[SALIR]"
#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_DELETEMODEL "BORRAR MODELO"
#define TR_COPYINGMODEL "Copiando modelo.."
@@ -494,17 +494,15 @@
#define TR_CAL "Cal"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\006" TR_ENTER "EMPEZAR"
#define TR_SETMIDPOINT CENTER "\003STICKS AL CENTRO"
#define TR_MENUTOSTART CENTER "\010" TR_ENTER " EMPEZAR"
#define TR_SETMIDPOINT TR(CENTER "\007STICKS AL CENTRO",CENTER "\010STICKS AL CENTRO")
#define TR_MOVESTICKSPOTS CENTER "\006MOVER STICKS/POTS"
#define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4
#define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "SIN DATOS"
#define TR_TM1TM2 "TM1\037\146TM2"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
@@ -527,7 +525,7 @@
#define TR_EEPROMLOWMEM "EEPROM mem.baja"
#define TR_ALERT "\016ALERTA"
#define TR_PRESSANYKEYTOSKIP "Pulsar tecla omitir"
#define TR_THROTTLENOTIDLE "Aceler.Activado"
#define TR_THROTTLENOTIDLE "Aceler. Activado"
#define TR_ALARMSDISABLED "Alarmas Desact."
#define TR_PRESSANYKEY TR("\010Pulsa una Tecla", "Pulsa una Tecla")
#define TR_BADEEPROMDATA "Datos EEprom mal"
radio/src/translations/fr.h.txt
+3 -5
View File
@@ -35,7 +35,7 @@
*/
/* Formatting octal codes available in TR_ strings:
* \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)
* \0 -ends actual string
*/
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#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 TR_VRENCODERS "REa""REb"
@@ -502,9 +502,7 @@
#define OFS_RX 4
#define TR_ACCEL "Acc:"
#define TR_NODATA "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
radio/src/translations/it.h.txt
+7 -9
View File
@@ -35,7 +35,7 @@
*/
/* Formatting octal codes available in TR_ strings:
* \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)
* \0 -ends actual string
*/
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#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 TR_VRENCODERS "REa""REb"
@@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER"\004[EXIT]"
#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_DELETEMODEL "Elimina modello?"
#define TR_COPYINGMODEL "Copia in corso.."
@@ -494,17 +494,15 @@
#define TR_CAL "Cal"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_MENUTOSTART CENTER"\006" TR_ENTER " per Cal."
#define TR_SETMIDPOINT CENTER"\011SETTA CENTRO"
#define TR_MOVESTICKSPOTS CENTER"\006MUOVI STICK/POT"
#define TR_MENUTOSTART CENTER"\011" TR_ENTER " per Cal."
#define TR_SETMIDPOINT CENTER"\012SETTA CENTRO"
#define TR_MOVESTICKSPOTS CENTER"\010MUOVI STICK/POT"
#define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4
#define TR_ACCEL "Acc:"
#define TR_NODATA CENTER"DATI ASSENTI"
#define TR_TM1TM2 "TM1\037\146TM2"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
radio/src/translations/pl.h.txt
+7 -9
View File
@@ -35,7 +35,7 @@
*/
/* Formatting octal codes available in TR_ strings:
* \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)
* \0 -ends actual string
*/
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#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 TR_VRENCODERS "REa""REb"
@@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER"\010[WYJŚCIE]"
#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_DELETEMODEL "SKASUJ MODEL"
#define TR_COPYINGMODEL "Kopiuj model.."
@@ -494,17 +494,15 @@
#define TR_CAL "Kal."
#define TR_VTRIM "Trymer- +"
#define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\007" TR_ENTER " = START"
#define TR_SETMIDPOINT TR(CENTER "\001Ustaw drążki/potencj na środku","\005Ustaw drązki/potencj na środku")
#define TR_MOVESTICKSPOTS TR(CENTER "\004Poruszaj drążkami i potenc.","\010Poruszaj drążkami i potenc.")
#define TR_MENUTOSTART CENTER "\011" TR_ENTER " = START"
#define TR_SETMIDPOINT TR(CENTER "\002Ustaw drążki/potencj","\010Ustaw drązki/potencj na środku")
#define TR_MOVESTICKSPOTS TR(CENTER "Poruszaj drążkami i pot","\014Poruszaj drążkami i potenc.")
#define TR_RXBATT "Rx Bat.:"
#define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4
#define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+12)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
radio/src/translations/pt.h.txt
+6 -8
View File
@@ -35,7 +35,7 @@
*/
/* Formatting octal codes available in TR_ strings:
* \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)
* \0 -ends actual string
*/
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#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 TR_VRENCODERS "REa""REb"
@@ -494,17 +494,15 @@
#define TR_CAL "Cal"
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_MENUTOSTART CENTER"\006" TR_ENTER " INICIAR"
#define TR_SETMIDPOINT CENTER"\005CENTRAR STICK/POT"
#define TR_MOVESTICKSPOTS CENTER"\005MOVER STICKS/POTs"
#define TR_MENUTOSTART CENTER"\011" TR_ENTER " INICIAR"
#define TR_SETMIDPOINT TR(CENTER"\005CENTRAR STICK/POT",CENTER"\006CENTRAR STICK/POT")
#define TR_MOVESTICKSPOTS TR(CENTER"\005MOVER STICKS/POTs",CENTER"\006MOVER STICKS/POTs")
#define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4
#define TR_ACCEL "Acc:"
#define TR_NODATA CENTER"SEM DADOS"
#define TR_TM1TM2 "TM1\037\146TM2"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"
radio/src/translations/se.h.txt
+7 -9
View File
@@ -35,7 +35,7 @@
*/
/* Formatting octal codes available in TR_ strings:
* \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)
* \0 -ends actual string
*/
@@ -304,7 +304,7 @@
#define TR_VSWASHTYPE "--- ""120 ""120X""140 ""90\0"
#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 TR_VRENCODERS "REa""REb"
@@ -390,7 +390,7 @@
#define TR_POPUPS TR_ENTER"\010[EXIT]"
#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_DELETEMODEL "Radera Modell"
#define TR_COPYINGMODEL "Kopierar Modell "
@@ -494,17 +494,15 @@
#define TR_CAL "Kalib."
#define TR_VTRIM "Trim- +"
#define TR_BG "BG:"
#define TR_MENUTOSTART CENTER "\006" TR_ENTER " Startar "
#define TR_SETMIDPOINT CENTER "\010Centrera Allt"
#define TR_MOVESTICKSPOTS CENTER "\004Rör Rattar/Spakar"
#define TR_MENUTOSTART CENTER "\011" TR_ENTER " Startar "
#define TR_SETMIDPOINT TR(CENTER "\012Centrera Allt",CENTER "\013Centrera Allt")
#define TR_MOVESTICKSPOTS TR(CENTER "\005Rör Rattar/Spakar",CENTER "\006Rör Rattar/Spakar")
#define TR_RXBATT "Rx Batt:"
#define TR_TXnRX "Tx:\0Rx:"
#define OFS_RX 4
#define TR_ACCEL "Acc:"
#define TR_NODATA CENTER "NO DATA"
#define TR_TM1TM2 "TM1\037\146TM2"
#define TR_THRTHP "THR\037\146TH%"
#define TR_TOT "TOT"
#define TR_TOTTM1TM2THRTHP "\037\146TOT\036TM1\037\146TM2\036THR\037\146TH%"
#define TR_TMR1LATMAXUS "Tmr1Lat max\037\124us"
#define STR_US (STR_TMR1LATMAXUS+13)
#define TR_TMR1LATMINUS "Tmr1Lat min\037\124us"