更新SW0103

This commit is contained in:
sunbeam 2024-08-19 21:02:09 +08:00
parent 4fc07ff656
commit 72eadfd3b5
8 changed files with 12354 additions and 5685 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
QualityReport
2023年8月24日 8:12:06
2024年8月19日 20:58:51
------ Start build(ECU_APP, DefaultBuild) ------
E:\Program Files (x86)\renesas\CS+\CC\CC-RL\V1.11.00\Bin\ccrl.exe r_main.c diagnose\extern.c user\appTask.c user\can_user.c user\hwCtrl.c -cpu=S3 -obj_path=DefaultBuild "-dev=E:\Program Files (x86)\renesas\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
@ -16,23 +16,21 @@ diagnose\extern.c(502):W0520940:Missing return statement at end of non-void func
diagnose\extern.c(520):W0520940:Missing return statement at end of non-void function "GetBcmCommFault"
diagnose\extern.c(537):W0520940:Missing return statement at end of non-void function "GetAcpCommFault"
user\appTask.c(40):W0520172:External/internal linkage conflict with previous declaration
user\appTask.c(133):W0520177:Variable "i" was declared but never referenced
user\appTask.c(133):W0520177:Variable "checksum" was declared but never referenced
user\appTask.c(180):W0523082:Pointer to the object of even alignment holds the odd address
user\appTask.c(184):W0520513:A value of type "MotorStateEE_Type __near *" cannot be assigned to an entity of type "uint8_t *"
user\appTask.c(222):W0520513:A value of type "MotorStateEE_Type __near *" cannot be assigned to an entity of type "uint8_t *"
user\appTask.c(471):W0523077:Called function should have prototype
user\appTask.c(525):W0523077:Called function should have prototype
user\can_user.c(97):W0520550:Variable "re_flag" was set but never used
user\appTask.c(199):W0523082:Pointer to the object of even alignment holds the odd address
user\appTask.c(203):W0520513:A value of type "MotorStateEE_Type __near *" cannot be assigned to an entity of type "uint8_t *"
user\appTask.c(241):W0520513:A value of type "MotorStateEE_Type __near *" cannot be assigned to an entity of type "uint8_t *"
user\appTask.c(480):W0523077:Called function should have prototype
user\appTask.c(534):W0523077:Called function should have prototype
user\can_user.c(98):W0520550:Variable "re_flag" was set but never used
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: 00000c79 Byte(s)
ROMDATA SECTION: 0000063b Byte(s)
PROGRAM SECTION: 00004fae Byte(s)
PROGRAM SECTION: 00004fa0 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:24)(ECU_APP, DefaultBuild) ------
------ Build ended(Error:0, Warning:22)(ECU_APP, DefaultBuild) ------
--- CommandFile 1 ---
DefaultBuild\ECU_APP.clnk :
@ -116,14 +114,14 @@ DefaultBuild\ECU_APP.clnk :
--- SHA1 hash value of output files ---
F:\FCB_project\temp\HWBS\CODE\ECU_APP\DefaultBuild\ECU_APP.abs: da289fcdc20427ef5dce9d82e6fa2bb6210c4b19
F:\FCB_project\temp\HWBS\CODE\ECU_APP\DefaultBuild\ECU_APP.mot: 23d1db21267495477d07638f8312ad9819cddb07
F:\FCB_project\temp\HWBS\CODE\ECU_APP\output\ECU_APP.S19: 1d1cfbad0914b130c16856ae65cc4108bc6a7264
F:\FCB_project\temp\HWBS\code\ECU_APP\DefaultBuild\ECU_APP.abs: bafd93c5df63c604af971d38ac5d09db2fed1b80
F:\FCB_project\temp\HWBS\code\ECU_APP\DefaultBuild\ECU_APP.mot: e01b26277a9b3271b59ec9768a32cdd1fe186b18
F:\FCB_project\temp\HWBS\code\ECU_APP\output\ECU_APP.S19: 019abf3cbb05630242a52202251236a44aa9774e
--- System Information ---
*OS Version
Microsoft Windows 10 专业版 (-, 10.0.19044, WOW64)
Microsoft Windows 10 专业版 (-, 10.0.19045, WOW64)
*Language
中文(中国)
*.NET Framework Version
@ -146,13 +144,13 @@ F:\FCB_project\temp\HWBS\CODE\ECU_APP\output\ECU_APP.S19: 1d1cfbad0914b130c16856
E:\Program Files (x86)\renesas\CS+\CC
*Memory Usage
*Private Working Set
229 MB
277 MB
*Number of GDI Objects
2057
2068
*Number of USER Objects
1092
1106
*Opened Files
1 editors, 1 files, 14 KB
1 editors, 1 files, 15 KB
--- Build Tool Plug-in Information ---
RH850 Build tool CC-RH Plug-in
@ -281,7 +279,7 @@ Device Information Common Interface
DeviceInformation.dll
--- Main Project Information ---
F:\FCB_project\temp\HWBS\CODE\ECU_APP\ECU_APP.mtpj
F:\FCB_project\temp\HWBS\code\ECU_APP\ECU_APP.mtpj
Microcontroller Information
*R5F10BBG
*File Name: Version

View File

@ -114,7 +114,7 @@ void Apply_task(void)
{
Timer_50ms_flag = 0;
//EEL_WRITE();
TxTestMsg();
//TxTestMsg();
//SleepDetect();//TODO
}
}
@ -133,14 +133,43 @@ void Can_Msg_Change(void)//
uint8_t i,checksum;
if (IGN_Voltage_error_flag == 0)
{
CAN_50A.Msg_Bit.b00 = GetKeyState(KEYID_P84);
CAN_50A.Msg_Bit.b01 = GetKeyState(KEYID_P80);
#if NOW_BOARD == LEFT_BOARD
CAN_50A.Msg_Bit.b00 = 0;//GetKeyState(KEYID_P84);
CAN_50A.Msg_Bit.b01 = GetKeyState(KEYID_P84);
CAN_50A.Msg_Bit.b02 = GetKeyState(KEYID_P83);
CAN_50A.Msg_Bit.b03 = GetKeyState(KEYID_P82);
CAN_50A.Msg_Bit.b04 = GetKeyState(KEYID_P81);
CAN_50A.Msg_Bit.b05 = GetKeyState(KEYID_P34);
CAN_50A.Msg_Bit.b06 = GetKeyState(KEYID_P125);
CAN_50A.Msg_Bit.b04 = GetKeyState(KEYID_P80);
CAN_50A.Msg_Bit.b05 = GetKeyState(KEYID_P81);
CAN_50A.Msg_Bit.b06 = GetKeyState(KEYID_P120);
CAN_50A.Msg_Bit.b07 = GetKeyState(KEYID_P34);
if (GetKeyState(KEYID_P85))
{
CAN_50A.Msg_Bit.b16 = 0;
CAN_50A.Msg_Bit.b17 = 1;
}
else if (GetKeyState(KEYID_P125))
{
CAN_50A.Msg_Bit.b16 = 1;
CAN_50A.Msg_Bit.b17 = 0;
}
else
{
CAN_50A.Msg_Bit.b16 = 0;
CAN_50A.Msg_Bit.b17 = 0;
}
#else
CAN_50A.Msg_Bit.b00 = 0;//GetKeyState(KEYID_P84);
CAN_50A.Msg_Bit.b01 = GetKeyState(KEYID_P84);
CAN_50A.Msg_Bit.b02 = GetKeyState(KEYID_P82);
CAN_50A.Msg_Bit.b03 = GetKeyState(KEYID_P83);
CAN_50A.Msg_Bit.b04 = GetKeyState(KEYID_P34);
CAN_50A.Msg_Bit.b05 = GetKeyState(KEYID_P81);
CAN_50A.Msg_Bit.b06 = GetKeyState(KEYID_P120);
CAN_50A.Msg_Bit.b07 = GetKeyState(KEYID_P85);
CAN_50A.Msg_Bit.b17 = GetKeyState(KEYID_P125);
#endif
}
else
{
@ -153,22 +182,12 @@ void Can_Msg_Change(void)//
CAN_50A.Msg_Bit.b06 = 0;
CAN_50A.Msg_Bit.b07 = 0;
}
/*
CAN_50A.Msg_Bit.b10 = GetKeyState(KEYID_P16);
CAN_50A.Msg_Bit.b11 = GetKeyState(KEYID_P17);
CAN_50A.Msg_Bit.b12 = GetKeyState(KEYID_P30);
CAN_50A.Msg_Bit.b13 = GetKeyState(KEYID_P63);
CAN_50A.Msg_Bit.b14 = GetKeyState(KEYID_P62);
CAN_50A.Msg_Bit.b15 = GetKeyState(KEYID_P61);
CAN_50A.Msg_Bit.b16 = GetKeyState(KEYID_P60);
CAN_50A.Msg_Bit.b17 = GetKeyState(KEYID_P137);
CAN_50A.Msg_Bit.b20 = GetKeyState(KEYID_P16);
CAN_50A.Msg_Bit.b21 = GetKeyState(KEYID_P17);
*/
checksum = 0;
for (i = 0; i < 7; i++)
{
checksum += CAN_50A.Msg_Byte[i];
}
CAN_50A.Msg_Bit.checksum = checksum;
}
static uint8_t EEL_BUF[50];
@ -447,17 +466,7 @@ void value_init(void)
uint8_t red_value,green_value,blue_value;
void CAN_RX_Data_Handle(void)
{
red_value = CAN_486.Msg_Byte[0];
green_value = CAN_486.Msg_Byte[1];
blue_value = CAN_486.Msg_Byte[2];
if (IGN_Voltage_error_flag == 0)
{
SetRGB(red_value,green_value,blue_value);
}
else
{
SetRGB(0,0,0);
}
}

View File

@ -10,7 +10,7 @@
#include "hwCtrl.h"
#define C_100MS_1MS 20
#define C_100MS_1MS 50
unsigned char App28sTxRxStatus = 3;
unsigned char Nw28sTxRxStatus = 3;
@ -53,6 +53,7 @@ void Copy_Array_to_Array(unsigned char *dest, unsigned char *src, unsigned char
void Can_Msg_Change_Bcm(void)
{
Copy_Array_to_Array(TxCanMessage.DB, CAN_50A.Msg_Byte, 8);
}
@ -63,9 +64,9 @@ void CAN_TX_MESSAGE_INIT(void)
TxCanMessage.RTR = 0; /* RTR 0:Data 1:Remote */
TxCanMessage.THDSE = 0; /* Transmit History Data Store Enable */
#if NOW_BOARD == LEFT_BOARD
TxCanMessage.IDL = 0x484; /* ID Data (low) */
TxCanMessage.IDL = 0x400; /* ID Data (low) */
#else
TxCanMessage.IDL = 0x485; /* ID Data (low) */
TxCanMessage.IDL = 0x401; /* ID Data (low) */
#endif
TxCanMessage.IDH = 0; /* ID Data (high) */
TxCanMessage.DLC = 8; /* DLC Data */

3330
OUTPUT/HWBS_LEFT_SW0103.hex Normal file

File diff suppressed because it is too large Load Diff

3330
OUTPUT/HWBS_RIGHT_SW0103.hex Normal file

File diff suppressed because it is too large Load Diff