diff --git a/ReadMe.md b/ReadMe.md index da037726c..1d110975c 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -36,6 +36,8 @@ Thank you to all the supporters! - Added: [Gui: proper navigation in file browser dialog #2014 (By skotopes)](https://github.com/flipperdevices/flipperzero-firmware/pull/2014) - Added: [(WIP) added ISO15693 reading, saving and revealing from privacy mode (unlock) #1991 (By g3gg0)](https://github.com/flipperdevices/flipperzero-firmware/pull/1991) - Added: [RC2014 ColecoVision (By ezod)](https://github.com/ezod/flipperzero-rc2014-coleco) +- Updated: [iButton Fuzzer (By xMasterX)](https://github.com/DarkFlippers/unleashed-firmware) location for file storage +- Updated: [Bad Apple (By GMMan)](https://github.com/GMMan/flipperzero-badapple) location for file storage and included video.bin ## Install from Release FLASH STOCK FIRST BEFORE UPDATING TO CUSTOM FIRMWARE! @@ -194,7 +196,7 @@ $ ./fbt resources icons dolphin_ext - [Air Mouse (By ginkage)](https://github.com/ginkage/FlippAirMouse/) - [Authenticator/TOTP (By akopachov)](https://github.com/akopachov/flipper-zero_authenticator) -- [Bad Apple (By GMMan)](https://github.com/GMMan/flipperzero-badapple) `video.bin NEEDED, Please LMK if you have it` +- [Bad Apple (By GMMan)](https://github.com/GMMan/flipperzero-badapple) - [Barcode Generator (By McAzzaMan)](https://github.com/McAzzaMan/flipperzero-firmware/tree/UPC-A_Barcode_Generator/applications/barcode_generator) - [Bluetooth Remote (By Cutch)-OFW](https://github.com/flipperdevices/flipperzero-firmware/pull/1330) - [BPM Tapper (By panki27)](https://github.com/panki27/bpm-tapper) diff --git a/applications/plugins/badapple/bad_apple.h b/applications/plugins/badapple/bad_apple.h index 4b7a92cd1..de842b8d7 100644 --- a/applications/plugins/badapple/bad_apple.h +++ b/applications/plugins/badapple/bad_apple.h @@ -9,7 +9,7 @@ #define VIDEO_WIDTH 104 #define VIDEO_HEIGHT 80 #define FILE_BUFFER_SIZE (1024 * 64) -#define VIDEO_PATH EXT_PATH("bad_apple/video.bin") +#define VIDEO_PATH EXT_PATH("apps_data/bad_apple/video.bin") #define VIDEO_X ((SCREEN_WIDTH - VIDEO_WIDTH) / 2) #define VIDEO_Y 0 diff --git a/applications/plugins/ibtn_fuzzer/ibtnfuzzer.c b/applications/plugins/ibtn_fuzzer/ibtnfuzzer.c index f02da3b82..9bf7ec1f5 100644 --- a/applications/plugins/ibtn_fuzzer/ibtnfuzzer.c +++ b/applications/plugins/ibtn_fuzzer/ibtnfuzzer.c @@ -6,7 +6,7 @@ #include "scene/ibtnfuzzer_scene_run_attack.h" #include "scene/ibtnfuzzer_scene_load_custom_uids.h" -#define IBTNFUZZER_APP_FOLDER "/ext/ibtnfuzzer" +#define IBTNFUZZER_APP_FOLDER "/ext/ibutton/ibtnfuzzer" static void ibtnfuzzer_draw_callback(Canvas* const canvas, void* ctx) { iBtnFuzzerState* ibtnfuzzer_state = (iBtnFuzzerState*)acquire_mutex((ValueMutex*)ctx, 100); diff --git a/assets/resources/apps_data/bad_apple/video.bin b/assets/resources/apps_data/bad_apple/video.bin new file mode 100644 index 000000000..5ef939d84 Binary files /dev/null and b/assets/resources/apps_data/bad_apple/video.bin differ diff --git a/assets/resources/ibtnfuzzer/example_uids_cyfral.txt b/assets/resources/ibutton/ibtnfuzzer/example_uids_cyfral.txt similarity index 100% rename from assets/resources/ibtnfuzzer/example_uids_cyfral.txt rename to assets/resources/ibutton/ibtnfuzzer/example_uids_cyfral.txt diff --git a/assets/resources/ibtnfuzzer/example_uids_ds1990.txt b/assets/resources/ibutton/ibtnfuzzer/example_uids_ds1990.txt similarity index 100% rename from assets/resources/ibtnfuzzer/example_uids_ds1990.txt rename to assets/resources/ibutton/ibtnfuzzer/example_uids_ds1990.txt diff --git a/assets/resources/ibtnfuzzer/example_uids_metakom.txt b/assets/resources/ibutton/ibtnfuzzer/example_uids_metakom.txt similarity index 100% rename from assets/resources/ibtnfuzzer/example_uids_metakom.txt rename to assets/resources/ibutton/ibtnfuzzer/example_uids_metakom.txt