diff --git a/applications/main/bad_usb/scenes/bad_usb_scene_error.c b/applications/main/bad_usb/scenes/bad_usb_scene_error.c index abd7b38b9..866339513 100644 --- a/applications/main/bad_usb/scenes/bad_usb_scene_error.c +++ b/applications/main/bad_usb/scenes/bad_usb_scene_error.c @@ -32,7 +32,7 @@ void bad_usb_scene_error_on_enter(void* context) { } else if(app->error == BadUsbAppErrorCloseRpc) { widget_add_icon_element(app->widget, 78, 0, &I_ActiveConnection_50x64); widget_add_string_multiline_element( - app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "Connection\nis active!"); + app->widget, 3, 2, AlignLeft, AlignTop, FontPrimary, "I am not\na whore!"); widget_add_string_multiline_element( app->widget, 3, @@ -40,7 +40,7 @@ void bad_usb_scene_error_on_enter(void* context) { AlignLeft, AlignTop, FontSecondary, - "Disconnect from\nPC or phone to\nuse this function."); + "Pull out from\nPC or phone to\nuse me like this."); } view_dispatcher_switch_to_view(app->view_dispatcher, BadUsbAppViewError); diff --git a/applications/main/bad_usb/views/bad_usb_view.c b/applications/main/bad_usb/views/bad_usb_view.c index d2c30b99e..ed94a6a5f 100644 --- a/applications/main/bad_usb/views/bad_usb_view.c +++ b/applications/main/bad_usb/views/bad_usb_view.c @@ -47,7 +47,7 @@ static void bad_usb_draw_callback(Canvas* canvas, void* _model) { if((model->state.state == BadUsbStateIdle) || (model->state.state == BadUsbStateDone) || (model->state.state == BadUsbStateNotConnected)) { - elements_button_center(canvas, "Run"); + elements_button_center(canvas, "Cum"); } else if((model->state.state == BadUsbStateRunning) || (model->state.state == BadUsbStateDelay)) { elements_button_center(canvas, "Stop"); } else if(model->state.state == BadUsbStateWillRun) { @@ -62,12 +62,12 @@ static void bad_usb_draw_callback(Canvas* canvas, void* _model) { if(model->state.state == BadUsbStateNotConnected) { canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18); canvas_set_font(canvas, FontPrimary); - canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Connect"); - canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "to USB"); + canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Plug me"); + canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "in, Daddy"); } else if(model->state.state == BadUsbStateWillRun) { canvas_draw_icon(canvas, 4, 26, &I_Clock_18x18); canvas_set_font(canvas, FontPrimary); - canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Will run"); + canvas_draw_str_aligned(canvas, 127, 31, AlignRight, AlignBottom, "Will cum"); canvas_draw_str_aligned(canvas, 127, 43, AlignRight, AlignBottom, "on connect"); } else if(model->state.state == BadUsbStateFileError) { canvas_draw_icon(canvas, 4, 26, &I_Error_18x18); diff --git a/applications/services/desktop/views/desktop_view_main.c b/applications/services/desktop/views/desktop_view_main.c index e3cfc8ad2..c0d11eb8f 100644 --- a/applications/services/desktop/views/desktop_view_main.c +++ b/applications/services/desktop/views/desktop_view_main.c @@ -8,18 +8,16 @@ #include "../desktop_i.h" #include "desktop_view_main.h" -#include "applications/settings/desktop_settings/desktop_settings_app.h" struct DesktopMainView { View* view; DesktopMainViewCallback callback; void* context; TimerHandle_t poweroff_timer; - bool is_gamemode; bool dummy_mode; }; -#define DESKTOP_MAIN_VIEW_POWEROFF_TIMEOUT 2000 +#define DESKTOP_MAIN_VIEW_POWEROFF_TIMEOUT 5000 static void desktop_main_poweroff_timer_callback(TimerHandle_t timer) { DesktopMainView* main_view = pvTimerGetTimerID(timer); @@ -49,86 +47,25 @@ void desktop_main_set_dummy_mode_state(DesktopMainView* main_view, bool dummy_mo bool desktop_main_input_callback(InputEvent* event, void* context) { furi_assert(event); furi_assert(context); + DesktopMainView* main_view = context; - // change to only check for game mode setting on keypress - if(event->type == InputTypeShort || event->type == InputTypeLong) { - main_view->is_gamemode = false; - DesktopSettings* desktop_settings = malloc(sizeof(DesktopSettings)); - DESKTOP_SETTINGS_LOAD(desktop_settings); - if(desktop_settings->is_dumbmode) main_view->is_gamemode = true; - free(desktop_settings); - } - - if(main_view->is_gamemode == false && main_view->dummy_mode == false) { - if(event->type == InputTypeShort) { - if(event->key == InputKeyOk) { - main_view->callback(DesktopMainEventOpenMenu, main_view->context); - } else if(event->key == InputKeyUp) { - main_view->callback(DesktopMainEventOpenLockMenu, main_view->context); - } else if(event->key == InputKeyDown) { - main_view->callback(DesktopMainEventOpenArchive, main_view->context); - } else if(event->key == InputKeyLeft) { - main_view->callback(DesktopMainEventOpenClock, main_view->context); // OPENS Clock - } else if(event->key == InputKeyRight) { - // Right key is handled by animation manager - // GOES TO PASSPORT NO MATTER WHAT - // THIS DOESNT WORK, PASSPORT WILL ONLY OPEN ON REGULAR RIGHT, NOTHING CAN GET ASSIGNED HERE - main_view->callback(DesktopMainEventOpenPassport, main_view->context); - } - } 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 - } + if(event->type == InputTypeShort) { + if(event->key == InputKeyOk) { + main_view->callback(DesktopMainEventOpenMenu, main_view->context); + } else if(event->key == InputKeyUp) { + main_view->callback(DesktopMainEventOpenLockMenu, main_view->context); + } else if(event->key == InputKeyDown) { + main_view->callback(DesktopMainEventOpenArchive, main_view->context); + } else if(event->key == InputKeyLeft) { + main_view->callback(DesktopMainEventOpenFavoritePrimary, main_view->context); } - } else if(main_view->is_gamemode == true) { - if(event->type == InputTypeShort) { - if(event->key == InputKeyOk) { - main_view->callback(DesktopMainEventOpenDice, main_view->context); // OPENS Dice - } else if(event->key == InputKeyUp) { - main_view->callback(DesktopMainEventOpenSnake, main_view->context); // OPENS SNAKE - } else if(event->key == InputKeyDown) { - // PREFER TO OPEN GAMES MENU - main_view->callback(DesktopMainEventOpen2048, main_view->context); // OPENS 2048 - } else if(event->key == InputKeyLeft) { - main_view->callback( - DesktopMainEventOpenTetris, main_view->context); // OPENS TETRIS - } - } else if(event->type == InputTypeLong) { - if(event->key == InputKeyOk) { - main_view->callback(DesktopAnimationEventNewIdleAnimation, main_view->context); - } else if(event->key == InputKeyUp) { - main_view->callback(DesktopMainEventOpenDOOM, main_view->context); // OPENS DOOM - } else if(event->key == InputKeyDown) { - main_view->callback( - DesktopMainEventOpenZombiez, main_view->context); // OPENS Zombiez - } else if(event->key == InputKeyLeft) { - main_view->callback(DesktopMainEventOpenClock, main_view->context); // OPENS CLOCK - } - } - } else { - if(event->type == InputTypeShort) { - if(event->key == InputKeyOk) { - main_view->callback(DesktopMainEventOpenMenu, main_view->context); - } else if(event->key == InputKeyUp) { - main_view->callback(DesktopMainEventOpenLockMenu, main_view->context); - } else if(event->key == InputKeyDown) { - main_view->callback(DesktopMainEventOpenArchive, main_view->context); - } else if(event->key == InputKeyLeft) { - main_view->callback(DesktopMainEventOpenClock, main_view->context); // OPENS Clock - } else if(event->key == InputKeyRight) { - // Right key is handled by animation manager - // GOES TO PASSPORT NO MATTER WHAT - // THIS DOESNT WORK, PASSPORT WILL ONLY OPEN ON REGULAR RIGHT, NOTHING CAN GET ASSIGNED HERE - main_view->callback(DesktopMainEventOpenPassport, main_view->context); - } + // Right key is handled by animation manager + } else if(event->type == InputTypeLong) { + if(event->key == InputKeyDown) { + main_view->callback(DesktopMainEventOpenDebug, main_view->context); + } else if(event->key == InputKeyLeft) { + main_view->callback(DesktopMainEventOpenFavoriteSecondary, main_view->context); } } @@ -148,11 +85,6 @@ bool desktop_main_input_callback(InputEvent* event, void* context) { DesktopMainView* desktop_main_alloc() { DesktopMainView* main_view = malloc(sizeof(DesktopMainView)); - main_view->is_gamemode = false; - DesktopSettings* desktop_settings = malloc(sizeof(DesktopSettings)); - DESKTOP_SETTINGS_LOAD(desktop_settings); - if(desktop_settings->is_dumbmode) main_view->is_gamemode = true; - free(desktop_settings); main_view->view = view_alloc(); view_allocate_model(main_view->view, ViewModelTypeLockFree, 1); diff --git a/fbt_options.py b/fbt_options.py index 3cdf2d190..a0bd4fb88 100644 --- a/fbt_options.py +++ b/fbt_options.py @@ -14,7 +14,7 @@ DEBUG = 0 # Suffix to add to files when building distribution # If OS environment has DIST_SUFFIX set, it will be used instead -DIST_SUFFIX = "XFW-0028_12232022" +DIST_SUFFIX = "XFW-0029_12232022" # Coprocessor firmware COPRO_OB_DATA = "scripts/ob.data"