Skip to content

J
jiancetai
Commit bf4e7f61 authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:完成诊断部分，无贴图

parent afe9affd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 332 additions and 869 deletions
YueJin_test_bench/ghs/850eserv2.log 0 → 100644
View file @ bf4e7f61
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 4 -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
View file @ bf4e7f61
...@@ -47,9 +47,13 @@ void Can_BusOffRecover(void); ...@@ -47,9 +47,13 @@ void Can_BusOffRecover(void);
uint8_t CrcCheckSum(uint8_t *data, uint8_t len); uint8_t CrcCheckSum(uint8_t *data, uint8_t len);
void can_submit(void); void can_submit(void);
void Get_ID_0x794_Msg(void); void Get_ID_0x794_Msg(void);
void send_0x714_fuc(void); void send_uid_fuc(void);
extern uint8_t ruanjianbanbenhao[8]; extern uint8_t ruanjianbanbenhao[7];
void Get_PN_msg(void); extern uint8_t yingjianbanbenhao[7];
extern uint8_t lingjianhao[21];
extern void Get_SW_msg(void);
extern void Get_HW_msg(void);
extern void Get_PN_msg(void);
extern void Get_UID_msg(void); extern void Get_UID_msg(void);
void change_UDS_DID(void); void change_UDS_DID(void);
void UIDWrite(void); void UIDWrite(void);
...@@ -67,4 +71,8 @@ extern uint8_t UIDresult; ...@@ -67,4 +71,8 @@ extern uint8_t UIDresult;
extern uint8_t writebeing; extern uint8_t writebeing;
extern uint8_t u8get714msg[8]; extern uint8_t u8get714msg[8];
extern uint8_t UIDdelay; extern uint8_t UIDdelay;
extern uint8_t UDSStep;
extern uint8_t swbegin;
extern uint8_t hwbegin;
extern uint8_t pnbegin;
#endif #endif
YueJin_test_bench/source/Appliciation/CAN_Communication_Matrix.c
View file @ bf4e7f61
...@@ -215,38 +215,37 @@ uint8_t Get_CAN_CH0_ID_18FEFC17_Sig_Fuel_level(void) ...@@ -215,38 +215,37 @@ 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)); 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_668_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_0x668_Msg_Count, 0u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_7A9_byte1_Sig(void) uint8_t Get_CAN_CH0_ID_668_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_0x668_Msg_Count, 1u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_7A9_byte2_Sig(void) uint8_t Get_CAN_CH0_ID_668_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_0x668_Msg_Count, 2u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_7A9_byte3_Sig(void) uint8_t Get_CAN_CH0_ID_668_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_0x668_Msg_Count, 3u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_668_byte4_Sig(void)
uint8_t Get_CAN_CH0_ID_7A9_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_0x668_Msg_Count, 4u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_7A9_byte5_Sig(void) uint8_t Get_CAN_CH0_ID_668_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_0x668_Msg_Count, 5u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_7A9_byte6_Sig(void) uint8_t Get_CAN_CH0_ID_668_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_0x668_Msg_Count, 6u) >> 0u) & 0xFFu));
} }
uint8_t Get_CAN_CH0_ID_7A9_byte7_Sig(void) uint8_t Get_CAN_CH0_ID_668_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_0x668_Msg_Count, 7u) >> 0u) & 0xFFu));
} }
...@@ -285,8 +284,8 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID) ...@@ -285,8 +284,8 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
case CAN_CH0_ID_Send0x794_Msg: case CAN_CH0_ID_Send0x794_Msg:
u8Result = CAN_CH0_ID_0x794_Msg_Count; u8Result = CAN_CH0_ID_0x794_Msg_Count;
break; break;
case CAN_CH0_ID_Send0x7A9_Msg: case CAN_CH0_ID_Send0x668_Msg:
u8Result = CAN_CH0_ID_0x7A9_Msg_Count; u8Result = CAN_CH0_ID_0x668_Msg_Count;
break; break;
default : default :
u8Result = CAN_CH0_ID_TOTAL_MAX; u8Result = CAN_CH0_ID_TOTAL_MAX;
......
YueJin_test_bench/source/Appliciation/CAN_Communication_Matrix.h
View file @ bf4e7f61
...@@ -13,7 +13,7 @@ typedef enum ...@@ -13,7 +13,7 @@ typedef enum
CAN_CH0_ID_Send0CFE6CEE_Msg_Count, CAN_CH0_ID_Send0CFE6CEE_Msg_Count,
CAN_CH0_ID_Send18FEFC17_Msg_Count, CAN_CH0_ID_Send18FEFC17_Msg_Count,
CAN_CH0_ID_0x794_Msg_Count, CAN_CH0_ID_0x794_Msg_Count,
CAN_CH0_ID_0x7A9_Msg_Count, CAN_CH0_ID_0x668_Msg_Count,
CAN_CH0_ID_TOTAL_MAX, CAN_CH0_ID_TOTAL_MAX,
} CAN_MSG_ID_t; } CAN_MSG_ID_t;
...@@ -35,7 +35,7 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ; ...@@ -35,7 +35,7 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ;
#define CAN_CH0_ID_Send0CFE6CEE_Msg 0x0CFE6CEEul #define CAN_CH0_ID_Send0CFE6CEE_Msg 0x0CFE6CEEul
#define CAN_CH0_ID_Send18FEFC17_Msg 0x18FEFC17ul #define CAN_CH0_ID_Send18FEFC17_Msg 0x18FEFC17ul
#define CAN_CH0_ID_Send0x794_Msg 0x794ul #define CAN_CH0_ID_Send0x794_Msg 0x794ul
#define CAN_CH0_ID_Send0x7A9_Msg 0x7A9ul #define CAN_CH0_ID_Send0x668_Msg 0x668ul
extern uint32_t Get_ID_ODO(void); extern uint32_t Get_ID_ODO(void);
extern uint32_t Get_ID_FUEL(void); extern uint32_t Get_ID_FUEL(void);
...@@ -60,14 +60,14 @@ extern uint8_t Get_CAN_CH0_ID_10FF1017_Sig_RHParkTailLightSts(void); ...@@ -60,14 +60,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 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 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_18FEFC17_Sig_Fuel_level(void);
extern uint8_t Get_CAN_CH0_ID_7A9_byte0_Sig(void); extern uint8_t Get_CAN_CH0_ID_668_byte0_Sig(void);
extern uint8_t Get_CAN_CH0_ID_7A9_byte1_Sig(void); extern uint8_t Get_CAN_CH0_ID_668_byte1_Sig(void);
extern uint8_t Get_CAN_CH0_ID_7A9_byte2_Sig(void); extern uint8_t Get_CAN_CH0_ID_668_byte2_Sig(void);
extern uint8_t Get_CAN_CH0_ID_7A9_byte3_Sig(void); extern uint8_t Get_CAN_CH0_ID_668_byte3_Sig(void);
extern uint8_t Get_CAN_CH0_ID_7A9_byte4_Sig(void); extern uint8_t Get_CAN_CH0_ID_668_byte4_Sig(void);
extern uint8_t Get_CAN_CH0_ID_7A9_byte5_Sig(void); extern uint8_t Get_CAN_CH0_ID_668_byte5_Sig(void);
extern uint8_t Get_CAN_CH0_ID_7A9_byte6_Sig(void); extern uint8_t Get_CAN_CH0_ID_668_byte6_Sig(void);
extern uint8_t Get_CAN_CH0_ID_7A9_byte7_Sig(void); extern uint8_t Get_CAN_CH0_ID_668_byte7_Sig(void);
......
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ bf4e7f61
...@@ -173,8 +173,6 @@ void CHECK_IPK_COUNT(void) ...@@ -173,8 +173,6 @@ void CHECK_IPK_COUNT(void)
ClearFlag = 0; ClearFlag = 0;
} }
} }
} }
} }
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ bf4e7f61
...@@ -4214,9 +4214,6 @@ const uint16_t banebenhao3[] = {105,95}; ...@@ -4214,9 +4214,6 @@ const uint16_t banebenhao3[] = {105,95};
extern uint8_t SWtestresult; extern uint8_t SWtestresult;
extern uint8_t HWtestresult; extern uint8_t HWtestresult;
extern uint8_t PNtestresult; extern uint8_t PNtestresult;
extern uint8_t ruanjianbanbenhao[8];
extern uint8_t yingjianbanbenhao[8];
extern uint8_t lingjianhao[21];
uint8_t UUIDX = 197; uint8_t UUIDX = 197;
void Display_Version_Info(uint32_t ON_OFF) void Display_Version_Info(uint32_t ON_OFF)
{ {
...@@ -4248,7 +4245,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4248,7 +4245,7 @@ void Display_Version_Info(uint32_t ON_OFF)
loc_Type_back = loc_Type; loc_Type_back = loc_Type;
} }
TFT_LCD_Draw_Bmp(3, 50, ( uint8_t * )gImage_Dyy_words_1X6_Y16 ); //软件版本号 TFT_LCD_Draw_Bmp(3, 50, ( uint8_t * )gImage_14X0_Y0 ); //软件版本号
const uint16_t Currenttest[] = {180,170}; const uint16_t Currenttest[] = {180,170};
...@@ -4258,12 +4255,12 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4258,12 +4255,12 @@ void Display_Version_Info(uint32_t ON_OFF)
// General_Number_Disp(yingjianbanbenhao, 105, 50); // General_Number_Disp(yingjianbanbenhao, 105, 50);
// General_Number_Disp(lingjianhao, 15, 100); // General_Number_Disp(lingjianhao, 15, 100);
} }
TFT_LCD_Draw_Bmp(3, 75, ( uint8_t * )gImage_Dyy_words_2X6_Y46 ); //硬件版本号 TFT_LCD_Draw_Bmp(3, 75, ( uint8_t * )gImage_123X0_Y0 ); //硬件版本号
TFT_LCD_Draw_Bmp(3, 25, ( uint8_t * )gImage_JCT_01X0_Y0 ); //检测台版本号 // TFT_LCD_Draw_Bmp(3, 25, ( uint8_t * )gImage_JCT_01X0_Y0 ); //检测台版本号
// TFT_LCD_Draw_Bmp(3, 120, ( uint8_t * )gImage_Dyy_words_3X6_Y75 ); //写入UID // TFT_LCD_Draw_Bmp(3, 120, ( uint8_t * )gImage_Dyy_words_3X6_Y75 ); //写入UID
// TFT_LCD_Draw_Bmp(3, 225, ( uint8_t * )gImage_JCT_08X0_Y0 ); //读取UID // TFT_LCD_Draw_Bmp(3, 225, ( uint8_t * )gImage_JCT_08X0_Y0 ); //读取UID
TFT_LCD_Draw_Bmp(3, 100, ( uint8_t * )gImage_JCT_06X0_Y0 ); //零件号 TFT_LCD_Draw_Bmp(3, 100, ( uint8_t * )gImage_JCT_06X0_Y0 ); //零件号
TFT_LCD_Draw_Bmp(3, 150, ( uint8_t * )gImage_JCT_02X0_Y0 ); //仪表名称 // TFT_LCD_Draw_Bmp(3, 150, ( uint8_t * )gImage_JCT_02X0_Y0 ); //仪表名称
// TFT_LCD_Draw_Bmp(3, 90+30+30, ( uint8_t * )gImage_gImage_dianyuanwaifX6_Y165 ); //仪表电电源检测外发对比检验 // TFT_LCD_Draw_Bmp(3, 90+30+30, ( uint8_t * )gImage_gImage_dianyuanwaifX6_Y165 ); //仪表电电源检测外发对比检验
// TFT_LCD_Draw_Bmp(3, 90+25+25+35+30, ( uint8_t * )gImage_gImage_yibiaowaif1X6_Y16 ); //仪表外发对比检验 // TFT_LCD_Draw_Bmp(3, 90+25+25+35+30, ( uint8_t * )gImage_gImage_yibiaowaif1X6_Y16 ); //仪表外发对比检验
...@@ -4287,14 +4284,14 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4287,14 +4284,14 @@ void Display_Version_Info(uint32_t ON_OFF)
// TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //% // TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
// TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号 // TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
uint8_t mbuff [10] = {2,0,2,5,97,0,5,2,8,0xff}; uint8_t mbuff [10] = {2,0,2,5,97,0,5,2,8,0xff};
General_Number_Disp(mbuff, 115, 25); //检测台版本号 // General_Number_Disp(mbuff, 115, 25); //检测台版本号
// General_Number_Disp(UIDNumber, 85, 120); //固定UID数字 // General_Number_Disp(UIDNumber, 85, 120); //固定UID数字
// General_Number_Disp(UIDNumber2, 70, 146); //可调UID数字 // General_Number_Disp(UIDNumber2, 70, 146); //可调UID数字
// uint8_t UUIDS[2] = {45,0xFF}; // uint8_t UUIDS[2] = {45,0xFF};
// General_Number_Disp(UUIDS, UUIDX, 160); //UID下—— // General_Number_Disp(UUIDS, UUIDX, 160); //UID下——
// General_Number_Disp(UIDcode1, 95, 225); // General_Number_Disp(UIDcode1, 95, 225);
uint8_t mbuffff [4] = {82,84,2,0xff}; // uint8_t mbuffff [4] = {82,84,2,0xff};
General_Number_Disp(mbuffff, 115, 150); //RT2 // General_Number_Disp(mbuffff, 115, 150); //RT2
} }
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ bf4e7f61
...@@ -31,7 +31,6 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void) ...@@ -31,7 +31,6 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
// DoCAN_Communication_Service( ); // DoCAN_Communication_Service( );
// UDS_Server_Application_Service( ); // UDS_Server_Application_Service( );
TFT_LCD_Display_Update_Service( ); TFT_LCD_Display_Update_Service( );
Get_PN_msg();
// Get_UID_msg(); // Get_UID_msg();
} }
/*============================================================================*/ /*============================================================================*/
...@@ -65,43 +64,25 @@ extern uint8_t SWtestresult; ...@@ -65,43 +64,25 @@ extern uint8_t SWtestresult;
extern uint8_t HWtestresult; extern uint8_t HWtestresult;
extern uint8_t PNtestresult; extern uint8_t PNtestresult;
extern uint8_t resetflag; extern uint8_t resetflag;
uint16_t poweronDelayTime ;
void Sys_Run_Mode_10ms_Tasks_Group(void) void Sys_Run_Mode_10ms_Tasks_Group(void)
{ {
BusOff_Service( ); BusOff_Service( );
Key_Service( ); Key_Service( );
if(fakedelay < 100) if(MENU_CHECK_STEP == 0)
{ {
fakedelay++; if(poweronDelayTime < 350) //上电延时到自检后
}
else
{
change_UDS_DID();
// cycleflag = 1;
}
if(resetflag == 0)
{
if(MENU_CHECK_STEP == 0)
{ {
if(send0x714time < 4) poweronDelayTime++;
{
send0x714time++;
}
else
{
if(begin714 == 0)
{
send_0x714_fuc();
send0x714time = 0;
}
}
} }
else else
{ {
send0x714time = 0; send_uid_fuc();
} }
}
if(begin714)
{
can_submit(); can_submit();
} }
...@@ -109,21 +90,6 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -109,21 +90,6 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
{ {
UIDWrite(); UIDWrite();
} }
// if(getmsgfinish == 0)
// {
// if(cycleflag == 0)
// {
// }
// else
// {
// send_0x714_fuc();
// // cycleflag = 0;
// }
// }
......
YueJin_test_bench/source/Driver/CAN/RSCAN.c
View file @ bf4e7f61
...@@ -792,6 +792,18 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame) ...@@ -792,6 +792,18 @@ void RSCAN0_CH4_Receive(CAN_Frame_st_t *pstCANFrame)
if (g_stRSCAN0Config.stRSCANCh4.pfnRSCANReadMsgCallBack) if (g_stRSCAN0Config.stRSCANCh4.pfnRSCANReadMsgCallBack)
{ {
g_stRSCAN0Config.stRSCANCh4.pfnRSCANReadMsgCallBack(pstCANFrame->u32CANID, pstCANFrame->u8CANLEN, pstCANFrame->unCANData.u8CANData); g_stRSCAN0Config.stRSCANCh4.pfnRSCANReadMsgCallBack(pstCANFrame->u32CANID, pstCANFrame->u8CANLEN, pstCANFrame->unCANData.u8CANData);
if(swbegin)
{
Get_SW_msg();
}
if(hwbegin)
{
Get_HW_msg();
}
if(pnbegin)
{
Get_PN_msg();
}
} }
} }
void RSCAN0_CH5_Receive(CAN_Frame_st_t *pstCANFrame) void RSCAN0_CH5_Receive(CAN_Frame_st_t *pstCANFrame)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment