huahua/CFMOTO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改busoff

Browse Source
This commit is contained in:
sunbeam 2023-06-20 11:41:33 +08:00
parent 86656b109c
commit 2e53cc04e4
6 changed files with 6955 additions and 2900 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
ECU_APP/ECU_APP.dm01.mtud
View File

File diff suppressed because one or more lines are too long

4098
ECU_APP/OutPut/ECU-ALL_SW0101.hex Normal file
View File

File diff suppressed because it is too large Load Diff

5652
ECU_APP/OutPut/ECU_APP.S19
View File

File diff suppressed because it is too large Load Diff

28
ECU_APP/QualityReport(ECU_APP,DefaultBuild).txt
View File

@ -1,22 +1,22 @@
QualityReport
2023年5月24日 15:25:41
2023年6月20日 11:08:58
------ Start build(ECU_APP, DefaultBuild) ------
E:\Program Files (x86)\renesas\CS+\CC\CC-RL\V1.11.00\Bin\ccrl.exe user\appTask.c user\hwCtrl.c -cpu=S3 -obj_path=DefaultBuild "-dev=E:\Program Files (x86)\renesas\CS+\CC\Device\RL78\Devicefile\DR5F10BGG.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
E:\Program Files (x86)\renesas\CS+\CC\CC-RL\V1.11.00\Bin\ccrl.exe user\appTask.c -cpu=S3 -obj_path=DefaultBuild "-dev=E:\Program Files (x86)\renesas\CS+\CC\Device\RL78\Devicefile\DR5F10BGG.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
user\appTask.c(40):W0520172:External/internal linkage conflict with previous declaration
user\appTask.c(257):W0520177:Variable "num" was declared but never referenced
user\appTask.c(258):W0520177:Variable "keyPressCounter" was declared but never referenced
user\appTask.c(259):W0520177:Variable "LastKey" was declared but never referenced
user\appTask.c(398):W0523082:Pointer to the object of even alignment holds the odd address
user\appTask.c(402):W0520513:A value of type "MotorStateEE_Type __near *" cannot be assigned to an entity of type "uint8_t *"
user\appTask.c(440):W0520513:A value of type "MotorStateEE_Type __near *" cannot be assigned to an entity of type "uint8_t *"
user\appTask.c(676):W0523077:Called function should have prototype
user\appTask.c(730):W0523077:Called function should have prototype
user\appTask.c(399):W0523082:Pointer to the object of even alignment holds the odd address
user\appTask.c(403):W0520513:A value of type "MotorStateEE_Type __near *" cannot be assigned to an entity of type "uint8_t *"
user\appTask.c(441):W0520513:A value of type "MotorStateEE_Type __near *" cannot be assigned to an entity of type "uint8_t *"
user\appTask.c(677):W0523077:Called function should have prototype
user\appTask.c(731):W0523077:Called function should have prototype
E:\Program Files (x86)\renesas\CS+\CC\CC-RL\V1.11.00\Bin\rlink.exe -subcommand=DefaultBuild\ECU_APP.clnk
W0561017:The evaluation period of CC-RL V1 has expired. Please consider purchasing the product.
RAMDATA SECTION: 00000c41 Byte(s)
ROMDATA SECTION: 000005ff Byte(s)
PROGRAM SECTION: 0000508e Byte(s)
PROGRAM SECTION: 000050c3 Byte(s)
W0561017:The evaluation period of CC-RL V1 has expired. Please consider purchasing the product.
W0561017:The evaluation period of CC-RL V1 has expired. Please consider purchasing the product.
Renesas Optimizing Linker Completed
@ -106,9 +106,9 @@ DefaultBuild\ECU_APP.clnk :
--- SHA1 hash value of output files ---
F:\FCB_project\temp\CFMOTOR\code\ECU_APP\DefaultBuild\ECU_APP.abs: 2c876bef4378507f1344b6949df629603ea6e1b9
F:\FCB_project\temp\CFMOTOR\code\ECU_APP\DefaultBuild\ECU_APP.mot: cc5db19a2d3fa3735ae01166f425461068b15b65
F:\FCB_project\temp\CFMOTOR\code\ECU_APP\output\ECU_APP.S19: c6227c465999927bb78f8aa449155cbe3b092ae5
F:\FCB_project\temp\CFMOTOR\code\ECU_APP\DefaultBuild\ECU_APP.abs: c4ac72f02ca4eda1972a131685c8a303032b038a
F:\FCB_project\temp\CFMOTOR\code\ECU_APP\DefaultBuild\ECU_APP.mot: 3fd595d131eea24237bd20f1b59c936087619f94
F:\FCB_project\temp\CFMOTOR\code\ECU_APP\output\ECU_APP.S19: b6a4dfacd1cfccc1bee31565552e9eba65adea4d
--- System Information ---
@ -136,11 +136,11 @@ F:\FCB_project\temp\CFMOTOR\code\ECU_APP\output\ECU_APP.S19: c6227c465999927bb78
E:\Program Files (x86)\renesas\CS+\CC
*Memory Usage
*Private Working Set
280 MB
271 MB
*Number of GDI Objects
2083
2097
*Number of USER Objects
1130
1132
*Opened Files
2 editors, 2 files, 24 KB

