✨ feat:改进can诊断bug，界面增加‘检测台’版本号

YueJin_test_bench/source/Appliciation/CAN_APP.c

@@ -306,6 +306,7 @@ void  Can_Set_Buff_001(uint8_t CopyData [])
     {
         pCANMsg->Sig.Msg_0x001_2b3t = 1;
     }
+    
 }
 
 void  Can_Set_Buff_021(uint8_t CopyData [])

YueJin_test_bench/source/Appliciation/Display_Info.c

@@ -438,6 +438,22 @@ const unsigned char gImage_phoneX0_Y0_[]={/*Byte Size202*/
         0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
         0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
         0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,};
+/*陡坡缓降*/
+const unsigned char gImage_doupohuanjiangX0_Y0_[]={/*Byte Size202*/
+        40U,40U,
+        0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
+        0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
+        0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
+        0X00U,0X00U,0X80U,0Xc0U,0Xf0U,0X78U,0X18U,0X18U,0X80U,0Xc0U,0Xc0U,0Xc0U,0Xe0U,0Xe0U,0Xc0U,0X80U,
+        0X80U,0X80U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
+        0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0XcfU,0XdfU,0XdfU,0XdfU,0XffU,0Xf8U,0Xf0U,
+        0Xe1U,0Xe7U,0XffU,0X7fU,0XffU,0XbfU,0XffU,0XffU,0XffU,0XffU,0XffU,0X60U,0Xe0U,0Xc0U,0X00U,0X00U,
+        0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
+        0X00U,0X1fU,0X1fU,0X1fU,0X0fU,0X0fU,0X0fU,0X06U,0X06U,0X07U,0X03U,0X03U,0X03U,0X01U,0X01U,0X01U,
+        0X00U,0X00U,0X00U,0X00U,0X01U,0X0fU,0X1eU,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
+        0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
+        0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,
+        0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,0X00U,};
 
 const unsigned char gImage_Number_15_white_0X0_Y0[]={/*Byte Size18*/
 8U,16U,
@@ -3710,7 +3726,7 @@ void Display_Init(void)
 
 void Display_Title_Info(void)// 检测台 标题
 {
-    // TFT_LCD_Draw_Bmp(70, 8, ( uint8_t * )gImage_titlex0_y0);    
+    //  TFT_LCD_Draw_Bmp(70, 8, ( uint8_t * )gImage_titlex0_y0);    
     
 }
 
@@ -4578,6 +4594,7 @@ void Display_Can_Data(uint8_t Data , uint16_t X,uint8_t Y)
 
 const uint16_t CurrentDigitNum15PosX_1[] = {75};
 const uint16_t CurrentDigitNum15PosX_2[] = {108,98};
+uint8_t banbenhao[5]={0x56,0x31,0x30,0x31,0xff};
 void Display_Can_Receive_Data(uint16_t X,uint8_t Y)
 {
     if(canData3[9]==0XFF&&canData2[13]==0XFF&&All_Flag.u8flag[8] == 1)
@@ -4589,6 +4606,8 @@ void Display_Can_Receive_Data(uint16_t X,uint8_t Y)
         GUI_General_Digit_Display(text5[0], Num_15, 1, 0, CurrentDigitNum15PosX_1, 200);
         TFT_LCD_Draw_Bmp(85,195,  ( uint8_t * )FONT_TABLE[37] );
         GUI_General_Digit_Display(text5[1], Num_15, 2, 0, CurrentDigitNum15PosX_2, 200);
+        
+        
     }
  }
 
@@ -4631,7 +4650,7 @@ void Display_flag(uint8_t Check_Steps)
             TFT_LCD_Draw_Bmp(20, 50,  ( uint8_t * )gImage_gImage_turnLeft1X6_Y16);
             TFT_LCD_Draw_Bmp(80, 50,  ( uint8_t * )gImage_gImage_position1X6_Y16);
             TFT_LCD_Draw_Bmp(160,50,  ( uint8_t * )gImage_gImage_turnRight1X6_Y16);
