Squashed 'applications/external/' changes from 7c63889c9a4..2ea37d003cf

2ea37d003cf Reorganize GPIO apps in subfolders 3d7ccda87b8 Fix build 44f14a6d859 Merge totp from https://github.com/xMasterX/all-the-plugins 894ef915986 Merge seader from https://github.com/bettse/seader 2882a34400c Merge seader from https://github.com/xMasterX/all-the-plugins 84e61f656ac Merge picopass from https://github.com/xMasterX/all-the-plugins 6bf23e509d6 Merge magspoof from https://github.com/zacharyweiss/magspoof_flipper 47e2f0dc76b Merge magspoof from https://github.com/xMasterX/all-the-plugins a2b03a1bbaf Merge gps_nmea from https://github.com/xMasterX/all-the-plugins ad33b215495 Unitemp: Fix view double free crash at exit b6bf1892b70 BLE Spam: Fix help section a8359cd B/W conversion attempt 2 dbcb0e2 BW icon convert fce6205 Screenshots 825130d99a4 add error handle in switch 520309b97fc upd gps nmea a9b9f2240f8 fix picopass plugin path 60756801f1e update magspoof 311bb96211a update totp 03da99f6b40 oops 636441b6c3b upd seader 1ea778633f9 upd picopass 3289a78 v2.8 ff3c15a Cross-FW compatible resource setup 4321676 Merge pull request #17 from bettse/mfc 4e12dde Temp disable one item for OFW compile eefae49 Quick fixes for FW differences 70548ac reads MFC SE 3f83d81 returns at message be81164 gets response for encrypted MFC 60440dd gets a couple messages in ce15b26 reduce stack size 460ace1 MFC support 30f4556 Revert "double size of rx buffer" 8faf1a8 14a error handling git-subtree-dir: applications/external git-subtree-split: 2ea37d003cf1bcee7963c95630220526651bd409
RogueMaster · May 2, 2024 · 3e4203a · 3e4203a
1 parent ff154bc
commit 3e4203a
Show file tree

Hide file tree

Showing 64 changed files with 405 additions and 85 deletions.
diff --git a/atomicdiceroller/application.fam b/atomicdiceroller/application.fam
@@ -10,5 +10,5 @@ App(
     stack_size=2 * 1024,
     fap_icon="atomicdiceroller.png",
     fap_libs=["mbedtls"],
-    fap_category="GPIO",
+    fap_category="GPIO/Sensors",
 )
