diff --git a/applications/external/camera_suite/views/camera_suite_view_style_1.h b/applications/external/camera_suite/views/camera_suite_view_style_1.h index 47b4d7038..31f968021 100644 --- a/applications/external/camera_suite/views/camera_suite_view_style_1.h +++ b/applications/external/camera_suite/views/camera_suite_view_style_1.h @@ -16,9 +16,9 @@ #include -#define UART_CH \ +#define UART_CH \ (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) + FuriHalUartIdLPUART1) #pragma once diff --git a/applications/external/esp8266_deauth/esp8266_deauth.c b/applications/external/esp8266_deauth/esp8266_deauth.c index e2c21df1d..3339ad9a4 100644 --- a/applications/external/esp8266_deauth/esp8266_deauth.c +++ b/applications/external/esp8266_deauth/esp8266_deauth.c @@ -15,9 +15,9 @@ #include "FlipperZeroWiFiDeauthModuleDefines.h" -#define UART_CH \ +#define UART_CH \ (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) + FuriHalUartIdLPUART1) #define DEAUTH_APP_DEBUG 0 diff --git a/applications/external/esp_flasher/esp_flasher_uart.c b/applications/external/esp_flasher/esp_flasher_uart.c index eb4f44012..c06fa7103 100644 --- a/applications/external/esp_flasher/esp_flasher_uart.c +++ b/applications/external/esp_flasher/esp_flasher_uart.c @@ -2,9 +2,9 @@ #include "esp_flasher_uart.h" #include -#define UART_CH \ +#define UART_CH \ (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) + FuriHalUartIdLPUART1) #define BAUDRATE (115200) struct EspFlasherUart { diff --git a/applications/external/evil_portal/evil_portal_app_i.h b/applications/external/evil_portal/evil_portal_app_i.h index d1e16c6e9..af36d8eb9 100644 --- a/applications/external/evil_portal/evil_portal_app_i.h +++ b/applications/external/evil_portal/evil_portal_app_i.h @@ -19,9 +19,9 @@ #define NUM_MENU_ITEMS (4) #define EVIL_PORTAL_TEXT_BOX_STORE_SIZE (4096) -#define UART_CH \ +#define UART_CH \ (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) + FuriHalUartIdLPUART1) #define SET_HTML_CMD "sethtml" #define SET_AP_CMD "setap" diff --git a/applications/external/wifi_deauther/wifi_deauther_app_i.h b/applications/external/wifi_deauther/wifi_deauther_app_i.h index f147ec2b2..a26950d98 100644 --- a/applications/external/wifi_deauther/wifi_deauther_app_i.h +++ b/applications/external/wifi_deauther/wifi_deauther_app_i.h @@ -14,9 +14,9 @@ #include -#define UART_CH \ +#define UART_CH \ (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) + FuriHalUartIdLPUART1) #define NUM_MENU_ITEMS (11) diff --git a/applications/external/wifi_scanner/FlipperZeroWiFiModuleDefines.h b/applications/external/wifi_scanner/FlipperZeroWiFiModuleDefines.h index 7eade2350..8ec46ce79 100644 --- a/applications/external/wifi_scanner/FlipperZeroWiFiModuleDefines.h +++ b/applications/external/wifi_scanner/FlipperZeroWiFiModuleDefines.h @@ -18,6 +18,6 @@ #include -#define UART_CH \ +#define UART_CH \ (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ - FuriHalUartIdLPUART1) + FuriHalUartIdLPUART1) diff --git a/applications/services/gui/modules/menu.c b/applications/services/gui/modules/menu.c index f7257543c..e4fa100de 100644 --- a/applications/services/gui/modules/menu.c +++ b/applications/services/gui/modules/menu.c @@ -165,9 +165,11 @@ static void menu_draw_callback(Canvas* canvas, void* _model) { if(i == 0) { width += 6; height += 6; - elements_bold_rounded_frame(canvas, pos_x - width / 2, pos_y - height / 2, width, height + 4); + elements_bold_rounded_frame( + canvas, pos_x - width / 2, pos_y - height / 2, width, height + 4); canvas_set_font(canvas, FontBatteryPercent); - canvas_draw_str_aligned(canvas, pos_x, pos_y + height / 2 + 1, AlignCenter, AlignBottom, "START"); + canvas_draw_str_aligned( + canvas, pos_x, pos_y + height / 2 + 1, AlignCenter, AlignBottom, "START"); canvas_draw_rframe(canvas, 0, 0, 128, 18, 3); canvas_draw_line(canvas, 60, 18, 64, 26); @@ -178,11 +180,18 @@ static void menu_draw_callback(Canvas* canvas, void* _model) { canvas_set_color(canvas, ColorBlack); canvas_set_font(canvas, FontPrimary); - canvas_draw_str_aligned(canvas, pos_x, pos_y - height / 2 - 7, AlignCenter, AlignBottom, item->label); + canvas_draw_str_aligned( + canvas, + pos_x, + pos_y - height / 2 - 7, + AlignCenter, + AlignBottom, + item->label); } else { pos_x += (width + 6) * i; pos_y += 2; - elements_slightly_rounded_frame(canvas, pos_x - width / 2, pos_y - height / 2, width, height); + elements_slightly_rounded_frame( + canvas, pos_x - width / 2, pos_y - height / 2, width, height); } if(item->icon) { canvas_draw_icon_animation(