Merge pull request #396 from ESurge/420

Bad USB as FAP
RogueMaster · Nov 4, 2022 · 550dc6f · 550dc6f
2 parents 5fa48b7 + eaa5adc
commit 550dc6f
Show file tree

Hide file tree

Showing 35 changed files with 37 additions and 2 deletions.
diff --git a/applications/main/application.fam b/applications/main/application.fam
@@ -11,7 +11,8 @@ App(
         "lfrfid",
         "nfc",
         "subghz",
-        "bad_usb",
+        #"bad_usb",
+        "bad_usb_loader",
         # "u2f",
         "u2f_loader",
         "fap_loader",

diff --git a/applications/main/archive/scenes/archive_scene_browser.c b/applications/main/archive/scenes/archive_scene_browser.c
@@ -63,6 +63,14 @@ static void archive_run_in_app(ArchiveBrowserView* browser, ArchiveFile_t* selec
             char* result =
                 malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1);
 
+            strcpy(result, tmpType);
+            strcat(result, furi_string_get_cstr(selected->path));
+            status = loader_start(loader, "Applications", result);
+        } else if(strcmp(flipper_app_name[selected->type], "Bad USB") == 0) {
+            char* tmpType = "/ext/apps/Main/bad_usb.fap¯";
+            char* result =
+                malloc(strlen(tmpType) + strlen(furi_string_get_cstr(selected->path)) + 1);
+
             strcpy(result, tmpType);
             strcat(result, furi_string_get_cstr(selected->path));
             status = loader_start(loader, "Applications", result);

diff --git a/applications/main/bad_usb/application.fam b/applications/main/bad_usb/application.fam
@@ -1,7 +1,7 @@
 App(
     appid="bad_usb",
     name="Bad USB",
-    apptype=FlipperAppType.APP,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="bad_usb_app",
     cdefines=["APP_BAD_USB"],
     requires=[
@@ -11,4 +11,7 @@ App(
     stack_size=2 * 1024,
     icon="A_BadUsb_14",
     order=70,
+    fap_category="Main",
+    fap_icon="badusb_10px.png",
+    fap_icon_assets="images",
 )
diff --git a/applications/main/bad_usb/badusb_10px.png b/applications/main/bad_usb/badusb_10px.png
diff --git a/applications/main/bad_usb/images/ActiveConnection_50x64.png b/applications/main/bad_usb/images/ActiveConnection_50x64.png
diff --git a/applications/main/bad_usb/images/Clock_18x18.png b/applications/main/bad_usb/images/Clock_18x18.png
diff --git a/applications/main/bad_usb/images/Error_18x18.png b/applications/main/bad_usb/images/Error_18x18.png
diff --git a/applications/main/bad_usb/images/EviSmile1_18x21.png b/applications/main/bad_usb/images/EviSmile1_18x21.png
diff --git a/applications/main/bad_usb/images/EviSmile2_18x21.png b/applications/main/bad_usb/images/EviSmile2_18x21.png
diff --git a/applications/main/bad_usb/images/EviWaiting1_18x21.png b/applications/main/bad_usb/images/EviWaiting1_18x21.png
diff --git a/applications/main/bad_usb/images/EviWaiting2_18x21.png b/applications/main/bad_usb/images/EviWaiting2_18x21.png
diff --git a/applications/main/bad_usb/images/Percent_10x14.png b/applications/main/bad_usb/images/Percent_10x14.png
diff --git a/applications/main/bad_usb/images/SDQuestion_35x43.png b/applications/main/bad_usb/images/SDQuestion_35x43.png
diff --git a/applications/main/bad_usb/images/Smile_18x18.png b/applications/main/bad_usb/images/Smile_18x18.png
diff --git a/applications/main/bad_usb/images/UsbTree_48x22.png b/applications/main/bad_usb/images/UsbTree_48x22.png
diff --git a/applications/main/bad_usb/images/badusb_10px.png b/applications/main/bad_usb/images/badusb_10px.png
diff --git a/applications/main/bad_usb/images/keyboard_10px.png b/applications/main/bad_usb/images/keyboard_10px.png
diff --git a/applications/main/bad_usb_loader/application.fam b/applications/main/bad_usb_loader/application.fam
@@ -0,0 +1,14 @@
+App(
+    appid="bad_usb_loader",
+    name="Bad USB",
+    apptype=FlipperAppType.APP,
+    entry_point="bad_usb_loader_app",
+    requires=[
+        "gui",
+        "dialogs",
+    ],
+    stack_size=int(2 * 1024),
+    icon="A_BadUsb_14",
+    order=80,
+	link="/ext/apps/Main/bad_usb.fap",
+)
diff --git a/applications/main/bad_usb_loader/bad_usb_loader_app.c b/applications/main/bad_usb_loader/bad_usb_loader_app.c
@@ -0,0 +1,9 @@
+#include <applications/services/loader/loader_i.h>
+
+#define TAG "bad_usb_loader_app"
+
+int32_t bad_usb_loader_app(void* p) {
+    UNUSED(p);
+
+    return 0;
+}
diff --git a/...ations/plugins/unirfremix/application.fam → applications/main/unirfremix/application.fam b/...ations/plugins/unirfremix/application.fam → applications/main/unirfremix/application.fam
diff --git a/...gins/unirfremix/images/ButtonDown_7x4.png → ...main/unirfremix/images/ButtonDown_7x4.png b/...gins/unirfremix/images/ButtonDown_7x4.png → ...main/unirfremix/images/ButtonDown_7x4.png
diff --git a/...gins/unirfremix/images/ButtonLeft_4x7.png → ...main/unirfremix/images/ButtonLeft_4x7.png b/...gins/unirfremix/images/ButtonLeft_4x7.png → ...main/unirfremix/images/ButtonLeft_4x7.png
diff --git a/...ins/unirfremix/images/ButtonRight_4x7.png → ...ain/unirfremix/images/ButtonRight_4x7.png b/...ins/unirfremix/images/ButtonRight_4x7.png → ...ain/unirfremix/images/ButtonRight_4x7.png
diff --git a/...lugins/unirfremix/images/ButtonUp_7x4.png → ...s/main/unirfremix/images/ButtonUp_7x4.png b/...lugins/unirfremix/images/ButtonUp_7x4.png → ...s/main/unirfremix/images/ButtonUp_7x4.png
diff --git a/.../plugins/unirfremix/images/Ok_btn_9x9.png → ...ons/main/unirfremix/images/Ok_btn_9x9.png b/.../plugins/unirfremix/images/Ok_btn_9x9.png → ...ons/main/unirfremix/images/Ok_btn_9x9.png
diff --git a/.../unirfremix/images/Pin_arrow_down_7x9.png → .../unirfremix/images/Pin_arrow_down_7x9.png b/.../unirfremix/images/Pin_arrow_down_7x9.png → .../unirfremix/images/Pin_arrow_down_7x9.png
diff --git a/.../unirfremix/images/Pin_arrow_left_9x7.png → .../unirfremix/images/Pin_arrow_left_9x7.png b/.../unirfremix/images/Pin_arrow_left_9x7.png → .../unirfremix/images/Pin_arrow_left_9x7.png
diff --git a/...unirfremix/images/Pin_arrow_right_9x7.png → ...unirfremix/images/Pin_arrow_right_9x7.png b/...unirfremix/images/Pin_arrow_right_9x7.png → ...unirfremix/images/Pin_arrow_right_9x7.png
diff --git a/...ns/unirfremix/images/Pin_arrow_up_7x9.png → ...in/unirfremix/images/Pin_arrow_up_7x9.png b/...ns/unirfremix/images/Pin_arrow_up_7x9.png → ...in/unirfremix/images/Pin_arrow_up_7x9.png
diff --git a/...gins/unirfremix/images/Pin_cell_13x13.png → ...main/unirfremix/images/Pin_cell_13x13.png b/...gins/unirfremix/images/Pin_cell_13x13.png → ...main/unirfremix/images/Pin_cell_13x13.png
diff --git a/...lugins/unirfremix/images/Pin_star_7x7.png → ...s/main/unirfremix/images/Pin_star_7x7.png b/...lugins/unirfremix/images/Pin_star_7x7.png → ...s/main/unirfremix/images/Pin_star_7x7.png
diff --git a/...s/plugins/unirfremix/images/back_10px.png → ...ions/main/unirfremix/images/back_10px.png b/...s/plugins/unirfremix/images/back_10px.png → ...ions/main/unirfremix/images/back_10px.png
diff --git a/...s/plugins/unirfremix/images/sub1_10px.png → ...ions/main/unirfremix/images/sub1_10px.png b/...s/plugins/unirfremix/images/sub1_10px.png → ...ions/main/unirfremix/images/sub1_10px.png
diff --git a/...ications/plugins/unirfremix/unirfIcon.png → applications/main/unirfremix/unirfIcon.png b/...ications/plugins/unirfremix/unirfIcon.png → applications/main/unirfremix/unirfIcon.png
diff --git a/...tions/plugins/unirfremix/unirfremix_app.c → ...ications/main/unirfremix/unirfremix_app.c b/...tions/plugins/unirfremix/unirfremix_app.c → ...ications/main/unirfremix/unirfremix_app.c