Revert the latest flash saving. Was wrong.
This commit is contained in:
+12
-13
@@ -1757,19 +1757,18 @@ void menuProcExpoMix(uint8_t expo, uint8_t _event_)
|
|||||||
|
|
||||||
for (uint8_t ch=1; ch<=(expo ? NUM_STICKS : NUM_CHNOUT); ch++) {
|
for (uint8_t ch=1; ch<=(expo ? NUM_STICKS : NUM_CHNOUT); ch++) {
|
||||||
MixData *md=NULL; ExpoData *ed=NULL;
|
MixData *md=NULL; ExpoData *ed=NULL;
|
||||||
int8_t k = cur - s_pgOfs;
|
|
||||||
if (expo ? (i<MAX_EXPOS && (ed=expoaddress(i))->chn+1 == ch && ed->mode) : (i<MAX_MIXERS && (md=mixaddress(i))->srcRaw && md->destCh+1 == ch)) {
|
if (expo ? (i<MAX_EXPOS && (ed=expoaddress(i))->chn+1 == ch && ed->mode) : (i<MAX_MIXERS && (md=mixaddress(i))->srcRaw && md->destCh+1 == ch)) {
|
||||||
if (k > 0 && k < 8) {
|
if (s_pgOfs < cur && cur-s_pgOfs < 8) {
|
||||||
if (expo)
|
if (expo)
|
||||||
putsChnRaw(0, k*FH, ch, 0);
|
putsChnRaw(0, (cur-s_pgOfs)*FH, ch, 0);
|
||||||
else
|
else
|
||||||
putsChn(0, k*FH, ch, 0); // show CHx
|
putsChn(0, (cur-s_pgOfs)*FH, ch, 0); // show CHx
|
||||||
}
|
}
|
||||||
uint8_t mixCnt = 0;
|
uint8_t mixCnt = 0;
|
||||||
do {
|
do {
|
||||||
if (s_copyMode) {
|
if (s_copyMode) {
|
||||||
if (s_copyMode == MOVE_MODE && k > 0 && k < 8 && s_copySrcCh == ch && s_copyTgtOfs != 0 && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
|
if (s_copyMode == MOVE_MODE && s_pgOfs < cur && cur-s_pgOfs < 8 && s_copySrcCh == ch && s_copyTgtOfs != 0 && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
|
||||||
uint8_t y = k*FH;
|
uint8_t y = (cur-s_pgOfs)*FH;
|
||||||
lcd_rect(expo ? 18 : 22, y-1, expo ? DISPLAY_W-18 : DISPLAY_W-22, 9, DOTTED);
|
lcd_rect(expo ? 18 : 22, y-1, expo ? DISPLAY_W-18 : DISPLAY_W-22, 9, DOTTED);
|
||||||
cur++;
|
cur++;
|
||||||
}
|
}
|
||||||
@@ -1781,7 +1780,7 @@ void menuProcExpoMix(uint8_t expo, uint8_t _event_)
|
|||||||
else if (sub == cur) {
|
else if (sub == cur) {
|
||||||
s_currIdx = i;
|
s_currIdx = i;
|
||||||
}
|
}
|
||||||
if (k > 0 && k < 8) {
|
if (s_pgOfs < cur && cur-s_pgOfs < 8) {
|
||||||
if (expo)
|
if (expo)
|
||||||
displayExpoLine(cur, i, ch, mixCnt, sub, _event);
|
displayExpoLine(cur, i, ch, mixCnt, sub, _event);
|
||||||
else
|
else
|
||||||
@@ -1789,8 +1788,8 @@ void menuProcExpoMix(uint8_t expo, uint8_t _event_)
|
|||||||
}
|
}
|
||||||
cur++; mixCnt++; i++; md++; ed++;
|
cur++; mixCnt++; i++; md++; ed++;
|
||||||
} while (expo ? (i<MAX_EXPOS && ed->chn+1 == ch && ed->mode) : (i<MAX_MIXERS && md->srcRaw && md->destCh+1 == ch));
|
} while (expo ? (i<MAX_EXPOS && ed->chn+1 == ch && ed->mode) : (i<MAX_MIXERS && md->srcRaw && md->destCh+1 == ch));
|
||||||
if (s_copyMode == MOVE_MODE && k > 0 && k < 8 && s_copySrcCh == ch && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
|
if (s_copyMode == MOVE_MODE && s_pgOfs < cur && cur-s_pgOfs < 8 && s_copySrcCh == ch && i == (s_copySrcIdx + (s_copyTgtOfs<0))) {
|
||||||
uint8_t y = k*FH;
|
uint8_t y = (cur-s_pgOfs)*FH;
|
||||||
lcd_rect(expo ? 18 : 22, y-1, expo ? DISPLAY_W-18 : DISPLAY_W-22, 9, DOTTED);
|
lcd_rect(expo ? 18 : 22, y-1, expo ? DISPLAY_W-18 : DISPLAY_W-22, 9, DOTTED);
|
||||||
cur++;
|
cur++;
|
||||||
}
|
}
|
||||||
@@ -1804,13 +1803,13 @@ void menuProcExpoMix(uint8_t expo, uint8_t _event_)
|
|||||||
attr = INVERS;
|
attr = INVERS;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (k > 0 && k < 8) {
|
if (s_pgOfs < cur && cur-s_pgOfs < 8) {
|
||||||
if (expo)
|
if (expo)
|
||||||
putsChnRaw(0, k*FH, ch, attr);
|
putsChnRaw(0, (cur-s_pgOfs)*FH, ch, attr);
|
||||||
else
|
else
|
||||||
putsChn(0, k*FH, ch, attr); // show CHx
|
putsChn(0, (cur-s_pgOfs)*FH, ch, attr); // show CHx
|
||||||
if (s_copyMode == MOVE_MODE && s_copySrcCh == ch) {
|
if (s_copyMode == MOVE_MODE && s_copySrcCh == ch) {
|
||||||
uint8_t y = k*FH;
|
uint8_t y = (cur-s_pgOfs)*FH;
|
||||||
lcd_rect(expo ? 18 : 22, y-1, expo ? (DISPLAY_W-18) : (DISPLAY_W-22), 9, DOTTED);
|
lcd_rect(expo ? 18 : 22, y-1, expo ? (DISPLAY_W-18) : (DISPLAY_W-22), 9, DOTTED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user