Merge branch 'UNLEASHED' into 420

.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

CHANGELOG.md

@@ -1,7 +1,10 @@
 ### New changes
-* SubGHz: Fixed bugs with Decode option for RAW signals (blank screen, broken files)
+* Plugins: RFID Fuzzer - fixed crash in load uids from file
-* 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
+* Fixed .fap's debug (unable to set breakpoint)
-* PR -> Docs, fix description - Slight update for newest dev method (by @UberGuidoZ | PR #93)
+* 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)
 

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;
             }
         }

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

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

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

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

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,
     )