From 9b7318710025ae85af714bb0b5f390db84ae2cd0 Mon Sep 17 00:00:00 2001 From: inmarket Date: Fri, 30 Jun 2017 19:43:51 +1000 Subject: Add compatibility with Visual Studio and make compile warning capabilities more cross platform --- drivers/gdisp/RA6963/gdisp_lld_RA6963.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'drivers/gdisp/RA6963') diff --git a/drivers/gdisp/RA6963/gdisp_lld_RA6963.c b/drivers/gdisp/RA6963/gdisp_lld_RA6963.c index bad7f38d..2a983a65 100755 --- a/drivers/gdisp/RA6963/gdisp_lld_RA6963.c +++ b/drivers/gdisp/RA6963/gdisp_lld_RA6963.c @@ -31,14 +31,16 @@ /*===========================================================================*/ /* Driver local definitions. */ /*===========================================================================*/ -#if defined(GDISP_SCREEN_HEIGHT) -#warning "GDISP: This low level driver does not support setting a screen size. It is being ignored." -#undef GISP_SCREEN_HEIGHT -#endif -#if defined(GDISP_SCREEN_WIDTH) -#warning "GDISP: This low level driver does not support setting a screen size. It is being ignored." -#undef GDISP_SCREEN_WIDTH +#if defined(GDISP_SCREEN_HEIGHT) || defined(GDISP_SCREEN_HEIGHT) + #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT + #warning "GDISP: This low level driver does not support setting a screen size. It is being ignored." + #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO + COMPILER_WARNING("GDISP: This low level driver does not support setting a screen size. It is being ignored.") + #endif + #undef GDISP_SCREEN_WIDTH + #undef GDISP_SCREEN_HEIGHT #endif + #include "board_RA6963.h" // RA6963 Commands @@ -213,7 +215,11 @@ static void set_viewport(GDisplay *g) { return; // 0 + ( x / 8 ) + ( y * 16 ) //uint16_t addr = (RA6963_GRAPHIC_HOME + ((g->p.x) / RA6963_FONT_WIDTH) + ((g->p.y) * RA6963_GRAPHIC_AREA)); uint16_t addr = (RA6963_GRAPHIC_HOME + ((g->p.x >> 3) + (g->p.y << 4))); -#warning "check function set_viewport about the shift operations if you change the resolution!" + #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT + #warning "check function set_viewport about the shift operations if you change the resolution!" + #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO + COMPILER_WARNING("check function set_viewport about the shift operations if you change the resolution!") + #endif write_data(g, (uint8_t)addr); write_data(g, (uint8_t)(addr>>8)); write_cmd(g, RA6963_SET_ADDRESS_POINTER); -- cgit v1.2.3