From f46cf7f35b16eff56576eff14e0b762e26796065 Mon Sep 17 00:00:00 2001 From: RogueMaster Date: Sun, 25 Dec 2022 01:40:05 -0500 Subject: [PATCH 1/3] Latest Release RM1225-0136-0.74.2-133a5b8 on PATREON --- ReadMe.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReadMe.md b/ReadMe.md index 96ce58bfc..e42c269f2 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -16,7 +16,7 @@ Thank you to all the supporters! - Donations: ETH: `0xC32Ea488DBeCF95992A5C81BD411e56Bd418BC5f` - [Join THE Flipper Uncensored Discord](https://discord.gg/gF2bBUzAFe) -## Latest Updates - [PATREON: Latest Release RM1224-0701-0.74.2-5d9926b](https://www.patreon.com/posts/76318937) +## Latest Updates - [PATREON: Latest Release RM1225-0136-0.74.2-133a5b8](https://www.patreon.com/posts/76346398) ## [BUILDS NOW AVAILABLE WITH STOCK, RM SELECT, RM SELECT + 18PLUS, RM MINIMAL (default) and RM 18PLUS ANIMATION SETS](https://www.patreon.com/RogueMaster/membership) From ab033bdf6247b06c9ea9b60a310ebb60ad02e2a3 Mon Sep 17 00:00:00 2001 From: RogueMaster Date: Sun, 25 Dec 2022 01:43:49 -0500 Subject: [PATCH 2/3] Latest Release RM1225-0136-0.74.2-133a5b8 on PATREON --- ReadMe.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ReadMe.md b/ReadMe.md index e42c269f2..36bd338c0 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -27,6 +27,7 @@ Thank you to all the supporters! - Updated: [Metronome (By panki27)](https://github.com/panki27/Metronome) - Updated: [Minesweeper (By panki27)](https://github.com/panki27/minesweeper) - Updated: [NRF24 Scanner v2.1 (By vad7)](https://github.com/vad7/nrf24scan) +- Updated: [Barcode Generator (By McAzzaMan)](https://github.com/McAzzaMan/flipperzero-firmware/tree/UPC-A_Barcode_Generator/applications/barcode_generator) (from Unleashed/gid9798) ## Install from Release FLASH STOCK FIRST BEFORE UPDATING TO CUSTOM FIRMWARE! From 3e6f3e7bd0cc06efa0c5d5fbeb1bf6baf60b622b Mon Sep 17 00:00:00 2001 From: VerstreuteSeele Date: Sun, 25 Dec 2022 07:53:43 +0100 Subject: [PATCH 3/3] Slight text updates --- .../desktop/scenes/desktop_scene_fault.c | 2 +- .../desktop/views/desktop_view_main.c | 21 +++++++++---------- .../scenes/desktop_settings_scene_favorite.c | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/applications/services/desktop/scenes/desktop_scene_fault.c b/applications/services/desktop/scenes/desktop_scene_fault.c index 36c958af5..baba82f96 100644 --- a/applications/services/desktop/scenes/desktop_scene_fault.c +++ b/applications/services/desktop/scenes/desktop_scene_fault.c @@ -16,7 +16,7 @@ void desktop_scene_fault_on_enter(void* context) { popup_set_context(popup, desktop); popup_set_header( popup, - "Flipper crashed\n and was rebooted", + "Slut passed out\n but is now back", 60, 14 + STATUS_BAR_Y_SHIFT, AlignCenter, diff --git a/applications/services/desktop/views/desktop_view_main.c b/applications/services/desktop/views/desktop_view_main.c index 2ce574b68..061a23452 100644 --- a/applications/services/desktop/views/desktop_view_main.c +++ b/applications/services/desktop/views/desktop_view_main.c @@ -61,18 +61,17 @@ bool desktop_main_input_callback(InputEvent* event, void* context) { main_view->callback(DesktopMainEventOpenClock, main_view->context); } // Right key is handled by animation manager - } else if(event->type == InputTypeLong) { - if(event->key == InputKeyOk) { - main_view->callback(DesktopAnimationEventNewIdleAnimation, main_view->context); - } else if(event->key == InputKeyUp) { - main_view->callback(DesktopMainEventOpenFavoriteSecondary, main_view->context); - } else if(event->key == InputKeyDown) { - main_view->callback(DesktopMainEventOpenFavoritePrimary, main_view->context); - } else if(event->key == InputKeyLeft) { - main_view->callback( - DesktopMainEventOpenSubRemote, main_view->context); // OPENS SUBGHZ REMOTE - } + } else if(event->type == InputTypeLong) { + if(event->key == InputKeyOk) { + main_view->callback(DesktopAnimationEventNewIdleAnimation, main_view->context); + } else if(event->key == InputKeyUp) { + main_view->callback(DesktopMainEventOpenFavoritePrimary, main_view->context); + } else if(event->key == InputKeyDown) { + main_view->callback(DesktopMainEventOpenFavoriteSecondary, main_view->context); + } else if(event->key == InputKeyLeft) { + main_view->callback(DesktopMainEventOpenSubRemote, main_view->context); // OPENS SUBGHZ REMOTE } + } if(event->key == InputKeyBack) { if(event->type == InputTypePress) { diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c index cf474c546..8cd3cf79d 100644 --- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c +++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_favorite.c @@ -69,7 +69,7 @@ void desktop_settings_scene_favorite_on_enter(void* context) { } submenu_set_header( - submenu, primary_favorite ? "Primary favorite app:" : "Secondary favorite app:"); + submenu, primary_favorite ? "Secondary favorite app:" : "Primary favorite app:"); submenu_set_selected_item(submenu, pre_select_item); // If set during loop, visual glitch. view_dispatcher_switch_to_view(app->view_dispatcher, DesktopSettingsAppViewMenu);