mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-06-07 19:01:54 -07:00
Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into dev
This commit is contained in:
@@ -71,8 +71,8 @@ static void bad_usb_draw_callback(Canvas* canvas, void* _model) {
|
||||
canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18);
|
||||
canvas_set_font(canvas, FontPrimary);
|
||||
if (settings->sfw_mode) {
|
||||
canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Connect me");
|
||||
canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "to a computer");
|
||||
canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Connect to");
|
||||
canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "a device");
|
||||
}
|
||||
else {
|
||||
canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Plug me");
|
||||
|
||||
@@ -25,7 +25,7 @@ static void u2f_view_draw_callback(Canvas* canvas, void* _model) {
|
||||
if (model->display_msg == U2fMsgNotConnected) {
|
||||
if (settings->sfw_mode) {
|
||||
canvas_draw_icon(canvas, 22, 15, &I_Connect_me_62x31_sfw);
|
||||
canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connect me to computer");
|
||||
canvas_draw_str_aligned(canvas, 128 / 2, 3, AlignCenter, AlignTop, "Connect to a device");
|
||||
}
|
||||
else {
|
||||
canvas_draw_icon(canvas, 22, 15, &I_Connect_me_62x31);
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
Filetype: Flipper SubGhz RAW File
|
||||
Version: 1
|
||||
UP: /any/subghz/Walgreens/Walgreens_Cough.sub
|
||||
DOWN: /any/subghz/CVS/CVS_Dental.sub
|
||||
LEFT: /any/subghz/Walgreens/Walgreens_Skincare.sub
|
||||
RIGHT: /subghz/Walgreens/Walgreens_Vitamin.sub
|
||||
OK: /any/subghz/CVS/CVS_Stomach.sub
|
||||
UP: /any/subghz/Stores/Walgreens/Walgreens_Cough.sub
|
||||
DOWN: /any/subghz/Stores/CVS/CVS_Dental.sub
|
||||
LEFT: /any/subghz/Stores/Walgreens/Walgreens_Skincare.sub
|
||||
RIGHT: /any/subghz/Stores/Walgreens/Walgreens_Vitamin.sub
|
||||
OK: /any/subghz/Stores/CVS/CVS_Stomach.sub
|
||||
ULABEL: Cough_Wal
|
||||
DLABEL: Dental_CVS
|
||||
LLABEL: Skincare_Wal
|
||||
|
||||
Reference in New Issue
Block a user