Merge branch 'wangyanan' into 'dev'

Wangyanan

See merge request !61

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -264,13 +264,15 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
     {
         if(g_u8Display_Mode == ModeDAY)
         {
-            SetPagePicFree(GRAPHICS_PAGE_0, Pic_0926_619_240, 610, 175);
-            SetPagePicFree(GRAPHICS_PAGE_0, Pic_0926_619_240, 610, 240);
+            /* ----- */
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0930_612_240);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0930_612_175);
         }
         else if(g_u8Display_Mode == ModeNIGHT)
         {
-            SetPagePicFree(GRAPHICS_PAGE_0, Pic_0927_619_175, 610, 175);
-            SetPagePicFree(GRAPHICS_PAGE_0, Pic_0927_619_175, 610, 240);
+            /* ----- */
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0931_612_240);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0931_612_175);
         }
         else
         {
@@ -4272,11 +4274,12 @@ void AMT630H_GUI_ReadPosittion_Display(void)
         AMT630H_GUI_SETTING();
         AMT630H_GUI_Quit();
         break;
-    case MENU_ITEM_PHONE_CONNECT_SET:
-        
-    case MENU_ITEM_PHONE_CONNECT_APP: /*28 手机互联成功*/
+    case MENU_ITEM_PHONE_CONNECT_SET:/*28 手机互联成功*/
         AMT630H_GUI_SETTING();
         AMT630H_GUI_Phone_Connect_Win();
+        break;
+    case MENU_ITEM_PHONE_CONNECT_APP:
+        
         break;
     default:
         break;

Firmware/Source/Component/AMT630H/PicBin.c

@@ -117,7 +117,7 @@ static const uint16_t PicIndexData[] = {
     Pic_0901, 12, 653, 164, Pic_0901, 12, 667, 164, Pic_0902, 13, 638, 293, Pic_0903, 15, 637, 293, Pic_0904, 15, 637, 293, Pic_0905, 21, 634, 293, Pic_0906, 15, 637, 293, Pic_0907, 14, 637, 293, Pic_0908, 15, 637, 293, Pic_0909, 13, 638, 292, 
     Pic_0910, 13, 639, 293, Pic_0911, 17, 636, 292, Pic_0912, 13, 639, 293, Pic_0913, 17, 636, 292, Pic_0914, 13, 638, 293, Pic_0915, 16, 636, 293, Pic_0916, 11, 640, 293, Pic_0917, 14, 639, 293, Pic_0899, 11, 638, 293, Pic_0918, 3, 643, 293, 
     Pic_0898, 14, 637, 293, Pic_0897, 15, 637, 292, Pic_0919, 11, 640, 293, Pic_0920, 12, 639, 293, Pic_0921, 14, 638, 293, Pic_0922, 14, 638, 292, Pic_0923, 14, 638, 293, Pic_0924, 15, 637, 293, Pic_0925, 221, 501, 160, Pic_0926, 50, 619, 240, 
-    Pic_0926, 50, 619, 175, Pic_0927, 50, 619, 240, Pic_0927, 50, 619, 175, Pic_0928, 75, 894, 310, Pic_0929, 75, 894, 310, 
+    Pic_0926, 50, 619, 175, Pic_0927, 50, 619, 240, Pic_0927, 50, 619, 175, Pic_0928, 75, 894, 310, Pic_0929, 75, 894, 310, Pic_0930, 64, 612, 240, Pic_0930, 64, 612, 175, Pic_0931, 64, 612, 240, Pic_0931, 64, 612, 175, 
 };
 #define PicIndexData_LEN   14888
 //uint32_t PicIndexDataLEN = 0;

Firmware/Source/Component/AMT630H/PicBin.h

 #ifndef PICBIN_H
 #define PICBIN_H
 
-/* Flash Bin Version:20240821 2024-08-21 09:09:13 Compression ratio:70.00% */
+/* Flash Bin Version:20240826 2024-08-26 19:25:18 Compression ratio:70.00% */
 #define Pic_0001 1
 #define Pic_0002 2
 #define Pic_0003 3
@@ -931,6 +931,8 @@
 #define Pic_0927 927
 #define Pic_0928 928
 #define Pic_0929 929
+#define Pic_0930 930
+#define Pic_0931 931
 
 enum {
     Pic_0001_0_0 = 0,
@@ -2103,9 +2105,13 @@ enum {
     Pic_0927_619_175,
     Pic_0928_894_310,
     Pic_0929_894_310,
+    Pic_0930_612_240,
+    Pic_0930_612_175,
+    Pic_0931_612_240,
+    Pic_0931_612_175,
 };
 
-#define PIC_INDEX_DATA_CRC 0xDE5B7F88
+#define PIC_INDEX_DATA_CRC 0xC89CDFB5
 
 extern void User_PicIndexDataInit(void);
 #endif