Skip to content

H
haoJin750TFT
Commit c2e147df authored by 王雅楠's avatar 王雅楠
Browse files
Options

Merge branch 'wangyanan' into 'dev' 

✨ feat:新增开机动画

See merge request !20
parents b1b3a959 e6ca06f1
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 36 deletions
Firmware/Source/Component/AMT630H/AMT630H.c
View file @ c2e147df
......@@ -45,24 +45,116 @@ static uint16_t AMT630H_Animation_DispPic = 0;
static uint16_t AMT630H_Animation_RefreshTime = 0;
static uint16_t AMT630H_Animation_RefreshTime_default = 0;
static const uint16_t BootAnimationList[AMT630H_ANIMATION_PIC_NUM] = {
0,
// Pic_0001_0_0,Pic_0758_0_0,Pic_0759_0_0,Pic_0760_0_0,Pic_0761_0_0,Pic_0762_0_0,Pic_0763_0_0,
// Pic_0764_0_0,Pic_0765_0_0,Pic_0766_0_0,Pic_0767_0_0,Pic_0768_0_0,Pic_0769_0_0,Pic_0770_0_0,
// Pic_0771_0_0,Pic_0772_0_0,Pic_0773_0_0,Pic_0774_0_0,Pic_0775_0_0,Pic_0776_0_0, Pic_0777_0_0,
//Pic_0778_0_0,Pic_0779_0_0,Pic_0780_0_0,Pic_0781_0_0,Pic_0782_0_0,Pic_0783_0_0,Pic_0784_0_0,
// Pic_0785_0_0,Pic_0786_0_0,Pic_0787_0_0,Pic_0788_0_0,Pic_0789_0_0,Pic_0790_0_0,Pic_0791_0_0,
//Pic_0792_0_0,Pic_0793_0_0,Pic_0794_0_0,Pic_0795_0_0,Pic_0796_0_0,Pic_0797_0_0,Pic_0798_0_0,
// Pic_0799_0_0,Pic_0800_0_0,Pic_0801_0_0,Pic_0802_0_0,Pic_0803_0_0, Pic_0804_0_0,Pic_0805_0_0,
// Pic_0806_0_0,Pic_0807_0_0,Pic_0808_0_0,Pic_0809_0_0,Pic_0810_0_0,Pic_0811_0_0,Pic_0812_0_0,
// Pic_0813_0_0,Pic_0814_0_0,Pic_0815_0_0,Pic_0816_0_0,Pic_0817_0_0,Pic_0818_0_0, Pic_0819_0_0,
// Pic_0820_0_0,Pic_0821_0_0,Pic_0822_0_0,Pic_0823_0_0,Pic_0824_0_0,Pic_0825_0_0,Pic_0826_0_0,
// Pic_0827_0_0,Pic_0828_0_0, Pic_0829_0_0,Pic_0830_0_0,Pic_0831_0_0, Pic_0832_0_0,Pic_0833_0_0,
// Pic_0834_0_0,Pic_0835_0_0,Pic_0836_0_0, Pic_0837_0_0,Pic_0838_0_0,Pic_0839_0_0,Pic_0840_0_0,
// Pic_0841_0_0,Pic_0842_0_0,Pic_0843_0_0,Pic_0844_0_0,Pic_0845_0_0,Pic_0846_0_0,Pic_0847_0_0,
// Pic_0848_0_0,Pic_0849_0_0,Pic_0850_0_0,Pic_0851_0_0,Pic_0852_0_0,Pic_0853_0_0,Pic_0854_0_0,
// Pic_0855_0_0,Pic_0856_0_0,Pic_0857_0_0,Pic_0858_0_0, Pic_0859_0_0,Pic_0859_0_0,Pic_0859_0_0,
// Pic_0859_0_0,Pic_0860_0_0, Pic_0860_0_0,Pic_0860_0_0,Pic_0860_0_0,
//psd已更新开机动画，fullbin等待odo trip补齐再开放
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0860_0_0,
Pic_0859_0_0,
Pic_0859_0_0,
Pic_0859_0_0,
Pic_0859_0_0,
Pic_0858_0_0,
Pic_0857_0_0,
Pic_0856_0_0,
Pic_0855_0_0,
Pic_0854_0_0,
Pic_0853_0_0,
Pic_0852_0_0,
Pic_0851_0_0,
Pic_0850_0_0,
Pic_0849_0_0,
Pic_0848_0_0,
Pic_0847_0_0,
Pic_0846_0_0,
Pic_0845_0_0,
Pic_0844_0_0,
Pic_0843_0_0,
Pic_0842_0_0,
Pic_0841_0_0,
Pic_0840_0_0,
Pic_0839_0_0,
Pic_0838_0_0,
Pic_0837_0_0,
Pic_0836_0_0,
Pic_0835_0_0,
Pic_0834_0_0,
Pic_0833_0_0,
Pic_0832_0_0,
Pic_0831_0_0,
Pic_0830_0_0,
Pic_0829_0_0,
Pic_0828_0_0,
Pic_0827_0_0,
Pic_0826_0_0,
Pic_0825_0_0,
Pic_0824_0_0,
Pic_0823_0_0,
Pic_0822_0_0,
Pic_0821_0_0,
Pic_0820_0_0,
Pic_0819_0_0,
Pic_0818_0_0,
Pic_0817_0_0,
Pic_0816_0_0,
Pic_0815_0_0,
Pic_0814_0_0,
Pic_0813_0_0,
Pic_0812_0_0,
Pic_0811_0_0,
Pic_0810_0_0,
Pic_0809_0_0,
Pic_0808_0_0,
Pic_0807_0_0,
Pic_0806_0_0,
Pic_0805_0_0,
Pic_0804_0_0,
Pic_0803_0_0,
Pic_0802_0_0,
Pic_0801_0_0,
Pic_0800_0_0,
Pic_0799_0_0,
Pic_0798_0_0,
Pic_0797_0_0,
Pic_0796_0_0,
Pic_0795_0_0,
Pic_0794_0_0,
Pic_0793_0_0,
Pic_0792_0_0,
Pic_0791_0_0,
Pic_0790_0_0,
Pic_0789_0_0,
Pic_0788_0_0,
Pic_0787_0_0,
Pic_0786_0_0,
Pic_0785_0_0,
Pic_0784_0_0,
Pic_0783_0_0,
Pic_0782_0_0,
Pic_0781_0_0,
Pic_0780_0_0,
Pic_0779_0_0,
Pic_0778_0_0,
Pic_0777_0_0,
Pic_0776_0_0,
Pic_0775_0_0,
Pic_0774_0_0,
Pic_0773_0_0,
Pic_0772_0_0,
Pic_0771_0_0,
Pic_0770_0_0,
Pic_0769_0_0,
Pic_0768_0_0,
Pic_0767_0_0,
Pic_0766_0_0,
Pic_0765_0_0,
Pic_0764_0_0,
Pic_0763_0_0,
Pic_0762_0_0,
Pic_0761_0_0,
Pic_0760_0_0,
Pic_0759_0_0,
Pic_0758_0_0,
Pic_0001_0_0
};
void AMT630H_Animation_PlayProc(uint16_t PicIndex)
{
......@@ -319,7 +411,7 @@ void AMT630H_Main(void)
// }
if (SYS_OPR_STAT_IGN_ON)
{
if(1)
if(AMT630H_Animation_Finish == 1)
{
AMT630H_Animation_RefreshTime = 0;
if(AMT630H_RefreshTime >= AMT630H_REFRESH_TIME)
......@@ -338,22 +430,22 @@ void AMT630H_Main(void)
}
else
{
// AMT630H_RefreshTime = 0;
// if(AMT630H_Animation_Start == 0)
// {
// AMT630H_Animation_Start = 1;
// AMT630H_Animation_RefreshTime_default = AMT630H_ANIMATION_REFRESHTIME_DEF(0);
// }
// if(AMT630H_Animation_RefreshTime >= AMT630H_Animation_RefreshTime_default)
// {
// AMT630H_Animation_RefreshTime = 0;
// AMT630H_Animation_PlayProc(BootAnimationList[AMT630H_Animation_DispPic]);
// AMT630H_Animation_DispPic++;
// if(AMT630H_Animation_DispPic >= AMT630H_ANIMATION_PIC_NUM)
// {
// AMT630H_Animation_Finish = 1;
// }
// }
AMT630H_RefreshTime = 0;
if(AMT630H_Animation_Start == 0)
{
AMT630H_Animation_Start = 1;
AMT630H_Animation_RefreshTime_default = AMT630H_ANIMATION_REFRESHTIME_DEF(0);
}
if(AMT630H_Animation_RefreshTime >= AMT630H_Animation_RefreshTime_default)
{
AMT630H_Animation_RefreshTime = 0;
AMT630H_Animation_PlayProc(BootAnimationList[AMT630H_Animation_DispPic]);
AMT630H_Animation_DispPic++;
if(AMT630H_Animation_DispPic >= AMT630H_ANIMATION_PIC_NUM)
{
AMT630H_Animation_Finish = 1;
}
}
}
......
Firmware/Source/Component/AMT630H/AMT630H.h
View file @ c2e147df
......@@ -21,7 +21,7 @@ typedef struct
#define AMT630H_REFRESH_TIME 25U
#define AMT630H_ANIMATION_TIME 3000U //ms
#define AMT630H_ANIMATION_PIC_NUM 146U
#define AMT630H_ANIMATION_PIC_NUM 110U
#define AMT630H_ANIMATION_REFRESHTIME_DEF(x) ((AMT630H_ANIMATION_TIME > x) ? \
(((AMT630H_ANIMATION_TIME - x) / AMT630H_ANIMATION_PIC_NUM) - 5) : \
(((AMT630H_ANIMATION_TIME) / AMT630H_ANIMATION_PIC_NUM) - 5))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment