liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-2237] Fix animation frame order, increase its max size (#976)

Browse Source 
* [FL-2237] Fix animation frame order, increase its max size
* Make frame_order variable sized
This commit is contained in:
Albert Kharisov
2022-01-31 17:09:15 +04:00
committed by GitHub
parent 3cdb59805e
commit 9f1a2f2d99
5 changed files with 57 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
assets/compiled/assets_dolphin_blocking.c
View File

@@ -36,6 +36,8 @@ const uint8_t *_A_L0_NoDb_128x51[] = {
const uint8_t L0_NoDb_128x51_frame_order[] = { 0, 1, 2, 3 };
const BubbleAnimation BA_L0_NoDb_128x51 = {
.icon_animation = {
.width = 128,
@@ -44,7 +46,7 @@ const BubbleAnimation BA_L0_NoDb_128x51 = {
.frame_rate = 2,
.frames = _A_L0_NoDb_128x51
},
.frame_order = { 0, 1, 2, 3 },
.frame_order = L0_NoDb_128x51_frame_order,
.passive_frames = 4,
.active_frames = 0,
.active_cooldown = 0,
@@ -76,6 +78,8 @@ const uint8_t *_A_L0_SdBad_128x51[] = {
const uint8_t L0_SdBad_128x51_frame_order[] = { 0, 1 };
const BubbleAnimation BA_L0_SdBad_128x51 = {
.icon_animation = {
.width = 128,
@@ -84,7 +88,7 @@ const BubbleAnimation BA_L0_SdBad_128x51 = {
.frame_rate = 2,
.frames = _A_L0_SdBad_128x51
},
.frame_order = { 0, 1 },
.frame_order = L0_SdBad_128x51_frame_order,
.passive_frames = 2,
.active_frames = 0,
.active_cooldown = 0,
@@ -128,6 +132,8 @@ const uint8_t *_A_L0_SdOk_128x51[] = {
const uint8_t L0_SdOk_128x51_frame_order[] = { 0, 1, 2, 3 };
const BubbleAnimation BA_L0_SdOk_128x51 = {
.icon_animation = {
.width = 128,
@@ -136,7 +142,7 @@ const BubbleAnimation BA_L0_SdOk_128x51 = {
.frame_rate = 2,
.frames = _A_L0_SdOk_128x51
},
.frame_order = { 0, 1, 2, 3 },
.frame_order = L0_SdOk_128x51_frame_order,
.passive_frames = 4,
.active_frames = 0,
.active_cooldown = 0,
@@ -180,6 +186,8 @@ const uint8_t *_A_L0_Url_128x51[] = {
const uint8_t L0_Url_128x51_frame_order[] = { 0, 1, 2, 3 };
const BubbleAnimation BA_L0_Url_128x51 = {
.icon_animation = {
.width = 128,
@@ -188,7 +196,7 @@ const BubbleAnimation BA_L0_Url_128x51 = {
.frame_rate = 2,
.frames = _A_L0_Url_128x51
},
.frame_order = { 0, 1, 2, 3 },
.frame_order = L0_Url_128x51_frame_order,
.passive_frames = 4,
.active_frames = 0,
.active_cooldown = 0,
@@ -232,6 +240,8 @@ const uint8_t *_A_L0_NewMail_128x51[] = {
const uint8_t L0_NewMail_128x51_frame_order[] = { 0, 1, 2, 3, 2, 1 };
const BubbleAnimation BA_L0_NewMail_128x51 = {
.icon_animation = {
.width = 128,
@@ -240,7 +250,7 @@ const BubbleAnimation BA_L0_NewMail_128x51 = {
.frame_rate = 2,
.frames = _A_L0_NewMail_128x51
},
.frame_order = { 0, 1, 2, 3, 2, 1 },
.frame_order = L0_NewMail_128x51_frame_order,
.passive_frames = 6,
.active_frames = 0,
.active_cooldown = 0,

12
assets/compiled/assets_dolphin_internal.c
View File

@@ -104,6 +104,8 @@ const FrameBubble L1_Tv_128x47_bubble_1_0 = {
const uint8_t L1_Tv_128x47_frame_order[] = { 0, 1, 2, 3, 4, 5, 6, 7 };
const BubbleAnimation BA_L1_Tv_128x47 = {
.icon_animation = {
.width = 128,
@@ -112,7 +114,7 @@ const BubbleAnimation BA_L1_Tv_128x47 = {
.frame_rate = 2,
.frames = _A_L1_Tv_128x47
},
.frame_order = { 0, 1, 2, 3, 4, 5, 6, 7 },
.frame_order = L1_Tv_128x47_frame_order,
.passive_frames = 6,
.active_frames = 2,
.active_cooldown = 5,
@@ -170,6 +172,8 @@ const FrameBubble L1_BadBattery_128x47_bubble_0_0 = {
const uint8_t L1_BadBattery_128x47_frame_order[] = { 0, 1 };
const BubbleAnimation BA_L1_BadBattery_128x47 = {
.icon_animation = {
.width = 128,
@@ -178,7 +182,7 @@ const BubbleAnimation BA_L1_BadBattery_128x47 = {
.frame_rate = 2,
.frames = _A_L1_BadBattery_128x47
},
.frame_order = { 0, 1 },
.frame_order = L1_BadBattery_128x47_frame_order,
.passive_frames = 2,
.active_frames = 0,
.active_cooldown = 0,
@@ -260,6 +264,8 @@ const FrameBubble L1_NoSd_128x49_bubble_0_0 = {
const uint8_t L1_NoSd_128x49_frame_order[] = { 0, 1, 0, 1, 0, 2, 3, 4, 3, 5 };
const BubbleAnimation BA_L1_NoSd_128x49 = {
.icon_animation = {
.width = 128,
@@ -268,7 +274,7 @@ const BubbleAnimation BA_L1_NoSd_128x49 = {
.frame_rate = 2,
.frames = _A_L1_NoSd_128x49
},
.frame_order = { 0, 1, 0, 1, 0, 2, 3, 4, 3, 5 },
.frame_order = L1_NoSd_128x49_frame_order,
.passive_frames = 10,
.active_frames = 0,
.active_cooldown = 0,