Merge branch 'dev' of http://tyw-server.synology.me:12345/shihao/haojin750tft into jinshuo

Firmware/Source/Application/BlueTooth.c

@@ -381,7 +381,7 @@ uint8_t Get_UUID_UDSStatus(void)
 {
     for(uint8_t i=0;i<21;i++)
     {
-        if(UUIDConfigBuf[i]!=0xFF)
+        if(UUIDConfigBuf[i]!=0xFF)//UUIDConfigBuf[i] < 10
         {
             return 1;
         }

Firmware/Source/Application/BlueTooth.h

@@ -52,5 +52,6 @@ extern uint8_t InformationMCUVersion[26];
 extern uint8_t TextFaultCodeNum[10];
 extern uint8_t UUIDDisplay[42];
 extern TEXT_STRUCT TextPara[];
+extern uint8_t UUIDConfigBuf[21];
 
 #endif
\ No newline at end of file

Firmware/Source/Component/AMT630H/PicBin.c

@@ -142,7 +142,14 @@ static const uint16_t PicIndexData[] = {
     Pic_1094, 1040, 0, 0, Pic_1095, 1040, 0, 0, Pic_1096, 1040, 0, 0, Pic_1097, 1040, 0, 0, Pic_1098, 1040, 0, 0, Pic_1099, 1040, 0, 0, Pic_1100, 1040, 0, 0, Pic_1101, 1040, 0, 0, Pic_1102, 1040, 0, 0, Pic_1103, 1040, 0, 0, 
     Pic_1104, 1040, 0, 0, Pic_1105, 1040, 0, 0, Pic_1106, 1040, 0, 0, Pic_1107, 1040, 0, 0, Pic_1108, 1040, 0, 0, Pic_1109, 1040, 0, 0, Pic_1110, 1040, 0, 0, Pic_1111, 1040, 0, 0, Pic_1112, 1040, 0, 0, Pic_1113, 1040, 0, 0, 
     Pic_1114, 1040, 0, 0, Pic_1115, 1040, 0, 0, Pic_1116, 1040, 0, 0, Pic_1117, 1040, 0, 0, Pic_1118, 1040, 0, 0, Pic_1119, 1040, 0, 0, Pic_1120, 1040, 0, 0, Pic_1121, 1040, 0, 0, Pic_1122, 1040, 0, 0, Pic_1123, 1040, 0, 0, 
-    Pic_1124, 1040, 0, 0, Pic_1125, 1040, 0, 0, 
+    Pic_1124, 1040, 0, 0, Pic_1125, 1040, 0, 0, Pic_1126, 13, 486, 251, Pic_1126, 13, 501, 251, Pic_1126, 13, 516, 251, Pic_1126, 13, 531, 251, Pic_1126, 13, 546, 251, Pic_1126, 13, 561, 251, Pic_1126, 13, 576, 251, Pic_1126, 13, 591, 251, 
+    Pic_1126, 13, 606, 251, Pic_1126, 13, 621, 251, Pic_1126, 13, 636, 251, Pic_1126, 13, 651, 251, Pic_1126, 13, 666, 251, Pic_1126, 13, 681, 251, Pic_1126, 13, 696, 251, Pic_1126, 13, 711, 251, Pic_1126, 13, 726, 251, Pic_1126, 13, 741, 251, 
+    Pic_1126, 13, 756, 251, Pic_1126, 13, 771, 251, Pic_1126, 13, 786, 251, Pic_1127, 12, 487, 252, Pic_1128, 13, 486, 251, Pic_1129, 14, 485, 251, Pic_1130, 15, 485, 252, Pic_1131, 14, 485, 252, Pic_1132, 13, 486, 251, Pic_1133, 13, 486, 252, 
+    Pic_1134, 13, 486, 251, Pic_1135, 13, 486, 251, Pic_1136, 8, 489, 263, Pic_1137, 52, 632, 551, Pic_1138, 133, 786, 561, Pic_1139, 13, 486, 251, Pic_1139, 13, 501, 251, Pic_1139, 13, 516, 251, Pic_1139, 13, 531, 251, Pic_1139, 13, 546, 251, 
+    Pic_1139, 13, 561, 251, Pic_1139, 13, 576, 251, Pic_1139, 13, 591, 251, Pic_1139, 13, 606, 251, Pic_1139, 13, 621, 251, Pic_1139, 13, 636, 251, Pic_1139, 13, 651, 251, Pic_1139, 13, 666, 251, Pic_1139, 13, 681, 251, Pic_1139, 13, 696, 251, 
+    Pic_1139, 13, 711, 251, Pic_1139, 13, 726, 251, Pic_1139, 13, 741, 251, Pic_1139, 13, 756, 251, Pic_1139, 13, 771, 251, Pic_1139, 13, 786, 251, Pic_1140, 12, 487, 252, Pic_1141, 13, 486, 251, Pic_1142, 14, 485, 251, Pic_1143, 15, 485, 252, 
+    Pic_1144, 14, 485, 252, Pic_1145, 13, 486, 251, Pic_1146, 13, 486, 252, Pic_1147, 13, 486, 251, Pic_1148, 13, 486, 251, Pic_1149, 8, 489, 263, Pic_1150, 71, 576, 287, Pic_0040, 12, 591, 289, Pic_0040, 12, 619, 289, Pic_1151, 85, 569, 287, 
+    Pic_0040, 12, 584, 289, Pic_0040, 12, 626, 289, Pic_1152, 71, 576, 287, Pic_0225, 12, 591, 289, Pic_0225, 12, 619, 289, Pic_1153, 85, 569, 287, Pic_0225, 12, 584, 289, Pic_0225, 12, 626, 289, 
 };
 #define PicIndexData_LEN   14888
 //uint32_t PicIndexDataLEN = 0;

Firmware/Source/Component/AMT630H/PicBin.h

 #ifndef PICBIN_H
 #define PICBIN_H
 
-/* Flash Bin Version:20241014 2024-10-14 11:24:42 Compression ratio:70.00% */
+/* Flash Bin Version:20241029 2024-10-29 15:58:39 Compression ratio:70.00% */
 #define Pic_0001 1
 #define Pic_0002 2
 #define Pic_0003 3
@@ -1127,6 +1127,34 @@
 #define Pic_1123 1123
 #define Pic_1124 1124
 #define Pic_1125 1125
+#define Pic_1126 1126
+#define Pic_1127 1127
+#define Pic_1128 1128
+#define Pic_1129 1129
+#define Pic_1130 1130
+#define Pic_1131 1131
+#define Pic_1132 1132
+#define Pic_1133 1133
+#define Pic_1134 1134
+#define Pic_1135 1135
+#define Pic_1136 1136
+#define Pic_1137 1137
+#define Pic_1138 1138
+#define Pic_1139 1139
+#define Pic_1140 1140
+#define Pic_1141 1141
+#define Pic_1142 1142
+#define Pic_1143 1143
+#define Pic_1144 1144
+#define Pic_1145 1145
+#define Pic_1146 1146
+#define Pic_1147 1147
+#define Pic_1148 1148
+#define Pic_1149 1149
+#define Pic_1150 1150
+#define Pic_1151 1151
+#define Pic_1152 1152
+#define Pic_1153 1153
 
 enum {
     Pic_0001_0_0 = 0,
@@ -2552,10 +2580,85 @@ enum {
 enum {
     Pic_1124_0_0 = 1400,
     Pic_1125_0_0,
+    Pic_1126_486_251,
+    Pic_1126_501_251,
+    Pic_1126_516_251,
+    Pic_1126_531_251,
+    Pic_1126_546_251,
+    Pic_1126_561_251,
+    Pic_1126_576_251,
+    Pic_1126_591_251,
+    Pic_1126_606_251,
+    Pic_1126_621_251,
+    Pic_1126_636_251,
+    Pic_1126_651_251,
+    Pic_1126_666_251,
+    Pic_1126_681_251,
+    Pic_1126_696_251,
+    Pic_1126_711_251,
+    Pic_1126_726_251,
+    Pic_1126_741_251,
+    Pic_1126_756_251,
+    Pic_1126_771_251,
+    Pic_1126_786_251,
+    Pic_1127_487_252,
+    Pic_1128_486_251,
+    Pic_1129_485_251,
+    Pic_1130_485_252,
+    Pic_1131_485_252,
+    Pic_1132_486_251,
+    Pic_1133_486_252,
+    Pic_1134_486_251,
+    Pic_1135_486_251,
+    Pic_1136_489_263,
+    Pic_1137_632_551,
+    Pic_1138_786_561,
+    Pic_1139_486_251,
+    Pic_1139_501_251,
+    Pic_1139_516_251,
+    Pic_1139_531_251,
+    Pic_1139_546_251,
+    Pic_1139_561_251,
+    Pic_1139_576_251,
+    Pic_1139_591_251,
+    Pic_1139_606_251,
+    Pic_1139_621_251,
+    Pic_1139_636_251,
+    Pic_1139_651_251,
+    Pic_1139_666_251,
+    Pic_1139_681_251,
+    Pic_1139_696_251,
+    Pic_1139_711_251,
+    Pic_1139_726_251,
+    Pic_1139_741_251,
+    Pic_1139_756_251,
+    Pic_1139_771_251,
+    Pic_1139_786_251,
+    Pic_1140_487_252,
+    Pic_1141_486_251,
+    Pic_1142_485_251,
+    Pic_1143_485_252,
+    Pic_1144_485_252,
+    Pic_1145_486_251,
+    Pic_1146_486_252,
+    Pic_1147_486_251,
+    Pic_1148_486_251,
+    Pic_1149_489_263,
+    Pic_1150_576_287,
+    Pic_0040_591_289,
+    Pic_0040_619_289,
+    Pic_1151_569_287,
+    Pic_0040_584_289,
+    Pic_0040_626_289,
+    Pic_1152_576_287,
+    Pic_0225_591_289,
+    Pic_0225_619_289,
+    Pic_1153_569_287,
+    Pic_0225_584_289,
+    Pic_0225_626_289,
 };
 
-
-#define PIC_INDEX_DATA_CRC 0xC0A4A9AD
+#define PIC_INDEX_DATA_CRC 0x12535796
 
 extern void User_PicIndexDataInit(void);
 #endif