Merge branch 'jinshuo' into 'dev'

Jinshuo

See merge request !96

Firmware/Source/Application/BlueTooth.c

@@ -352,15 +352,36 @@ void TextService(void)
         TextPara[TEXT_NUM_FAUULT_CODE].Vaild = 0x01;
     }
     if (((memcmp(LastUUIDDisplay, UUIDConfigBuf, sizeof(LastUUIDDisplay))) != 0))
+    {
+        for (uint8_t i = 0; i < (sizeof(UUIDConfigBuf)); i++)
         {
-            for (uint8_t i = 0; i < (sizeof(UUIDConfigBuf)); i++)
-            {
-                UUIDDisplay[i * 2] = UUIDConfigBuf[i];
-                UUIDDisplay[(i * 2) + 1] = 0x00;
-            }
-            memcpy(LastUUIDDisplay, UUIDConfigBuf, sizeof(LastUUIDDisplay));
-            TextPara[TEXT_NUM_INFORMATION_UUID].Vaild = 0X01;
+            UUIDDisplay[i * 2] = UUIDConfigBuf[i];
+            UUIDDisplay[(i * 2) + 1] = 0x00;
         }
+        memcpy(LastUUIDDisplay, UUIDConfigBuf, sizeof(LastUUIDDisplay));
+        TextPara[TEXT_NUM_INFORMATION_UUID].Vaild = 0X01;
+    }
+}
+
+uint8_t Get_Talking_PhoneBookValid(void)
+{
+    for(uint8_t i=0;i<100;i++)
+    {
+        if(CurBlueToothPhoneName[i]!=0)
+        return 1;
+    }
+    
+    return 0;
+}
+uint8_t Get_UUID_UDSStatus(void)
+{
+    for(uint8_t i=0;i<21;i++)
+    {
+        if(UUIDConfigBuf[i]!=0xFF)
+        return 1;
+    }
+    
+    return 0;
 }
 
 

Firmware/Source/Application/BlueTooth.h

@@ -39,6 +39,8 @@ static const uint8_t SW_Version[3] =  {SW_EXTERNAL_VERSION};
 
 
 extern void BlueToothService(void);
+extern uint8_t Get_Talking_PhoneBookValid(void);
+extern uint8_t Get_UUID_UDSStatus(void);
 extern _PICID_Struct PicObj;
 extern _QRCODE_RECT QRCode_Rect;
 extern uint8_t PhoneNumber[40];

Firmware/Source/Component/AMT630H/AMT630H.c

@@ -48,131 +48,84 @@ static uint16_t AMT630H_Animation_DispPic = 0;
 static uint16_t AMT630H_Animation_RefreshTime = 0;
 static uint32_t AMT630H_Animation_RefreshTime_default = 0;
 static const uint16_t BootAnimationList[AMT630H_ANIMATION_PIC_NUM] = {
-    Pic_0860_0_0,
-    Pic_0860_0_0,
-    Pic_0860_0_0,
-    Pic_0860_0_0,
-    Pic_0860_0_0,
-    Pic_0860_0_0,
-    Pic_0860_0_0,
-    Pic_0860_0_0,
-    Pic_0860_0_0,
-    Pic_0860_0_0,
-    Pic_0860_0_0,
-    Pic_0860_0_0,
-    Pic_0860_0_0,
-    Pic_0860_0_0,
-    Pic_0860_0_0,
-    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
+    Pic_1055_0_0,
+    Pic_1056_0_0,
+    Pic_1057_0_0,
+    Pic_1058_0_0,
+    Pic_1059_0_0,
+    Pic_1060_0_0,
+    Pic_1061_0_0,
+    Pic_1062_0_0,
+    Pic_1063_0_0,
+    Pic_1064_0_0,
+    Pic_1065_0_0,
+    Pic_1066_0_0,
+    Pic_1067_0_0,
+    Pic_1068_0_0,
+    Pic_1069_0_0,
+    Pic_1070_0_0,
+    Pic_1071_0_0,
+    Pic_1072_0_0,
+    Pic_1073_0_0,
+    Pic_1074_0_0,
+    Pic_1075_0_0,
+    Pic_1076_0_0,
+    Pic_1077_0_0,
+    Pic_1078_0_0,
+    Pic_1079_0_0,
+    Pic_1080_0_0,
+    Pic_1081_0_0,
+    Pic_1082_0_0,
+    Pic_1083_0_0,
+    Pic_1084_0_0,
+    Pic_1085_0_0,
+    Pic_1086_0_0,
+    Pic_1087_0_0,
+    Pic_1088_0_0,
+    Pic_1089_0_0,
+    Pic_1090_0_0,
+    Pic_1091_0_0,
+    Pic_1092_0_0,
+    Pic_1093_0_0,
+    Pic_1094_0_0,
+    Pic_1095_0_0,
+    Pic_1096_0_0,
+    Pic_1097_0_0,
+    Pic_1098_0_0,
+    Pic_1099_0_0,
+    Pic_1100_0_0,
+    Pic_1101_0_0,
+    Pic_1102_0_0,
+    Pic_1103_0_0,
+    Pic_1104_0_0,
+    Pic_1105_0_0,
+    Pic_1106_0_0,
+    Pic_1107_0_0,
+    Pic_1108_0_0,
+    Pic_1109_0_0,
+    Pic_1110_0_0,
+    Pic_1111_0_0,
+    Pic_1112_0_0,
+    Pic_1113_0_0,
+    Pic_1114_0_0,
+    Pic_1115_0_0,
+    Pic_1116_0_0,
+    Pic_1117_0_0,
+    Pic_1118_0_0,
+    Pic_1119_0_0,
+    Pic_1120_0_0,
+    Pic_1121_0_0,
+    Pic_1122_0_0,
+    Pic_1123_0_0,
+    Pic_1124_0_0,
+    Pic_1125_0_0,
+    Pic_1125_0_0,
+    Pic_1125_0_0,
+    Pic_1125_0_0,
+    Pic_1125_0_0,
+    Pic_1125_0_0,
+    Pic_1125_0_0,
+
 };
 void AMT630H_Animation_PlayProc(uint16_t PicIndex)
 {
@@ -460,7 +413,7 @@ void AMT630H_Main(void)
             {
                 AMT630H_Animation_RefreshTime = 0;
                 AMT630H_Animation_PlayProc(BootAnimationList[AMT630H_Animation_DispPic]);
-                AMT630H_Animation_DispPic++;
+                AMT630H_Animation_DispPic--;
                 if(AMT630H_Animation_DispPic >= AMT630H_ANIMATION_PIC_NUM)
                 {
                     AMT630H_Animation_Finish = 1;
@@ -499,7 +452,7 @@ unsigned char AMT630H_isInitFinish(void)
 void AMT630H_Animation_IGON(void)
 {
     AMT630H_Animation_Finish = 0;
-    AMT630H_Animation_DispPic = 0;
+    AMT630H_Animation_DispPic = 76;
 }
 unsigned char AMT630H_Animation_Finish_Flage(void)
 {

Firmware/Source/Component/AMT630H/AMT630H.h

@@ -21,7 +21,7 @@ typedef struct
 #define AMT630H_REFRESH_TIME        50U
 
 #define AMT630H_ANIMATION_TIME                  4000U   //ms
-#define AMT630H_ANIMATION_PIC_NUM               125U
+#define AMT630H_ANIMATION_PIC_NUM               77U
 #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)) 

Firmware/Source/Component/AMT630H/PicBin.h

 #ifndef PICBIN_H
 #define PICBIN_H
 
-/* Flash Bin Version:20241012 2024-10-12 16:40:02 Compression ratio:70.00% */
+/* Flash Bin Version:20241014 2024-10-14 11:24:42 Compression ratio:70.00% */
 #define Pic_0001 1
 #define Pic_0002 2
 #define Pic_0003 3
@@ -2549,6 +2549,11 @@ enum {
     Pic_1123_0_0,
 };
 
+enum {
+    Pic_1124_0_0 = 1400,
+    Pic_1125_0_0,
+};
+
 
 #define PIC_INDEX_DATA_CRC 0xC0A4A9AD