From 6b0fd1f1acbb1520b2f6675c1eeb28501d52de43 Mon Sep 17 00:00:00 2001 From: C47D Date: Sun, 31 Jan 2021 17:28:03 -0600 Subject: [PATCH] SSD1306: Handle theme not being mono --- lvgl_helpers.h | 4 ++++ lvgl_tft/ssd1306.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/lvgl_helpers.h b/lvgl_helpers.h index 9c622f7..bbe8211 100644 --- a/lvgl_helpers.h +++ b/lvgl_helpers.h @@ -40,7 +40,11 @@ extern "C" { #elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341 #define DISP_BUF_SIZE (LV_HOR_RES_MAX * 64) #elif defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_SSD1306 +#if defined (CONFIG_LV_THEME_MONO) #define DISP_BUF_SIZE (LV_HOR_RES_MAX * (LV_VER_RES_MAX / 8)) +#else +#define DISP_BUF_SIZE (LV_HOR_RES_MAX * LV_VER_RES_MAX) +#endif #elif defined (CONFIG_LV_TFT_DISPLAY_CONTROLLER_FT81X) #define DISP_BUF_LINES 40 #define DISP_BUF_SIZE (LV_HOR_RES_MAX * DISP_BUF_LINES) diff --git a/lvgl_tft/ssd1306.c b/lvgl_tft/ssd1306.c index 6529eee..276039a 100644 --- a/lvgl_tft/ssd1306.c +++ b/lvgl_tft/ssd1306.c @@ -176,8 +176,18 @@ void ssd1306_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t void ssd1306_rounder(lv_disp_drv_t * disp_drv, lv_area_t *area) { +#if defined (CONFIG_LV_THEME_MONO) area->x1 = area->x1 & ~(0x07); area->x2 = area->x2 | 0x07; +#else + uint8_t hor_max = disp_drv->hor_res; + uint8_t ver_max = disp_drv->ver_res; + + area->x1 = 0; + area->y1 = 0; + area->x2 = hor_max - 1; + area->y2 = ver_max - 1; +#endif } void ssd1306_sleep_in(void)