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

功能OK

Browse Source
This commit is contained in:
sunbeam 2024-06-02 21:11:27 +08:00
parent ec35c83092
commit 34149cf2b7
14 changed files with 10575 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CAN_Bootloader/main.aardio
View File

@ -3,7 +3,6 @@ import win.ui;
mainForm = win.form(text="CAN_Bootloader";right=599;bottom=465;border="dialog frame";max=false)
mainForm.add(
btnConnect={cls="button";text="连接";left=204;top=64;right=289;bottom=90;z=4};
btnDiag={cls="button";text="诊断";left=149;top=350;right=248;bottom=375;z=25};
btnFlash={cls="button";text="开始刷写";left=37;top=315;right=136;bottom=343;z=9};
btnFresh={cls="button";text="刷新";left=204;top=28;right=288;bottom=54;z=2};
btnOpen={cls="button";text="打开文件";left=37;top=282;right=136;bottom=310;z=8};
@ -16,7 +15,7 @@ btnReadSw={cls="button";text="读取软件版本号";left=37;top=382;right=136;b
btnTest={cls="button";text="停止";left=149;top=316;right=248;bottom=344;z=11};
cbbChannel={cls="combobox";left=58;top=64;right=191;bottom=90;edge=1;items={};mode="dropdown";z=3};
cbbDev={cls="combobox";left=58;top=27;right=191;bottom=53;edge=1;items={};mode="dropdown";z=1};
checkbox={cls="checkbox";text="CANFD设备";left=151;top=101;right=248;bottom=120;checked=1;z=21};
checkbox={cls="checkbox";text="CANFD设备";left=151;top=101;right=248;bottom=120;z=21};
edFile={cls="richedit";left=8;top=131;right=288;bottom=187;border=1;disabled=1;edge=1;multiline=1;wrap=1;z=14};
edFile2={cls="richedit";left=8;top=213;right=288;bottom=269;border=1;disabled=1;edge=1;multiline=1;wrap=1;z=22};
edit={cls="edit";left=294;top=19;right=596;bottom=401;autovscroll=false;edge=1;multiline=1;vscroll=1;z=5};
@ -235,13 +234,6 @@ mainForm.btnOpenFlashdrv.oncommand = function(id,event){
::PostThreadMessage(thrdId,104,0,0)//自定义消息-打开flashdriver
}
var frmChild = win.loadForm("\dlg\诊断子窗口.aardio");
frmChild.show(false);
mainForm.btnDiag.oncommand = function(id,event){
frmChild.show();
}
thrdHandle,thrdId = thread.create( CanThread )

4
CAN_Bootloader/user/CanThread.aardio
View File

@ -5,8 +5,8 @@ import win.timer;
CANHw = usb2canfd.USB2CANHW();
CANHw.LoadDll();
DiagReqID = 0x751;//0x18dadff1;
DiagRespID = 0x759;//0x18daf1df;
DiagReqID = 0x741;//0x18dadff1;
DiagRespID = 0x751;//0x18daf1df;
DiagGloableID = 0x7DF;//0x18DB33F1;
stopflag = 0;

34
ECU_APP/ECU_APP.mtpj
View File

@ -663,6 +663,13 @@
<TreeImageGuid>941832c1-fc3b-4e1b-94e8-01ea17128b42</TreeImageGuid>
<ParentItem>9acb8dfa-c536-43d2-adb6-96ad9ab90ba1</ParentItem>
</Instance>
<Instance Guid="b2948ca1-cf65-44f8-a60b-6f67f49c7190">
<Name>CRC.c</Name>
<Type>File</Type>
<RelativePath>user\CRC.c</RelativePath>
<TreeImageGuid>941832c1-fc3b-4e1b-94e8-01ea17128b42</TreeImageGuid>
<ParentItem>9acb8dfa-c536-43d2-adb6-96ad9ab90ba1</ParentItem>
</Instance>
</Class>
<Class Guid="fb98844b-2c27-4275-9804-f6e63e204da0">
<Instance Guid="fb98844b-2c27-4275-9804-f6e63e204da0">
@ -817,7 +824,9 @@
<SourceItemType39>CSource</SourceItemType39>
<SourceItemGuid40>f288e9d7-9649-4d48-a164-a4a16245dd2e</SourceItemGuid40>
<SourceItemType40>CSource</SourceItemType40>
<SourceItemCount>41</SourceItemCount>
<SourceItemGuid41>b2948ca1-cf65-44f8-a60b-6f67f49c7190</SourceItemGuid41>
<SourceItemType41>CSource</SourceItemType41>
<SourceItemCount>42</SourceItemCount>
<LastDeviceChangedCounter>5</LastDeviceChangedCounter>
</Instance>
<Instance Guid="6bb7060d-7e24-4135-bd9b-7db166417523">
@ -1337,7 +1346,7 @@ user
<HexOptionEndRecord-DefaultValue>None</HexOptionEndRecord-DefaultValue>
<HexOptionS9-DefaultValue>False</HexOptionS9-DefaultValue>
<IsLockedByUser>False</IsLockedByUser>
<TimeTagModified--0>-8585363289149754556</TimeTagModified--0>
<TimeTagModified--0>-8584845240262320122</TimeTagModified--0>
<HexOptionCheckOutputRomArea-0>False</HexOptionCheckOutputRomArea-0>
<HexOptionCrc-0>False</HexOptionCrc-0>
<HexOptionForm-0>Stype</HexOptionForm-0>
@ -1346,7 +1355,7 @@ user
<HexOptionSameLinkMessage-0>True</HexOptionSameLinkMessage-0>
<HexOptionCrcOutputAddress-0 />
<HexOptionMessage-0>False</HexOptionMessage-0>
<HexOptionOutputFolder-0>%BuildModeName%</HexOptionOutputFolder-0>
<HexOptionOutputFolder-0>OutPut</HexOptionOutputFolder-0>
<HexOptionRecordH-0>H16</HexOptionRecordH-0>
<HexOptionCrcCalculationRange-0 />
<HexOptionNoMessageErrorNumber-0 />
@ -1807,6 +1816,10 @@ user
<ItemAddTime>637917687457637381</ItemAddTime>
<ItemAddTimeCount>0</ItemAddTimeCount>
</Instance>
<Instance Guid="b2948ca1-cf65-44f8-a60b-6f67f49c7190">
<ItemAddTime>638527084942892500</ItemAddTime>
<ItemAddTimeCount>0</ItemAddTimeCount>
</Instance>
<Instance Guid="0b7e78c3-aadd-45ee-9f9d-ffac6141eeb2">
<TimeTagModified-SourceItem0--0>-8586968545862092427</TimeTagModified-SourceItem0--0>
<SourceItem0-IsLockedByUser>False</SourceItem0-IsLockedByUser>
@ -1966,6 +1979,10 @@ user
<SourceItem40-IsLockedByUser>False</SourceItem40-IsLockedByUser>
<SourceItem40-BuildingTarget-0>True</SourceItem40-BuildingTarget-0>
<SourceItem40-IndividualCompileOption-0>False</SourceItem40-IndividualCompileOption-0>
<TimeTagModified-SourceItem41--0>-8584845239911883308</TimeTagModified-SourceItem41--0>
<SourceItem41-IsLockedByUser>False</SourceItem41-IsLockedByUser>
<SourceItem41-BuildingTarget-0>True</SourceItem41-BuildingTarget-0>
<SourceItem41-IndividualCompileOption-0>False</SourceItem41-IndividualCompileOption-0>
</Instance>
<Instance Guid="e4582a76-90da-4988-9864-24db24826845">
<TimeTagModified-SourceItem14--0>-8586968545212665282</TimeTagModified-SourceItem14--0>
@ -2944,7 +2961,7 @@ user
&lt;/RTC1HZ&gt;
&lt;RXD0 Name="RXD0" Text="disable" /&gt;
&lt;ProjectName Name="PrjName" Text="ECU_APP" /&gt;
&lt;ProjectPath Name="PrjPath" Text="F:\work\HDG\CODE\ECU_APP" /&gt;
&lt;ProjectPath Name="PrjPath" Text="E:\workspace\HDG\CODE\ECU_APP" /&gt;
&lt;ProjectKind Name="PrjKind" Text="Project78K0R" /&gt;
&lt;DeviceName Name="DeviceName" Fixed="" Text="RL78F13" /&gt;
&lt;MCUName Name="MCUName" Text="RL78F13_48pin" /&gt;
@ -4183,9 +4200,10 @@ user
&lt;/FUNC&gt;
&lt;TAG&gt;
&lt;GlobleUserTag&gt;
&lt;cg_crc_area Name="cg_crc_area" Value="00" /&gt;
&lt;cg_security9 Name="cg_security9" Value="00" /&gt;
&lt;cg_security7 Name="cg_security7" Value="00" /&gt;
&lt;pior_value7 Name="pior_value7" Value="00" /&gt;
&lt;pior_value4 Name="pior_value4" Value="00" /&gt;
&lt;pior_value1 Name="pior_value1" Value="00" /&gt;
&lt;cg_security5 Name="cg_security5" Value="00" /&gt;
&lt;ocdstart Name="ocdstart" Value="1FE00" /&gt;
@ -4195,16 +4213,15 @@ user
&lt;cg_security1 Name="cg_security1" Value="00" /&gt;
&lt;wdt_option Name="wdt_option" Value="E9" /&gt;
&lt;clock_option Name="clock_option" Value="E8" /&gt;
&lt;cg_security2 Name="cg_security2" Value="00" /&gt;
&lt;cg_option Name="cg_option" Value="04" /&gt;
&lt;cg_security8 Name="cg_security8" Value="00" /&gt;
&lt;cg_security6 Name="cg_security6" Value="00" /&gt;
&lt;pior_value0 Name="pior_value0" Value="00" /&gt;
&lt;cg_security4 Name="cg_security4" Value="00" /&gt;
&lt;cg_crc_area Name="cg_crc_area" Value="00" /&gt;
&lt;cg_security2 Name="cg_security2" Value="00" /&gt;
&lt;cg_iawctl_value Name="cg_iawctl_value" Value="00" /&gt;
&lt;lvi_option Name="lvi_option" Value="33" /&gt;
&lt;pior_value4 Name="pior_value4" Value="00" /&gt;
&lt;pior_value7 Name="pior_value7" Value="00" /&gt;
&lt;/GlobleUserTag&gt;
&lt;/TAG&gt;
&lt;/DIR&gt;
@ -5039,7 +5056,6 @@ user
&lt;/RL78F13&gt;</CodeGenerator>
<FormatVersion>1.0</FormatVersion>
<ToolGUID>e0ec9d6a-1791-4da2-b198-c88f27471ae8</ToolGUID>
<CodeGeneratorItem>8d70aa2b-ba0a-4416-bbe6-cbf224b2aaea</CodeGeneratorItem>
</Instance>
</Class>
<Class Guid="6750ad11-a84e-4756-9db4-04c15ef09e7a">

14
ECU_APP/ECU_APP.rcpe
View File

@ -114,6 +114,7 @@
<Path>user\appTask.c</Path>
<Path>user\can_user.c</Path>
<Path>user\hwCtrl.c</Path>
<Path>user\CRC.c</Path>
</Category>
</Files>
<DebugOptions>
@ -165,6 +166,7 @@
<Path>DefaultBuild\appTask.obj</Path>
<Path>DefaultBuild\can_user.obj</Path>
<Path>DefaultBuild\hwCtrl.obj</Path>
<Path>DefaultBuild\CRC.obj</Path>
<Path>DataFlash\pfdl.lib</Path>
</LinkOrder>
<CommonOptions>
@ -234,7 +236,7 @@
<Option>-END</Option>
<Option>-Input=%BuildModeName%\%ProjectName%.abs</Option>
<Option>-DEVICE=%MicomToolPath%\Device\RL78\Devicefile\DR5F10BGG.DVF</Option>
<Option>-OUtput=%BuildModeName%\%ProjectName%.mot</Option>
<Option>-OUtput=OutPut\%ProjectName%.mot</Option>
<Option>-FOrm=Stype</Option>
<Option>-REcord=S3</Option>
<Option>-BYte_count=10</Option>
@ -475,7 +477,7 @@
&lt;/RTC1HZ&gt;
&lt;RXD0 Name="RXD0" Text="disable" /&gt;
&lt;ProjectName Name="PrjName" Text="ECU_APP" /&gt;
&lt;ProjectPath Name="PrjPath" Text="F:\work\HDG\CODE\ECU_APP" /&gt;
&lt;ProjectPath Name="PrjPath" Text="E:\workspace\HDG\CODE\ECU_APP" /&gt;
&lt;ProjectKind Name="PrjKind" Text="Project78K0R" /&gt;
&lt;DeviceName Name="DeviceName" Fixed="" Text="RL78F13" /&gt;
&lt;MCUName Name="MCUName" Text="RL78F13_48pin" /&gt;
@ -1714,9 +1716,10 @@
&lt;/FUNC&gt;
&lt;TAG&gt;
&lt;GlobleUserTag&gt;
&lt;cg_crc_area Name="cg_crc_area" Value="00" /&gt;
&lt;cg_security9 Name="cg_security9" Value="00" /&gt;
&lt;cg_security7 Name="cg_security7" Value="00" /&gt;
&lt;pior_value7 Name="pior_value7" Value="00" /&gt;
&lt;pior_value4 Name="pior_value4" Value="00" /&gt;
&lt;pior_value1 Name="pior_value1" Value="00" /&gt;
&lt;cg_security5 Name="cg_security5" Value="00" /&gt;
&lt;ocdstart Name="ocdstart" Value="1FE00" /&gt;
@ -1726,16 +1729,15 @@
&lt;cg_security1 Name="cg_security1" Value="00" /&gt;
&lt;wdt_option Name="wdt_option" Value="E9" /&gt;
&lt;clock_option Name="clock_option" Value="E8" /&gt;
&lt;cg_security2 Name="cg_security2" Value="00" /&gt;
&lt;cg_option Name="cg_option" Value="04" /&gt;
&lt;cg_security8 Name="cg_security8" Value="00" /&gt;
&lt;cg_security6 Name="cg_security6" Value="00" /&gt;
&lt;pior_value0 Name="pior_value0" Value="00" /&gt;
&lt;cg_security4 Name="cg_security4" Value="00" /&gt;
&lt;cg_crc_area Name="cg_crc_area" Value="00" /&gt;
&lt;cg_security2 Name="cg_security2" Value="00" /&gt;
&lt;cg_iawctl_value Name="cg_iawctl_value" Value="00" /&gt;
&lt;lvi_option Name="lvi_option" Value="33" /&gt;
&lt;pior_value4 Name="pior_value4" Value="00" /&gt;
&lt;pior_value7 Name="pior_value7" Value="00" /&gt;
&lt;/GlobleUserTag&gt;
&lt;/TAG&gt;
&lt;/DIR&gt;

6216
ECU_APP/ECU_APP.sunbeam.mtud
View File

File diff suppressed because one or more lines are too long

4105
ECU_APP/OutPut/ECU_APP.S19 Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -1,113 +1,19 @@
QualityReport
2024年5月26日 11:12:21
2024年6月2日 21:06:33
------ Start build(ECU_APP, DefaultBuild) ------
C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.11.00\Bin\ccrl.exe r_cg_timer_user.c user\can_user.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
r_cg_timer_user.c(142):W0520167:Argument of type "uint16_t __near *" is incompatible with parameter of type "unsigned int *__near"
user\can_user.c(81):W0520177:Variable "i" was declared but never referenced
user\can_user.c(82):W0520177:Variable "temp" was declared but never referenced
user\can_user.c(97):W0520550:Variable "re_flag" was set but never used
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 52 days. After that, link size limit (64 Kbyte) will be applied. Please consider purchasing the product.
RAMDATA SECTION: 00000bd5 Byte(s)
ROMDATA SECTION: 000006e9 Byte(s)
PROGRAM SECTION: 00004dc0 Byte(s)
W0561016:The evaluation version of CC-RL V1 is valid for the remaining 52 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 52 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:7)(ECU_APP, DefaultBuild) ------
--- CommandFile 1 ---
DefaultBuild\ECU_APP.clnk :
-Input=DefaultBuild\cstart.obj
-Input=DefaultBuild\stkinit.obj
-Input=DefaultBuild\r_pfdl.obj
-Input=DefaultBuild\RL78_RCAN.obj
-Input=DefaultBuild\r_rl78_can_drv.obj
-Input=DefaultBuild\r_rl78_can_irq.obj
-Input=DefaultBuild\r_systeminit.obj
-Input=DefaultBuild\r_main.obj
-Input=DefaultBuild\r_cg_wdt_user.obj
-Input=DefaultBuild\r_cg_wdt.obj
-Input=DefaultBuild\r_cg_timer_user.obj
-Input=DefaultBuild\r_cg_timer.obj
-Input=DefaultBuild\r_cg_port_user.obj
-Input=DefaultBuild\r_cg_port.obj
-Input=DefaultBuild\r_cg_cgc_user.obj
-Input=DefaultBuild\r_cg_cgc.obj
-Input=DefaultBuild\r_cg_adc_user.obj
-Input=DefaultBuild\r_cg_adc.obj
-Input=DefaultBuild\VectorTable.obj
-Input=DefaultBuild\CanNw.obj
-Input=DefaultBuild\CanNwConfig.obj
-Input=DefaultBuild\Dcm_App.obj
-Input=DefaultBuild\Dcm_App_Cfg.obj
-Input=DefaultBuild\Dcm_Cfg.obj
-Input=DefaultBuild\Dcm_DID.obj
-Input=DefaultBuild\Dcm_DID_Cfg.obj
-Input=DefaultBuild\Dcm_Key.obj
-Input=DefaultBuild\extern.obj
-Input=DefaultBuild\CanIf.obj
-Input=DefaultBuild\CanIf_Cfg.obj
-Input=DefaultBuild\CanTp_Cfg.obj
-Input=DefaultBuild\CanTrcv.obj
-Input=DefaultBuild\CanTrcv_Cfg.obj
-Input=DefaultBuild\DCM_DTC.obj
-Input=DefaultBuild\Dcm.obj
-Input=DefaultBuild\CanTp.obj
-Input=DefaultBuild\appTask.obj
-Input=DefaultBuild\can_user.obj
-Input=DefaultBuild\hwCtrl.obj
-Input=DefaultBuild\CRC.obj
-LIBrary=DataFlash\pfdl.lib
-SECURITY_ID=00000000000000000000
-DEVICE=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10BGG.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
-OCDBG=04
-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
-ROm=.data=.dataR
-ROm=.sdata=.sdataR
-Message
-Total_size
-NOLOgo
-end
-Input=DefaultBuild\ECU_APP.abs
-DEVICE=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10BGG.DVF
-OUtput=DefaultBuild\ECU_APP.mot
-FOrm=Stype
-REcord=S3
-BYte_count=10
-Message
-end
-Input=DefaultBuild\ECU_APP.abs
-DEVICE=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10BGG.DVF
-OUtput=output\ECU_APP.S19= A000-19FFF
-FOrm=Stype
-REcord=S3
-SPace=FF
-BYte_count=10
-Message
-exit
------ Build ended(Error:0, Warning:0)(ECU_APP, DefaultBuild) ------
--- SHA1 hash value of output files ---
F:\work\HDG\CODE\ECU_APP\DefaultBuild\ECU_APP.abs: e3ae779b5924815a7f523acfbe117297ce32f801
F:\work\HDG\CODE\ECU_APP\DefaultBuild\ECU_APP.mot: fe185c143cd779b68782addbb634d8e451e8c500
F:\work\HDG\CODE\ECU_APP\output\ECU_APP.S19: ed65f0757dd43adc316e865d804edc8dd1054cdd
E:\workspace\HDG\CODE\ECU_APP\DefaultBuild\ECU_APP.abs: 00e1f724d7f8ed0b1ff4d11785625afc491f8dd9
E:\workspace\HDG\CODE\ECU_APP\OutPut\ECU_APP.mot: 5fa76ca34d7eeb75831acea1a85ae776cae8c0ce
E:\workspace\HDG\CODE\ECU_APP\output\ECU_APP.S19: c775bac146a41f0760842ae719f4b465fc8e674d
--- System Information ---
*OS Version
Microsoft Windows 10 企业版 LTSC (-, 10.0.19044, WOW64)
Microsoft Windows 10 企业版 LTSC (-, 10.0.17763, WOW64)
*Language
中文(中国)
*.NET Framework Version
@ -130,13 +36,13 @@ F:\work\HDG\CODE\ECU_APP\output\ECU_APP.S19: ed65f0757dd43adc316e865d804edc8dd10
C:\Program Files (x86)\Renesas Electronics\CS+\CC
*Memory Usage
*Private Working Set
269 MB
294 MB
*Number of GDI Objects
2098
2221
*Number of USER Objects
936
1131
*Opened Files
1 editors, 1 files, 11 KB
5 editors, 5 files, 60 KB
--- Build Tool Plug-in Information ---
RH850 Build tool CC-RH Plug-in
@ -265,7 +171,7 @@ Device Information Common Interface
DeviceInformation.dll
--- Main Project Information ---
F:\work\HDG\CODE\ECU_APP\ECU_APP.mtpj
E:\workspace\HDG\CODE\ECU_APP\ECU_APP.mtpj
Microcontroller Information
*R5F10BGG
*File Name: Version

11
ECU_APP/diagnose/Dcm_DID_Cfg.c
View File

@ -1,4 +1,4 @@
/* @处根据实际情况填写相关信息，将@字符以及这条提示语句去掉 */
/* @处根据实际情况填写相关信息，将@字符以及这条提示语句去掉 */
/******************************************************************************
| File Name : @文件名
| Description: @文件描述
@ -175,7 +175,8 @@ uint8 GetRTE_Dcm_DidServices_0xF197_ReadData(uint8* data)
*****************************************************************************/
uint8 GetRTE_Dcm_DidServices_0xF180_ReadData(uint8* data)
{
__far uint8 *p = DID_F180_ADDR;
__far uint8 *p;
p = (__far uint8 *)DID_F180_ADDR;
(void)data;
data[0] = *p++;
data[1] = *p++;
@ -310,7 +311,7 @@ uint8 GetRTE_Dcm_DidServices_0xF18B_ReadData(uint8* data)
uint8 GetRTE_Dcm_DidServices_0xF190_ReadData(uint8* data)
{
(void *)data;
//(void *)data;
if(0 == DF_Read(data,GetIndexNumber(INDEX_0xF190),17)) //R_FDL_OK
return DCM_CHECK_OK;
@ -341,7 +342,7 @@ uint8 GetRTE_Dcm_DidServices_0xF192_ReadData(uint8* data)
uint8 GetRTE_Dcm_DidServices_0xF193_ReadData(uint8* data)
{
__far uint8 *p = DID_F193_ADDR;
__far uint8 *p = (__far uint8 *)DID_F193_ADDR;
(void)data;
*data++ = *p++;
*data++ = *p++;
@ -373,7 +374,7 @@ uint8 GetRTE_Dcm_DidServices_0xF195_ReadData(uint8* data)
uint8 GetRTE_Dcm_DidServices_0xF198_ReadData(uint8* data)
{
(void *)data;
//(void *)data;
if(0 == DF_Read(data,GetIndexNumber(INDEX_0xF198),16)) //R_FDL_OK
return DCM_CHECK_OK;
else

17
ECU_APP/diagnose/extern.c
View File

@ -1,4 +1,4 @@
#include "extern.h"
#include "extern.h"
#include "hwCtrl.h"
#include "PINdef.h"
@ -101,6 +101,7 @@ unsigned char GetVoltage(unsigned char ch)
// return 0;
// break;
// }
return 0;
}
/************************************************************************************/
@ -129,6 +130,7 @@ unsigned char GetMotorLockStatus(unsigned char motor)
// return 0;
// break;
// }
return 0;
}
/************************************************************************************/
@ -175,7 +177,7 @@ unsigned char GetIoParameter(unsigned char p)
break;
default:
return 0;
break;
}
return (io_parameter[p].data);
}
@ -316,19 +318,19 @@ unsigned char DF_Read(unsigned char* read_buf,unsigned char data_num,unsigned ch
case 1:
ReadFlashData(read_buf,0x000F1000+0x400,len);
return 0;
break;
case 2:
ReadFlashData(read_buf,0x000F1000+0x420,len);
return 0;
break;
case 3:
ReadFlashData(read_buf,0x000F1000+0x430,len);
return 0;
break;
case 4:
ReadFlashData(read_buf,0x000F1000+0x438,len);
return 0;
break;
default:
break;
@ -499,6 +501,7 @@ unsigned char GetCanBusOffErr(void)
// return 0;
// else
// return 1;
return 0;
}
/******************************/
//获取BCM节点丢失状态
@ -517,6 +520,7 @@ unsigned char GetBcmCommFault(void)
// BCM=0;
// return 1;
// }
return 0;
}
/******************************/
//获取ACP节点丢失状态
@ -534,6 +538,7 @@ unsigned char GetAcpCommFault(void)
// ACP=0;
// return 1;
// }
return 0;
}
/******************************/

