Commit b931f608 authored by 时昊's avatar 时昊

:sparkles: feat:上传时序,屏参正确的代码

parent 7251b8ca
......@@ -248,7 +248,7 @@
<aPa1>0</aPa1>
<AscS4>0</AscS4>
<aSer4>0</aSer4>
<StkLoc>0</StkLoc>
<StkLoc>1</StkLoc>
<TrcWin>0</TrcWin>
<newCpu>0</newCpu>
<uProt>0</uProt>
......
......@@ -45,31 +45,7 @@ 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] = {
Pic_0268_0_0,Pic_0268_0_0,Pic_0268_0_0,Pic_0267_0_0,Pic_0266_0_0,Pic_0265_0_0,
Pic_0264_0_0,Pic_0263_0_0,Pic_0262_0_0,Pic_0261_0_0,Pic_0260_0_0,Pic_0259_0_0,
Pic_0258_0_0,Pic_0257_0_0,Pic_0256_0_0,Pic_0255_0_0,Pic_0254_0_0,Pic_0253_0_0,
Pic_0252_0_0,Pic_0251_0_0,Pic_0250_0_0,Pic_0249_0_0,Pic_0248_0_0,Pic_0247_0_0,
Pic_0246_0_0,Pic_0245_0_0,Pic_0244_0_0,Pic_0243_0_0,Pic_0242_0_0,Pic_0241_0_0,
Pic_0240_0_0,Pic_0239_0_0,Pic_0238_0_0,Pic_0237_0_0,Pic_0236_0_0,Pic_0235_0_0,
Pic_0234_0_0,Pic_0233_0_0,Pic_0232_0_0,Pic_0231_0_0,Pic_0230_0_0,Pic_0229_0_0,
Pic_0228_0_0,Pic_0227_0_0,Pic_0226_0_0,Pic_0225_0_0,Pic_0224_0_0,Pic_0223_0_0,
Pic_0222_0_0,Pic_0221_0_0,Pic_0220_0_0,Pic_0219_0_0,Pic_0218_0_0,Pic_0217_0_0,
Pic_0216_0_0,Pic_0215_0_0,Pic_0214_0_0,Pic_0213_0_0,Pic_0212_0_0,Pic_0211_0_0,
Pic_0210_0_0,Pic_0209_0_0,Pic_0208_0_0,Pic_0207_0_0,Pic_0206_0_0,Pic_0205_0_0,
Pic_0204_0_0,Pic_0203_0_0,Pic_0202_0_0,Pic_0201_0_0,Pic_0200_0_0,Pic_0199_0_0,
Pic_0198_0_0,Pic_0197_0_0,Pic_0196_0_0,Pic_0195_0_0,Pic_0194_0_0,Pic_0193_0_0,
Pic_0192_0_0,Pic_0191_0_0,Pic_0190_0_0,Pic_0189_0_0,Pic_0188_0_0,Pic_0187_0_0,
Pic_0186_0_0,Pic_0185_0_0,Pic_0184_0_0,Pic_0183_0_0,Pic_0182_0_0,Pic_0181_0_0,
Pic_0180_0_0,Pic_0179_0_0,Pic_0178_0_0,Pic_0177_0_0,Pic_0176_0_0,Pic_0175_0_0,
Pic_0174_0_0,Pic_0173_0_0,Pic_0172_0_0,Pic_0171_0_0,Pic_0170_0_0,Pic_0169_0_0,
Pic_0168_0_0,Pic_0167_0_0,Pic_0166_0_0,Pic_0165_0_0,Pic_0164_0_0,Pic_0163_0_0,
Pic_0162_0_0,Pic_0161_0_0,Pic_0160_0_0,Pic_0159_0_0,Pic_0158_0_0,Pic_0157_0_0,
Pic_0156_0_0,Pic_0155_0_0,Pic_0154_0_0,Pic_0153_0_0,Pic_0152_0_0,Pic_0152_0_0,
Pic_0150_0_0,Pic_0149_0_0,Pic_0148_0_0,Pic_0147_0_0,Pic_0146_0_0,Pic_0145_0_0,
Pic_0144_0_0,Pic_0143_0_0,Pic_0142_0_0,Pic_0141_0_0,Pic_0140_0_0,Pic_0139_0_0,
Pic_0138_0_0,Pic_0137_0_0,Pic_0136_0_0,Pic_0135_0_0,Pic_0134_0_0,Pic_0133_0_0,
Pic_0132_0_0,Pic_0131_0_0,Pic_0130_0_0,Pic_0129_0_0,Pic_0128_0_0,Pic_0127_0_0,
Pic_0126_0_0,Pic_0125_0_0
0,
};
void AMT630H_Animation_PlayProc(uint16_t PicIndex)
{
......@@ -180,22 +156,22 @@ void Amt630hInit(void)
LcdSoundParamterData.LcdBpp = 32;
LcdSoundParamterData.LcdVideoInputValid = 0;
LcdSoundParamterData.Ark7116ResetPin = 0;
LcdSoundParamterData.LcdInterfaceType = LCD_INTERFACE_TTL;
LcdSoundParamterData.LcdInterfaceType = LCD_INTERFACE_LVDS;
LcdSoundParamterData.LcdWiringMode = LCD_WIRING_MODE_BGR;
LcdSoundParamterData.LcdWiringBitOrder = LCD_WIRING_BIT_ORDER_MSB;
LcdSoundParamterData.LcdDotClkReverse = 0; /* NuoMa 50pin TFT */
LcdSoundParamterData.LvdsPanelFormat = LVDS_PANEL_FORMAT_TI;
LcdSoundParamterData.LvdsPanelFormat = LVDS_PANEL_FORMAT_NS;
LcdSoundParamterData.LvdsPanelData = LVDS_PANEL_DATA_8BIT;
LcdSoundParamterData.LcdTimingVBP = 60;
LcdSoundParamterData.LcdTimingVFP = 12;
LcdSoundParamterData.LcdTimingVBP = 12;
LcdSoundParamterData.LcdTimingVFP = 20;
LcdSoundParamterData.LcdTimingVSW = 4;
LcdSoundParamterData.LcdTimingHBP = 20;
LcdSoundParamterData.LcdTimingHFP = 80;
LcdSoundParamterData.LcdTimingHSW = 20;
LcdSoundParamterData.LcdTimingHBP = 160;
LcdSoundParamterData.LcdTimingHFP = 160;
LcdSoundParamterData.LcdTimingHSW = 24;
LcdSoundParamterData.LcdClkFreq = 48000000;
LcdSoundParamterData.LcdClkFreq = 51200000;
LcdSoundParamterData.SoundChannelNum = 0;
LcdSoundParamterData.SoundFreq = AUDIO_FREQ_48K;
......@@ -287,46 +263,46 @@ void AMT630H_Main(void)
AMT630H_Animation_Finish = 1;
return;
}
if(g_sysFlag_Lcdcheck == 1)
{
if(AMT630H_FlashCheck.Flag == 0)
{
AMT630H_FlashCheck.Flag = 1;
AMT630H_FlashCheck.InquireTime = 0;
AMT630H_FlashCheck.CheckStateTime = 0;
PackedTransfer_CheckFlash();
AMT630H_FlashCheck.Result = 0xFF;
}
if(AMT630H_FlashCheck.Flag == 1)
{
if(AMT630H_FlashCheck.InquireTime >= 100)
{
AMT630H_FlashCheck.InquireTime = 0;
AMT630H_FlashCheck.Result = PackedTransfer_CheckFlashGetResult();
if(AMT630H_FlashCheck.Result != 0xFF)
{
if(AMT630H_FlashCheck.Result == 1)
{
PackedTransfer_CheckFlashForceDisplay(DISPLAY_CHECK_PASS, 3000);
AMT630H_FlashCheck.Flag = 2;
}
else if (AMT630H_FlashCheck.CheckStateTime >= FLASH_CHECK_TIME_NUM)
{
PackedTransfer_CheckFlashForceDisplay(DISPLAY_CHECK_FAIL, 60000);
AMT630H_FlashCheck.Flag = 2;
}
}
// if(g_sysFlag_Lcdcheck == 1)
// {
// if(AMT630H_FlashCheck.Flag == 0)
// {
// AMT630H_FlashCheck.Flag = 1;
// AMT630H_FlashCheck.InquireTime = 0;
// AMT630H_FlashCheck.CheckStateTime = 0;
// PackedTransfer_CheckFlash();
// AMT630H_FlashCheck.Result = 0xFF;
// }
// if(AMT630H_FlashCheck.Flag == 1)
// {
// if(AMT630H_FlashCheck.InquireTime >= 100)
// {
// AMT630H_FlashCheck.InquireTime = 0;
// AMT630H_FlashCheck.Result = PackedTransfer_CheckFlashGetResult();
// if(AMT630H_FlashCheck.Result != 0xFF)
// {
// if(AMT630H_FlashCheck.Result == 1)
// {
// PackedTransfer_CheckFlashForceDisplay(DISPLAY_CHECK_PASS, 3000);
// AMT630H_FlashCheck.Flag = 2;
// }
// else if (AMT630H_FlashCheck.CheckStateTime >= FLASH_CHECK_TIME_NUM)
// {
// PackedTransfer_CheckFlashForceDisplay(DISPLAY_CHECK_FAIL, 60000);
// AMT630H_FlashCheck.Flag = 2;
// }
// }
}
else
{
PackedTransfer_CheckFlashForceDisplay(DISPLAY_CHECKING, 60000);
}
}
}
// }
// else
// {
// PackedTransfer_CheckFlashForceDisplay(DISPLAY_CHECKING, 60000);
// }
// }
// }
if (SYS_OPR_STAT_IGN_ON)
{
if(AMT630H_Animation_Finish == 1)
if(1)
{
AMT630H_Animation_RefreshTime = 0;
if(AMT630H_RefreshTime >= AMT630H_REFRESH_TIME)
......@@ -345,22 +321,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;
// }
// }
}
......
This diff is collapsed.
This diff is collapsed.
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