From 46ae2e434a6bcf9a60ba5c862cba87c0a372b703 Mon Sep 17 00:00:00 2001 From: "bsongis@gmail.com" Date: Wed, 12 Jun 2013 05:34:35 +0000 Subject: [PATCH] [stock] Overlap in Custom Functions screen when GRAPHICS=NO --- src/gui/menu_model.cpp | 29 +++++++++++++++-------------- src/gui/menus.cpp | 5 ++--- src/haptic.cpp | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/gui/menu_model.cpp b/src/gui/menu_model.cpp index 15e25bc2d..ee0a3a26e 100644 --- a/src/gui/menu_model.cpp +++ b/src/gui/menu_model.cpp @@ -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()) { diff --git a/src/gui/menus.cpp b/src/gui/menus.cpp index d42fa0040..e69fc9b41 100644 --- a/src/gui/menus.cpp +++ b/src/gui/menus.cpp @@ -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 diff --git a/src/haptic.cpp b/src/haptic.cpp index 83f3a8410..ff97d6f21 100644 --- a/src/haptic.cpp +++ b/src/haptic.cpp @@ -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)); } } }