From f9bda68ef84036b5708e102e06cf34e81f72a245 Mon Sep 17 00:00:00 2001 From: aanper Date: Thu, 15 Oct 2020 18:57:21 +0300 Subject: [PATCH] lint --- applications/gui/canvas.c | 5 +---- applications/gui/canvas.h | 10 +++++----- applications/gui/gui.c | 19 ++++++++++--------- applications/gui/widget.c | 2 +- applications/menu/menu.c | 4 ++-- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/applications/gui/canvas.c b/applications/gui/canvas.c index 5a8d7307..6dc7962c 100644 --- a/applications/gui/canvas.c +++ b/applications/gui/canvas.c @@ -18,10 +18,7 @@ CanvasApi* canvas_api_init() { CanvasApi* api = furi_alloc(sizeof(CanvasApi)); u8g2_Setup_st7565_erc12864_alt_f( - &api->canvas.fb, - U8G2_R0, - u8x8_hw_spi_stm32, - u8g2_gpio_and_delay_stm32); + &api->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); diff --git a/applications/gui/canvas.h b/applications/gui/canvas.h index 3d77e8fe..27dd2efe 100644 --- a/applications/gui/canvas.h +++ b/applications/gui/canvas.h @@ -4,15 +4,15 @@ #include typedef enum { - ColorWhite = 0x00, - ColorBlack = 0x01, + ColorWhite = 0x00, + ColorBlack = 0x01, } Color; typedef const uint8_t* Font; typedef struct { - Font primary; - Font secondary; + Font primary; + Font secondary; } Fonts; struct _CanvasApi; @@ -31,7 +31,7 @@ typedef struct { struct _CanvasApi { Canvas canvas; Fonts* fonts; - + uint8_t (*width)(CanvasApi* canvas); uint8_t (*height)(CanvasApi* canvas); diff --git a/applications/gui/gui.c b/applications/gui/gui.c index e03971eb..6be88315 100644 --- a/applications/gui/gui.c +++ b/applications/gui/gui.c @@ -32,20 +32,21 @@ void gui_add_widget(GuiApi* gui_api, Widget* widget, WidgetLayer layer) { WidgetArray_t* widget_array = NULL; switch(layer) { - case WidgetLayerStatusBar: - widget_array = &gui_api->gui->widgets_status_bar; + case WidgetLayerStatusBar: + widget_array = &gui_api->gui->widgets_status_bar; break; - case WidgetLayerMain: - widget_array = &gui_api->gui->widgets; + case WidgetLayerMain: + widget_array = &gui_api->gui->widgets; break; - case WidgetLayerFullscreen: - widget_array = &gui_api->gui->widgets_fs; + case WidgetLayerFullscreen: + widget_array = &gui_api->gui->widgets_fs; break; - case WidgetLayerDialog: - widget_array = &gui_api->gui->widgets_dialog; + case WidgetLayerDialog: + widget_array = &gui_api->gui->widgets_dialog; break; - default: break; + default: + break; } assert(widget); diff --git a/applications/gui/widget.c b/applications/gui/widget.c index 148abdf6..3277c24d 100644 --- a/applications/gui/widget.c +++ b/applications/gui/widget.c @@ -70,7 +70,7 @@ void widget_draw(Widget* widget, CanvasApi* canvas_api) { assert(widget->gui); if(widget->draw_callback) { - widget->draw_callback(canvas_api, widget->draw_callback_context); + widget->draw_callback(canvas_api, widget->draw_callback_context); } } diff --git a/applications/menu/menu.c b/applications/menu/menu.c index 92737b87..156e7f60 100644 --- a/applications/menu/menu.c +++ b/applications/menu/menu.c @@ -15,7 +15,7 @@ struct Menu { // GUI Widget* widget; - + // State MenuItem* root; MenuItem* settings; @@ -175,7 +175,7 @@ void menu_exit(Menu* menu) { void menu_task(void* p) { Menu* menu = menu_init(); - menu_build_main(menu); + menu_build_main(menu); if(!furi_create_deprecated("menu", menu, sizeof(menu))) { printf("[menu_task] cannot create the menu record\n");