Merge branch 'zhengping' into 'dev'

Zhengping

See merge request !7

Firmware/Source/Component/AMT630H/AMT630H.c

@@ -160,7 +160,7 @@ void Amt630hInit(void)
     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;

Firmware/Source/Component/AMT630H/AMT630H_Datas.h

@@ -3,13 +3,28 @@
 
 typedef enum
 {
-   PIC_DAYTIME_CH = 0,//日间中文
+   PIC_DAYTIME_Main_CH =0 ,//日间中文主界面
+   PIC_NIGHTTIME_Main_CH ,//夜间中文主界面
+   PIC_DAYTIME_Main_EN ,//日间英文主界面
+   PIC_NIGHTTIME_Main_EN ,//夜间英文主界面
+
+   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);
 

Firmware/Source/Component/AMT630H/PicBin.c

@@ -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, Pic_0755, 1024, 0, 0, Pic_0756, 1024, 0, 0, Pic_0757, 1024, 0, 0, 
 };
 #define PicIndexData_LEN   14888
 //uint32_t PicIndexDataLEN = 0;

Firmware/Source/Component/AMT630H/PicBin.h

 #ifndef PICBIN_H
 #define PICBIN_H
 
-/* Flash Bin Version:20240708 2024-07-08 14:30:03 Compression ratio:70.00% */
+/* Flash Bin Version:20240729 2024-07-29 10:18:50 Compression ratio:70.00% */
 #define Pic_0001 1
 #define Pic_0002 2
 #define Pic_0003 3
@@ -754,6 +754,11 @@
 #define Pic_0750 750
 #define Pic_0751 751
 #define Pic_0752 752
+#define Pic_0753 753
+#define Pic_0754 754
+#define Pic_0755 755
+#define Pic_0756 756
+#define Pic_0757 757
 
 enum {
     Pic_0001_0_0 = 0,
@@ -1709,8 +1714,13 @@ enum {
     Pic_0750_106_26,
     Pic_0751_111_30,
     Pic_0752_28_13,
+    Pic_0753_109_331,
+    Pic_0754_109_347,
+    Pic_0755_0_0,
+    Pic_0756_0_0,
+    Pic_0757_0_0,
 };
-#define PIC_INDEX_DATA_CRC 0xB1B4E2C2
+#define PIC_INDEX_DATA_CRC 0x6A630F71
 
 extern void User_PicIndexDataInit(void);
 #endif