37
ECU_APP/r_main.c
View File

@ -43,6 +43,7 @@ Includes
#include "extern.h"
#include "PINdef.h"
#include "hwCtrl.h"
#include "r_cg_wdt.h"
/* End user code. Do not edit comment generated here */
#include "r_cg_userdefine.h"
@ -74,41 +75,12 @@ void main(void)
{
R_MAIN_UserInit();
/* Start user code. Do not edit comment generated here */
//ADCE = 1U; //ADM0寄存器，1时允许A/D电压比较器的运行
/*
POWER_UP_DELAY_CNT=POWER_UP_DELAY_TIME; //压缩机和鼓风机的启动延时
POWER_UP_STATUS=1;
EEL_READ(); //读取数据闪存
R_TAU0_Channel0_Start();
R_TAU0_Channel2_Start();
TB9102_Enable=1;
TB9102_MODE=1;
RecFreSetOld=0xff; //初始化循环电机的旧<E79A84>?
ModeSetOld=0xff;
TempSetOld=0xff;
Can_Msg_Change_1(); //can信息初始<E5889D>?
*/
/*
R_TAU0_Channel0_Start();//timer
C0CTRH &= ~0x0300; // 设置正常模式
TransmitCAN_Message(0x7FB,8,KamData.RspData); //诊断信息发<E681AF>?
C0CTRH &= ~0x0300; // 设置正常模式
*/
if(KamData.AckReq == ACK_REQ)
{
//FlgTemp = 1;
C0CTRH &= ~0x0300; // 设置正常模式
TransmitCAN_Message(CANTP_RESP_CANID,8,KamData.RspData); //诊断信息发<EFBFBD>?
TransmitCAN_Message(CANTP_RESP_CANID,8,KamData.RspData); //诊断信息发送
}
value_init();
while (1U)
@ -159,10 +131,7 @@ void CAN_Pin_init(void)
PM1_bit.no1 = 1;
}
void test()
{
}
/***********************************************************************************************************************
* Function Name: Vectors_Isr_DefaultHandler

180
ECU_APP/user/appTask.c
View File

@ -1,8 +1,9 @@
#include "appTask.h"
#include "appTask.h"
#include "iodefine.h"
#include "extern.h"
#include "r_cg_adc.h"
#include "r_cg_intc.h"
#include "r_cg_timer.h"
#include "PINdef.h"
#include "hwCtrl.h"
#include "crc.h"
@ -39,8 +40,14 @@ unsigned char BusoffFlag;
uint16_t VehicleSpeedRaw,VehicleSpeed;
uint8_t nouse;//Relocation value is odd number
uint8_t lock_state,lkey_state;
static uint8_t lh_state,fnr_state;
void IND_task(void);
void HD_task(void);
void Apply_task(void)
{
@ -73,7 +80,7 @@ void Apply_task(void)
{
Timer_5ms_flag = 0;
CAN_RX_Data_Handle();
HD_task();
// IGN_Detect();
}
@ -98,12 +105,152 @@ void Apply_task(void)
Timer_50ms_flag = 0;
BL_Ctrl(1);
//TxTestMsg();
IND_task();
//SleepDetect();//TODO
}
}
extern uint8 txbuf1[8];
void HD_task(void)//5ms
{
uint16_t adval = getAdval(ADCH_HALL);
static uint8_t fnr_step = 0, lh_step = 0;
static uint16_t fnr_counter[3] = {0};
uint8_t db_pos = 0;
txbuf1[0] = lock_state;
txbuf1[1] = lkey_state;
txbuf1[3] = adval & 0xff;
txbuf1[2] = adval >> 8;
txbuf1[4] = lh_state;
txbuf1[5] = fnr_state;
if (adval>50 && adval<=165)
{
db_pos = 1;
}
else if (adval>165 && adval<=250)
{
db_pos = 2;
}
else if (adval>250 && adval<=350)
{
db_pos = 3;
}
else if (adval>350 && adval<=460)
{
db_pos = 4;
}
else if (adval>460 && adval<=560)
{
db_pos = 5;
}
txbuf1[6] = db_pos;
txbuf1[7] = (lh_step<<4) | (fnr_step);
if (lock_state == 1)
{
lh_step = 0;
fnr_step = 0;
}
switch (lh_step)
{
case 0:
if (lock_state == 0)
{
lh_step = 1;
lkey_state = 0;
}
break;
case 1:
if (lkey_state == 1)
{
if (lh_state == LH_STATE_L)
{
lh_state = LH_STATE_H;
}
else
{
lh_state = LH_STATE_L;
}
lh_step = 2;
}
case 2:
default:
break;
}
switch (fnr_step)
{
case 0:
if (lock_state == 0 && adval<350 && adval>250)
{
fnr_step = 1;
fnr_counter[0] = 0;
fnr_counter[1] = 0;
fnr_counter[2] = 0;
}
break;
case 1:
if(lock_state == 1)
{
fnr_step = 0;
break;
}
if (adval>=350 && adval<=460)
{
fnr_counter[FNR_STATE_N]++;
if (fnr_counter[FNR_STATE_N]>=100)
{
fnr_state = FNR_STATE_N;
fnr_step = 2;
}
fnr_counter[FNR_STATE_F] = 0;
fnr_counter[FNR_STATE_R] = 0;
}
else if (adval>460 && adval<=560)
{
fnr_counter[FNR_STATE_R]++;
if (fnr_counter[FNR_STATE_R]>=20)
{
fnr_state = FNR_STATE_R;
fnr_step = 2;
}
fnr_counter[FNR_STATE_N] = 0;
fnr_counter[FNR_STATE_F] = 0;
}
else if (adval>50 && adval<=165)
{
fnr_counter[FNR_STATE_F]++;
if (fnr_counter[FNR_STATE_F]>=20)
{
fnr_state = FNR_STATE_F;
fnr_step = 2;
}
fnr_counter[FNR_STATE_N] = 0;
fnr_counter[FNR_STATE_R] = 0;
}
else if (adval>165 && adval<=250)
{
fnr_counter[FNR_STATE_N]++;
if (fnr_counter[FNR_STATE_N]>=100)
{
fnr_state = FNR_STATE_N;
fnr_step = 2;
}
fnr_counter[FNR_STATE_F] = 0;
fnr_counter[FNR_STATE_R] = 0;
}
break;
case 2:
break;
default:
fnr_step = 0;
break;
}
}
void IND_task(void)
{
IND_Ctrl(fnr_state,lh_state);
}
@ -112,11 +259,20 @@ void KeyPro(void)
//按下
if (getKeyPressFlag(SIGID_SW_LOCK_IN) == KEY_PRESSED)
{
lock_state = 0;
}
if (getKeyPressFlag(SIGID_SW_L_IN) == KEY_PRESSED)
{
lkey_state = 1;
}
if (getKeyReleaseFlag(SIGID_SW_LOCK_IN) == KEY_PRESSED)
{
lock_state = 1;
}
if (getKeyReleaseFlag(SIGID_SW_L_IN) == KEY_PRESSED)
{
lkey_state = 0;
}
}
@ -124,11 +280,11 @@ void KeyPro(void)
void Can_Msg_Change(void)
{
//CAN_45A.Msg_Part.SCM_PsngrSeatBeltWarnSts = sbrWarnState;
CAN_188.Msg_Part.SL_Fswitch = 0;
CAN_188.Msg_Part.SL_Hswitch = 0;
CAN_188.Msg_Part.SL_Lswitch = 0;
CAN_188.Msg_Part.SL_Nswitch = 0;
CAN_188.Msg_Part.SL_Rswitch = 0;
CAN_188.Msg_Part.SL_Fswitch = (fnr_state == FNR_STATE_F)?1:0;
CAN_188.Msg_Part.SL_Hswitch = (lh_state == LH_STATE_H)?1:0;
CAN_188.Msg_Part.SL_Lswitch = (lh_state == LH_STATE_L)?1:0;
CAN_188.Msg_Part.SL_Nswitch = (fnr_state == FNR_STATE_N)?1:0;
CAN_188.Msg_Part.SL_Rswitch = (fnr_state == FNR_STATE_R)?1:0;
CAN_188.Msg_Part.err1 = 0;
CAN_188.Msg_Part.err2 = 0;
CAN_188.Msg_Part.err3 = 0;
@ -366,6 +522,10 @@ void value_init(void)
CAN_LostCount = 500;
BusOff_Detect_delay_count = 2000;
ucIgnStus = IGN_OFF;
lock_state = 1;
lkey_state = 0;
fnr_state = FNR_STATE_N;
lh_state = LH_STATE_H;
}
void CAN_RX_Data_Handle(void)
{

17
ECU_APP/user/can_user.c
View File

@ -1,4 +1,4 @@
#include "r_cg_macrodriver.h"
#include "r_cg_macrodriver.h"
#include "r_cg_userdefine.h"
#include "r_rl78_can_sfr.h"
#include "r_rl78_can_drv.h"
@ -75,26 +75,26 @@ void CAN_TX_MESSAGE_INIT(void)
}
//extern uint8_t flagOverCurrentKB,flagOverCurrentZY;
uint8 txbuf1[8],txbuf2[8],txbuf3[8];
uint8 txbuf1[8]={0},txbuf2[8],txbuf3[8];
void TxTestMsg(void)
{
uint8 i;
uint16_t temp;
//uint8 i;
//uint16_t temp;
if ((App28sTxRxStatus & DCM28S_MASK_TX_DISABLE) == 0)
{
return;
}
txbuf1[0] = 0xff;
//txbuf1[0] = 0xff;
TransmitCAN_Message(0x336,8,txbuf1);
TransmitCAN_Message(0x333,8,txbuf1);
}
void TxServe(void)
{
Can_RtnType re_flag;
//Can_RtnType re_flag;
static unsigned char sucNwSendCnt = 0;
////////////////////////////////////////////////////////////////////////
@ -142,7 +142,8 @@ void TxServe(void)
{
Can_Msg_Change_Bcm();
re_flag = R_CAN_TrmByTRFIFO0_CH0(&TxCanMessage);
//re_flag = R_CAN_TrmByTRFIFO0_CH0(&TxCanMessage);
R_CAN_TrmByTRFIFO0_CH0(&TxCanMessage);
rolling++;
if (rolling > 0x0F)
{

44
ECU_APP/user/hwCtrl.c
View File

@ -132,44 +132,23 @@ void BL_Ctrl(uint8_t bl_state)
}
void IND_Ctrl(uint8_t ind_state)
void IND_Ctrl(uint8_t fnr_state,uint8_t lh_state)
{
switch (ind_state)
O_IND_CTRL = 1;
switch (fnr_state)
{
case 0:
O_IND_CTRL = 0;
O_IND1_CTRL = 0;
O_IND2_CTRL = 0;
O_IND3_CTRL = 0;
O_IND4_CTRL = 0;
break;
case 1:
O_IND_CTRL = 1;
O_IND1_CTRL = 1;
O_IND2_CTRL = 0;
O_IND3_CTRL = 0;
O_IND4_CTRL = 0;
break;
case 2:
O_IND_CTRL = 1;
O_IND1_CTRL = 0;
case FNR_STATE_F:
O_IND2_CTRL = 1;
O_IND3_CTRL = 0;
O_IND4_CTRL = 0;
break;
case 3:
O_IND_CTRL = 1;
O_IND1_CTRL = 0;
case FNR_STATE_N:
O_IND2_CTRL = 0;
O_IND3_CTRL = 1;
O_IND4_CTRL = 0;
break;
case 4:
O_IND_CTRL = 1;
O_IND1_CTRL = 0;
case FNR_STATE_R:
O_IND2_CTRL = 0;
O_IND3_CTRL = 0;
O_IND4_CTRL = 1;
@ -177,6 +156,15 @@ void IND_Ctrl(uint8_t ind_state)
default:
break;
}
if (lh_state == LH_STATE_L)
{
O_IND1_CTRL = 1;
}
else
{
O_IND1_CTRL = 0;
}
}

8
ECU_APP/user/hwCtrl.h
View File

@ -9,6 +9,12 @@
#define KEY_PRESSED 1
#define KEY_NOPRESSED 0
#define LH_STATE_L 0
#define LH_STATE_H 1
#define FNR_STATE_N 0
#define FNR_STATE_F 1
#define FNR_STATE_R 2
uint8_t GetKeyState(uint8_t keyno);
@ -22,6 +28,6 @@ uint8_t getKeyReleaseFlag(uint8_t id);
uint8_t getKeyPressFlag(uint8_t id);
void getInputStatus(unsigned char* data);
void BL_Ctrl(uint8_t bl_state);
void IND_Ctrl(uint8_t ind_state);
void IND_Ctrl(uint8_t fnr_state,uint8_t lh_state);
#endif