Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 15:08:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Format

Browse Source
This commit is contained in:
Willy-JL
2023-07-28 00:31:58 +02:00
parent 27fb23d4ce
commit 586d63f223
7 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/external/camera_suite/views/camera_suite_view_style_1.h vendored
View File

@@ -16,9 +16,9 @@
#include <xtreme.h> #include <xtreme.h>
#define UART_CH \ #define UART_CH \
(XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \
FuriHalUartIdLPUART1) FuriHalUartIdLPUART1)
#pragma once #pragma once

4
applications/external/esp8266_deauth/esp8266_deauth.c vendored
View File

@@ -15,9 +15,9 @@
#include "FlipperZeroWiFiDeauthModuleDefines.h" #include "FlipperZeroWiFiDeauthModuleDefines.h"
#define UART_CH \ #define UART_CH \
(XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \
FuriHalUartIdLPUART1) FuriHalUartIdLPUART1)
#define DEAUTH_APP_DEBUG 0 #define DEAUTH_APP_DEBUG 0

4
applications/external/esp_flasher/esp_flasher_uart.c vendored
View File

@@ -2,9 +2,9 @@
#include "esp_flasher_uart.h" #include "esp_flasher_uart.h"
#include <xtreme.h> #include <xtreme.h>
#define UART_CH \ #define UART_CH \
(XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \
FuriHalUartIdLPUART1) FuriHalUartIdLPUART1)
#define BAUDRATE (115200) #define BAUDRATE (115200)
struct EspFlasherUart { struct EspFlasherUart {

4
applications/external/evil_portal/evil_portal_app_i.h vendored
View File

@@ -19,9 +19,9 @@
#define NUM_MENU_ITEMS (4) #define NUM_MENU_ITEMS (4)
#define EVIL_PORTAL_TEXT_BOX_STORE_SIZE (4096) #define EVIL_PORTAL_TEXT_BOX_STORE_SIZE (4096)
#define UART_CH \ #define UART_CH \
(XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \
FuriHalUartIdLPUART1) FuriHalUartIdLPUART1)
#define SET_HTML_CMD "sethtml" #define SET_HTML_CMD "sethtml"
#define SET_AP_CMD "setap" #define SET_AP_CMD "setap"

4
applications/external/wifi_deauther/wifi_deauther_app_i.h vendored
View File

@@ -14,9 +14,9 @@
#include <xtreme.h> #include <xtreme.h>
#define UART_CH \ #define UART_CH \
(XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \
FuriHalUartIdLPUART1) FuriHalUartIdLPUART1)
#define NUM_MENU_ITEMS (11) #define NUM_MENU_ITEMS (11)

4
applications/external/wifi_scanner/FlipperZeroWiFiModuleDefines.h vendored
View File

@@ -18,6 +18,6 @@
#include <xtreme.h> #include <xtreme.h>
#define UART_CH \ #define UART_CH \
(XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \ (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \
FuriHalUartIdLPUART1) FuriHalUartIdLPUART1)

17
applications/services/gui/modules/menu.c
View File

@@ -165,9 +165,11 @@ static void menu_draw_callback(Canvas* canvas, void* _model) {
if(i == 0) { if(i == 0) {
width += 6; width += 6;
height += 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_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_rframe(canvas, 0, 0, 128, 18, 3);
canvas_draw_line(canvas, 60, 18, 64, 26); 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_color(canvas, ColorBlack);
canvas_set_font(canvas, FontPrimary); 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 { } else {
pos_x += (width + 6) * i; pos_x += (width + 6) * i;
pos_y += 2; 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) { if(item->icon) {
canvas_draw_icon_animation( canvas_draw_icon_animation(