Merge branch 'dev' into dev

Author: skotopes

applications/main/bad_usb/resources/badusb/Install_qFlipper_gnome.txt

@@ -0,0 +1,51 @@
+ID 1234:abcd Generic:USB Keyboard
+REM Declare ourselves as a generic usb keyboard
+
+REM This will install qFlipper on Linux/Gnome, using the latest AppImage package
+
+REM Open a terminal
+ALT F2
+DELAY 1000
+STRINGLN gnome-terminal --maximize
+DELAY 1000
+
+REM Ensure we have a folder to run executables from
+STRINGLN mkdir -p $HOME/.local/bin
+
+REM Download the latest AppImage
+STRINGLN curl -fsSL "https://update.flipperzero.one/qFlipper/release/linux-amd64/AppImage" -o "$HOME/.local/bin/qFlipper"
+DELAY 1000
+
+REM Make it executable
+STRINGLN chmod +x $HOME/.local/bin/qFlipper
+
+REM Extract the appimage in /tmp to install icon and .desktop file
+STRINGLN cd /tmp
+STRINGLN $HOME/.local/bin/qFlipper --appimage-extract > /dev/null
+STRINGLN sed "s@Exec=qFlipper@Exec=$HOME/.local/bin/qFlipper@" squashfs-root/usr/share/applications/qFlipper.desktop > $HOME/.local/share/applications/qFlipper.desktop
+STRINGLN mkdir -p $HOME/.local/share/icons/hicolor/512x512/apps
+STRINGLN cp squashfs-root/usr/share/icons/hicolor/512x512/apps/qFlipper.png $HOME/.local/share/icons/hicolor/512x512/apps/qFlipper.png
+STRINGLN rm -rf squashfs-root
+STRINGLN cd
+
+REM Depending on the Linux distribution and display manager
+REM there might be several ways to update desktop entries
+REM try all
+STRINGLN xdg-desktop-menu forceupdate || true
+STRINGLN update-desktop-database ~/.local/share/applications || true
+
+STRINGLN echo "
+ENTER
+REPEAT 60
+STRINGLN ==========================================================================================
+STRINGLN qFlipper has been installed to $HOME/.local/bin/
+STRINGLN It should appear in your Applications menu.
+STRINGLN If it does not, you might want to log out and log in again.
+ENTER
+STRINGLN If you prefer to run qFlipper from your terminal, either use the absolute path
+STRINGLN or make sure $HOME/.local/bin/ is included in your PATH environment variable.
+ENTER
+STRINGLN Additional configurations might be required by your Linux distribution such as 
+STRINGLN group membership, udev rules or else.
+STRINGLN ==========================================================================================
+STRINGLN "

applications/main/bad_usb/resources/badusb/demo_gnome.txt

