Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 00:35:18 +03:00
Code Issues Wiki Activity

Fixes #5256

Browse source
This commit is contained in:
Bertrand Songis 2019-11-15 13:08:00 +01:00
parent 2f7a4c9ecd
commit 3b2e1a61e7
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
7 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/gui/128x64/model_inputs_mixes.cpp
View file

@ -378,7 +378,7 @@ void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
void menuModelMixOne(event_t event) void menuModelMixOne(event_t event)
{ {
title(STR_MIXER); title(STR_MIXES);
MixData * md2 = mixAddress(s_currIdx) ; MixData * md2 = mixAddress(s_currIdx) ;
putsChn(lcdLastRightPos+1*FW, 0, md2->destCh+1,0); putsChn(lcdLastRightPos+1*FW, 0, md2->destCh+1,0);
@ -731,10 +731,10 @@ void menuModelExpoMix(uint8_t expo, event_t event)
break; break;
} }
lcdDrawNumber(FW*max(sizeof(TR_MENUINPUTS), sizeof(TR_MIXER))+FW+FW/2, 0, getExpoMixCount(expo)); lcdDrawNumber(FW*max(sizeof(TR_MENUINPUTS), sizeof(TR_MIXES))+FW+FW/2, 0, getExpoMixCount(expo));
lcdDrawText(FW*max(sizeof(TR_MENUINPUTS), sizeof(TR_MIXER))+FW+FW/2, 0, expo ? STR_MAX(MAX_EXPOS) : STR_MAX(MAX_MIXERS)); lcdDrawText(FW*max(sizeof(TR_MENUINPUTS), sizeof(TR_MIXES))+FW+FW/2, 0, expo ? STR_MAX(MAX_EXPOS) : STR_MAX(MAX_MIXERS));
SIMPLE_MENU(expo ? STR_MENUINPUTS : STR_MIXER, menuTabModel, expo ? MENU_MODEL_INPUTS : MENU_MODEL_MIXES, s_maxLines); SIMPLE_MENU(expo ? STR_MENUINPUTS : STR_MIXES, menuTabModel, expo ? MENU_MODEL_INPUTS : MENU_MODEL_MIXES, s_maxLines);
sub = menuVerticalPosition; sub = menuVerticalPosition;
s_currCh = 0; s_currCh = 0;

4
radio/src/gui/128x64/model_mix_edit.cpp
View file

@ -86,9 +86,9 @@ void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
void menuModelMixOne(event_t event) void menuModelMixOne(event_t event)
{ {
MixData * md2 = mixAddress(s_currIdx) ; MixData * md2 = mixAddress(s_currIdx) ;
putsChn(PSIZE(TR_MIXER)*FW+FW, 0, md2->destCh+1,0); putsChn(PSIZE(TR_MIXES)*FW+FW, 0, md2->destCh+1,0);
SUBMENU(STR_MIXER, MIX_FIELD_COUNT, {0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); SUBMENU(STR_MIXES, MIX_FIELD_COUNT, {0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/});
int8_t sub = menuVerticalPosition; int8_t sub = menuVerticalPosition;
int8_t editMode = s_editMode; int8_t editMode = s_editMode;

4
radio/src/gui/212x64/model_mix_edit.cpp
View file

@ -91,10 +91,10 @@ void menuModelMixOne(event_t event)
} }
MixData * md2 = mixAddress(s_currIdx) ; MixData * md2 = mixAddress(s_currIdx) ;
putsChn(PSIZE(TR_MIXER)*FW+FW, 0, md2->destCh+1,0); putsChn(PSIZE(TR_MIXES)*FW+FW, 0, md2->destCh+1,0);
lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT); lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT);
SUBMENU(STR_MIXER, MIX_FIELD_COUNT, {0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); SUBMENU(STR_MIXES, MIX_FIELD_COUNT, {0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/});
int8_t sub = menuVerticalPosition; int8_t sub = menuVerticalPosition;
int8_t editMode = s_editMode; int8_t editMode = s_editMode;

4
radio/src/gui/480x272/model_mixes.cpp
View file

@ -176,7 +176,7 @@ bool menuModelMixOne(event_t event)
{ {
MixData * md2 = mixAddress(s_currIdx) ; MixData * md2 = mixAddress(s_currIdx) ;
SUBMENU_WITH_OPTIONS(STR_MIXER, ICON_MODEL_MIXER, MIX_FIELD_COUNT, OPTION_MENU_NO_SCROLLBAR, { 0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/ }); SUBMENU_WITH_OPTIONS(STR_MIXES, ICON_MODEL_MIXER, MIX_FIELD_COUNT, OPTION_MENU_NO_SCROLLBAR, { 0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/ });
putsChn(50, 3+FH, md2->destCh+1, MENU_TITLE_COLOR); putsChn(50, 3+FH, md2->destCh+1, MENU_TITLE_COLOR);
displayMixStatus(md2->destCh); displayMixStatus(md2->destCh);
@ -413,7 +413,7 @@ bool menuModelMixAll(event_t event)
uint8_t chn = mixAddress(s_currIdx)->destCh + 1; uint8_t chn = mixAddress(s_currIdx)->destCh + 1;
int linesCount = getMixesLinesCount(); int linesCount = getMixesLinesCount();
SIMPLE_MENU(STR_MIXER, MODEL_ICONS, menuTabModel, MENU_MODEL_MIXES, linesCount); SIMPLE_MENU(STR_MIXES, MODEL_ICONS, menuTabModel, MENU_MODEL_MIXES, linesCount);
switch (event) { switch (event) {
case EVT_ENTRY: case EVT_ENTRY:

6
radio/src/gui/common/stdlcd/model_mixes.cpp
View file

@ -231,7 +231,7 @@ void displayMixInfos(coord_t y, MixData * md)
void displayMixLine(coord_t y, MixData * md, bool active) void displayMixLine(coord_t y, MixData * md, bool active)
{ {
if(active && md->name[0]) { if(active && md->name[0]) {
lcdDrawSizedText(FW*sizeof(TR_MIXER)+FW/2, 0, md->name, sizeof(md->name), ZCHAR); lcdDrawSizedText(FW*sizeof(TR_MIXES)+FW/2, 0, md->name, sizeof(md->name), ZCHAR);
if (!md->flightModes || ((md->curve.value || md->swtch) && ((get_tmr10ms() / 200) & 1))) if (!md->flightModes || ((md->curve.value || md->swtch) && ((get_tmr10ms() / 200) & 1)))
displayMixInfos(y, md); displayMixInfos(y, md);
else else
@ -385,7 +385,7 @@ void menuModelMixAll(event_t event)
break; break;
} }
lcdDrawNumber(FW*sizeof(TR_MIXER)+FW/2, 0, getMixesCount(), 0); lcdDrawNumber(FW*sizeof(TR_MIXES)+FW/2, 0, getMixesCount(), 0);
lcdDrawText(lcdNextPos, 0, STR_MAX(MAX_MIXERS)); lcdDrawText(lcdNextPos, 0, STR_MAX(MAX_MIXERS));
// Value // Value
@ -397,7 +397,7 @@ void menuModelMixAll(event_t event)
#endif #endif
} }
SIMPLE_MENU(STR_MIXER, menuTabModel, MENU_MODEL_MIXES, HEADER_LINE + s_maxLines); SIMPLE_MENU(STR_MIXES, menuTabModel, MENU_MODEL_MIXES, HEADER_LINE + s_maxLines);
#if LCD_W >= 212 #if LCD_W >= 212
// Gauge // Gauge

2
radio/src/translations.cpp
View file

@ -146,7 +146,7 @@ const char STR_DELAYDOWN[] = TR_DELAYDOWN;
const char STR_DELAYUP[] = TR_DELAYUP; const char STR_DELAYUP[] = TR_DELAYUP;
const char STR_SLOWDOWN[] = TR_SLOWDOWN; const char STR_SLOWDOWN[] = TR_SLOWDOWN;
const char STR_SLOWUP[] = TR_SLOWUP; const char STR_SLOWUP[] = TR_SLOWUP;
const char STR_MIXER[] = TR_MIXER; const char STR_MIXES[] = TR_MIXES;
const char STR_CV[] = TR_CV; const char STR_CV[] = TR_CV;
const char STR_GV[] = TR_GV; const char STR_GV[] = TR_GV;
const char STR_RANGE[] = TR_RANGE; const char STR_RANGE[] = TR_RANGE;

2
radio/src/translations/en.h.txt
View file

@ -480,7 +480,7 @@
#define TR_DELAYUP "Delay up" #define TR_DELAYUP "Delay up"
#define TR_SLOWDOWN "Slow dn" #define TR_SLOWDOWN "Slow dn"
#define TR_SLOWUP "Slow up" #define TR_SLOWUP "Slow up"
#define TR_MIXER "MIXER" #define TR_MIXER "MIXES"
#define TR_CV "CV" #define TR_CV "CV"
#define TR_GV TR("G", "GV") #define TR_GV TR("G", "GV")
#define TR_ACHANNEL "A\004channel" #define TR_ACHANNEL "A\004channel"