diff --git a/avr_isp/application.fam b/avr_isp/application.fam
@@ -8,7 +8,7 @@ App(
     fap_description="Application for flashing AVR microcontrollers",
     fap_version="1.3",
     fap_icon="avr_app_icon_10px.png",
-    fap_category="GPIO",
+    fap_category="GPIO/Debug",
     fap_icon_assets="images",
     fap_private_libs=[
         Lib(

diff --git a/ble_spam/application.fam b/ble_spam/application.fam
@@ -9,7 +9,7 @@ App(
     fap_file_assets="assets",
     fap_author="@Willy-JL @ECTO-1A @Spooks4576",
     fap_weburl="https://github.com/Next-Flip/Momentum-Apps/tree/dev/ble_spam",
-    fap_version="6.3",
+    fap_version="6.4",
     fap_description="Flood BLE advertisements to cause spammy and annoying popups/notifications",
     fap_icon_assets="icons",
     fap_icon_assets_symbol="ble_spam",

diff --git a/ble_spam/ble_spam.c b/ble_spam/ble_spam.c
@@ -357,7 +357,7 @@ static void draw_callback(Canvas* canvas, void* _ctx) {
             AlignTop,
             "\e#Delay\e# is time between\n"
             "attack attempts (top right),\n"
-            "keep 20ms for best results",
+            "keep 30ms for best results",
             false);
         break;
     case PageHelpDistance:
@@ -388,7 +388,7 @@ static void draw_callback(Canvas* canvas, void* _ctx) {
             AlignLeft,
             AlignTop,
             "See \e#more info\e# and change\n"
-            "\e#attack options\e# by holding\n"
+            "attack \e#options\e# by holding\n"
             "Ok on each attack page",
             false);
         break;

diff --git a/camera_suite/application.fam b/camera_suite/application.fam
@@ -4,12 +4,12 @@ App(
     cdefines=["APP_CAMERA_SUITE"],
     entry_point="camera_suite_app",
     fap_author="@CodyTolene @Z4urce @leedave",
-    fap_category="GPIO",
+    fap_category="GPIO/ESP",
     fap_description="A camera suite application for the Flipper Zero ESP32-CAM module.",
     fap_icon="icons/camera_suite.png",
     fap_version="1.7",
     fap_weburl="https://github.com/CodyTolene/Flipper-Zero-Cam",
-    name="[ESP32] Camera Suite",
+    name="[ESP32CAM] Camera Suite",
     order=1,
     requires=["gui", "storage"],
     stack_size=8 * 1024,

diff --git a/dap_link/application.fam b/dap_link/application.fam
@@ -11,7 +11,7 @@ App(
     fap_description="Enables use of Flipper as a debug probe for ARM devices, implements the CMSIS-DAP protocol",
     fap_version="1.2",
     fap_icon="dap_link.png",
-    fap_category="GPIO",
+    fap_category="GPIO/Debug",
     fap_private_libs=[
         Lib(
             name="free-dap",

diff --git a/esp8266_deauth/application.fam b/esp8266_deauth/application.fam
@@ -7,7 +7,7 @@ App(
     stack_size=2 * 1024,
     order=100,
     fap_icon="wifi_10px.png",
-    fap_category="WiFi",
+    fap_category="GPIO/ESP",
     fap_author="@SequoiaSan & @xMasterX",
     fap_version="1.1",
     fap_description="DSTIKE Deauther module interface, based on ESP8266",

diff --git a/esp_flasher/application.fam b/esp_flasher/application.fam
@@ -9,7 +9,7 @@ App(
     order=90,
     resources="resources",
     fap_icon="wifi_10px.png",
-    fap_category="GPIO",
+    fap_category="GPIO/ESP",
     fap_private_libs=[
         Lib(
             name="esp-serial-flasher",

diff --git a/evil_portal/application.fam b/evil_portal/application.fam
@@ -12,5 +12,5 @@ App(
     fap_description="Create an evil captive portal Wi-Fi access point",
     fap_icon_assets="icons",
     fap_icon="icons/evil_portal_10px.png",
-    fap_category="WiFi",
+    fap_category="GPIO/ESP",
 )
diff --git a/geiger/application.fam b/geiger/application.fam
@@ -9,7 +9,7 @@ App(
     ],
     stack_size=2 * 1024,
     fap_icon="geiger.png",
-    fap_category="GPIO",
+    fap_category="GPIO/Sensors",
     fap_author="@nmrr",
     fap_weburl="https://github.com/nmrr/flipperzero-geigercounter",
     fap_version="1.3",

diff --git a/hc_sr04/application.fam b/hc_sr04/application.fam
@@ -9,7 +9,7 @@ App(
     stack_size=2 * 1024,
     order=20,
     fap_icon="dist_sensor10px.png",
-    fap_category="GPIO",
+    fap_category="GPIO/Sensors",
     fap_author="@xMasterX (first implementation by @Sanqui)",
     fap_version="1.1",
     fap_description="HC-SR(04) Distance sensor reader",

diff --git a/i2ctools/application.fam b/i2ctools/application.fam
@@ -7,7 +7,7 @@ App(
     stack_size=2 * 1024,
     order=175,
     fap_icon="i2ctools.png",
-    fap_category="GPIO",
+    fap_category="GPIO/Debug",
     fap_icon_assets="images",
     fap_author="@NaejEL",
     fap_version="1.1",

diff --git a/ifttt/application.fam b/ifttt/application.fam
@@ -10,5 +10,5 @@ App(
     stack_size=2 * 1024,
     order=20,
     fap_icon="icon.png",
-    fap_category="WiFi",
+    fap_category="GPIO/ESP",
 )
diff --git a/lightmeter/application.fam b/lightmeter/application.fam
@@ -10,7 +10,7 @@ App(
     order=90,
     fap_version=(1, 2),
     fap_icon="lightmeter.png",
-    fap_category="GPIO",
+    fap_category="GPIO/Sensors",
     fap_private_libs=[
         Lib(
             name="BH1750",

diff --git a/magspoof/application.fam b/magspoof/application.fam
@@ -10,10 +10,9 @@ App(
         "notification",
         "dialogs",
     ],
-    resources="resources",
     provides=[],
     stack_size=6 * 1024,
-    order=64,  # keep it at the bottom of the list while still WIP
+    order=64,
     fap_icon="icons/mag_10px.png",
     fap_category="GPIO",
     fap_icon_assets="icons",
@@ -22,4 +21,5 @@ App(
     fap_description="Enables wireless transmission of magstripe data",
     fap_author="Zachary Weiss",
     fap_weburl="https://github.com/zacharyweiss/magspoof_flipper",
+    fap_file_assets="resources",
 )
diff --git a/magspoof/assets/emulate.png b/magspoof/assets/emulate.png
diff --git a/magspoof/assets/emulate_config.png b/magspoof/assets/emulate_config.png
diff --git a/magspoof/assets/settings.png b/magspoof/assets/settings.png
diff --git a/magspoof/assets/start.png b/magspoof/assets/start.png
diff --git a/magspoof/icons/mag_10px.png b/magspoof/icons/mag_10px.png
diff --git a/magspoof/mag.c b/magspoof/mag.c
@@ -149,6 +149,7 @@ int32_t mag_app(void* p) {
     }
 
     mag_make_app_folder(mag);
+    mag_migrate_and_copy_files(mag);
 
     // Enable 5v power, multiple attempts to avoid issues with power chip protection false triggering
     uint8_t attempts = 0;
@@ -191,6 +192,29 @@ void mag_make_app_folder(Mag* mag) {
     }
 }
 
+void mag_migrate_and_copy_files(Mag* mag) {
+    furi_assert(mag);
+    Storage* storage = mag->storage;
+
+    storage_common_migrate(storage, EXT_PATH("magspoof"), STORAGE_APP_DATA_PATH_PREFIX);
+    storage_common_migrate(storage, EXT_PATH("mag"), STORAGE_APP_DATA_PATH_PREFIX);
+
+    if(!storage_common_exists(storage, APP_DATA_PATH(MAG_EXAMPLE_FILE_1))) {
+        storage_common_copy(
+            storage, APP_ASSETS_PATH(MAG_EXAMPLE_FILE_1), APP_DATA_PATH(MAG_EXAMPLE_FILE_1));
+    }
+
+    if(!storage_common_exists(storage, APP_DATA_PATH(MAG_EXAMPLE_FILE_2))) {
+        storage_common_copy(
+            storage, APP_ASSETS_PATH(MAG_EXAMPLE_FILE_2), APP_DATA_PATH(MAG_EXAMPLE_FILE_2));
+    }
+
+    if(!storage_common_exists(storage, APP_DATA_PATH(MAG_EXAMPLE_FILE_3))) {
+        storage_common_copy(
+            storage, APP_ASSETS_PATH(MAG_EXAMPLE_FILE_3), APP_DATA_PATH(MAG_EXAMPLE_FILE_3));
+    }
+}
+
 void mag_text_store_set(Mag* mag, const char* text, ...) {
     furi_assert(mag);
     va_list args;

diff --git a/magspoof/mag_device.h b/magspoof/mag_device.h
@@ -8,14 +8,16 @@
 #include "mag_icons.h"
 #include "helpers/mag_types.h"
 
-#include <assets_icons.h>
-
 #define MAG_DEV_NAME_MAX_LEN 22
 #define MAG_DEV_TRACKS 3
 
 #define MAG_APP_FOLDER STORAGE_APP_DATA_PATH_PREFIX
 #define MAG_APP_EXTENSION ".mag"
 
+#define MAG_EXAMPLE_FILE_1 "TestMagstripe.mag"
+#define MAG_EXAMPLE_FILE_2 "SamyExpiredCard.mag"
+#define MAG_EXAMPLE_FILE_3 "SamyExampleImage.mag"
+
 typedef void (*MagLoadingCallback)(void* context, bool state);
 
 typedef struct {

diff --git a/magspoof/mag_i.h b/magspoof/mag_i.h
@@ -44,7 +44,7 @@
 #define submenu_add_lockable_item(                                             \
     submenu, label, index, callback, callback_context, locked, locked_message) \
     if(!locked) {                                                              \
-        submenu_add_item(submenu, label, index, callback, callback_context)    \
+        submenu_add_item(submenu, label, index, callback, callback_context);   \
     }
 #endif
 
@@ -89,7 +89,6 @@ typedef struct {
     char uart_text_input_store[UART_TERMINAL_TEXT_INPUT_STORE_SIZE + 1];
     FuriString* uart_text_box_store;
     size_t uart_text_box_store_strlen;
-    // UART_TextInput* text_input;
 } Mag;
 
 void mag_text_store_set(Mag* mag, const char* text, ...);
@@ -100,6 +99,8 @@ void mag_show_loading_popup(void* context, bool show);
 
 void mag_make_app_folder(Mag* mag);
 
+void mag_migrate_and_copy_files(Mag* mag);
+
 void mag_popup_timeout_callback(void* context);
 
 void mag_widget_callback(GuiButtonType result, InputType type, void* context);

diff --git a/...s/apps_data/magspoof/SamyExampleImage.mag → magspoof/resources/SamyExampleImage.mag b/...s/apps_data/magspoof/SamyExampleImage.mag → magspoof/resources/SamyExampleImage.mag
diff --git a/...es/apps_data/magspoof/SamyExpiredCard.mag → magspoof/resources/SamyExpiredCard.mag b/...es/apps_data/magspoof/SamyExpiredCard.mag → magspoof/resources/SamyExpiredCard.mag
diff --git a/...rces/apps_data/magspoof/TestMagstripe.mag → magspoof/resources/TestMagstripe.mag b/...rces/apps_data/magspoof/TestMagstripe.mag → magspoof/resources/TestMagstripe.mag
diff --git a/magspoof/scenes/mag_scene_emulate_config.c b/magspoof/scenes/mag_scene_emulate_config.c
@@ -182,8 +182,6 @@ static void mag_scene_emulate_config_set_interpacket(VariableItem* item) {
 };
 
 void mag_scene_emulate_config_on_enter(void* context) {
-    // TODO: retrieve current values from struct, rather than setting to default on setup
-
     Mag* mag = context;
     VariableItem* item;
     uint8_t value_index;

diff --git a/magspoof/scenes/mag_scene_settings.c b/magspoof/scenes/mag_scene_settings.c
@@ -8,7 +8,9 @@ enum VarItemListIndex {
     VarItemListIndexPinInput,
     VarItemListIndexPinOutput,
     VarItemListIndexPinEnable,
+#ifndef FW_ORIGIN_Official
     VarItemListIndexAllowUART,
+#endif
 };
 
 static const char* gpio[] = {
@@ -64,7 +66,6 @@ static void mag_pin_variable_item_list_add(
 
 void mag_scene_settings_on_enter(void* context) {
     Mag* mag = context;
-    VariableItem* item;
     VariableItemList* var_item_list = mag->variable_item_list;
 
     mag_pin_variable_item_list_add(
@@ -74,8 +75,10 @@ void mag_scene_settings_on_enter(void* context) {
     mag_pin_variable_item_list_add(
         mag, "Enable pin:", mag->state.pin_enable, mag_scene_settings_set_gpio_enable);
 
-    item = variable_item_list_add(var_item_list, "UART MSR: ", 1, NULL, mag);
+#ifndef FW_ORIGIN_Official
+    VariableItem* item = variable_item_list_add(var_item_list, "UART MSR: ", 1, NULL, mag);
     variable_item_set_current_value_text(item, mag->state.allow_uart ? "ON" : "OFF");
+#endif
 
     variable_item_list_set_enter_callback(
         var_item_list, mag_scene_settings_var_item_list_callback, mag);
@@ -109,6 +112,7 @@ void mag_scene_settings_dialog_invalid_pins(Mag* mag) {
     }
 }
 
+#ifndef FW_ORIGIN_Official
 void mag_scene_settings_dialog_allow_uart(Mag* mag) {
     bool change = mag->state.allow_uart;
     if(!change) {
@@ -136,6 +140,7 @@ void mag_scene_settings_dialog_allow_uart(Mag* mag) {
             mag->state.allow_uart ? "ON" : "OFF");
     }
 }
+#endif
 
 bool mag_scene_settings_on_event(void* context, SceneManagerEvent event) {
     Mag* mag = context;
@@ -154,13 +159,15 @@ bool mag_scene_settings_on_event(void* context, SceneManagerEvent event) {
             scene_manager_previous_scene(scene_manager);
         }
         break;
+#ifndef FW_ORIGIN_Official
     case SceneManagerEventTypeCustom:
         scene_manager_set_scene_state(mag->scene_manager, MagSceneSettings, event.event);
         consumed = true;
         if(event.event == VarItemListIndexAllowUART) {
             mag_scene_settings_dialog_allow_uart(mag);
         }
         break;
+#endif
     default:
         break;
     }

diff --git a/mayhem_camera/application.fam b/mayhem_camera/application.fam
@@ -8,7 +8,7 @@ App(
     stack_size=8 * 1024,
     order=1,
     fap_icon="icon.png",
-    fap_category="GPIO",
+    fap_category="GPIO/MAYHEM",
     fap_description="ESP32-CAM live feed and photo capture, use left/right for orientation/mode, up/down for brightness and center for saving a screenshot. [Unplug the USB cable to test with Mayhem]",
     fap_author="Z4urce",
     fap_weburl="https://github.com/Z4urce/flipper-camera",

diff --git a/mayhem_marauder/application.fam b/mayhem_marauder/application.fam
@@ -8,7 +8,7 @@ App(
     stack_size=4 * 1024,
     order=2,
     fap_icon="wifi_10px.png",
-    fap_category="GPIO",
+    fap_category="GPIO/MAYHEM",
     fap_icon_assets="assets",
     fap_description="ESP32-CAM version of Marauder. Includes all functionality from the original plus some options to trigger the camera and flashlight. [Unplug the USB cable to test with Mayhem]",
 )
diff --git a/mayhem_morseflash/application.fam b/mayhem_morseflash/application.fam
@@ -9,6 +9,6 @@ App(
     order=90,
     fap_icon_assets="assets",
     fap_icon="icon.png",
-    fap_category="GPIO",
+    fap_category="GPIO/MAYHEM",
     fap_description="ESP32-CAM app to stream a message in morse using the powerful flashlight. [Unplug the USB cable to test with Mayhem]",
 )
diff --git a/mayhem_motion/application.fam b/mayhem_motion/application.fam
@@ -8,7 +8,7 @@ App(
     stack_size=8 * 1024,
     order=1,
     fap_icon="icon.png",
-    fap_category="GPIO",
+    fap_category="GPIO/MAYHEM",
     fap_description="ESP32-CAM Motion detection. It generates a beep when motion is detected. Can be extended to trigger more stuff in the code. [Unplug the USB cable to test with Mayhem]",
     fap_author="eried",
     fap_weburl="https://flipper.ried.cl",

diff --git a/mayhem_nannycam/application.fam b/mayhem_nannycam/application.fam
@@ -8,7 +8,7 @@ App(
     stack_size=8 * 1024,
     order=1,
     fap_icon="icon.png",
-    fap_category="GPIO",
+    fap_category="GPIO/MAYHEM",
     fap_description="ESP32-CAM simple app to start a remote camera. [Unplug the USB cable to test with Mayhem]",
     fap_author="eried",
     fap_weburl="https://flipper.ried.cl",

diff --git a/mayhem_qrcode/application.fam b/mayhem_qrcode/application.fam
@@ -8,7 +8,7 @@ App(
     stack_size=8 * 1024,
     order=1,
     fap_icon="icon.png",
-    fap_category="GPIO",
+    fap_category="GPIO/MAYHEM",
     fap_description="ESP32-CAM simple app to show a payload from QR codes. Can be extended to trigger more stuff in the code. [Unplug the USB cable to test with Mayhem]",
     fap_author="eried",
     fap_weburl="https://flipper.ried.cl",

diff --git a/nrf24batch/application.fam b/nrf24batch/application.fam
@@ -9,7 +9,7 @@ App(
     order=60,
     resources="resources",
     fap_icon="nrf24batch_10px.png",
-    fap_category="GPIO",
+    fap_category="GPIO/NRF24",
     fap_private_libs=[
         Lib(
             name="nrf24",

diff --git a/nrf24channelscanner/application.fam b/nrf24channelscanner/application.fam
@@ -7,7 +7,7 @@ App(
     fap_weburl="https://github.com/htotoo/NRF24ChannelScanner",
     stack_size=2 * 1024,
     requires=["gui"],
-    fap_category="GPIO",
+    fap_category="GPIO/NRF24",
     fap_version=(1, 3),
     fap_icon_assets="images",
     fap_icon="fapicon.png",

diff --git a/nrf24mousejacker/application.fam b/nrf24mousejacker/application.fam
@@ -10,7 +10,7 @@ App(
     stack_size=2 * 1024,
     order=60,
     fap_icon="mouse_10px.png",
-    fap_category="GPIO",
+    fap_category="GPIO/NRF24",
     fap_author="@mothball187 & @xMasterX",
     fap_version="1.2",
     fap_description="App works with NRF24 Sniffer app to perform mousejack attacks",

diff --git a/nrf24scan/application.fam b/nrf24scan/application.fam
@@ -9,7 +9,7 @@ App(
     order=60,
     resources="resources",
     fap_icon="nrf24scan_10px.png",
-    fap_category="GPIO",
+    fap_category="GPIO/NRF24",
     fap_private_libs=[
         Lib(
             name="nrf24",