13
ECU_APP/user/appTask.c
View File

@ -115,7 +115,7 @@ void Apply_task(void)
{
Timer_50ms_flag = 0;
//EEL_WRITE();
TxTestMsg();
//TxTestMsg();
//SleepDetect();//TODO
}
}
@ -387,6 +387,7 @@ void Can_Msg_Change(void)
CAN_212.Msg_Part.MSW_TogReq = toggle_req;
CAN_212.Msg_Part.MSW_BtnFltSts = 0;
CAN_212.Msg_Part.MSW_RotStep = xn_tx_num;
//CAN_212.Msg_Part.Reserve_7 = BusOff_flag;
}
static uint8_t EEL_BUF[50];
@ -542,8 +543,8 @@ unsigned char CanBusOffPro(void)
return ret;
}
#define FAST_BUSOFF_THRESHOULD 100 // 100MS
#define SLOW_BUSOFF_THRESHOULD 1000 // 100MS
#define FAST_BUSOFF_THRESHOULD 50 // 100MS
#define SLOW_BUSOFF_THRESHOULD 200 // 100MS
void BusOff_Recovery(void);
@ -552,13 +553,13 @@ void BusOff_Detect(void)
if ((C0ERFLL & 0x08) && (R_CAN_ReadChStatus_CH0() & 0x02))
{
BusOff_flag = 1;
if (uiBusOffCnt == 0)
{
if (ucBusOffModeState == 0)
{
uiBusOffCnt = FAST_BUSOFF_THRESHOULD;
// BusOff_Recovery();
BusOff_Recovery();
}
if ((ucBusOffModeState > 0) && (ucBusOffModeState < 5))
{
@ -651,7 +652,7 @@ void IGN_Voltage_Detect(void)
void value_init(void)
{
CAN_LostCount = 500;
BusOff_Detect_delay_count = 2000;
BusOff_Detect_delay_count = 1000;
ucIgnStus = IGN_OFF;
}
void CAN_RX_Data_Handle(void)

11
ECU_APP/user/can_user.c
View File

@ -25,7 +25,7 @@ uint16_t air_req_timer = C_100MS_1MS;
unsigned char BusOff_flag = 0;
unsigned char BusOff_IGN_cycle_count = 0;
unsigned int BusOff_Detect_delay_count = 2000;
unsigned int BusOff_Detect_delay_count = 1000;
unsigned char Can_2F_SET_run = 0;
@ -75,17 +75,12 @@ void CAN_TX_MESSAGE_INIT(void)
uint8_t txbuf1[8],txbuf2[8],txbuf3[8];
void TxTestMsg(void)
{
uint8_t testdata[8] = {0};
if ((App28sTxRxStatus & DCM28S_MASK_TX_DISABLE) == 0)
{
return;
}
TransmitCAN_Message(0x333,8,testdata);
}
//立即发送
void ClearTxCounter(void)