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

Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.c

@@ -25,7 +25,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
-        5000ul,
+        500ul,
         0x111ul,
         (( void * )0),
         (( void * )0),

Firmware/Source/Component/AMT630H/PicBin.c

@@ -117,7 +117,8 @@ 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_0930, 64, 612, 240, Pic_0930, 64, 612, 175, Pic_0931, 64, 612, 240, Pic_0931, 64, 612, 175, 
+    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, Pic_0932, 777, 124, 85, 
+    Pic_0933, 317, 101, 210, Pic_0934, 209, 102, 260, Pic_0935, 461, 36, 367, Pic_0936, 350, 92, 367, Pic_0937, 323, 564, 521, 
 };
 #define PicIndexData_LEN   14888
 //uint32_t PicIndexDataLEN = 0;

Firmware/Source/Component/AMT630H/PicBin.h

 #ifndef PICBIN_H
 #define PICBIN_H
 
-/* Flash Bin Version:20240826 2024-08-26 19:25:18 Compression ratio:70.00% */
+/* Flash Bin Version:20240828 2024-08-28 15:55:32 Compression ratio:70.00% */
 #define Pic_0001 1
 #define Pic_0002 2
 #define Pic_0003 3
@@ -933,6 +933,12 @@
 #define Pic_0929 929
 #define Pic_0930 930
 #define Pic_0931 931
+#define Pic_0932 932
+#define Pic_0933 933
+#define Pic_0934 934
+#define Pic_0935 935
+#define Pic_0936 936
+#define Pic_0937 937
 
 enum {
     Pic_0001_0_0 = 0,
@@ -2109,9 +2115,15 @@ enum {
     Pic_0930_612_175,
     Pic_0931_612_240,
     Pic_0931_612_175,
+    Pic_0932_124_85,
+    Pic_0933_101_210,
+    Pic_0934_102_260,
+    Pic_0935_36_367,
+    Pic_0936_92_367,
+    Pic_0937_564_521,
 };
 
-#define PIC_INDEX_DATA_CRC 0xC89CDFB5
+#define PIC_INDEX_DATA_CRC 0xD0B47BE6
 
 extern void User_PicIndexDataInit(void);
 #endif

Firmware/Source/Component/Telltales/Telltales_user.c

@@ -336,14 +336,13 @@ static void LED_Fuel_Level_Low_Execution(Tellib_uint16_t led_status)
    
 }
 // uint16_t ECU_Engine_Temperature_R =0;
-// uint32_t test_ECU_Engine_Temperature =0;
+uint16_t test_ECU_Engine_Temperature =0;
 /*信号来源：ECU_101 +硬线-P11 阻值 CAN>硬线*/
 static Tellib_uint16_t LED_Coolant_Temperature_Judgement(void)
 {
     Tellib_uint16_t LED_STATE = 0u;
     if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_CH0_101_Msg_Count) == CAN_SIG_LOST)
     {
-        // ECU_Engine_Temperature_R = ADC_Read_Signal(ADC_CH_COOLANT_TEMP1_R);
         if(ADC_Read_Signal(ADC_CH_COOLANT_TEMP1_R) <= 20)
         {
             ECU_Engine_Temperature_flag = 1;
@@ -372,7 +371,7 @@ static Tellib_uint16_t LED_Coolant_Temperature_Judgement(void)
     }
     else
     {
-        // test_ECU_Engine_Temperature = Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature();
+        test_ECU_Engine_Temperature = Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature();
         if(Get_CAN_CH0_ID_101_Sig_ECU_Engine_Temperature() >= 120 )
         {
             ECU_Engine_Temperature_flag = 1;