Merge branch 'master' of http://ikuai.hua-hua.cn:3000/huahua/LYFJDB
This commit is contained in:
commit
9a6507a576
File diff suppressed because one or more lines are too long
@ -1,19 +1,19 @@
|
||||
QualityReport
|
||||
2024年7月7日 16:35:07
|
||||
2024年8月16日 23:45:14
|
||||
|
||||
------ Start build(ECU_APP, DefaultBuild) ------
|
||||
C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\Bin\ccrl.exe user\appTask.c -cpu=S3 -obj_path=DefaultBuild "-dev=C:\Program Files (x86)\Renesas Electronics\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(141):W0520177:Variable "fnr_step" was declared but never referenced
|
||||
user\appTask.c(141):W0520177:Variable "lh_step" was declared but never referenced
|
||||
user\appTask.c(143):W0520177:Variable "db_pos" was declared but never referenced
|
||||
user\appTask.c(144):W0520177:Variable "fnr_step" was declared but never referenced
|
||||
user\appTask.c(144):W0520177:Variable "lh_step" was declared but never referenced
|
||||
user\appTask.c(146):W0520177:Variable "db_pos" was declared but never referenced
|
||||
user\appTask.c(50):W0520177:Variable "err_counter" was declared but never referenced
|
||||
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 10 days. After that, link size limit (64 Kbyte) will be applied. Please consider purchasing the product.
|
||||
RAMDATA SECTION: 00000bf9 Byte(s)
|
||||
ROMDATA SECTION: 00000709 Byte(s)
|
||||
PROGRAM SECTION: 000050d5 Byte(s)
|
||||
W0561016:The evaluation version of CC-RL V1 is valid for the remaining 10 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 10 days. After that, link size limit (64 Kbyte) will be applied. Please consider purchasing the product.
|
||||
W0561017:The evaluation period of CC-RL V1 has expired. Please consider purchasing the product.
|
||||
RAMDATA SECTION: 00000c03 Byte(s)
|
||||
ROMDATA SECTION: 0000070b Byte(s)
|
||||
PROGRAM SECTION: 0000516d 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
|
||||
------ Build ended(Error:0, Warning:7)(ECU_APP, DefaultBuild) ------
|
||||
|
||||
@ -70,7 +70,7 @@ DefaultBuild\ECU_APP.clnk :
|
||||
-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
|
||||
-OCDBG=04
|
||||
-USER_OPT_BYTE=6833E8
|
||||
-USER_OPT_BYTE=E933E8
|
||||
-LISt=DefaultBuild\ECU_APP.map
|
||||
-SHow=Reference,Xreference,Total_size,STRUCT
|
||||
-STARt=VectorRemapingAddr_n,.const,.text,.RLIB,.SLIB,PFDL_COD,.textf,.constf,.data,.sdata/0A000,DID_TBL_f/19C00,KAM_SEG_n/FE500,.dataR,.bss/FE510,.sdataR,.sbss/FFE20
|
||||
@ -100,9 +100,9 @@ DefaultBuild\ECU_APP.clnk :
|
||||
|
||||
|
||||
--- SHA1 hash value of output files ---
|
||||
F:\work\HDG\ZHENAN\CODE\ECU_APP\DefaultBuild\ECU_APP.abs: e89ebb308fc461af8ea9305e35bca813e350e07d
|
||||
F:\work\HDG\ZHENAN\CODE\ECU_APP\OutPut\ECU_APP.mot: 4f0f2b8ed25a756c1ccefbe0793e679817d6e8b7
|
||||
F:\work\HDG\ZHENAN\CODE\ECU_APP\output\ECU_APP.S19: 30942179605d46d7bde2ec8f15d845091a9f3b00
|
||||
F:\work\HDG\ZHENAN\CODE\ECU_APP\DefaultBuild\ECU_APP.abs: 27514eb2afc94e7dd01e3720ef0e19415980e0a9
|
||||
F:\work\HDG\ZHENAN\CODE\ECU_APP\OutPut\ECU_APP.mot: ff615b6223765b22c1e668c38977f555c207cc7e
|
||||
F:\work\HDG\ZHENAN\CODE\ECU_APP\output\ECU_APP.S19: 2e4557f4e8eb9e2f542fe0d80d7a6a9b55a8c30e
|
||||
|
||||
|
||||
--- System Information ---
|
||||
@ -130,13 +130,13 @@ F:\work\HDG\ZHENAN\CODE\ECU_APP\output\ECU_APP.S19: 30942179605d46d7bde2ec8f15d8
|
||||
C:\Program Files (x86)\Renesas Electronics\CS+\CC
|
||||
*Memory Usage
|
||||
*Private Working Set
|
||||
289 MB
|
||||
207 MB
|
||||
*Number of GDI Objects
|
||||
2332
|
||||
2146
|
||||
*Number of USER Objects
|
||||
1050
|
||||
1177
|
||||
*Opened Files
|
||||
7 editors, 7 files, 68 KB
|
||||
6 editors, 6 files, 69 KB
|
||||
|
||||
--- Build Tool Plug-in Information ---
|
||||
RH850 Build tool CC-RH Plug-in
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -84,8 +84,8 @@ void Apply_task(void)
|
||||
BusOff_Detect();
|
||||
}
|
||||
KeyScan();
|
||||
P_light_task();
|
||||
|
||||
|
||||
IND_task();
|
||||
//IGN_Detect();
|
||||
//CanNwHandle();
|
||||
}
|
||||
@ -112,7 +112,7 @@ void Apply_task(void)
|
||||
{
|
||||
PowerUpDetect();
|
||||
}
|
||||
|
||||
P_light_task();
|
||||
}
|
||||
if (Timer_20ms_flag == 1)
|
||||
{
|
||||
@ -125,7 +125,7 @@ void Apply_task(void)
|
||||
{
|
||||
Timer_50ms_flag = 0;
|
||||
//TxTestMsg();
|
||||
IND_task();
|
||||
|
||||
//SleepDetect();//TODO
|
||||
}
|
||||
}
|
||||
@ -356,7 +356,22 @@ void P_light_task(void)
|
||||
|
||||
void IND_task(void)
|
||||
{
|
||||
IND_Ctrl(g_fnr_state);
|
||||
static uint8_t counter=0;
|
||||
|
||||
if (counter < 7)
|
||||
{
|
||||
IND_Ctrl(g_fnr_state);
|
||||
}
|
||||
else
|
||||
{
|
||||
IND_Ctrl(FNR_ALL_LIGHT);
|
||||
}
|
||||
counter++;
|
||||
if (counter > 9)
|
||||
{
|
||||
counter = 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -404,8 +419,8 @@ void Can_Msg_Change(void)
|
||||
{
|
||||
//CAN_45A.Msg_Part.SCM_PsngrSeatBeltWarnSts = sbrWarnState;
|
||||
CAN_188.Msg_Part.SL_Fswitch = (g_fnr_state == FNR_STATE_F)?1:0;
|
||||
CAN_188.Msg_Part.SL_Hswitch = (g_lh_state == LH_STATE_H)?1:0;
|
||||
CAN_188.Msg_Part.SL_Lswitch = (g_lh_state == LH_STATE_L)?1:0;
|
||||
CAN_188.Msg_Part.SL_Hswitch = 0;//(g_lh_state == LH_STATE_H)?1:0;
|
||||
CAN_188.Msg_Part.SL_Lswitch = 0;//(g_lh_state == LH_STATE_L)?1:0;
|
||||
CAN_188.Msg_Part.SL_Nswitch = (g_fnr_state == FNR_STATE_N)?1:0;
|
||||
CAN_188.Msg_Part.SL_Rswitch = (g_fnr_state == FNR_STATE_R)?1:0;
|
||||
CAN_188.Msg_Part.switch1 = Pkey_state;
|
||||
|
||||
@ -107,7 +107,7 @@ void P_light_Ctrl(uint8_t state)
|
||||
O_IND5_CTRL = 1;
|
||||
O_IND1_CTRL = 0;
|
||||
break;
|
||||
case P_LIGHT_NONE:
|
||||
case P_LIGHT_YELLOE:
|
||||
O_IND5_CTRL = 0;
|
||||
O_IND1_CTRL = 1;
|
||||
break;
|
||||
@ -166,6 +166,11 @@ void IND_Ctrl(uint8_t fnr_state)
|
||||
O_IND3_CTRL = 0;
|
||||
O_IND4_CTRL = 1;
|
||||
break;
|
||||
case FNR_ALL_LIGHT:
|
||||
O_IND2_CTRL = 1;
|
||||
O_IND3_CTRL = 1;
|
||||
O_IND4_CTRL = 1;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
#define FNR_STATE_N 0
|
||||
#define FNR_STATE_F 1
|
||||
#define FNR_STATE_R 2
|
||||
#define FNR_ALL_LIGHT 3
|
||||
|
||||
#define P_LIGHT_NONE 0
|
||||
#define P_LIGHT_RED 1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user