✨ feat:初步增加上电读取版本号与点亮报文指示灯

.vscode/settings.json

@@ -62,6 +62,7 @@
     "display_info.h": "c",
     "can_communication_matrix.h": "c",
     "analog_signals.h": "c",
-    "key.h": "c"
+    "key.h": "c",
+    "tft_lcd.h": "c"
   }
 }
\ No newline at end of file

YueJin_test_bench/source/Appliciation/CAN_APP.h

@@ -55,6 +55,10 @@ void change_UDS_DID(void);
 void resetchangeUDSfuc(void);
 void resetpowerfuel(void);
 void UIDWrite(void);
+extern void Get_SWIN_msg(void);
+extern void Get_SWOUT_msg(void);
+extern void Get_HWIN_msg(void);
+extern void Get_HWOUT_msg(void);
 extern uint8_t UIDcode1[33];
 extern uint8_t UIDcode2[33];
 extern uint8_t UIDNumber[19];
@@ -69,4 +73,5 @@ extern uint8_t UIDresult;
 extern uint8_t writebeing;
 extern uint8_t u8get714msg[8];
 extern uint8_t UIDdelay;
+extern uint8_t UDSStep;
 #endif

YueJin_test_bench/source/Appliciation/CAN_Communication_Matrix.c

@@ -215,38 +215,38 @@ uint8_t  Get_CAN_CH0_ID_18FEFC17_Sig_Fuel_level(void)
 {
     return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_Send18FEFC17_Msg_Count, 1u) >> 0u) & 0xFFu));
 }
-uint8_t Get_CAN_CH0_ID_7A9_byte0_Sig(void)
+uint8_t Get_CAN_CH0_ID_7EB_byte0_Sig(void)
 {
-    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7A9_Msg_Count, 0u) >> 0u) & 0xFFu));
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7EB_Msg_Count, 0u) >> 0u) & 0xFFu));
 }
-uint8_t Get_CAN_CH0_ID_7A9_byte1_Sig(void)
+uint8_t Get_CAN_CH0_ID_7EB_byte1_Sig(void)
 {
-    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7A9_Msg_Count, 1u) >> 0u) & 0xFFu));
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7EB_Msg_Count, 1u) >> 0u) & 0xFFu));
 }
-uint8_t Get_CAN_CH0_ID_7A9_byte2_Sig(void)
+uint8_t Get_CAN_CH0_ID_7EB_byte2_Sig(void)
 {
-    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7A9_Msg_Count, 2u) >> 0u) & 0xFFu));
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7EB_Msg_Count, 2u) >> 0u) & 0xFFu));
 }
-uint8_t Get_CAN_CH0_ID_7A9_byte3_Sig(void)
+uint8_t Get_CAN_CH0_ID_7EB_byte3_Sig(void)
 {
-    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7A9_Msg_Count, 3u) >> 0u) & 0xFFu));
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7EB_Msg_Count, 3u) >> 0u) & 0xFFu));
 }
 
-uint8_t Get_CAN_CH0_ID_7A9_byte4_Sig(void)
+uint8_t Get_CAN_CH0_ID_7EB_byte4_Sig(void)
 {
-    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7A9_Msg_Count, 4u) >> 0u) & 0xFFu));
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7EB_Msg_Count, 4u) >> 0u) & 0xFFu));
 }
-uint8_t Get_CAN_CH0_ID_7A9_byte5_Sig(void)
+uint8_t Get_CAN_CH0_ID_7EB_byte5_Sig(void)
 {
-    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7A9_Msg_Count, 5u) >> 0u) & 0xFFu));
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7EB_Msg_Count, 5u) >> 0u) & 0xFFu));
 }
-uint8_t Get_CAN_CH0_ID_7A9_byte6_Sig(void)
+uint8_t Get_CAN_CH0_ID_7EB_byte6_Sig(void)
 {
-    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7A9_Msg_Count, 6u) >> 0u) & 0xFFu));
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7EB_Msg_Count, 6u) >> 0u) & 0xFFu));
 }
-uint8_t Get_CAN_CH0_ID_7A9_byte7_Sig(void)
+uint8_t Get_CAN_CH0_ID_7EB_byte7_Sig(void)
 {
-    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7A9_Msg_Count, 7u) >> 0u) & 0xFFu));
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x7EB_Msg_Count, 7u) >> 0u) & 0xFFu));
 }
 
 
@@ -282,11 +282,8 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
     case CAN_CH0_ID_Send18FEFC17_Msg:
         u8Result = CAN_CH0_ID_Send18FEFC17_Msg_Count;
         break;
-    case CAN_CH0_ID_Send0x794_Msg:
-        u8Result = CAN_CH0_ID_0x794_Msg_Count;
-        break;
-    case CAN_CH0_ID_Send0x7A9_Msg:
-        u8Result = CAN_CH0_ID_0x7A9_Msg_Count;
+    case CAN_CH0_ID_Send0x7EB_Msg:
+        u8Result = CAN_CH0_ID_0x7EB_Msg_Count;
         break;
     default :
         u8Result = CAN_CH0_ID_TOTAL_MAX;

YueJin_test_bench/source/Appliciation/CAN_Communication_Matrix.h

@@ -12,8 +12,7 @@ typedef enum
     CAN_CH0_ID_Send18FEC1EE_Msg_Count,
     CAN_CH0_ID_Send0CFE6CEE_Msg_Count,
     CAN_CH0_ID_Send18FEFC17_Msg_Count,
-    CAN_CH0_ID_0x794_Msg_Count,
-    CAN_CH0_ID_0x7A9_Msg_Count,
+    CAN_CH0_ID_0x7EB_Msg_Count,
     CAN_CH0_ID_TOTAL_MAX,
 } CAN_MSG_ID_t;
 
@@ -34,8 +33,8 @@ extern const st_CAN_SendAttribute    st_CANSendAttr[ID_SEND_TOTAL] ;
 #define  CAN_CH0_ID_Send18FEC1EE_Msg    0x18FEC1EEul
 #define  CAN_CH0_ID_Send0CFE6CEE_Msg    0x0CFE6CEEul
 #define  CAN_CH0_ID_Send18FEFC17_Msg    0x18FEFC17ul
-#define  CAN_CH0_ID_Send0x794_Msg       0x794ul
-#define  CAN_CH0_ID_Send0x7A9_Msg       0x7A9ul
+#define  CAN_CH0_ID_Send0x7E3_Msg       0x7E3ul
+#define  CAN_CH0_ID_Send0x7EB_Msg       0x7EBul
 
 extern uint32_t Get_ID_ODO(void);
 extern uint32_t Get_ID_FUEL(void);
@@ -60,14 +59,14 @@ extern uint8_t  Get_CAN_CH0_ID_10FF1017_Sig_RHParkTailLightSts(void);
 extern uint32_t Get_CAN_CH0_ID_18FEC1EE_Sig_Total_Vehicle_Distance(void);
 extern uint16_t Get_CAN_CH0_ID_0CFE6CEE_Sig_Tachograph_vehicle_speed(void);
 extern uint8_t  Get_CAN_CH0_ID_18FEFC17_Sig_Fuel_level(void);
-extern uint8_t Get_CAN_CH0_ID_7A9_byte0_Sig(void);
-extern uint8_t Get_CAN_CH0_ID_7A9_byte1_Sig(void);
-extern uint8_t Get_CAN_CH0_ID_7A9_byte2_Sig(void);
-extern uint8_t Get_CAN_CH0_ID_7A9_byte3_Sig(void);
-extern uint8_t Get_CAN_CH0_ID_7A9_byte4_Sig(void);
-extern uint8_t Get_CAN_CH0_ID_7A9_byte5_Sig(void);
-extern uint8_t Get_CAN_CH0_ID_7A9_byte6_Sig(void);
-extern uint8_t Get_CAN_CH0_ID_7A9_byte7_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_7EB_byte0_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_7EB_byte1_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_7EB_byte2_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_7EB_byte3_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_7EB_byte4_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_7EB_byte5_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_7EB_byte6_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_7EB_byte7_Sig(void);
 
 
 

YueJin_test_bench/source/Appliciation/Display_Info.h

@@ -79,10 +79,10 @@ extern void Buzzer_Init(void);
 extern void Buzzer_Warning(void);
 void Display_Send_Vspead(uint8_t menu);
 extern void Get_static_Current(void);
-
+extern void General_Number_PN_Disp(uint8_t *p, uint16_t x, uint16_t y);
 void GUI_General_Digit_Display(uint32_t Digit, const uint8_t *Font[], uint8_t Len, uint8_t Blank, const uint16_t *px, uint16_t y);
 void GUI_Display_Version_Code_Service(uint8_t StarX, uint16_t PosY, uint8_t * Str, const uint8_t * Version[] , uint8_t SpaceKeySize);
-
+extern void General_Number_Disp_No_Conver(uint8_t *p, uint16_t x, uint16_t y);
 extern uint8_t UDS_Warning_Voltage;
 
 extern const uint16_t BackLightDigitNum09PosX[];

YueJin_test_bench/source/Appliciation/Task.c

@@ -31,7 +31,6 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
     // DoCAN_Communication_Service( );
     // UDS_Server_Application_Service( );
     TFT_LCD_Display_Update_Service( );
-    Get_PN_msg();
     // Get_UID_msg();
 }
 /*============================================================================*/
@@ -111,31 +110,25 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
         change_UDS_DID();
         // cycleflag = 1;
     }
-    if(resetflag == 0)
+
+    if(MENU_CHECK_STEP == 0)
     {
-        if(MENU_CHECK_STEP == 0)
+        if(send0x714time < 4)
         {
-            if(send0x714time < 4)
-            {
-                send0x714time++;
-            }
-            else
-            {
-                if(begin714 == 0)
-                {
-                    send_0x714_fuc();
-                    send0x714time = 0;
-                }
-            }
-            
+            send0x714time++;
         }
         else
         {
+            send_0x714_fuc();
             send0x714time = 0;
         }
-
-        can_submit();
+        
+    }
+    else
+    {
+        send0x714time = 0;
     }
+    can_submit();
 
     if(writeflag == 1)
     {

YueJin_test_bench/source/Driver/CAN/RSCAN.c

@@ -792,6 +792,26 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
     if (g_stRSCAN0Config.stRSCANCh4.pfnRSCANReadMsgCallBack)
     {
         g_stRSCAN0Config.stRSCANCh4.pfnRSCANReadMsgCallBack(pstCANFrame->u32CANID, pstCANFrame->u8CANLEN, pstCANFrame->unCANData.u8CANData);
+        if(UDSStep == 0)
+        {
+            Get_SWIN_msg();
+        }
+        else if(UDSStep == 1)
+        {
+            Get_SWOUT_msg();
+        }
+        else if(UDSStep == 2)
+        {
+            Get_HWIN_msg();
+        }
+        else if(UDSStep == 3)
+        {
+            Get_HWOUT_msg();
+        }
+        else if(UDSStep == 4)
+        {
+            Get_PN_msg();
+        }
     }
 }
 void RSCAN0_CH5_Receive(CAN_Frame_st_t *pstCANFrame)