From 73e807062a9532fbb5a212766319340eb61b46ac Mon Sep 17 00:00:00 2001 From: bsongis Date: Wed, 9 Jan 2013 17:38:02 +0000 Subject: [PATCH] [X9D] No more GREY on inactives mixes / expos. CoOS delay instead of loop in SD Init. --- src/menus.h | 6 ++--- src/model_menus.cpp | 53 ++++++++++++--------------------------------- src/x9d/diskio.cpp | 6 +++-- 3 files changed, 20 insertions(+), 45 deletions(-) diff --git a/src/menus.h b/src/menus.h index 9d6ccda38..f87211135 100644 --- a/src/menus.h +++ b/src/menus.h @@ -212,11 +212,9 @@ uint8_t onoffMenuItem(uint8_t value, uint8_t x, uint8_t y, const pm_char *label, int8_t switchMenuItem(uint8_t x, uint8_t y, int8_t value, LcdFlags attr, uint8_t event); int8_t gvarMenuItem(uint8_t x, uint8_t y, int8_t value, int8_t min, int8_t max, LcdFlags attr, uint8_t event); #if defined(GVARS) -#define displayGVar(x, y, v, a) gvarMenuItem(x, y, v, 0, 0, a, 0) -#elif defined(PCBX9D) -#define displayGVar(x, y, v, a) lcd_outdezAtt(x, y, v, a) +#define displayGVar(x, y, v) gvarMenuItem(x, y, v, 0, 0, 0, 0) #else -#define displayGVar(x, y, v, a) lcd_outdez8(x, y, v) +#define displayGVar(x, y, v) lcd_outdez8(x, y, 0) #endif #define WARNING_TYPE_ASTERISK 0 diff --git a/src/model_menus.cpp b/src/model_menus.cpp index 189e90492..684bf7e51 100644 --- a/src/model_menus.cpp +++ b/src/model_menus.cpp @@ -2126,15 +2126,6 @@ void menuModelExpoMix(uint8_t expo, uint8_t event) uint8_t cur = 1; uint8_t i = 0; -#if defined(PCBX9D) - #define mixsrcattr allattr - #define expoweightattr allattr -#else - #define allattr 0 - #define mixsrcattr (isMixActive(i) ? BOLD : 0) - #define expoweightattr (isExpoActive(i) ? BOLD : 0) -#endif - for (uint8_t ch=1; ch<=(expo ? NUM_STICKS : NUM_CHNOUT); ch++) { void *pointer = NULL; MixData * &md = (MixData * &)pointer; ExpoData * &ed = (ExpoData * &)pointer; uint8_t y = (cur-s_pgOfs)*FH; @@ -2163,50 +2154,38 @@ void menuModelExpoMix(uint8_t expo, uint8_t event) if (s_pgOfs < cur && cur-s_pgOfs < 8) { uint8_t attr = ((s_copyMode || sub != cur) ? 0 : INVERS); if (expo) { -#if defined(PCBX9D) - uint32_t allattr = isMixActive(i) ? 0 : GREY1; -#endif - ed->weight = gvarMenuItem(EXPO_LINE_WEIGHT_POS, y, ed->weight, 0, 100, attr | expoweightattr, event); + ed->weight = gvarMenuItem(EXPO_LINE_WEIGHT_POS, y, ed->weight, 0, 100, attr | (isExpoActive(i) ? BOLD : 0), event); if (ed->curveMode == MODE_CURVE) - putsCurve(EXPO_LINE_EXPO_POS-3*FW, y, ed->curveParam, allattr); + putsCurve(EXPO_LINE_EXPO_POS-3*FW, y, ed->curveParam); else - displayGVar(EXPO_LINE_EXPO_POS, y, ed->curveParam, allattr); + displayGVar(EXPO_LINE_EXPO_POS, y, ed->curveParam); #if defined(CPUARM) if (ed->name[0]) { - putsSwitches(11*FW, y, ed->swtch, allattr); - lcd_putsnAtt(DISPLAY_W-sizeof(ed->name)*FW-MENUS_SCROLLBAR_WIDTH, y, ed->name, sizeof(ed->name), ZCHAR | expoweightattr); + putsSwitches(11*FW, y, ed->swtch, 0); + lcd_putsnAtt(DISPLAY_W-sizeof(ed->name)*FW-MENUS_SCROLLBAR_WIDTH, y, ed->name, sizeof(ed->name), ZCHAR | (isExpoActive(i) ? BOLD : 0)); } #if !defined(LCD212) else #endif #endif { - putsSwitches(EXPO_LINE_SWITCH_POS, y, ed->swtch, allattr); // normal switches - if (ed->mode!=3) { -#if defined(PCBX9D) - lcd_putcAtt(17*FW, y, ed->mode == 2 ? 126 : 127, allattr); -#else - lcd_putc(17*FW, y, ed->mode == 2 ? 126 : 127); -#endif - } + putsSwitches(EXPO_LINE_SWITCH_POS, y, ed->swtch, 0); // normal switches + if (ed->mode!=3) lcd_putc(17*FW, y, ed->mode == 2 ? 126 : 127);//'|' : (stkVal[i] ? '<' : '>'),0);*/ } } else { -#if defined(PCBX9D) - uint32_t allattr = isMixActive(i) ? 0 : GREY2; -#endif if (mixCnt > 0) - lcd_putsiAtt(1*FW+0, y, STR_VMLTPX2, md->mltpx, allattr); + lcd_putsiAtt(1*FW+0, y, STR_VMLTPX2, md->mltpx, 0); - putsMixerSource(4*FW+0, y, md->srcRaw, mixsrcattr); + putsMixerSource(4*FW+0, y, md->srcRaw, isMixActive(i) ? BOLD : 0); - md->weight = gvarMenuItem(11*FW+3, y, md->weight, -125, 125, attr|allattr, event); + md->weight = gvarMenuItem(11*FW+3, y, md->weight, -125, 125, attr, event); #if defined(CPUARM) if (md->name[0]) { - lcd_putsnAtt(DISPLAY_W-sizeof(md->name)*FW-MENUS_SCROLLBAR_WIDTH, y, md->name, sizeof(md->name), ZCHAR | mixsrcattr); + lcd_putsnAtt(DISPLAY_W-sizeof(md->name)*FW-MENUS_SCROLLBAR_WIDTH, y, md->name, sizeof(md->name), ZCHAR | (isMixActive(i) ? BOLD : 0)); } #if !defined(LCD212) else @@ -2215,22 +2194,18 @@ void menuModelExpoMix(uint8_t expo, uint8_t event) { if (md->curveParam) { if (md->curveMode == MODE_CURVE) - putsCurve(12*FW+2, y, md->curveParam, allattr); + putsCurve(12*FW+2, y, md->curveParam); else - displayGVar(15*FW+2, y, md->curveParam, allattr); + displayGVar(15*FW+2, y, md->curveParam); } - if (md->swtch) putsSwitches(16*FW, y, md->swtch, allattr); + if (md->swtch) putsSwitches(16*FW, y, md->swtch); char cs = ' '; if (md->speedDown || md->speedUp) cs = 'S'; if ((md->delayUp || md->delayDown)) cs = (cs =='S' ? '*' : 'D'); -#if defined(PCBX9D) - lcd_putcAtt(19*FW+7, y, cs, allattr); -#else lcd_putc(19*FW+7, y, cs); -#endif } } if (s_copyMode) { diff --git a/src/x9d/diskio.cpp b/src/x9d/diskio.cpp index 5a074dd91..0ca25a5da 100644 --- a/src/x9d/diskio.cpp +++ b/src/x9d/diskio.cpp @@ -360,7 +360,8 @@ void power_on (void) socket_cp_init();//Empty return socket_wp_init();//Empty return. - for (Timer1 = 25; Timer1; ); /* Wait for 250ms */ + CoTickDelay(125); + // for (Timer1 = 25; Timer1; ); /* Wait for 250ms */ /* SPI configuration */ SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex; @@ -906,12 +907,13 @@ uint32_t sdMounted() void sdMountPoll() { + /* TODO a define static uint8_t mountTimer; if (mountTimer-- == 0) { mountTimer = 100; if (!sdMounted()) { sdInit(); } - } + }*/ }