From 1a36dfc5d32eed8148a3f7d0078494ab35cf0403 Mon Sep 17 00:00:00 2001 From: Aleksandr Kutuzov Date: Fri, 16 Oct 2020 16:34:36 +0300 Subject: [PATCH] GUI: hide canvas inside --- applications/gui/canvas.c | 87 +++++++++++++++++++++++---------------- applications/gui/canvas.h | 29 +++---------- applications/menu/menu.c | 4 +- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/applications/gui/canvas.c b/applications/gui/canvas.c index 6dc7962c..c353bca3 100644 --- a/applications/gui/canvas.c +++ b/applications/gui/canvas.c @@ -4,6 +4,16 @@ #include #include +typedef struct { + CanvasApi api; + + u8g2_t fb; + uint8_t offset_x; + uint8_t offset_y; + uint8_t width; + uint8_t height; +} Canvas; + uint8_t canvas_width(CanvasApi* api); uint8_t canvas_height(CanvasApi* api); void canvas_clear(CanvasApi* api); @@ -15,30 +25,26 @@ uint8_t u8g2_gpio_and_delay_stm32(u8x8_t* u8x8, uint8_t msg, uint8_t arg_int, vo uint8_t u8x8_hw_spi_stm32(u8x8_t* u8x8, uint8_t msg, uint8_t arg_int, void* arg_ptr); CanvasApi* canvas_api_init() { - CanvasApi* api = furi_alloc(sizeof(CanvasApi)); + Canvas* canvas = furi_alloc(sizeof(Canvas)); u8g2_Setup_st7565_erc12864_alt_f( - &api->canvas.fb, U8G2_R0, u8x8_hw_spi_stm32, u8g2_gpio_and_delay_stm32); + &canvas->fb, U8G2_R0, u8x8_hw_spi_stm32, u8g2_gpio_and_delay_stm32); // send init sequence to the display, display is in sleep mode after this - u8g2_InitDisplay(&api->canvas.fb); - u8g2_SetContrast(&api->canvas.fb, 36); + u8g2_InitDisplay(&canvas->fb); + u8g2_SetContrast(&canvas->fb, 36); - u8g2_SetPowerSave(&api->canvas.fb, 0); // wake up display - u8g2_SendBuffer(&api->canvas.fb); + u8g2_SetPowerSave(&canvas->fb, 0); // wake up display + u8g2_SendBuffer(&canvas->fb); - api->width = canvas_width; - api->height = canvas_height; - api->clear = canvas_clear; - api->set_color = canvas_color_set; - api->set_font = canvas_font_set; - api->draw_str = canvas_str_draw; + canvas->api.width = canvas_width; + canvas->api.height = canvas_height; + canvas->api.clear = canvas_clear; + canvas->api.set_color = canvas_color_set; + canvas->api.set_font = canvas_font_set; + canvas->api.draw_str = canvas_str_draw; - api->fonts = furi_alloc(sizeof(Fonts)); - api->fonts->primary = u8g2_font_Born2bSportyV2_tr; - api->fonts->secondary = u8g2_font_HelvetiPixel_tr; - - return api; + return (CanvasApi*)canvas; } void canvas_api_free(CanvasApi* api) { @@ -48,9 +54,9 @@ void canvas_api_free(CanvasApi* api) { void canvas_commit(CanvasApi* api) { assert(api); - - u8g2_SetPowerSave(&api->canvas.fb, 0); // wake up display - u8g2_SendBuffer(&api->canvas.fb); + Canvas* canvas = (Canvas *)api; + u8g2_SetPowerSave(&canvas->fb, 0); // wake up display + u8g2_SendBuffer(&canvas->fb); } void canvas_frame_set( @@ -60,43 +66,54 @@ void canvas_frame_set( uint8_t width, uint8_t height) { assert(api); - api->canvas.offset_x = offset_x; - api->canvas.offset_y = offset_y; - api->canvas.width = width; - api->canvas.height = height; + Canvas* canvas = (Canvas*)api; + canvas->offset_x = offset_x; + canvas->offset_y = offset_y; + canvas->width = width; + canvas->height = height; } uint8_t canvas_width(CanvasApi* api) { assert(api); - - return api->canvas.width; + Canvas* canvas = (Canvas *)api; + return canvas->width; } uint8_t canvas_height(CanvasApi* api) { assert(api); - - return api->canvas.height; + Canvas* canvas = (Canvas *)api; + return canvas->height; } void canvas_clear(CanvasApi* api) { assert(api); - u8g2_ClearBuffer(&api->canvas.fb); + Canvas* canvas = (Canvas *)api; + u8g2_ClearBuffer(&canvas->fb); } void canvas_color_set(CanvasApi* api, Color color) { assert(api); - u8g2_SetDrawColor(&api->canvas.fb, color); + Canvas* canvas = (Canvas *)api; + u8g2_SetDrawColor(&canvas->fb, color); } void canvas_font_set(CanvasApi* api, Font font) { assert(api); - u8g2_SetFontMode(&api->canvas.fb, 1); - u8g2_SetFont(&api->canvas.fb, font); + Canvas* canvas = (Canvas *)api; + u8g2_SetFontMode(&canvas->fb, 1); + if (font == FontPrimary) { + u8g2_SetFont(&canvas->fb, u8g2_font_Born2bSportyV2_tr); + } else if (font == FontSecondary) { + u8g2_SetFont(&canvas->fb, u8g2_font_HelvetiPixel_tr); + } else { + assert(0); + } } void canvas_str_draw(CanvasApi* api, uint8_t x, uint8_t y, const char* str) { assert(api); - x += api->canvas.offset_x; - y += api->canvas.offset_y; - u8g2_DrawStr(&api->canvas.fb, x, y, str); + Canvas* canvas = (Canvas *)api; + x += canvas->offset_x; + y += canvas->offset_y; + u8g2_DrawStr(&canvas->fb, x, y, str); } diff --git a/applications/gui/canvas.h b/applications/gui/canvas.h index 27dd2efe..237a75de 100644 --- a/applications/gui/canvas.h +++ b/applications/gui/canvas.h @@ -8,30 +8,13 @@ typedef enum { ColorBlack = 0x01, } Color; -typedef const uint8_t* Font; - -typedef struct { - Font primary; - Font secondary; -} Fonts; - -struct _CanvasApi; - -typedef struct _CanvasApi CanvasApi; - -// Canvas is private but we need its declaration here -typedef struct { - u8g2_t fb; - uint8_t offset_x; - uint8_t offset_y; - uint8_t width; - uint8_t height; -} Canvas; - -struct _CanvasApi { - Canvas canvas; - Fonts* fonts; +typedef enum { + FontPrimary = 0x00, + FontSecondary = 0x01, +} Font; +typedef struct CanvasApi CanvasApi; +struct CanvasApi { uint8_t (*width)(CanvasApi* canvas); uint8_t (*height)(CanvasApi* canvas); diff --git a/applications/menu/menu.c b/applications/menu/menu.c index 0ef37d67..a0261bf5 100644 --- a/applications/menu/menu.c +++ b/applications/menu/menu.c @@ -87,13 +87,13 @@ void menu_widget_callback(CanvasApi* canvas, void* context) { if(!menu->current) { canvas->clear(canvas); canvas->set_color(canvas, ColorBlack); - canvas->set_font(canvas, canvas->fonts->primary); + canvas->set_font(canvas, FontPrimary); canvas->draw_str(canvas, 2, 32, "Idle Screen"); } else { MenuItemArray_t* items = menu_item_get_subitems(menu->current); canvas->clear(canvas); canvas->set_color(canvas, ColorBlack); - canvas->set_font(canvas, canvas->fonts->secondary); + canvas->set_font(canvas, FontSecondary); for(size_t i = 0; i < 5; i++) { size_t shift_position = i + menu->position + MenuItemArray_size(*items) - 2; shift_position = shift_position % (MenuItemArray_size(*items));