-            
+            TFT_LCD_Draw_Bmp(20,70,  ( uint8_t * )gImage_doupohuanjiangX0_Y0_);
             break;
         case 2://远光\TCS
             TFT_LCD_Draw_Box(0, 0, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);//清除全亮

YueJin_test_bench/source/Appliciation/Key.h

@@ -147,6 +147,7 @@ extern uint8_t canData3[10];
 extern uint8_t canData4[8];
 
 extern uint32_t text5[5];
+extern uint8_t banbenhao[5];
 
 extern const unsigned char gImage_Dyy_words_1X6_Y16[];
 extern const unsigned char gImage_Dyy_words_2X6_Y46[];

YueJin_test_bench/source/Appliciation/Key_user.c

@@ -8,6 +8,8 @@
 #include "TFT_LCD.h"
 
 
+extern const unsigned char gImage_titlex0_y0[];
+
 uint8_t Check_Steps = 0;
 uint8_t Check_Control_Mode = 2;// 1 自走模式 2 打点模式 0  默认都发0
 uint16_t Check_Control_Time = 0;
@@ -186,14 +188,15 @@ void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
         memset(canData4, 0, sizeof(canData4));
 
         Diagnosis_banbenhao_flag=1;/*CAN诊断起始信号*/
+
         Display_TFT_Clear();
         TFT_LCD_Draw_Bmp(5, 50,   ( uint8_t * )gImage_Dyy_words_1X6_Y16 );      //软件版本号
         TFT_LCD_Draw_Bmp(5, 100,   ( uint8_t * )gImage_Dyy_words_2X6_Y46 );    //硬件版本号 
         TFT_LCD_Draw_Bmp(0,200 ,   ( uint8_t * )gImage_Dyy_words_5X6_Y137 );    //静态电流
+        TFT_LCD_Draw_Bmp(0, 220, ( uint8_t * )gImage_titlex0_y0); 
+        General_Number_Disp(banbenhao, 90, 230);/*显示检测台版本号*/
         Display_Can_Receive_Data(5,50);
 
-        
-        
 
     }
     else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )

YueJin_test_bench/source/Driver/CAN/RSCAN.c

@@ -817,7 +817,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
             if(pstCANFrame->u32CANID==0x750u)
             {
                 /*第二步*/
-                if ((pstCANFrame->unCANData.u8CANData[0] == 0x21)&&(pstCANFrame->unCANData.u8CANData[1] == 0x30))
+                if (pstCANFrame->unCANData.u8CANData[0] == 0x21)
                 {
                     memcpy(canData1,pstCANFrame->unCANData.u8CANData,pstCANFrame->u8CANLEN);
                 }
@@ -839,7 +839,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
         {
             if(pstCANFrame->u32CANID==0x750u)
             { 
-                if ((pstCANFrame->unCANData.u8CANData[0] == 0x10)&&(pstCANFrame->unCANData.u8CANData[7] == 0x46))
+                if (pstCANFrame->unCANData.u8CANData[0] == 0x10)
                 {
                     memcpy(canData1,pstCANFrame->unCANData.u8CANData,pstCANFrame->u8CANLEN);
                     for (uint8_t i = 0; i < 3; i++)
@@ -855,7 +855,7 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
         {
             if(pstCANFrame->u32CANID==0x750u)
             {
-                if ((pstCANFrame->unCANData.u8CANData[0] == 0x21)&&(pstCANFrame->unCANData.u8CANData[7] == 0xAA))
+                if (pstCANFrame->unCANData.u8CANData[0] == 0x21)
                 {
                     memcpy(canData4,pstCANFrame->unCANData.u8CANData,pstCANFrame->u8CANLEN);
                     // for (uint8_t i = 0; i < 6; i++)

YueJin_test_bench/utility/诊断工具1.10.11 x64/Option/Option.properties

 #new Option
-#Mon Jun 09 10:38:31 CST 2025
+#Mon Jun 09 14:28:58 CST 2025
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=