diff --git a/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c b/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c index 136f66f80..029614c5d 100644 --- a/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c +++ b/applications/plugins/wifi_marauder_companion/scenes/wifi_marauder_scene_start.c @@ -60,7 +60,15 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = { {"Sniff", {"beacon", "deauth", "esp", "pmkid", "probe", "pwn", "raw", "bt", "skim"}, 9, - {"sniffbeacon", "sniffdeauth", "sniffesp", "sniffpmkid", "sniffprobe", "sniffpwn", "sniffraw", "sniffbt", "sniffskim"}, + {"sniffbeacon", + "sniffdeauth", + "sniffesp", + "sniffpmkid", + "sniffprobe", + "sniffpwn", + "sniffraw", + "sniffbt", + "sniffskim"}, NO_ARGS, FOCUS_CONSOLE_END, SHOW_STOPSCAN_TIP}, diff --git a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_0.bm b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_0.bm index 436bc602f..8da6b45f0 100644 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_0.bm 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 index 33228b8e1..e9597309a 100644 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_1.bm 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 index d21335363..ebd22d637 100644 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_2.bm 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 index 8c0430da1..4ac97ced6 100644 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_3.bm 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 index 78a5862a1..41bcf9e29 100644 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_4.bm 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 index 7702099d0..d394375f6 100644 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_5.bm 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 index cda2e4d0d..082961555 100644 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_6.bm 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 index 8c7910c83..e5780c17c 100644 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_7.bm 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 index 9cb483006..112c38f2f 100644 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_8.bm 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 index 538c4edb6..3d12a0d0d 100644 Binary files a/assets/resources/dolphin/L2_FlipperCity_128x64/frame_9.bm and b/assets/resources/dolphin/L2_FlipperCity_128x64/frame_9.bm differ diff --git a/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_0.bm b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_0.bm new file mode 100644 index 000000000..fdbf0c922 Binary files /dev/null and b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_0.bm differ diff --git a/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_1.bm b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_1.bm new file mode 100644 index 000000000..159fd5f1b Binary files /dev/null and b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_1.bm differ diff --git a/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_10.bm b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_10.bm new file mode 100644 index 000000000..465759184 Binary files /dev/null and b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_10.bm differ diff --git a/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_11.bm b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_11.bm new file mode 100644 index 000000000..f89baa157 Binary files /dev/null and b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_11.bm differ diff --git a/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_2.bm b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_2.bm new file mode 100644 index 000000000..8c59fc403 Binary files /dev/null and b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_2.bm differ diff --git a/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_3.bm b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_3.bm new file mode 100644 index 000000000..2753b8abb Binary files /dev/null and b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_3.bm differ diff --git a/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_4.bm b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_4.bm new file mode 100644 index 000000000..25471df39 Binary files /dev/null and b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_4.bm differ diff --git a/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_5.bm b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_5.bm new file mode 100644 index 000000000..f4982cafa Binary files /dev/null and b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_5.bm differ diff --git a/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_6.bm b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_6.bm new file mode 100644 index 000000000..d98632563 Binary files /dev/null and b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_6.bm differ diff --git a/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_7.bm b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_7.bm new file mode 100644 index 000000000..d93803b89 Binary files /dev/null and b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_7.bm differ diff --git a/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_8.bm b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_8.bm new file mode 100644 index 000000000..5c0b2ae22 Binary files /dev/null and b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_8.bm differ diff --git a/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_9.bm b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_9.bm new file mode 100644 index 000000000..5d0862439 Binary files /dev/null and b/assets/resources/dolphin/L3_FlipperMustache_128x64/frame_9.bm differ diff --git a/assets/resources/dolphin/L3_FlipperMustache_128x64/meta.txt b/assets/resources/dolphin/L3_FlipperMustache_128x64/meta.txt new file mode 100644 index 000000000..64de3a3df --- /dev/null +++ b/assets/resources/dolphin/L3_FlipperMustache_128x64/meta.txt @@ -0,0 +1,32 @@ +Filetype: Flipper Animation +Version: 1 + +Width: 128 +Height: 64 +Passive frames: 10 +Active frames: 2 +Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 +Active cycles: 8 +Frame rate: 3 +Duration: 3600 +Active cooldown: 7 + +Bubble slots: 1 + +Slot: 0 +X: 60 +Y: 30 +Text: Some hack\nwe made +AlignH: Left +AlignV: Center +StartFrame: 10 +EndFrame: 17 + +Slot: 0 +X: 60 +Y: 30 +Text: It's a firmware\nupgrade! +AlignH: Left +AlignV: Center +StartFrame: 18 +EndFrame: 25 diff --git a/assets/resources/dolphin/manifest.txt b/assets/resources/dolphin/manifest.txt index 0b3022d94..245c109d2 100644 --- a/assets/resources/dolphin/manifest.txt +++ b/assets/resources/dolphin/manifest.txt @@ -57,6 +57,13 @@ Min level: 2 Max level: 30 Weight: 7 +Name: L3_FlipperMustache_128x64 +Min butthurt: 0 +Max butthurt: 14 +Min level: 3 +Max level: 30 +Weight: 7 + Name: L3_Fireplace_128x64 Min butthurt: 0 Max butthurt: 14