Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
WZ-DG01-01
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
WZ
WZ-DG01-01
Commits
bcda9604
Commit
bcda9604
authored
Feb 06, 2025
by
崔立宝
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
变更项,增加水温指示回差
parent
b0a6b066
Changes
14
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
520 additions
and
490 deletions
+520
-490
API_CAN.c
Api_Sources/API_CAN.c
+1
-1
API_Device_Init.c
Api_Sources/API_Device_Init.c
+3
-0
APP_CAN.c
Api_Sources/APP_CAN.c
+3
-0
APP_Data_Process.c
Api_Sources/APP_Data_Process.c
+48
-30
Globals_Var.h
App_Headers/Globals_Var.h
+1
-0
main.c
Sources/main.c
+3
-0
TBDML.ini
TBDML.ini
+22
-22
WZ24v--DG01.mcp
WZ24v--DG01.mcp
+14
-14
WZ-DG01-01_S0.02_250206.s19
s19/WZ-DG01-01_S0.02_250206.s19
+422
-421
文件释放说明.txt
s19/文件释放说明.txt
+3
-2
DG01-01-软件变更记录 - 20231218.xlsx
utility/DG01-01-软件变更记录 - 20231218.xlsx
+0
-0
DG01-01-软件自测报告-20231218.xlsx
utility/DG01-01-软件自测报告-20231218.xlsx
+0
-0
五征DG01-01-软件变更记录.xlsx
utility/五征DG01-01-软件变更记录.xlsx
+0
-0
五征DG01-01-软件自测报告.xlsx
utility/五征DG01-01-软件自测报告.xlsx
+0
-0
No files found.
Api_Sources/API_CAN.c
View file @
bcda9604
...
...
@@ -688,7 +688,7 @@ interrupt void Api_CAN_Rev_isr(void)
// CanMsgFEEE.Data[6].bbyte = CANRXDSR6;
// CanMsgFEEE.Data[7].bbyte = CANRXDSR7;
CanClk
.
Signal
.
ExistFEEE
=
Enable
;
CanClk
.
IDFEEECn
=
20
;
CanClk
.
IDFEEECn
=
50
;
//
20;
bFEEEFlag
=
1
;
}
}
...
...
Api_Sources/API_Device_Init.c
View file @
bcda9604
...
...
@@ -191,6 +191,9 @@ void Api_InitParamer(void)
TempMeter
.
CurPosition
=
null
;
TempMeter
.
DestPosition
=
null
;
TempMeter
.
CalTime
=
null
;
TempMeter_CurBoardVal
=
null
;
TempMeter_CurBoardVal_Old
=
null
;
TempMeter_DelayTime
=
null
;
CurRevCnt
.
dw32
=
null
;
OldRevCnt
.
dw32
=
null
;
...
...
Api_Sources/APP_CAN.c
View file @
bcda9604
...
...
@@ -121,6 +121,9 @@ void App_CheckCanDrop(void)
{
bFEEEFlag
=
0
;
TempMeter
.
CurBoardVal
=
0
;
TempMeter_CurBoardVal
=
0
;
TempMeter_CurBoardVal_Old
=
0
;
TempMeter_DelayTime
=
0
;
CanClk
.
Signal
.
ExistFEEE
=
Disable
;
}
if
(
CanClk
.
IDFEEECn
>
null
)
...
...
Api_Sources/APP_Data_Process.c
View file @
bcda9604
...
...
@@ -446,40 +446,58 @@ void far App_CalFuelBoard(void)
--------------------------------------------------------------------------*/
void
far
App_CalTmpBoard
(
void
)
{
if
(
TempShowFlag
==
1
)
{
if
(
Tempnum
<
3
)
{
Tempnum
++
;
}
else
{
TempShowFlag
=
0
;
}
TempSpeed
=
10
;
INT8U
temp
=
0
;
if
(
TempShowFlag
==
1
)
{
if
(
Tempnum
<
3
)
{
Tempnum
++
;
}
else
{
TempShowFlag
=
0
;
}
else
if
(
bFEEEFlag
==
0
)
{
TempSpeed
=
10
;
}
else
TempSpeed
=
10
;
}
else
if
(
bFEEEFlag
==
0
)
{
TempSpeed
=
10
;
}
else
{
TempSpeed
=
170
;
}
if
(
TempMeter
.
CurBoardVal
!=
TempMeter_CurBoardVal_Old
)
{
TempMeter_DelayTime
=
0
;
TempMeter_CurBoardVal_Old
=
TempMeter
.
CurBoardVal
;
}
else
{
if
(
TempMeter_DelayTime
>=
T_2s
)
{
TempSpeed
=
170
;
if
(
TempMeter
.
CurBoardVal
>
TempMeter_CurBoardVal
)
{
temp
=
TempMeter
.
CurBoardVal
-
TempMeter_CurBoardVal
;
}
else
{
temp
=
TempMeter_CurBoardVal
-
TempMeter
.
CurBoardVal
;
}
if
(
temp
>=
2
)
{
TempMeter_CurBoardVal
=
TempMeter
.
CurBoardVal
;
}
}
if
(
TempMeter
.
CurBoardVal
!=
TempMeter_CurBoardVal
)
{
TempMeter_DelayTime
=
0
;
TempMeter_CurBoardVal
=
TempMeter
.
CurBoardVal
;
}
if
(
TempMeter_DelayTime
==
T_2s
)
{
TempMeter
.
DestPosition
=
App_CalMicroStep
((
INT32U
)
TempMeter
.
CurBoardVal
,(
EE_MeterType
*
)
&
TempMeterParamer
);
}
}
FuelTime
=
0
;
TempMeter
.
DestPosition
=
App_CalMicroStep
((
INT32U
)
TempMeter_CurBoardVal
,
(
EE_MeterType
*
)
&
TempMeterParamer
);
FuelTime
=
0
;
}
/*-------------------------------------------------------------------------
...
...
App_Headers/Globals_Var.h
View file @
bcda9604
...
...
@@ -271,6 +271,7 @@
EXTERN_VAR
volatile
INT8U
ClearOdoCanOut
;
EXTERN_VAR
volatile
INT8U
ClearOdoCanOutCn
;
EXTERN_VAR
volatile
INT16U
TempMeter_CurBoardVal_Old
;
EXTERN_VAR
volatile
INT16U
TempMeter_CurBoardVal
;
EXTERN_VAR
volatile
INT16U
TempMeter_DelayTime
;
//
...
...
Sources/main.c
View file @
bcda9604
...
...
@@ -9,6 +9,9 @@
//20231115 变更:增加远程报文清零功能(接收清零报文0x5F2,发送清零状态报文0x49E)
//20231116 修改IGNON、IGNOFF门槛值,由16.6V改为6.5V
//20231208 修改清零外发不是30帧和清零后里程继续累加及需发12帧清零指令才清零禅道问题
//V0.02
//20250110 变更,水温变动,延时2秒
//20250205 增加回差
INT8U
Read_OUT_2000km_Clear
(
void
)
{
...
...
TBDML.ini
View file @
bcda9604
...
...
@@ -10,7 +10,7 @@ Target=TBDML
Layout
=
C_layout.hwl
LoadDialogOptions
=
AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
CPU
=
HC12
MainFrame
=
2,3,-
32000,-32000
,-1,-1,2328,134,3180,909
MainFrame
=
2,3,-
1,-1
,-1,-1,2328,134,3180,909
TOOLBAR
=
57600 57601 32795 0 57635 57634 57637 0 57671 57669 0 32777 32776 32782 32780 32781 32778 0 32806
AEFWarningDialog
=
FALSE
Configuration
=
TBDML.hwc
...
...
@@ -138,11 +138,11 @@ File3=
[Recent Applications File List]
File0
=
H:
\五
征
\五
征DG01
\变
更241
008
\变
更后代码
\3
-程序源码
\b
in
\W
Z-DG
01
File1
=
H:
\五
征
DG01
\变
更
\0
3-程序源码
\源
码
\b
in
\P
roject.abs
File2
=
E:
\E
dge下载
\五
征DG01_充电指示灯_20231005.s19
File3
=
H:
\五
征DG01
\D
G01_16C22_20230314
.s19
LoadFlags0
=
AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
File0
=
H:
\五
征
\五
征DG01
\变
更241
125
\变
更后代码
\3
-程序源码
\b
in
\W
Z-DG01-
01
File1
=
H:
\五
征
\五
征DG01
\变
更241008
\变
更后代码
\3
-程序源码
\b
in
\W
Z-DG01
File2
=
H:
\五
征DG01
\变
更
\0
3-程序源码
\源
码
\b
in
\P
roject.abs
File3
=
E:
\E
dge下载
\五
征DG01_充电指示灯_20231005
.s19
LoadFlags0
=
AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags1
=
AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags2
=
AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags3
=
AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
...
...
@@ -155,19 +155,19 @@ TARGET_FREQUENCY=16000000
[Recent HI-WAVE FindProcedure Search]
Search0
=
bsp_CANSendStdFrame
Search1
=
App_SendCANMsg
Search2
=
GUI_CheckKeyProc
Search3
=
App_
ReadAccKm
Search4
=
App_CalAccKm
Search5
=
GUI_BeepOut
Search6
=
Ap
i_CAN_Rev_isr
Search7
=
main
Search8
=
GUI_LedNormalDisplay
Search9
=
App_CheckCanDrop
Search10
=
GUI_ZAQD_QDDPRG
Search11
=
Api_InitParamer
Search12
=
Ap
p_CalFuelBoard
Search13
=
App_Cal
Veh
Board
Search14
=
Gui_Icon
Search15
=
QY1_Disp
Search0
=
App_CalTmpBoard
Search1
=
main
Search2
=
bsp_CANSendStdFrame
Search3
=
App_
SendCANMsg
Search4
=
GUI_CheckKeyProc
Search5
=
App_ReadAccKm
Search6
=
Ap
p_CalAccKm
Search7
=
GUI_BeepOut
Search8
=
Api_CAN_Rev_isr
Search9
=
GUI_LedNormalDisplay
Search10
=
App_CheckCanDrop
Search11
=
GUI_ZAQD_QDDPRG
Search12
=
Ap
i_InitParamer
Search13
=
App_Cal
Fuel
Board
Search14
=
App_CalVehBoard
Search15
=
Gui_Icon
WZ24v--DG01.mcp
View file @
bcda9604
...
...
@@ -660,7 +660,7 @@
<SETTING><NAME>
Options
</NAME><VALUE></VALUE></SETTING>
<SETTING><NAME>
LinkParameterFilename
</NAME><VALUE>
out.prm
</VALUE></SETTING>
<SETTING><NAME>
EchoCommandLine
</NAME><VALUE>
0
</VALUE></SETTING>
<SETTING><NAME>
OutputFilename
</NAME><VALUE>
WZ-DG01
</VALUE></SETTING>
<SETTING><NAME>
OutputFilename
</NAME><VALUE>
WZ-DG01
-01
</VALUE></SETTING>
<SETTING><NAME>
UseTemplate
</NAME><VALUE>
2
</VALUE></SETTING>
<SETTING><NAME>
PrmTemplateName
</NAME><VALUE>
mc9s12hy32.prm
</VALUE></SETTING>
<SETTING><NAME>
RunPreprocessor
</NAME><VALUE>
0
</VALUE></SETTING>
...
...
@@ -854,13 +854,6 @@
<FILEKIND>
Unknown
</FILEKIND>
<FILEFLAGS>
Debug
</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>
Name
</PATHTYPE>
<PATH>
Project.map
</PATH>
<PATHFORMAT>
Windows
</PATHFORMAT>
<FILEKIND>
Text
</FILEKIND>
<FILEFLAGS>
Debug
</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>
Name
</PATHTYPE>
<PATH>
API_AT24C04.c
</PATH>
...
...
@@ -1162,6 +1155,13 @@
<FILEKIND>
Text
</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>
Name
</PATHTYPE>
<PATH>
WZ-DG01-01.map
</PATH>
<PATHFORMAT>
Windows
</PATHFORMAT>
<FILEKIND>
Text
</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
</FILELIST>
<LINKORDER>
<FILEREF>
...
...
@@ -1194,11 +1194,6 @@
<PATH>
ansisi.lib
</PATH>
<PATHFORMAT>
Windows
</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>
Name
</PATHTYPE>
<PATH>
Project.map
</PATH>
<PATHFORMAT>
Windows
</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>
Name
</PATHTYPE>
<PATH>
API_AT24C04.c
</PATH>
...
...
@@ -1414,6 +1409,11 @@
<PATH>
API_16C23.h
</PATH>
<PATHFORMAT>
Windows
</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>
Name
</PATHTYPE>
<PATH>
WZ-DG01-01.map
</PATH>
<PATHFORMAT>
Windows
</PATHFORMAT>
</FILEREF>
</LINKORDER>
</TARGET>
</TARGETLIST>
...
...
@@ -1716,7 +1716,7 @@
<FILEREF>
<TARGETNAME>
Standard
</TARGETNAME>
<PATHTYPE>
Name
</PATHTYPE>
<PATH>
Project
.map
</PATH>
<PATH>
WZ-DG01-01
.map
</PATH>
<PATHFORMAT>
Windows
</PATHFORMAT>
</FILEREF>
</GROUP>
...
...
s19/WZ-DG01-01_S0.02_250
110
.s19
→
s19/WZ-DG01-01_S0.02_250
206
.s19
View file @
bcda9604
This diff is collapsed.
Click to expand it.
s19/文件释放说明.txt
View file @
bcda9604
无boot,无升级文件
工程文件:WZ-DG01-01_S0.02_250110.s19
工程文件:WZ-DG01-01_S0.02_250206.s19
升级文件:无
\ No newline at end of file
utility/DG01-01-软件变更记录 - 20231218.xlsx
deleted
100644 → 0
View file @
b0a6b066
File deleted
utility/DG01-01-软件自测报告-20231218.xlsx
deleted
100644 → 0
View file @
b0a6b066
File deleted
utility/五征DG01-01-软件变更记录.xlsx
View file @
bcda9604
No preview for this file type
utility/五征DG01-01-软件自测报告.xlsx
View file @
bcda9604
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment