删除DTC和上下左右

This commit is contained in:
sunbeam 2024-11-28 22:55:34 +08:00
parent 45912d6fa6
commit 61fd7c9a40
10 changed files with 4824 additions and 703 deletions

File diff suppressed because one or more lines are too long

4105
ECU_APP/OutPut/ECU_APP.S19 Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,37 @@
QualityReport
2024年4月17日 22:31:42
2024年11月28日 22:50:11
------ Start build(ECU_APP, DefaultBuild) ------
C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\Bin\ccrl.exe r_main.c diagnose\extern.c diagnose\DTC\DCM_DTC.c diagnose\CanTp\CanTp.c -cpu=S3 -obj_path=DefaultBuild "-dev=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10BBG.DVF" -g -g_line -I diagnose\DTC -I diagnose\CanTrcv -I sys -I . -I rscan_driver -I diagnose -I DataFlash -I CanNw -I diagnose\CanTp -I diagnose\CanIf -I user -D DEBUG1 -c -msg_lang=english
r_main.c(116):W0523077:Called function should have prototype
r_main.c(162):W0523076:Function declarations should have prototype
D:\software\CSPlus_CC\CS+\CC\CC-RL\V1.11.00\Bin\ccrl.exe diagnose\Dcm_App.c diagnose\extern.c -cpu=S3 -obj_path=DefaultBuild -dev=D:\software\CSPlus_CC\CS+\CC\Device\RL78\Devicefile\DR5F10BBG.DVF -g -g_line -I diagnose\DTC -I diagnose\CanTrcv -I sys -I . -I rscan_driver -I diagnose -I DataFlash -I CanNw -I diagnose\CanTp -I diagnose\CanIf -I user -D DEBUG1 -c -msg_lang=english
diagnose\Dcm_App.c(296):W0520549:Variable "DcmResetDelay" is used before its value is set
diagnose\Dcm_App.c(320):W0520177:Variable "ResetDelayCnt" was declared but never referenced
diagnose\Dcm_App.c(470):W0520177:Variable "ResetDelayCnt" was declared but never referenced
diagnose\Dcm_App.c(912):W0520549:Variable "LeDcm_u_Result" is used before its value is set
diagnose\Dcm_App.c(979):W0520549:Variable "LeDcm_u_Result" is used before its value is set
diagnose\Dcm_App.c(930):W0520177:Variable "LaDcm_u_TempBuffer" was declared but never referenced
diagnose\Dcm_App.c(1294):W0520940:Missing return statement at end of non-void function "MngDcm_RoutineF001Start"
diagnose\Dcm_App.c(1298):W0520940:Missing return statement at end of non-void function "MngDcm_RoutineF001Stop"
diagnose\Dcm_App.c(1302):W0520940:Missing return statement at end of non-void function "MngDcm_RoutineF001Result"
diagnose\Dcm_App.c(1572):W0520177:Variable "temp" was declared but never referenced
diagnose\Dcm_App.c(1919):W0520549:Variable "LeDcm_u_FinallyResult" is used before its value is set
diagnose\Dcm_App.c(1853):W0520177:Variable "LeDcm_u_dataFomatldentifier" was declared but never referenced
diagnose\Dcm_App.c(1854):W0520177:Variable "LeDcm_u_addressAndLengthFomatldentifier" was declared but never referenced
diagnose\Dcm_App.c(1855):W0520177:Variable "LeDcm_w_Address" was declared but never referenced
diagnose\Dcm_App.c(1856):W0520177:Variable "LeDcm_w_DataLength" was declared but never referenced
diagnose\Dcm_App.c(1857):W0520177:Variable "LeDcm_u_SidIndex" was declared but never referenced
diagnose\Dcm_App.c(1858):W0520177:Variable "LeDcm_u_SecurityAccessCheckResult" was declared but never referenced
diagnose\Dcm_App.c(1859):W0520177:Variable "LaDcm_u_TempBuffer" was declared but never referenced
diagnose\Dcm_App.c(2023):W0520549:Variable "LeDcm_u_FinallyResult" is used before its value is set
diagnose\Dcm_App.c(1939):W0520177:Variable "LeDcm_w_SingleTransmitDataCount" was declared but never referenced
diagnose\Dcm_App.c(1940):W0520177:Variable "LeDcm_u_BlockSequenceCount" was declared but never referenced
diagnose\Dcm_App.c(1941):W0520177:Variable "LeDcm_u_BlockExpect" was declared but never referenced
diagnose\Dcm_App.c(1942):W0520177:Variable "LaDcm_u_TempBuffer" was declared but never referenced
diagnose\Dcm_App.c(60):W0520177:Variable "CeDcm_w_SecurityAccessFBLMask" was declared but never referenced
diagnose\Dcm_App.c(63):W0520177:Variable "SeDcm_w_DownLoadDataLength" was declared but never referenced
diagnose\Dcm_App.c(64):W0520177:Variable "SeDcm_w_TransmitDataCount" was declared but never referenced
diagnose\Dcm_App.c(65):W0520177:Variable "SeDcm_u_BlockSequenceCountSts" was declared but never referenced
diagnose\Dcm_App.c(66):W0520177:Variable "CaDcm_w_SingleAllowDateLength" was declared but never referenced
diagnose\Dcm_App.c(71):W0520177:Variable "SeDcm_u_RidF001Sts" was declared but never referenced
diagnose\extern.c(99):W0520111:Statement is unreachable
diagnose\extern.c(128):W0520940:Missing return statement at end of non-void function "GetMotorLockStatus"
diagnose\extern.c(174):W0520111:Statement is unreachable
@ -14,28 +41,15 @@ diagnose\extern.c(340):W0520111:Statement is unreachable
diagnose\extern.c(344):W0520111:Statement is unreachable
diagnose\extern.c(541):W0520940:Missing return statement at end of non-void function "GetBcmCommFault"
diagnose\extern.c(558):W0520940:Missing return statement at end of non-void function "GetAcpCommFault"
diagnose\DTC\DCM_DTC.c(128):W0520167:Argument of type "uint32 __near *" is incompatible with parameter of type "unsigned char *__near"
diagnose\DTC\DCM_DTC.c(192):W0520167:Argument of type "uint8 __near (*)[2]" is incompatible with parameter of type "unsigned char *__near"
diagnose\DTC\DCM_DTC.c(183):W0520177:Variable "DtcSnapshotRecord" was declared but never referenced
diagnose\DTC\DCM_DTC.c(857):W0520167:Argument of type "uint8 __near (*)[28]" is incompatible with parameter of type "unsigned char *__near"
diagnose\DTC\DCM_DTC.c(114):W0520177:Function "ChkDiagVolt" was declared but never referenced
diagnose\DTC\DCM_DTC.c(124):W0520177:Function "GetLastSnapshotRecordNum" was declared but never referenced
diagnose\DTC\DCM_DTC.c(349):W0520177:Function "TempMotorFeedbackChk" was declared but never referenced
diagnose\DTC\DCM_DTC.c(399):W0520177:Function "ModeMotorFeedbackChk" was declared but never referenced
diagnose\DTC\DCM_DTC.c(449):W0520177:Function "RecMotorFeedbackChk" was declared but never referenced
diagnose\DTC\DCM_DTC.c(499):W0520177:Function "EvaSensorChk" was declared but never referenced
diagnose\DTC\DCM_DTC.c(549):W0520177:Function "MotorLockChk" was declared but never referenced
diagnose\CanTp\CanTp.c(192):W0520069:Integer conversion resulted in truncation
diagnose\CanTp\CanTp.c(796):W0520188:Enumerated type mixed with another type
C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\Bin\rlink.exe -subcommand=DefaultBuild\ECU_APP.clnk
W0561016:The evaluation version of CC-RL V1 is valid for the remaining 60 days. After that, link size limit (64 Kbyte) will be applied. Please consider purchasing the product.
RAMDATA SECTION: 00000c67 Byte(s)
ROMDATA SECTION: 00000664 Byte(s)
PROGRAM SECTION: 000051cb Byte(s)
W0561016:The evaluation version of CC-RL V1 is valid for the remaining 60 days. After that, link size limit (64 Kbyte) will be applied. Please consider purchasing the product.
W0561016:The evaluation version of CC-RL V1 is valid for the remaining 60 days. After that, link size limit (64 Kbyte) will be applied. Please consider purchasing the product.
D:\software\CSPlus_CC\CS+\CC\CC-RL\V1.11.00\Bin\rlink.exe -subcommand=DefaultBuild\ECU_APP.clnk
W0561016:The evaluation version of CC-RL V1 is valid for the remaining 43 days. After that, link size limit (64 Kbyte) will be applied. Please consider purchasing the product.
RAMDATA SECTION: 00000c5b Byte(s)
ROMDATA SECTION: 0000064c Byte(s)
PROGRAM SECTION: 0000515a Byte(s)
W0561016:The evaluation version of CC-RL V1 is valid for the remaining 43 days. After that, link size limit (64 Kbyte) will be applied. Please consider purchasing the product.
W0561016:The evaluation version of CC-RL V1 is valid for the remaining 43 days. After that, link size limit (64 Kbyte) will be applied. Please consider purchasing the product.
Renesas Optimizing Linker Completed
------ Build ended(Error:0, Warning:27)(ECU_APP, DefaultBuild) ------
------ Build ended(Error:0, Warning:41)(ECU_APP, DefaultBuild) ------
--- CommandFile 1 ---
DefaultBuild\ECU_APP.clnk :
@ -82,14 +96,14 @@ DefaultBuild\ECU_APP.clnk :
-Input=DefaultBuild\hwCtrl.obj
-LIBrary=DataFlash\pfdl.lib
-SECURITY_ID=00000000000000000000
-DEVICE=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10BBG.DVF
-DEVICE=D:\software\CSPlus_CC\CS+\CC\Device\RL78\Devicefile\DR5F10BBG.DVF
-DEBug
-NOCOmpress
-NOOPtimize
-OUtput=DefaultBuild\ECU_APP.abs
-LIBrary=C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\lib\rl78em4s.lib
-LIBrary=C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\lib\malloc_n.lib
-LIBrary=C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\lib\rl78em4r.lib
-LIBrary=D:\software\CSPlus_CC\CS+\CC\CC-RL\V1.11.00\lib\rl78em4s.lib
-LIBrary=D:\software\CSPlus_CC\CS+\CC\CC-RL\V1.11.00\lib\malloc_n.lib
-LIBrary=D:\software\CSPlus_CC\CS+\CC\CC-RL\V1.11.00\lib\rl78em4r.lib
-OCDBG=04
-USER_OPT_BYTE=E933E8
-LISt=DefaultBuild\ECU_APP.map
@ -102,7 +116,7 @@ DefaultBuild\ECU_APP.clnk :
-NOLOgo
-end
-Input=DefaultBuild\ECU_APP.abs
-DEVICE=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10BBG.DVF
-DEVICE=D:\software\CSPlus_CC\CS+\CC\Device\RL78\Devicefile\DR5F10BBG.DVF
-OUtput=DefaultBuild\ECU_APP.mot
-FOrm=Stype
-REcord=S3
@ -110,7 +124,7 @@ DefaultBuild\ECU_APP.clnk :
-Message
-end
-Input=DefaultBuild\ECU_APP.abs
-DEVICE=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10BBG.DVF
-DEVICE=D:\software\CSPlus_CC\CS+\CC\Device\RL78\Devicefile\DR5F10BBG.DVF
-OUtput=output\ECU_APP.S19= A000-19FFF
-FOrm=Stype
-REcord=S3
@ -121,14 +135,14 @@ DefaultBuild\ECU_APP.clnk :
--- SHA1 hash value of output files ---
E:\workspace\CFMOTO\CFMOTOR\ECU_APP\DefaultBuild\ECU_APP.abs: b91823c95da5bd5bc99f4c35c8474b4f0192635e
E:\workspace\CFMOTO\CFMOTOR\ECU_APP\DefaultBuild\ECU_APP.mot: 08b1f28913cc43ae39c0e03d5e3af4e7a57c6fef
E:\workspace\CFMOTO\CFMOTOR\ECU_APP\output\ECU_APP.S19: be7b0e8b501d0be26c6cc55699bd84b3d9f2a47f
E:\work\wk\CFMOTO\CFMOTO\ECU_APP\DefaultBuild\ECU_APP.abs: c662302ab45791624c1dcb516300a5b125831c31
E:\work\wk\CFMOTO\CFMOTO\ECU_APP\DefaultBuild\ECU_APP.mot: f1e8320424271e92c110db1273894d64aa91ce96
E:\work\wk\CFMOTO\CFMOTO\ECU_APP\output\ECU_APP.S19: ef3db7c8ba075175eae6226c9177b10d54a231c8
--- System Information ---
*OS Version
Microsoft Windows 10 企业版 LTSC (-, 10.0.17763, WOW64)
Microsoft Windows 11 专业版 (-, 10.0.22631, WOW64)
*Language
中文(中国)
*.NET Framework Version
@ -148,16 +162,16 @@ E:\workspace\CFMOTO\CFMOTOR\ECU_APP\output\ECU_APP.S19: be7b0e8b501d0be26c6cc556
*Product License
*Execution Place
C:\Program Files (x86)\Renesas Electronics\CS+\CC
D:\software\CSPlus_CC\CS+\CC
*Memory Usage
*Private Working Set
162 MB
299 MB
*Number of GDI Objects
1880
2168
*Number of USER Objects
1164
1212
*Opened Files
0 editors, 0 files, 0 KB
5 editors, 5 files, 50 KB
--- Build Tool Plug-in Information ---
RH850 Build tool CC-RH Plug-in
@ -286,7 +300,7 @@ Device Information Common Interface
DeviceInformation.dll
--- Main Project Information ---
E:\workspace\CFMOTO\CFMOTOR\ECU_APP\ECU_APP.mtpj
E:\work\wk\CFMOTO\CFMOTO\ECU_APP\ECU_APP.mtpj
Microcontroller Information
*R5F10BBG
*File Name: Version

View File

@ -20,13 +20,14 @@ const TsDcm_h_DtcGroupType CaDcm_u_DtcTable[DCM_SUPDTC_COUNT]={
{ 1,0x91,0x17,0x17},//系统供电电压过高
{ 2,0xC0,0x73,0x88},//BICAN总线BusOff
{ 3,0xA8,0x81,0x23},//旋钮下压按键卡滞
{ 4,0xA8,0x82,0x23},//旋钮上拨卡滞
{ 5,0xA8,0x83,0x23},//旋钮下拨卡滞
{ 6,0xA8,0x84,0x23},//旋钮左拨卡滞
{ 7,0xA8,0x85,0x23},//旋钮右拨卡滞
{ 8,0xA8,0x86,0x25},//旋钮光栅故障
{ 9,0xC1,0x00,0x87},//ECM节点通信丢失
{10,0xD1,0x10,0x87},//GBC节点通信丢失
{ 4,0xA8,0x86,0x25},//旋钮光栅故障
//{ 4,0xA8,0x82,0x23},//旋钮上拨卡滞
//{ 5,0xA8,0x83,0x23},//旋钮下拨卡滞
//{ 6,0xA8,0x84,0x23},//旋钮左拨卡滞
//{ 7,0xA8,0x85,0x23},//旋钮右拨卡滞
//{ 9,0xC1,0x00,0x87},//ECM节点通信丢失
//{10,0xD1,0x10,0x87},//GBC节点通信丢失
};
/*
@ -599,7 +600,7 @@ void CanDTC_Task(void)
//CanDTC_CanCommunicationLostDetected(COMP_Information_ID);
//CanDTC_CompErrChk();
//CanDTC_MotorRunTimeChk();
CanDTC_LostCommDetected();
//CanDTC_LostCommDetected();//20241128取消
//MotorLockChk();
if(DtcTestCycleTim < DTC_TEST_CYCLE_TIM)

View File

@ -8,7 +8,7 @@
#define DCM_19SUPDTCEXTDATARECORD_COUNT (4U)
/* 19 06????DTCExtDataRecord ???????? */
#define DCM_SUPDTC_COUNT ( 11U )
#define DCM_SUPDTC_COUNT ( 5U )
/* ???????DTC???? */
@ -95,11 +95,13 @@ extern DtcStutas_T DtcStutas[DCM_SUPDTC_COUNT];
#define AC_OVER_VOLTAGE 1
#define AC_BusOff 2
#define AC_KEY_OK_STICK 3
#define AC_KEY_GRID_STICK 4
//20242218以下取消
#define AC_KEY_UP_STICK 4
#define AC_KEY_DOWN_STICK 5
#define AC_KEY_LEFT_STICK 6
#define AC_KEY_RIGHT_STICK 7
#define AC_KEY_GRID_STICK 8
#define AC_ECM_LOST 9
#define AC_GBC_LOST 10

File diff suppressed because it is too large Load Diff

View File

@ -1,13 +1,13 @@
/* @处根据实际情况填写相关信息,将@字符以及这条提示语句去掉 */
/* @处根据实际情况填写相关信息,将@字符以及这条提示语句去掉 */
/******************************************************************************
| File Name : @
| Description: @
| File Name : @
| Description: @
*****************************************************************************/
/******************************************************************************
* Description: : Include File Section
******************************************************************************/
/* @包含其他文件 */
/* @包含其他文件 */
#include "r_cg_macrodriver.h"
#include "Dcm_DID_Cfg.h"
//#include "R_TypeDefs.h"
@ -23,7 +23,7 @@ unsigned char DF_Read(unsigned char* read_buf,unsigned char data_num,unsigned ch
/******************************************************************************
* Description: : Global Variable Definition Section
******************************************************************************/
/*@ 定义全局变量 */
/*@ 定义全局变量 */
extern uint16 adResult[7];
uint8 TempTxBuffer[40];
@ -31,30 +31,30 @@ uint8 TempTxBuffer[40];
* Description: : Static Variable Definition Section
******************************************************************************/
uint8 CaDcm_u_NRCData[DCM_NRCCOUNT] = {0x11,0x12,0x13,0x14,0x22,0x24,0x31,0x33,0x35,0x36,0x37,0x7F,0x72,0x71,0x73,0x78,0x7E}; /*27 负响应码数组*/
uint8 CaDcm_u_NRCData[DCM_NRCCOUNT] = {0x11,0x12,0x13,0x14,0x22,0x24,0x31,0x33,0x35,0x36,0x37,0x7F,0x72,0x71,0x73,0x78,0x7E}; /*27 负响应码数组*/
uint8 wBuf[20] = {0,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,0x99,0xaa,0xbb,0xcc,0xdd,0xee,0xff,0};
/******************************************************************************
* Description: : Static Function Prototype Declaration
*****************************************************************************/
/*@静态函数声明*/
/*@静态函数声明*/
/******************************************************************************
* Description: : Write User Function Code
*****************************************************************************/
/*@函数头注释格式,所有函数头按照此格式注释*/
/*@函数头注释格式,所有函数头按照此格式注释*/
/******************************************************************************
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
*****************************************************************************/
uint8 GetRTE_Dcm_DidServices_0x0200_ReadData(uint8* data)
{
@ -66,17 +66,17 @@ uint8 GetRTE_Dcm_DidServices_0x0200_ReadData(uint8* data)
}
/******************************************************************************
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
*****************************************************************************/
uint8 GetRTE_Dcm_DidServices_0x0201_ReadData(uint8* data)
{
@ -89,17 +89,17 @@ uint8 GetRTE_Dcm_DidServices_0x0201_ReadData(uint8* data)
/******************************************************************************
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
*****************************************************************************/
uint8 GetRTE_Dcm_DidServices_0xF110_ReadData(uint8* data)
{
@ -110,17 +110,17 @@ uint8 GetRTE_Dcm_DidServices_0xF110_ReadData(uint8* data)
}
/******************************************************************************
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
*****************************************************************************/
uint8 GetRTE_Dcm_DidServices_0xF112_ReadData(uint8* data)
{
@ -131,17 +131,17 @@ uint8 GetRTE_Dcm_DidServices_0xF112_ReadData(uint8* data)
}
/******************************************************************************
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
*****************************************************************************/
uint8 GetRTE_Dcm_DidServices_0xF197_ReadData(uint8* data)
{
@ -156,17 +156,17 @@ uint8 GetRTE_Dcm_DidServices_0xF197_ReadData(uint8* data)
}
/******************************************************************************
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
*****************************************************************************/
uint8 GetRTE_Dcm_DidServices_0xF180_ReadData(uint8* data)
{
@ -186,17 +186,17 @@ uint8 GetRTE_Dcm_DidServices_0xF180_ReadData(uint8* data)
}
/******************************************************************************
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
* : @
*****************************************************************************/
uint8 GetRTE_Dcm_DidServices_0xF181_ReadData(uint8* data)
{
@ -211,15 +211,15 @@ uint8 GetRTE_Dcm_DidServices_0xF183_ReadData(uint8* data)
return DCM_CHECK_OK;
}
#define DCM_DEFAULT_SESSION 0x01 /*默认模式*/
#define DCM_PROGRAMME_SESSION 0x02 /*编程模式*/
#define DCM_EXTEND_SESSION 0x04 /*扩展模式*/
#define DCM_DEFAULT_SESSION 0x01 /*默认模式*/
#define DCM_PROGRAMME_SESSION 0x02 /*编程模式*/
#define DCM_EXTEND_SESSION 0x04 /*扩展模式*/
extern uint8 MngDcm_GetDiagnosticSession(void);
uint8 GetRTE_Dcm_DidServices_0xF186_ReadData(uint8* data)
{
uint8 temp = 0xFF;
temp = MngDcm_GetDiagnosticSession(); /* 当前会话模式 */
temp = MngDcm_GetDiagnosticSession(); /* 当前会话模式 */
if(temp == DCM_DEFAULT_SESSION){
*data = 0x01;

View File

@ -33,7 +33,7 @@ __far const unsigned char SW_VERSION[]={
'1' , //AC_SW_VERSION_06
'.' , //AC_SW_VERSION_07
'0' , //AC_SW_VERSION_08
'6' , //AC_SW_VERSION_09
'1' , //AC_SW_VERSION_09
' ' , //AC_SW_VERSION_10
' ' , //AC_SW_VERSION_11
' ' , //AC_SW_VERSION_12

View File

@ -265,7 +265,7 @@ void KeyPro(void)//5ms
case 0:
keyLongPressState = 0;
keyPressState = 0;
for (i = 1; i < 6; i++)
for (i = KEYID_MIDDLE; i < 6; i++)
{
key = GetKeyState(i);
if (key == KEY_Long_PRESSED)

View File

@ -109,13 +109,13 @@ uint8_t GetIOState(uint8_t keyno)
{
//KEY
case KEYID_UP:
return KEY_UP==0?1:0;
return 0;//KEY_UP==0?1:0;
case KEYID_DOWN:
return KEY_DOWN==0?1:0;
return 0;//KEY_DOWN==0?1:0;
case KEYID_LEFT:
return KEY_LEFT==0?1:0;
return 0;//KEY_LEFT==0?1:0;
case KEYID_RIGHT:
return KEY_RIGHT==0?1:0;
return 0;//KEY_RIGHT==0?1:0;
case KEYID_MIDDLE:
return KEY_MIDDLE==0?1:0;
case KEYID_XNP: