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

Bsongis/gui refactoring for x7 d (#3701)

Browse Source 
* [X7D] New board added
* Cosmetics
This commit is contained in:
Bertrand Songis
2016-08-18 11:49:16 +02:00
committed by GitHub
parent 282b856309
commit d3ae3c035d
233 changed files with 7472 additions and 4560 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/480x272/model_mixes.cpp
+8 -8
View File
@@ -24,7 +24,7 @@
int getMixesLinesCount()
{
int lastch = -1;
uint8_t count = NUM_CHNOUT;
uint8_t count = MAX_OUTPUT_CHANNELS;
for (int i=0; i<MAX_MIXERS; i++) {
bool valid = mixAddress(i)->srcRaw;
if (!valid)
@@ -116,7 +116,7 @@ bool swapMixes(uint8_t & idx, uint8_t up)
}
if (tgt_idx == MAX_MIXERS) {
if (x->destCh == NUM_CHNOUT-1)
if (x->destCh == MAX_OUTPUT_CHANNELS-1)
return false;
x->destCh++;
return true;
@@ -130,7 +130,7 @@ bool swapMixes(uint8_t & idx, uint8_t up)
else return false;
}
else {
if (destCh<NUM_CHNOUT-1) x->destCh++;
if (destCh<MAX_OUTPUT_CHANNELS-1) x->destCh++;
else return false;
}
return true;
@@ -201,7 +201,7 @@ bool menuModelMixOne(event_t event)
break;
case MIX_FIELD_SOURCE:
lcdDrawText(MENUS_MARGIN_LEFT, y, NO_INDENT(STR_SOURCE));
putsMixerSource(MIXES_2ND_COLUMN, y, md2->srcRaw, attr);
drawSource(MIXES_2ND_COLUMN, y, md2->srcRaw, attr);
if (attr) CHECK_INCDEC_MODELSOURCE(event, md2->srcRaw, 1, MIXSRC_LAST);
break;
case MIX_FIELD_WEIGHT:
@@ -324,11 +324,11 @@ void onMixesMenu(const char * result)
void displayMixInfos(coord_t y, MixData *md)
{
if (md->curve.value != 0 ) lcd->drawBitmap(MIX_LINE_CURVE_ICON, y + 2, mixerSetupCurveBitmap);
putsCurveRef(MIX_LINE_CURVE_POS, y, md->curve);
drawCurveRef(MIX_LINE_CURVE_POS, y, md->curve);
if (md->swtch) {
lcd->drawBitmap(MIX_LINE_SWITCH_ICON, y + 2, mixerSetupSwitchBitmap);
putsSwitches(MIX_LINE_SWITCH_POS, y, md->swtch);
drawSwitch(MIX_LINE_SWITCH_POS, y, md->swtch);
}
}
@@ -519,7 +519,7 @@ bool menuModelMixAll(event_t event)
int cur = 0;
int i = 0;
for (int ch=1; ch<=NUM_CHNOUT; ch++) {
for (int ch=1; ch<=MAX_OUTPUT_CHANNELS; ch++) {
MixData * md;
coord_t y = MENU_CONTENT_TOP + (cur-menuVerticalOffset)*FH;
if (i<MAX_MIXERS && (md=mixAddress(i))->srcRaw && md->destCh+1 == ch) {
@@ -547,7 +547,7 @@ bool menuModelMixAll(event_t event)
if (mixCnt > 0) lcd->drawBitmap(10, y, mpx_mode[md->mltpx]);
putsMixerSource(MIX_LINE_SRC_POS, y, md->srcRaw);
drawSource(MIX_LINE_SRC_POS, y, md->srcRaw);
gvarWeightItem(MIX_LINE_WEIGHT_POS, y, md, RIGHT | attr | (isMixActive(i) ? BOLD : 0), event);