✨ feat:虬龙检测台

.vscode/iar-vsc.json

+{
+  "workspace": {
+    "path": "${workspaceFolder}\\tools\\iar_ewarm\\S6J3360_template_iar_ewarm.eww"
+  },
+  "workspaces": {
+    "${workspaceFolder}\\tools\\iar_ewarm\\S6J3360_template_iar_ewarm.eww": {
+      "configs": {
+        "${workspaceFolder}\\tools\\iar_ewarm\\S6J3360_template_iar_ewarm.ewp": "standalone_tcflash"
+      },
+      "selected": {
+        "path": "${workspaceFolder}\\tools\\iar_ewarm\\S6J3360_template_iar_ewarm.ewp"
+      }
+    }
+  }
+}
\ No newline at end of file

YueJin_test_bench/ghs/850eserv2.log

+850eserv2 Version : V2.050
+Release           : MULTI v2019.1.0-P01 v800, Wed Sep 05 01:22:57 2018
+Host OS:          : Windows 7 Service Pack 1
+Command line      :  C:\ghs\comp_rh850\850eserv2.exe -rh850 -e1lpd4=16500 -df=dr7f701412.dvf -noiop -id ffffffffffffffffffffffffffffffff -D -dclock=8000,0,swoff -fastflashload -sr_client_start_cookie 16 -sr_connect_servicerouter_host 127.0.0.1 -sr_connect_servicerouter_port 49160
+Device file       : dr7f701412.dvf

YueJin_test_bench/source/Appliciation/CAN_APP.h

@@ -42,6 +42,12 @@ void Can_Set_Buff_75F(uint8_t CopyData []);
 
 
 
+typedef enum
+{
+    Can_RX_IDLE = 0,  // 空闲状态
+    Can_RX_RECEIVING, // 接收中
+    Can_RX_COMPLETE   // 接收完成
+} Can_RxState_t;
 
 void    Can_BusOffRecover(void);
 uint8_t CrcCheckSum(uint8_t *data, uint8_t len);
@@ -53,4 +59,8 @@ void Get_PN_msg(void);
 void change_UDS_DID(void);
 void resetchangeUDSfuc(void);
 void resetpowerfuel(void);
+
+void Can_Time(void);
+void Get_SW_msg(void);
+void Get_HW_msg(void);
 #endif

YueJin_test_bench/source/Appliciation/CAN_Communication_Matrix.c

@@ -89,6 +89,18 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY [ CAN_CH0_ID_TOTAL_MAX ] =
         (( void * )0),
         (( void * )0),
     },
+
+    {
+        {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,
+        0x72dul,
+        (( void * )0),
+        (( void * )0),
+        (( void * )0),
+    },
+
 };
 
 
@@ -252,7 +264,39 @@ uint8_t Get_CAN_CH0_ID_794_byte7_Sig(void)
 
 
 
+uint8_t Get_CAN_CH0_ID_72d_byte0_Sig(void)
+{
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x72d_Msg_Count, 0u) >> 0u) & 0xFFu));
+}
+uint8_t Get_CAN_CH0_ID_72d_byte1_Sig(void)
+{
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x72d_Msg_Count, 1u) >> 0u) & 0xFFu));
+}
+uint8_t Get_CAN_CH0_ID_72d_byte2_Sig(void)
+{
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x72d_Msg_Count, 2u) >> 0u) & 0xFFu));
+}
+uint8_t Get_CAN_CH0_ID_72d_byte3_Sig(void)
+{
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x72d_Msg_Count, 3u) >> 0u) & 0xFFu));
+}
 
+uint8_t Get_CAN_CH0_ID_72d_byte4_Sig(void)
+{
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x72d_Msg_Count, 4u) >> 0u) & 0xFFu));
+}
+uint8_t Get_CAN_CH0_ID_72d_byte5_Sig(void)
+{
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x72d_Msg_Count, 5u) >> 0u) & 0xFFu));
+}
+uint8_t Get_CAN_CH0_ID_72d_byte6_Sig(void)
+{
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x72d_Msg_Count, 6u) >> 0u) & 0xFFu));
+}
+uint8_t Get_CAN_CH0_ID_72d_byte7_Sig(void)
+{
+    return (((uint8_t)((uint8_t)CAN_MSG_Read(CAN_CH0_ID_0x72d_Msg_Count, 7u) >> 0u) & 0xFFu));
+}
 
 
 
@@ -284,6 +328,8 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
         break;
     case CAN_CH0_ID_Send0x794_Msg:
         u8Result = CAN_CH0_ID_0x794_Msg_Count;
+    case CAN_CH0_ID_Send0x72d_Msg:
+        u8Result = CAN_CH0_ID_0x72d_Msg_Count;
         break;
     default :
         u8Result = CAN_CH0_ID_TOTAL_MAX;

YueJin_test_bench/source/Appliciation/CAN_Communication_Matrix.h

@@ -13,6 +13,7 @@ typedef enum
     CAN_CH0_ID_Send0CFE6CEE_Msg_Count,
     CAN_CH0_ID_Send18FEFC17_Msg_Count,
     CAN_CH0_ID_0x794_Msg_Count,
+    CAN_CH0_ID_0x72d_Msg_Count,
     CAN_CH0_ID_TOTAL_MAX,
 } CAN_MSG_ID_t;
 
@@ -34,6 +35,7 @@ extern const st_CAN_SendAttribute    st_CANSendAttr[ID_SEND_TOTAL] ;
 #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_Send0x72d_Msg      0x72dul
  
 extern uint32_t Get_ID_ODO(void);
 extern uint32_t Get_ID_FUEL(void);
@@ -68,7 +70,14 @@ extern uint8_t Get_CAN_CH0_ID_794_byte6_Sig(void);
 extern uint8_t Get_CAN_CH0_ID_794_byte7_Sig(void);
 
 
-
+extern uint8_t Get_CAN_CH0_ID_72d_byte0_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_72d_byte1_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_72d_byte2_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_72d_byte3_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_72d_byte4_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_72d_byte5_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_72d_byte6_Sig(void);
+extern uint8_t Get_CAN_CH0_ID_72d_byte7_Sig(void);
 
 
 

YueJin_test_bench/source/Appliciation/Key_user.c

@@ -138,27 +138,14 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
         /*清零ODO*/
     if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
     {
-        if(resetflag == 0)
-        {
-            MENU_CHECK_STEP_ADD( );
-        }
-            
-        
        
+            MENU_CHECK_STEP_ADD( );
     }
     else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
     {
     }
     else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
     {
-        if ( LED_Waring == 1 || (UDS_Warning_Voltage ==1))
-        {
-            ;
-        }
-        else
-        {
-            MENU_CHECK_STEP_ADD( );
-        }  
     }
     else
     {

YueJin_test_bench/source/Appliciation/RTE_GPIO.h

@@ -46,7 +46,7 @@
 // #define LINE_OUT_PARK        GPIO_OUT_PORT10_PIN06
 // #define LINE_OUT_EPS         GPIO_OUT_PORT10_PIN06 //远光
 
-#define POWER_CTRL_KL30         GPIO_OUT_PORT10_PIN13
+#define POWER_CTRL_KL30         GPIO_OUT_PORT00_PIN15
 #define POWER_CTRL_KL15         GPIO_OUT_PORT10_PIN12
 #define POWER_CTRL_KL30_Current GPIO_OUT_PORT10_PIN14
 
@@ -80,13 +80,13 @@
 // #define  LINE_SafeBelt_5_press  NEG_9_Ctrl
 
 
-//左转
+
 #define  LINE_OUT_POS_04 GPIO_OUT_APORT00_PIN05
 //右转
 #define LINE_OUT_POS_01 GPIO_OUT_PORT10_PIN06
-//远光
+//左转
 #define LINE_OUT_POS_02 GPIO_OUT_PORT09_PIN00
-//位置灯
+//远光
 #define LINE_OUT_POS_03 GPIO_OUT_APORT00_PIN04
 #define LINE_OUT_POS_05 GPIO_OUT_APORT00_PIN06
 #define LINE_OUT_POS_06 GPIO_OUT_APORT00_PIN13
@@ -95,7 +95,7 @@
 #define LINE_OUT_POS_09 GPIO_OUT_PORT08_PIN08
 #define LINE_OUT_POS_10 GPIO_OUT_PORT00_PIN07
 
-//安全带//R挡
+//灯光信号隔离地
 #define LINE_OUT_NEG_01 GPIO_OUT_PORT09_PIN06
 //机油压力//L挡
 #define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05

YueJin_test_bench/source/Appliciation/Task.c

@@ -101,7 +101,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
     Key_Service( );
 
     resetchangeUDSfuc();
-    if((MENU_CHECK_STEP != 14) || (MENU_CHECK_STEP != 13))
+    if((MENU_CHECK_STEP != 4))
     {
         if(fakedelay < 100)
         {
@@ -126,7 +126,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
                 }
                 else
                 {
-                    send_0x714_fuc();
+                    
                     send0x714time = 0;
                 }
                 
@@ -138,10 +138,9 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
         }
 
 
-        if(MENU_CHECK_STEP != 0)
-        {
+     
             can_submit();
-        }
+        
     }
 
     // if(getmsgfinish == 0)
@@ -161,7 +160,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
     // }
 
 
-
+    send_0x714_fuc();
 
     //刷数字、刷英文拼写。
     //GUI_General_Digit_Display(123456789, Num_09, 10, 0, BackLightDigitNum09PosX, 79);
@@ -238,6 +237,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
     Buzzer_Start();
     Total_Check( );
     //u16LJSText = TFT_LCD_REQ_FIFO_MAX_DEPTH;
+
 }
 /*=================================================================*/
 

YueJin_test_bench/source/Driver/CAN/RSCAN.c

@@ -7,7 +7,7 @@
 #include "rh850_macros.h"
 #include "RSCAN.h"
 #include "RSCAN_Table.h"
-
+#include "CAN_APP.h"
 #define RSCAN_CKSCLK_IPERI2_CLKC 40000000UL        /*PPLLCLK2*/
 #define RSCAN_CKSCLK_ICANOSC_CLK_XIN_CAN 8000000UL /*MainOSC*/
 #define RSCAN_F_CAN RSCAN_CKSCLK_IPERI2_CLKC
@@ -2057,6 +2057,8 @@ void RSCAN0_CH4_RX_ISR(void)
             RSCAN0_CH4_Receive(&stCANFrameReceive.stReceiveContent);
         }
     }
+    Get_SW_msg();
+    Get_HW_msg();
 }
 
 void RSCAN0_CH5_RX_ISR(void)

YueJin_test_bench/source/System/init.c

@@ -81,9 +81,9 @@ void Sys_Startup_Init(void)
     Display_Title_Info( );
     Key_Init( );
     Buzzer_Init();
-    POWER_CTRL_KL30   = 0u;  //B+
-    POWER_CTRL_KL15   = 0u;  //KL15
-    MENU_CHECK_STEP = 14;
+    // POWER_CTRL_KL30   = 0u;  //B+
+    // POWER_CTRL_KL15   = 0u;  //KL15
+    // MENU_CHECK_STEP = 14;
 }
 
 /***********************************************************************