Commit 4ded9752 authored by 王雅楠's avatar 王雅楠 :apple:

:sparkles:...

:sparkles: feat:1.新增PSD修改代码中pin.c与pin.h文件2.新增一级菜单与二级菜单显示代码编写3.修改部分日间中文主界面函数参数等代码4.根据代码编写规范更改代码格式5.修改AMT630H.c文件中显示参数
parent 4fbcce69
......@@ -157,10 +157,11 @@ void Amt630hInit(void)
LcdSoundParamterData.LcdVideoInputValid = 0;
LcdSoundParamterData.Ark7116ResetPin = 0;
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_NS;
LcdSoundParamterData.LvdsPanelFormat = LVDS_PANEL_FORMAT_TI;
LcdSoundParamterData.LvdsPanelData = LVDS_PANEL_DATA_8BIT;
LcdSoundParamterData.LcdTimingVBP = 12;
......@@ -256,13 +257,13 @@ void AMT630H_Main(void)
return;
}
AMT630H_AliveCounterMonitor();
if(AMT630H_Err == 1U)
{
AMT630H_Err = 0;
Amt630hInit();
AMT630H_Animation_Finish = 1;
return;
}
// if(AMT630H_Err == 1U)
// {
// AMT630H_Err = 0;
// Amt630hInit();
// AMT630H_Animation_Finish = 1;
// return;
// }
// if(g_sysFlag_Lcdcheck == 1)
// {
// if(AMT630H_FlashCheck.Flag == 0)
......
......@@ -3,13 +3,24 @@
typedef enum
{
PIC_DAYTIME_CH = 0,//日间中文
PIC_DAYTIME_Main_CH =0 ,//日间主界面
PIC_DAYTIME_CH ,//日间中文
PIC_NIGHTTIME_CH , //夜间中文
PIC_DAYTIME_EN, //日间英文
PIC_NIGHTTIME_EN, //夜间英文
PIC_Max,
}_Picture_Mode;
typedef enum
{
MAIN_MENU = 0,
SETTING_MENU ,
}_MENU_MODE;
extern void AMT630H_GUI_DisplayProc(void);
extern void AMT630H_GUI_Background(void);
......
......@@ -96,7 +96,7 @@ static const uint16_t PicIndexData[] = {
Pic_0722, 423, 94, 114, Pic_0723, 85, 379, 149, Pic_0724, 119, 292, 128, Pic_0725, 165, 191, 110, Pic_0726, 198, 138, 111, Pic_0727, 153, 94, 123, Pic_0728, 20, 56, 165, Pic_0729, 7, 118, 95, Pic_0730, 19, 178, 81, Pic_0731, 18, 268, 89,
Pic_0732, 21, 350, 114, Pic_0733, 19, 422, 114, Pic_0734, 18, 498, 114, Pic_0735, 21, 570, 114, Pic_0736, 56, 941, 13, Pic_0737, 44, 875, 23, Pic_0738, 61, 792, 25, Pic_0739, 39, 731, 19, Pic_0740, 28, 682, 21, Pic_0741, 44, 616, 20,
Pic_0742, 50, 544, 22, Pic_0743, 47, 476, 20, Pic_0744, 53, 402, 21, Pic_0745, 39, 341, 21, Pic_0746, 86, 233, 26, Pic_0747, 64, 244, 26, Pic_0748, 16, 194, 26, Pic_0749, 19, 192, 26, Pic_0750, 65, 106, 26, Pic_0751, 56, 111, 30,
Pic_0752, 56, 28, 13,
Pic_0752, 56, 28, 13, Pic_0753, 809, 109, 331, Pic_0754, 809, 109, 347,
};
#define PicIndexData_LEN 14888
//uint32_t PicIndexDataLEN = 0;
......
#ifndef PICBIN_H
#define PICBIN_H
/* Flash Bin Version:20240708 2024-07-08 14:30:03 Compression ratio:70.00% */
/* Flash Bin Version:20240712 2024-07-12 13:27:08 Compression ratio:70.00% */
#define Pic_0001 1
#define Pic_0002 2
#define Pic_0003 3
......@@ -754,6 +754,8 @@
#define Pic_0750 750
#define Pic_0751 751
#define Pic_0752 752
#define Pic_0753 753
#define Pic_0754 754
enum {
Pic_0001_0_0 = 0,
......@@ -1709,8 +1711,10 @@ enum {
Pic_0750_106_26,
Pic_0751_111_30,
Pic_0752_28_13,
Pic_0753_109_331,
Pic_0754_109_347,
};
#define PIC_INDEX_DATA_CRC 0xB1B4E2C2
#define PIC_INDEX_DATA_CRC 0xD1FA96F4
extern void User_PicIndexDataInit(void);
#endif
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