diff --git a/.gitignore b/.gitignore index 8c870fd2f..c4ae56ddd 100644 --- a/.gitignore +++ b/.gitignore @@ -49,9 +49,6 @@ build/ # Toolchain /toolchain -# automate -automate.py - # openocd output file openocd.log @@ -61,8 +58,8 @@ PVS-Studio.log .gdbinit -RM*-*.tgz -RM*-*.zip -RM*-*.txt -RM*-*-*/ -PATREONbuildRelease.sh + +# XFW-specific: + +# Automate files, etc +automate.py diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index a97e0933a..000000000 --- a/.gitmodules +++ /dev/null @@ -1,33 +0,0 @@ -[submodule "lib/mlib"] - path = lib/mlib - url = https://github.com/P-p-H-d/mlib.git -[submodule "lib/STM32CubeWB"] - path = lib/STM32CubeWB - url = https://github.com/Flipper-Zero/STM32CubeWB.git -[submodule "lib/littlefs"] - path = lib/littlefs - url = https://github.com/littlefs-project/littlefs.git -[submodule "lib/nanopb"] - path = lib/nanopb - url = https://github.com/nanopb/nanopb.git -[submodule "assets/protobuf"] - path = assets/protobuf - url = https://github.com/flipperdevices/flipperzero-protobuf.git -[submodule "lib/libusb_stm32"] - path = lib/libusb_stm32 - url = https://github.com/flipperdevices/libusb_stm32.git -[submodule "lib/FreeRTOS-Kernel"] - path = lib/FreeRTOS-Kernel - url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git -[submodule "lib/microtar"] - path = lib/microtar - url = https://github.com/amachronic/microtar.git -[submodule "lib/mbedtls"] - path = lib/mbedtls - url = https://github.com/Mbed-TLS/mbedtls.git -[submodule "lib/cxxheaderparser"] - path = lib/cxxheaderparser - url = https://github.com/robotpy/cxxheaderparser.git -[submodule "applications/plugins/dap_link/lib/free-dap"] - path = applications/plugins/dap_link/lib/free-dap - url = https://github.com/ataradov/free-dap.git diff --git a/assets/dolphin/external/lvl_11/frame_0.png b/assets/dolphin/external/lvl_11/frame_0.png index fc17f293a..b976ce8ce 100644 Binary files a/assets/dolphin/external/lvl_11/frame_0.png and b/assets/dolphin/external/lvl_11/frame_0.png differ diff --git a/assets/dolphin/external/lvl_11/frame_1.png b/assets/dolphin/external/lvl_11/frame_1.png index 8c14a9472..933a7d8f9 100644 Binary files a/assets/dolphin/external/lvl_11/frame_1.png and b/assets/dolphin/external/lvl_11/frame_1.png differ diff --git a/assets/dolphin/external/lvl_11/frame_10.png b/assets/dolphin/external/lvl_11/frame_10.png index 5bd3b91ce..c20683472 100644 Binary files a/assets/dolphin/external/lvl_11/frame_10.png and b/assets/dolphin/external/lvl_11/frame_10.png differ diff --git a/assets/dolphin/external/lvl_11/frame_11.png b/assets/dolphin/external/lvl_11/frame_11.png index 47f8e41b4..0599ca4c4 100644 Binary files a/assets/dolphin/external/lvl_11/frame_11.png and b/assets/dolphin/external/lvl_11/frame_11.png differ diff --git a/assets/dolphin/external/lvl_11/frame_12.png b/assets/dolphin/external/lvl_11/frame_12.png index 1b4fd09b0..aed09aa1a 100644 Binary files a/assets/dolphin/external/lvl_11/frame_12.png and b/assets/dolphin/external/lvl_11/frame_12.png differ diff --git a/assets/dolphin/external/lvl_11/frame_13.png b/assets/dolphin/external/lvl_11/frame_13.png index 821ce0055..d9cda316b 100644 Binary files a/assets/dolphin/external/lvl_11/frame_13.png and b/assets/dolphin/external/lvl_11/frame_13.png differ diff --git a/assets/dolphin/external/lvl_11/frame_14.png b/assets/dolphin/external/lvl_11/frame_14.png index 2a7767f2d..3bdd4cf6c 100644 Binary files a/assets/dolphin/external/lvl_11/frame_14.png and b/assets/dolphin/external/lvl_11/frame_14.png differ diff --git a/assets/dolphin/external/lvl_11/frame_15.png b/assets/dolphin/external/lvl_11/frame_15.png index f41d84833..af4c413e7 100644 Binary files a/assets/dolphin/external/lvl_11/frame_15.png and b/assets/dolphin/external/lvl_11/frame_15.png differ diff --git a/assets/dolphin/external/lvl_11/frame_16.png b/assets/dolphin/external/lvl_11/frame_16.png index 356161be7..5c538c065 100644 Binary files a/assets/dolphin/external/lvl_11/frame_16.png and b/assets/dolphin/external/lvl_11/frame_16.png differ diff --git a/assets/dolphin/external/lvl_11/frame_17.png b/assets/dolphin/external/lvl_11/frame_17.png index e240975a3..a12ba1e31 100644 Binary files a/assets/dolphin/external/lvl_11/frame_17.png and b/assets/dolphin/external/lvl_11/frame_17.png differ diff --git a/assets/dolphin/external/lvl_11/frame_18.png b/assets/dolphin/external/lvl_11/frame_18.png index f1b7f5b9d..3428ad60d 100644 Binary files a/assets/dolphin/external/lvl_11/frame_18.png and b/assets/dolphin/external/lvl_11/frame_18.png differ diff --git a/assets/dolphin/external/lvl_11/frame_19.png b/assets/dolphin/external/lvl_11/frame_19.png index 683eca161..f66eae160 100644 Binary files a/assets/dolphin/external/lvl_11/frame_19.png and b/assets/dolphin/external/lvl_11/frame_19.png differ diff --git a/assets/dolphin/external/lvl_11/frame_2.png b/assets/dolphin/external/lvl_11/frame_2.png index e562779ab..1c30f9903 100644 Binary files a/assets/dolphin/external/lvl_11/frame_2.png and b/assets/dolphin/external/lvl_11/frame_2.png differ diff --git a/assets/dolphin/external/lvl_11/frame_20.png b/assets/dolphin/external/lvl_11/frame_20.png index 1b378ec92..45c2b7dfb 100644 Binary files a/assets/dolphin/external/lvl_11/frame_20.png and b/assets/dolphin/external/lvl_11/frame_20.png differ diff --git a/assets/dolphin/external/lvl_11/frame_21.png b/assets/dolphin/external/lvl_11/frame_21.png index 2831a1d62..980f2c3c9 100644 Binary files a/assets/dolphin/external/lvl_11/frame_21.png and b/assets/dolphin/external/lvl_11/frame_21.png differ diff --git a/assets/dolphin/external/lvl_11/frame_22.png b/assets/dolphin/external/lvl_11/frame_22.png index feda5534e..e9939e482 100644 Binary files a/assets/dolphin/external/lvl_11/frame_22.png and b/assets/dolphin/external/lvl_11/frame_22.png differ diff --git a/assets/dolphin/external/lvl_11/frame_23.png b/assets/dolphin/external/lvl_11/frame_23.png new file mode 100644 index 000000000..7518f2f8b Binary files /dev/null and b/assets/dolphin/external/lvl_11/frame_23.png differ diff --git a/assets/dolphin/external/lvl_11/frame_24.png b/assets/dolphin/external/lvl_11/frame_24.png new file mode 100644 index 000000000..29dab5d73 Binary files /dev/null and b/assets/dolphin/external/lvl_11/frame_24.png differ diff --git a/assets/dolphin/external/lvl_11/frame_25.png b/assets/dolphin/external/lvl_11/frame_25.png new file mode 100644 index 000000000..5c1cf8963 Binary files /dev/null and b/assets/dolphin/external/lvl_11/frame_25.png differ diff --git a/assets/dolphin/external/lvl_11/frame_26.png b/assets/dolphin/external/lvl_11/frame_26.png new file mode 100644 index 000000000..0657cf100 Binary files /dev/null and b/assets/dolphin/external/lvl_11/frame_26.png differ diff --git a/assets/dolphin/external/lvl_11/frame_27.png b/assets/dolphin/external/lvl_11/frame_27.png new file mode 100644 index 000000000..5885bc0ee Binary files /dev/null and b/assets/dolphin/external/lvl_11/frame_27.png differ diff --git a/assets/dolphin/external/lvl_11/frame_3.png b/assets/dolphin/external/lvl_11/frame_3.png index b53786318..8f2de0da5 100644 Binary files a/assets/dolphin/external/lvl_11/frame_3.png and b/assets/dolphin/external/lvl_11/frame_3.png differ diff --git a/assets/dolphin/external/lvl_11/frame_4.png b/assets/dolphin/external/lvl_11/frame_4.png index 40f541fd0..9d503ddb4 100644 Binary files a/assets/dolphin/external/lvl_11/frame_4.png and b/assets/dolphin/external/lvl_11/frame_4.png differ diff --git a/assets/dolphin/external/lvl_11/frame_5.png b/assets/dolphin/external/lvl_11/frame_5.png index 53d398a5b..26fa60fdf 100644 Binary files a/assets/dolphin/external/lvl_11/frame_5.png and b/assets/dolphin/external/lvl_11/frame_5.png differ diff --git a/assets/dolphin/external/lvl_11/frame_6.png b/assets/dolphin/external/lvl_11/frame_6.png index 2046f14cf..9e38d9831 100644 Binary files a/assets/dolphin/external/lvl_11/frame_6.png and b/assets/dolphin/external/lvl_11/frame_6.png differ diff --git a/assets/dolphin/external/lvl_11/frame_7.png b/assets/dolphin/external/lvl_11/frame_7.png index 64d04a41b..6d6f8b557 100644 Binary files a/assets/dolphin/external/lvl_11/frame_7.png and b/assets/dolphin/external/lvl_11/frame_7.png differ diff --git a/assets/dolphin/external/lvl_11/frame_8.png b/assets/dolphin/external/lvl_11/frame_8.png index 4d7914643..b15212ceb 100644 Binary files a/assets/dolphin/external/lvl_11/frame_8.png and b/assets/dolphin/external/lvl_11/frame_8.png differ diff --git a/assets/dolphin/external/lvl_11/frame_9.png b/assets/dolphin/external/lvl_11/frame_9.png index 2bbda2ec4..16c7f0c99 100644 Binary files a/assets/dolphin/external/lvl_11/frame_9.png and b/assets/dolphin/external/lvl_11/frame_9.png differ diff --git a/assets/dolphin/external/lvl_11/meta.txt b/assets/dolphin/external/lvl_11/meta.txt index 22801094f..4ca1452a8 100644 --- a/assets/dolphin/external/lvl_11/meta.txt +++ b/assets/dolphin/external/lvl_11/meta.txt @@ -3,11 +3,11 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 23 +Passive frames: 28 Active frames: 0 -Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 +Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 Active cycles: 0 -Frame rate: 6 +Frame rate: 7 Duration: 3600 Active cooldown: 0 diff --git a/assets/dolphin/internal/manifest.txt b/assets/dolphin/internal/manifest.txt index c42bab84e..ecd3ac5a4 100644 --- a/assets/dolphin/internal/manifest.txt +++ b/assets/dolphin/internal/manifest.txt @@ -2,7 +2,7 @@ Filetype: Flipper Animation Manifest Version: 1 # Animation 1 -Name: Sasquach_D1g1talRa1n_128x64 +Name: infomercial_128x64 Min butthurt: 0 Max butthurt: 14 Min level: 1 diff --git a/assets/resources/dolphin/lvl_11/frame_0.bm b/assets/resources/dolphin/lvl_11/frame_0.bm index 5b8f1c17e..420ee7376 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_0.bm and b/assets/resources/dolphin/lvl_11/frame_0.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_1.bm b/assets/resources/dolphin/lvl_11/frame_1.bm index e6c216a60..6b10b7fbe 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_1.bm and b/assets/resources/dolphin/lvl_11/frame_1.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_10.bm b/assets/resources/dolphin/lvl_11/frame_10.bm index 422edea7a..d9defe1cb 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_10.bm and b/assets/resources/dolphin/lvl_11/frame_10.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_11.bm b/assets/resources/dolphin/lvl_11/frame_11.bm index 45542d4f2..52b284969 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_11.bm and b/assets/resources/dolphin/lvl_11/frame_11.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_12.bm b/assets/resources/dolphin/lvl_11/frame_12.bm index 95815b6c7..52e7722a0 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_12.bm and b/assets/resources/dolphin/lvl_11/frame_12.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_13.bm b/assets/resources/dolphin/lvl_11/frame_13.bm index 7b713a98b..e90233342 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_13.bm and b/assets/resources/dolphin/lvl_11/frame_13.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_14.bm b/assets/resources/dolphin/lvl_11/frame_14.bm index f81a46173..57723112f 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_14.bm and b/assets/resources/dolphin/lvl_11/frame_14.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_15.bm b/assets/resources/dolphin/lvl_11/frame_15.bm index 67dd28955..6ed83b3ad 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_15.bm and b/assets/resources/dolphin/lvl_11/frame_15.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_16.bm b/assets/resources/dolphin/lvl_11/frame_16.bm index 7d99ef7c6..f1b6b32ec 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_16.bm and b/assets/resources/dolphin/lvl_11/frame_16.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_17.bm b/assets/resources/dolphin/lvl_11/frame_17.bm index a6e7c34d9..158810f06 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_17.bm and b/assets/resources/dolphin/lvl_11/frame_17.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_18.bm b/assets/resources/dolphin/lvl_11/frame_18.bm index 028d6e342..c6eac5abe 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_18.bm and b/assets/resources/dolphin/lvl_11/frame_18.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_19.bm b/assets/resources/dolphin/lvl_11/frame_19.bm index 1a65b28f0..39b209140 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_19.bm and b/assets/resources/dolphin/lvl_11/frame_19.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_2.bm b/assets/resources/dolphin/lvl_11/frame_2.bm index 8c04072b3..67958b7db 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_2.bm and b/assets/resources/dolphin/lvl_11/frame_2.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_20.bm b/assets/resources/dolphin/lvl_11/frame_20.bm index f76af6900..789f27738 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_20.bm and b/assets/resources/dolphin/lvl_11/frame_20.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_21.bm b/assets/resources/dolphin/lvl_11/frame_21.bm index 3da0e8961..a0b4d3cf7 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_21.bm and b/assets/resources/dolphin/lvl_11/frame_21.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_22.bm b/assets/resources/dolphin/lvl_11/frame_22.bm index 7a79d596b..e37a42201 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_22.bm and b/assets/resources/dolphin/lvl_11/frame_22.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_23.bm b/assets/resources/dolphin/lvl_11/frame_23.bm new file mode 100644 index 000000000..2162cf14d Binary files /dev/null and b/assets/resources/dolphin/lvl_11/frame_23.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_24.bm b/assets/resources/dolphin/lvl_11/frame_24.bm new file mode 100644 index 000000000..8cdce5515 Binary files /dev/null and b/assets/resources/dolphin/lvl_11/frame_24.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_25.bm b/assets/resources/dolphin/lvl_11/frame_25.bm new file mode 100644 index 000000000..e01e4fabb Binary files /dev/null and b/assets/resources/dolphin/lvl_11/frame_25.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_26.bm b/assets/resources/dolphin/lvl_11/frame_26.bm new file mode 100644 index 000000000..8f5fa633c Binary files /dev/null and b/assets/resources/dolphin/lvl_11/frame_26.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_27.bm b/assets/resources/dolphin/lvl_11/frame_27.bm new file mode 100644 index 000000000..859d8d707 Binary files /dev/null and b/assets/resources/dolphin/lvl_11/frame_27.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_3.bm b/assets/resources/dolphin/lvl_11/frame_3.bm index 8e61d4c54..cdb6c331e 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_3.bm and b/assets/resources/dolphin/lvl_11/frame_3.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_4.bm b/assets/resources/dolphin/lvl_11/frame_4.bm index 0355beb61..a82c79a17 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_4.bm and b/assets/resources/dolphin/lvl_11/frame_4.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_5.bm b/assets/resources/dolphin/lvl_11/frame_5.bm index 9871aa6e0..c0757262c 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_5.bm and b/assets/resources/dolphin/lvl_11/frame_5.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_6.bm b/assets/resources/dolphin/lvl_11/frame_6.bm index 8dae3d823..6cc36ec9b 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_6.bm and b/assets/resources/dolphin/lvl_11/frame_6.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_7.bm b/assets/resources/dolphin/lvl_11/frame_7.bm index 894f2f246..8fc70c65b 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_7.bm and b/assets/resources/dolphin/lvl_11/frame_7.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_8.bm b/assets/resources/dolphin/lvl_11/frame_8.bm index 8e230b675..bb3fb78b8 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_8.bm and b/assets/resources/dolphin/lvl_11/frame_8.bm differ diff --git a/assets/resources/dolphin/lvl_11/frame_9.bm b/assets/resources/dolphin/lvl_11/frame_9.bm index b569be285..2ee35b135 100644 Binary files a/assets/resources/dolphin/lvl_11/frame_9.bm and b/assets/resources/dolphin/lvl_11/frame_9.bm differ diff --git a/assets/resources/dolphin/lvl_11/meta.txt b/assets/resources/dolphin/lvl_11/meta.txt index 22801094f..4ca1452a8 100644 --- a/assets/resources/dolphin/lvl_11/meta.txt +++ b/assets/resources/dolphin/lvl_11/meta.txt @@ -3,11 +3,11 @@ Version: 1 Width: 128 Height: 64 -Passive frames: 23 +Passive frames: 28 Active frames: 0 -Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 +Frames order: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 Active cycles: 0 -Frame rate: 6 +Frame rate: 7 Duration: 3600 Active cooldown: 0 diff --git a/fbt_options.py b/fbt_options.py index db2036a19..7c06edbed 100644 --- a/fbt_options.py +++ b/fbt_options.py @@ -14,7 +14,7 @@ DEBUG = 0 # Suffix to add to files when building distribution # If OS environment has DIST_SUFFIX set, it will be used instead -DIST_SUFFIX = "XFW-0023_12222022" +DIST_SUFFIX = "XFW-0024_12232022" # Coprocessor firmware COPRO_OB_DATA = "scripts/ob.data"