diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 2c7ccdfda..4094902d4 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -4,5 +4,5 @@ contact_links: url: https://t.me/flipperzero_unofficial about: Unofficial Telegram chat - name: Discord - url: https://discord.gg/58D6E8BtTU + url: https://discord.unleashedflip.com about: Unofficial Discord Community diff --git a/CHANGELOG.md b/CHANGELOG.md index d4c217286..8efbf0d58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ ### New changes -* SubGHz: Fixed bugs with Decode option for RAW signals (blank screen, broken files) -* SubGHz: Allowed usage of hopper with detect raw feature (with attempt to fix) - WARNING -> This feature is very unstable, may cause crashes(with lost of captured signal), use at your own risk, it was enabled due to many requests from users -* PR -> Docs, fix description - Slight update for newest dev method (by @UberGuidoZ | PR #93) +* Plugins: RFID Fuzzer - fixed crash in load uids from file +* Fixed .fap's debug (unable to set breakpoint) +* PR: Turkish language support badusb layout (by @hardcod3dd | PR #95) +* New icon for UART Echo (by @Svaarich) +* New animaiton (flipper city) (by @Svaarich) +* Discord link updated #### [🎲 Download extra apps pack](https://download-directory.github.io/?url=https://github.com/UberGuidoZ/Flipper/tree/main/Applications/Unleashed) diff --git a/applications/plugins/flipfrid/scene/flipfrid_scene_run_attack.c b/applications/plugins/flipfrid/scene/flipfrid_scene_run_attack.c index 18e0d9c82..585badf9d 100644 --- a/applications/plugins/flipfrid/scene/flipfrid_scene_run_attack.c +++ b/applications/plugins/flipfrid/scene/flipfrid_scene_run_attack.c @@ -533,14 +533,17 @@ void flipfrid_scene_run_attack_on_event(FlipFridEvent event, FlipFridState* cont break; case InputKeyBack: if(context->attack == FlipFridAttackLoadFileCustomUids) { + furi_string_reset(context->data_str); + stream_rewind(context->uids_stream); buffered_file_stream_close(context->uids_stream); } context->attack_step = 0; + counter = 0; context->is_attacking = false; furi_string_reset(context->notification_msg); - context->current_scene = SceneEntryPoint; notification_message(context->notify, &sequence_blink_stop); + context->current_scene = SceneEntryPoint; break; } } diff --git a/assets/dolphin/external/L2_FlipperCity_128x64/frame_0.png b/assets/dolphin/external/L2_FlipperCity_128x64/frame_0.png new file mode 100644 index 000000000..1b4de2fcd Binary files /dev/null and b/assets/dolphin/external/L2_FlipperCity_128x64/frame_0.png differ diff --git a/assets/dolphin/external/L2_FlipperCity_128x64/frame_1.png b/assets/dolphin/external/L2_FlipperCity_128x64/frame_1.png new file mode 100644 index 000000000..5c05ab5e1 Binary files /dev/null and b/assets/dolphin/external/L2_FlipperCity_128x64/frame_1.png differ diff --git a/assets/dolphin/external/L2_FlipperCity_128x64/frame_2.png b/assets/dolphin/external/L2_FlipperCity_128x64/frame_2.png new file mode 100644 index 000000000..2065ab2bf Binary files /dev/null and b/assets/dolphin/external/L2_FlipperCity_128x64/frame_2.png differ diff --git a/assets/dolphin/external/L2_FlipperCity_128x64/frame_3.png b/assets/dolphin/external/L2_FlipperCity_128x64/frame_3.png new file mode 100644 index 000000000..3a04ec159 Binary files /dev/null and b/assets/dolphin/external/L2_FlipperCity_128x64/frame_3.png differ diff --git a/assets/dolphin/external/L2_FlipperCity_128x64/frame_4.png b/assets/dolphin/external/L2_FlipperCity_128x64/frame_4.png new file mode 100644 index 000000000..67eb6274a Binary files /dev/null and b/assets/dolphin/external/L2_FlipperCity_128x64/frame_4.png differ diff --git a/assets/dolphin/external/L2_FlipperCity_128x64/frame_5.png b/assets/dolphin/external/L2_FlipperCity_128x64/frame_5.png new file mode 100644 index 000000000..c35307497 Binary files /dev/null and b/assets/dolphin/external/L2_FlipperCity_128x64/frame_5.png differ diff --git a/assets/dolphin/external/L2_FlipperCity_128x64/frame_6.png b/assets/dolphin/external/L2_FlipperCity_128x64/frame_6.png new file mode 100644 index 000000000..fa85be7cc Binary files /dev/null and b/assets/dolphin/external/L2_FlipperCity_128x64/frame_6.png differ diff --git a/assets/dolphin/external/L2_FlipperCity_128x64/frame_7.png b/assets/dolphin/external/L2_FlipperCity_128x64/frame_7.png new file mode 100644 index 000000000..4adaf63a8 Binary files /dev/null and b/assets/dolphin/external/L2_FlipperCity_128x64/frame_7.png differ diff --git a/assets/dolphin/external/L2_FlipperCity_128x64/frame_8.png b/assets/dolphin/external/L2_FlipperCity_128x64/frame_8.png new file mode 100644 index 000000000..c1f7c02f5 Binary files /dev/null and b/assets/dolphin/external/L2_FlipperCity_128x64/frame_8.png differ diff --git a/assets/dolphin/external/L2_FlipperCity_128x64/frame_9.png b/assets/dolphin/external/L2_FlipperCity_128x64/frame_9.png new file mode 100644 index 000000000..64df2cb16 Binary files /dev/null and b/assets/dolphin/external/L2_FlipperCity_128x64/frame_9.png differ diff --git a/assets/dolphin/external/L2_FlipperCity_128x64/meta.txt b/assets/dolphin/external/L2_FlipperCity_128x64/meta.txt new file mode 100644 index 000000000..5ba9eab4a --- /dev/null +++ b/assets/dolphin/external/L2_FlipperCity_128x64/meta.txt @@ -0,0 +1,14 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 10 +Active frames: 0 +Frames order: 0 1 2 3 4 5 6 7 8 9 +Active cycles: 0 +Frame rate: 4 +Duration: 3600 +Active cooldown: 0 + +Bubble slots: 0 diff --git a/assets/dolphin/external/manifest.txt b/assets/dolphin/external/manifest.txt index 1de5166e9..e4708265d 100644 --- a/assets/dolphin/external/manifest.txt +++ b/assets/dolphin/external/manifest.txt @@ -43,6 +43,13 @@ Min level: 2 Max level: 30 Weight: 3 +Name: L2_FlipperCity_128x64 +Min butthurt: 0 +Max butthurt: 13 +Min level: 2 +Max level: 3 +Weight: 3 + Name: L2_Soldering_128x64 Min butthurt: 0 Max butthurt: 10 diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_0.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_0.bm new file mode 100644 index 000000000..436bc602f Binary files /dev/null and b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_0.bm differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_1.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_1.bm new file mode 100644 index 000000000..33228b8e1 Binary files /dev/null and b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_1.bm differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_2.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_2.bm new file mode 100644 index 000000000..d21335363 Binary files /dev/null and b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_2.bm differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_3.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_3.bm new file mode 100644 index 000000000..8c0430da1 Binary files /dev/null and b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_3.bm differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_4.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_4.bm new file mode 100644 index 000000000..78a5862a1 Binary files /dev/null and b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_4.bm differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_5.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_5.bm new file mode 100644 index 000000000..7702099d0 Binary files /dev/null and b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_5.bm differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_6.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_6.bm new file mode 100644 index 000000000..cda2e4d0d Binary files /dev/null and b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_6.bm differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_7.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_7.bm new file mode 100644 index 000000000..8c7910c83 Binary files /dev/null and b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_7.bm differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_8.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_8.bm new file mode 100644 index 000000000..9cb483006 Binary files /dev/null and b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_8.bm differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_9.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_9.bm new file mode 100644 index 000000000..538c4edb6 Binary files /dev/null and b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_9.bm differ diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/meta.txt b/assets/resources/dolphin/L2_FlipperCity_128x64/meta.txt new file mode 100644 index 000000000..fdddbdb2e --- /dev/null +++ b/assets/resources/dolphin/L2_FlipperCity_128x64/meta.txt @@ -0,0 +1,14 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 10 +Active frames: 0 +Frames order: 0 1 2 3 4 5 6 7 8 9 +Active cycles: 0 +Frame rate: 4 +Duration: 3600 +Active cooldown: 0 + +Bubble slots: 0 diff --git a/assets/resources/dolphin/manifest.txt b/assets/resources/dolphin/manifest.txt index be7433df4..ad599a6e4 100644 --- a/assets/resources/dolphin/manifest.txt +++ b/assets/resources/dolphin/manifest.txt @@ -3,21 +3,21 @@ Version: 1 Name: RM_G0kuPatPat_128x64 Min butthurt: 0 -Max butthurt: 5 +Max butthurt: 14 Min level: 18 Max level: 30 Weight: 0 Name: RM_Sail0rM00n_128x64 Min butthurt: 0 -Max butthurt: 5 +Max butthurt: 14 Min level: 18 Max level: 30 Weight: 0 Name: RM_BulmFlash_128x64 Min butthurt: 0 -Max butthurt: 5 +Max butthurt: 14 Min level: 18 Max level: 30 Weight: 0 @@ -66,28 +66,28 @@ Weight: 0 Name: Sasquach_Naruto_128x64 Min butthurt: 0 -Max butthurt: 5 +Max butthurt: 14 Min level: 1 Max level: 30 Weight: 7 Name: RM_G0kuPew_128x64 Min butthurt: 0 -Max butthurt: 5 +Max butthurt: 14 Min level: 1 Max level: 30 Weight: 7 Name: RM_ChiChi_128x64 Min butthurt: 0 -Max butthurt: 5 +Max butthurt: 14 Min level: 1 Max level: 30 Weight: 7 Name: RM_R0shi_128x64 Min butthurt: 0 -Max butthurt: 5 +Max butthurt: 14 Min level: 1 Max level: 30 Weight: 7 @@ -388,42 +388,49 @@ Weight: 2 Name: L2_Hacking_pc_128x64 Min butthurt: 0 -Max butthurt: 10 +Max butthurt: 14 Min level: 2 Max level: 30 Weight: 4 Name: L3_Hijack_radio_128x64 Min butthurt: 0 -Max butthurt: 10 +Max butthurt: 14 Min level: 3 Max level: 30 Weight: 4 Name: L3_Lab_research_128x54 Min butthurt: 0 -Max butthurt: 10 +Max butthurt: 14 Min level: 3 Max level: 30 Weight: 4 +Name: L2_FlipperCity_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 2 +Max level: 30 +Weight: 3 + Name: L2_Soldering_128x64 Min butthurt: 0 -Max butthurt: 10 +Max butthurt: 14 Min level: 2 Max level: 30 Weight: 4 Name: L1_Waves_128x50 Min butthurt: 0 -Max butthurt: 10 +Max butthurt: 14 Min level: 1 Max level: 30 Weight: 3 Name: L1_Read_books_128x64 Min butthurt: 0 -Max butthurt: 10 +Max butthurt: 14 Min level: 1 Max level: 30 Weight: 3 diff --git a/site_scons/site_tools/fbt_extapps.py b/site_scons/site_tools/fbt_extapps.py index a1fa77140..7930d613b 100644 --- a/site_scons/site_tools/fbt_extapps.py +++ b/site_scons/site_tools/fbt_extapps.py @@ -111,7 +111,7 @@ def BuildAppElf(env, app): ) app_elf_raw = app_env.Program( - os.path.join(app_work_dir, f"{app.appid}_d"), + os.path.join(ext_apps_work_dir, f"{app.appid}_d"), app_sources, APP_ENTRY=app.entry_point, )