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

[stock] Overlap in Custom Functions screen when GRAPHICS=NO

Browse Source
This commit is contained in:
bsongis@gmail.com
2013-06-12 05:34:35 +00:00
parent 4c01fa5ccd
commit 46ae2e434a
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/menu_model.cpp
+15 -14
View File
@@ -4118,20 +4118,21 @@ void menuModelCustomSwitches(uint8_t event)
#endif
#if LCD_W >= 212
#define MODEL_CUSTOM_FUNC_1ST_COLUMN (5+4*FW)
#define MODEL_CUSTOM_FUNC_2ND_COLUMN (9*FW)
#define MODEL_CUSTOM_FUNC_3RD_COLUMN (21*FW)
#define MODEL_CUSTOM_FUNC_4TH_COLUMN (34*FW-3)
#elif defined(GRAPHICS)
#define MODEL_CUSTOM_FUNC_1ST_COLUMN (3)
#define MODEL_CUSTOM_FUNC_2ND_COLUMN (5*FW-2)
#define MODEL_CUSTOM_FUNC_3RD_COLUMN (15*FW+2)
#define MODEL_CUSTOM_FUNC_4TH_COLUMN (20*FW)
#define MODEL_CUSTOM_FUNC_1ST_COLUMN (5+4*FW)
#define MODEL_CUSTOM_FUNC_2ND_COLUMN (9*FW)
#define MODEL_CUSTOM_FUNC_3RD_COLUMN (21*FW)
#define MODEL_CUSTOM_FUNC_4TH_COLUMN (34*FW-3)
#define MODEL_CUSTOM_FUNC_4TH_COLUMN_ONOFF MODEL_CUSTOM_FUNC_4TH_COLUMN
#else
#define MODEL_CUSTOM_FUNC_1ST_COLUMN (3)
#define MODEL_CUSTOM_FUNC_2ND_COLUMN (5*FW-2)
#define MODEL_CUSTOM_FUNC_3RD_COLUMN (15*FW+2)
#define MODEL_CUSTOM_FUNC_4TH_COLUMN (18*FW+2)
#define MODEL_CUSTOM_FUNC_1ST_COLUMN (3)
#define MODEL_CUSTOM_FUNC_2ND_COLUMN (5*FW-2)
#define MODEL_CUSTOM_FUNC_3RD_COLUMN (15*FW+2)
#define MODEL_CUSTOM_FUNC_4TH_COLUMN (20*FW)
#if defined(GRAPHICS)
#define MODEL_CUSTOM_FUNC_4TH_COLUMN_ONOFF MODEL_CUSTOM_FUNC_4TH_COLUMN
#else
#define MODEL_CUSTOM_FUNC_4TH_COLUMN_ONOFF (18*FW+2)
#endif
#endif
#if defined(CPUARM) && defined(SDCARD)
@@ -4395,7 +4396,7 @@ void menuModelCustomFunctions(uint8_t event)
|| CFN_FUNC(sd) == FUNC_VOLUME
#endif
)) {
menu_lcd_onoff(MODEL_CUSTOM_FUNC_4TH_COLUMN, y, CFN_ACTIVE(sd), attr);
menu_lcd_onoff(MODEL_CUSTOM_FUNC_4TH_COLUMN_ONOFF, y, CFN_ACTIVE(sd), attr);
if (active) CHECK_INCDEC_MODELVAR_ZERO(event, CFN_ACTIVE(sd), 1);
}
else if (sd->swtch && HAS_REPEAT_PARAM()) {
src/gui/menus.cpp
+2 -3
View File
@@ -41,12 +41,11 @@ int8_t s_editMode;
uint8_t s_noHi;
uint8_t s_noScroll;
void menu_lcd_onoff(uint8_t x,uint8_t y, uint8_t value, LcdFlags attr)
void menu_lcd_onoff(uint8_t x, uint8_t y, uint8_t value, LcdFlags attr)
{
#if defined(GRAPHICS)
if (value) {
if (value)
lcd_putc(x+1, y, '#');
}
if (attr)
lcd_filled_rect(x, y, 7, 7);
else
src/haptic.cpp
+1 -1
View File
@@ -120,7 +120,7 @@ void hapticQueue::event(uint8_t e)
play(15, 3, (e-AU_TIMER_20+1)|PLAY_NOW);
else if (e >= AU_FRSKY_LAST && empty()) {
play(30, 10, 0);
play(10,50-10*(e-AU_FRSKY_LAST),(e-AU_FRSKY_LAST));
play(10, 50-10*(e-AU_FRSKY_LAST), (e-AU_FRSKY_LAST));
}
}
}