@@ -0,0 +1,87 @@
+ID 1234:abcd Generic:USB Keyboard
+REM Declare ourselves as a generic usb keyboard
+REM You can override this to use something else
+REM Check the `lsusb` command to know your own devices IDs
+
+REM This is BadUSB demo script for Linux/Gnome
+
+REM Open terminal window
+DELAY 1000
+ALT F2
+DELAY 500
+STRING gnome-terminal --maximize
+DELAY 500
+ENTER
+DELAY 750
+
+REM Clear the screen in case some banner was displayed
+STRING clear
+ENTER
+
+REM Bigger shell script example
+STRING cat > /dev/null << EOF
+ENTER
+
+STRING Hello World!
+ENTER
+
+DEFAULT_DELAY 50
+
+STRING =
+REPEAT 59
+ENTER
+ENTER
+
+STRING               _.-------.._                    -,
+ENTER
+HOME
+STRING           .-"'''"--..,,_/ /'-,               -,  \
+ENTER
+HOME
+STRING        .:"          /:/  /'\  \     ,_...,  '. |  |
+ENTER
+HOME
+STRING       /       ,----/:/  /'\ _\~'_-"'     _;
+ENTER
+HOME
+STRING      '      / /'"""'\ \ \.~'_-'      ,-"'/
+ENTER
+HOME
+STRING     |      | |  0    | | .-'      ,/'  /
+ENTER
+HOME
+STRING    |    ,..\ \     ,.-"'       ,/'    /
+ENTER
+HOME
+STRING   ;    :    '/'""\'           ,/--==,/-----,
+ENTER
+HOME
+STRING   |    '-...|        -.___-Z:_______J...---;
+ENTER
+HOME
+STRING   :         '                           _-'
+ENTER
+HOME
+STRING  _L_  _     ___  ___  ___  ___  ____--"'
+ENTER
+HOME
+STRING | __|| |   |_ _|| _ \| _ \| __|| _ \
+ENTER
+HOME
+STRING | _| | |__  | | |  _/|  _/| _| |   /
+ENTER
+HOME
+STRING |_|  |____||___||_|  |_|  |___||_|_\
+ENTER
+HOME
+ENTER
+
+STRING Flipper Zero BadUSB feature is compatible with USB Rubber Ducky script format
+ENTER
+STRING More information about script syntax can be found here:
+ENTER
+STRING https://github.com/flipperdevices/flipperzero-firmware/blob/dev/documentation/file_formats/BadUsbScriptFormat.md
+ENTER
+
+STRING EOF
+ENTER

applications/services/dolphin/dolphin.c

@@ -47,6 +47,26 @@ void dolphin_deed(DolphinDeed deed) {
     furi_record_close(RECORD_DOLPHIN);
 }
 
+void dolphin_get_settings(Dolphin* dolphin, DolphinSettings* settings) {
+    furi_check(dolphin);
+    furi_check(settings);
+
+    DolphinEvent event;
+    event.type = DolphinEventTypeSettingsGet;
+    event.settings = settings;
+    dolphin_event_send_wait(dolphin, &event);
+}
+
+void dolphin_set_settings(Dolphin* dolphin, DolphinSettings* settings) {
+    furi_check(dolphin);
+    furi_check(settings);
+
+    DolphinEvent event;
+    event.type = DolphinEventTypeSettingsSet;
+    event.settings = settings;
+    dolphin_event_send_wait(dolphin, &event);
+}
+
 DolphinStats dolphin_stats(Dolphin* dolphin) {
     furi_check(dolphin);
 
@@ -211,7 +231,9 @@ static bool dolphin_process_event(FuriEventLoopObject* object, void* context) {
 
     } else if(event.type == DolphinEventTypeStats) {
         event.stats->icounter = dolphin->state->data.icounter;
-        event.stats->butthurt = dolphin->state->data.butthurt;
+        event.stats->butthurt = (dolphin->state->data.flags & DolphinFlagHappyMode) ?
+                                    0 :
+                                    dolphin->state->data.butthurt;
         event.stats->timestamp = dolphin->state->data.timestamp;
         event.stats->level = dolphin_get_level(dolphin->state->data.icounter);
         event.stats->level_up_is_pending =
@@ -228,6 +250,15 @@ static bool dolphin_process_event(FuriEventLoopObject* object, void* context) {
         dolphin_state_load(dolphin->state);
         furi_event_loop_timer_start(dolphin->butthurt_timer, BUTTHURT_INCREASE_PERIOD_TICKS);
 
+    } else if(event.type == DolphinEventTypeSettingsGet) {
+        event.settings->happy_mode = dolphin->state->data.flags & DolphinFlagHappyMode;
+
+    } else if(event.type == DolphinEventTypeSettingsSet) {
+        dolphin->state->data.flags &= ~DolphinFlagHappyMode;
+        if(event.settings->happy_mode) dolphin->state->data.flags |= DolphinFlagHappyMode;
+        dolphin->state->dirty = true;
+        dolphin_state_save(dolphin->state);
+
     } else {
         furi_crash();
     }

applications/services/dolphin/dolphin.h

@@ -21,6 +21,10 @@ typedef struct {
     bool level_up_is_pending;
 } DolphinStats;
 
+typedef struct {
+    bool happy_mode;
+} DolphinSettings;
+
 typedef enum {
     DolphinPubsubEventUpdate,
 } DolphinPubsubEvent;
@@ -31,6 +35,10 @@ typedef enum {
  */
 void dolphin_deed(DolphinDeed deed);
 
+void dolphin_get_settings(Dolphin* dolphin, DolphinSettings* settings);
+
+void dolphin_set_settings(Dolphin* dolphin, DolphinSettings* settings);
+
 /** Retrieve dolphin stats
  * Thread safe, blocking
  */

applications/services/dolphin/dolphin_i.h

@@ -13,6 +13,8 @@ typedef enum {
     DolphinEventTypeFlush,
     DolphinEventTypeLevel,
     DolphinEventTypeReloadState,
+    DolphinEventTypeSettingsGet,
+    DolphinEventTypeSettingsSet,
 } DolphinEventType;
 
 typedef struct {
@@ -21,6 +23,7 @@ typedef struct {
     union {
         DolphinDeed deed;
         DolphinStats* stats;
+        DolphinSettings* settings;
     };
 } DolphinEvent;
 

applications/services/dolphin/helpers/dolphin_state.h

@@ -5,6 +5,10 @@
 
 #include "dolphin_deed.h"
 
+typedef enum {
+    DolphinFlagHappyMode = 1,
+} DolphinFlags;
+
 typedef struct DolphinState DolphinState;
 typedef struct {
     uint8_t icounter_daily_limit[DolphinAppMAX];

applications/settings/desktop_settings/desktop_settings_app.c

@@ -1,5 +1,6 @@
 #include <furi.h>
 #include <gui/modules/popup.h>
+#include <gui/modules/dialog_ex.h>
 #include <gui/scene_manager.h>
 
 #include <desktop/desktop.h>
@@ -42,6 +43,7 @@ DesktopSettingsApp* desktop_settings_app_alloc(void) {
     app->pin_input_view = desktop_view_pin_input_alloc();
     app->pin_setup_howto_view = desktop_settings_view_pin_setup_howto_alloc();
     app->pin_setup_howto2_view = desktop_settings_view_pin_setup_howto2_alloc();
+    app->dialog_ex = dialog_ex_alloc();
 
     view_dispatcher_add_view(
         app->view_dispatcher, DesktopSettingsAppViewMenu, submenu_get_view(app->submenu));
@@ -63,6 +65,8 @@ DesktopSettingsApp* desktop_settings_app_alloc(void) {
         app->view_dispatcher,
         DesktopSettingsAppViewIdPinSetupHowto2,
         desktop_settings_view_pin_setup_howto2_get_view(app->pin_setup_howto2_view));
+    view_dispatcher_add_view(
+        app->view_dispatcher, DesktopSettingsAppViewDialogEx, dialog_ex_get_view(app->dialog_ex));
     return app;
 }
 
@@ -75,12 +79,14 @@ void desktop_settings_app_free(DesktopSettingsApp* app) {
     view_dispatcher_remove_view(app->view_dispatcher, DesktopSettingsAppViewIdPinInput);
     view_dispatcher_remove_view(app->view_dispatcher, DesktopSettingsAppViewIdPinSetupHowto);
     view_dispatcher_remove_view(app->view_dispatcher, DesktopSettingsAppViewIdPinSetupHowto2);
+    view_dispatcher_remove_view(app->view_dispatcher, DesktopSettingsAppViewDialogEx);
     variable_item_list_free(app->variable_item_list);
     submenu_free(app->submenu);
     popup_free(app->popup);
     desktop_view_pin_input_free(app->pin_input_view);
     desktop_settings_view_pin_setup_howto_free(app->pin_setup_howto_view);
     desktop_settings_view_pin_setup_howto2_free(app->pin_setup_howto2_view);
+    dialog_ex_free(app->dialog_ex);
     // View dispatcher
     view_dispatcher_free(app->view_dispatcher);
     scene_manager_free(app->scene_manager);

applications/settings/desktop_settings/desktop_settings_app.h

@@ -6,6 +6,7 @@
 #include <gui/scene_manager.h>
 #include <gui/modules/submenu.h>
 #include <gui/modules/variable_item_list.h>
+#include <gui/modules/dialog_ex.h>
 #include <dialogs/dialogs.h>
 #include <assets_icons.h>
 
@@ -21,6 +22,7 @@ typedef enum {
     DesktopSettingsAppViewIdPinInput,
     DesktopSettingsAppViewIdPinSetupHowto,
     DesktopSettingsAppViewIdPinSetupHowto2,
+    DesktopSettingsAppViewDialogEx,
 } DesktopSettingsAppView;
 
 typedef struct {
@@ -36,6 +38,7 @@ typedef struct {
     DesktopViewPinInput* pin_input_view;
     DesktopSettingsViewPinSetupHowto* pin_setup_howto_view;
     DesktopSettingsViewPinSetupHowto2* pin_setup_howto2_view;
+    DialogEx* dialog_ex;
 
     DesktopPinCode pincode_buffer;
     bool pincode_buffer_filled;

applications/settings/desktop_settings/desktop_settings_custom_event.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    // reserve 100 for button presses, submenu selections, etc.
+    DesktopSettingsCustomEventExit = 100,
+    DesktopSettingsCustomEventDone,
+
+    DesktopSettingsCustomEvent1stPinEntered,
+    DesktopSettingsCustomEventPinsEqual,
+    DesktopSettingsCustomEventPinsDifferent,
+
+    DesktopSettingsCustomEventSetPin,
+    DesktopSettingsCustomEventChangePin,
+    DesktopSettingsCustomEventDisablePin,
+
+    DesktopSettingsCustomEventSetDefault,
+    DesktopSettingsCustomEventSetDummy,
+} DesktopSettingsCustomEvent;
+
+#ifdef __cplusplus
+}
+#endif

applications/settings/desktop_settings/scenes/desktop_settings_scene_config.h

@@ -12,3 +12,5 @@ ADD_SCENE(desktop_settings, pin_setup_done, PinSetupDone)
 
 ADD_SCENE(desktop_settings, quick_apps_menu, QuickAppsMenu)
 ADD_SCENE(desktop_settings, quick_apps_direction_menu, QuickAppsDirectionMenu)
+
+ADD_SCENE(desktop_settings, happy_mode, HappyMode)