Skip to content

W
WZ-DG01-01
Commit 39bfc54d authored by 王金山's avatar 王金山
Browse files
Options

Merge branch 'dev-1' into 'dev' 

变更项，增加水温指示回差

See merge request !6
parents a378dacd bcda9604
Expand all Show whitespace changes
Inline Side-by-side
Showing with 520 additions and 490 deletions
Api_Sources/API_CAN.c
View file @ 39bfc54d
...@@ -688,7 +688,7 @@ interrupt void Api_CAN_Rev_isr(void) ...@@ -688,7 +688,7 @@ interrupt void Api_CAN_Rev_isr(void)
// CanMsgFEEE.Data[6].bbyte = CANRXDSR6; // CanMsgFEEE.Data[6].bbyte = CANRXDSR6;
// CanMsgFEEE.Data[7].bbyte = CANRXDSR7; // CanMsgFEEE.Data[7].bbyte = CANRXDSR7;
CanClk.Signal.ExistFEEE = Enable; CanClk.Signal.ExistFEEE = Enable;
CanClk.IDFEEECn = 20; CanClk.IDFEEECn = 50; //20;
bFEEEFlag = 1; bFEEEFlag = 1;
} }
} }
......
Api_Sources/API_Device_Init.c
View file @ 39bfc54d
...@@ -191,6 +191,9 @@ void Api_InitParamer(void) ...@@ -191,6 +191,9 @@ void Api_InitParamer(void)
TempMeter.CurPosition = null; TempMeter.CurPosition = null;
TempMeter.DestPosition = null; TempMeter.DestPosition = null;
TempMeter.CalTime = null; TempMeter.CalTime = null;
TempMeter_CurBoardVal = null;
TempMeter_CurBoardVal_Old = null;
TempMeter_DelayTime = null;
CurRevCnt.dw32 = null; CurRevCnt.dw32 = null;
OldRevCnt.dw32 = null; OldRevCnt.dw32 = null;
......
Api_Sources/APP_CAN.c
View file @ 39bfc54d
...@@ -121,6 +121,9 @@ void App_CheckCanDrop(void) ...@@ -121,6 +121,9 @@ void App_CheckCanDrop(void)
{ {
bFEEEFlag=0; bFEEEFlag=0;
TempMeter.CurBoardVal=0; TempMeter.CurBoardVal=0;
TempMeter_CurBoardVal=0;
TempMeter_CurBoardVal_Old = 0;
TempMeter_DelayTime = 0;
CanClk.Signal.ExistFEEE = Disable; CanClk.Signal.ExistFEEE = Disable;
} }
if(CanClk.IDFEEECn > null) if(CanClk.IDFEEECn > null)
......
Api_Sources/APP_Data_Process.c
View file @ 39bfc54d
...@@ -446,40 +446,58 @@ void far App_CalFuelBoard(void) ...@@ -446,40 +446,58 @@ void far App_CalFuelBoard(void)
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void far App_CalTmpBoard(void) void far App_CalTmpBoard(void)
{ {
if(TempShowFlag==1) INT8U temp = 0;
if (TempShowFlag == 1)
{ {
if(Tempnum<3) if (Tempnum < 3)
{ {
Tempnum++; Tempnum++;
} }
else else
{ {
TempShowFlag=0; TempShowFlag = 0;
} }
TempSpeed=10; TempSpeed = 10;
} }
else if(bFEEEFlag==0) else if (bFEEEFlag == 0)
{ {
TempSpeed=10; TempSpeed = 10;
} }
else else
{ {
TempSpeed=170; TempSpeed = 170;
} }
if (TempMeter.CurBoardVal != TempMeter_CurBoardVal)
if (TempMeter.CurBoardVal != TempMeter_CurBoardVal_Old)
{ {
TempMeter_DelayTime = 0; TempMeter_DelayTime = 0;
TempMeter_CurBoardVal = TempMeter.CurBoardVal; TempMeter_CurBoardVal_Old = TempMeter.CurBoardVal;
}
else
{
if (TempMeter_DelayTime >= T_2s)
{
if (TempMeter.CurBoardVal > TempMeter_CurBoardVal)
{
temp = TempMeter.CurBoardVal - TempMeter_CurBoardVal;
}
else
{
temp = TempMeter_CurBoardVal - TempMeter.CurBoardVal;
} }
if (TempMeter_DelayTime == T_2s) if (temp >= 2)
{ {
TempMeter.DestPosition = App_CalMicroStep((INT32U)TempMeter.CurBoardVal,(EE_MeterType *)&TempMeterParamer); TempMeter_CurBoardVal = TempMeter.CurBoardVal;
}
}
} }
FuelTime=0; TempMeter.DestPosition = App_CalMicroStep((INT32U)TempMeter_CurBoardVal, (EE_MeterType *)&TempMeterParamer);
FuelTime = 0;
} }
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
......
App_Headers/Globals_Var.h
View file @ 39bfc54d
...@@ -271,6 +271,7 @@ ...@@ -271,6 +271,7 @@
EXTERN_VAR volatile INT8U ClearOdoCanOut; EXTERN_VAR volatile INT8U ClearOdoCanOut;
EXTERN_VAR volatile INT8U ClearOdoCanOutCn; EXTERN_VAR volatile INT8U ClearOdoCanOutCn;
EXTERN_VAR volatile INT16U TempMeter_CurBoardVal_Old;
EXTERN_VAR volatile INT16U TempMeter_CurBoardVal; EXTERN_VAR volatile INT16U TempMeter_CurBoardVal;
EXTERN_VAR volatile INT16U TempMeter_DelayTime; EXTERN_VAR volatile INT16U TempMeter_DelayTime;
// //
......
Sources/main.c
View file @ 39bfc54d
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
//20231115 变更：增加远程报文清零功能（接收清零报文0x5F2，发送清零状态报文0x49E） //20231115 变更：增加远程报文清零功能（接收清零报文0x5F2，发送清零状态报文0x49E）
//20231116 修改IGNON、IGNOFF门槛值，由16.6V改为6.5V //20231116 修改IGNON、IGNOFF门槛值，由16.6V改为6.5V
//20231208 修改清零外发不是30帧和清零后里程继续累加及需发12帧清零指令才清零禅道问题 //20231208 修改清零外发不是30帧和清零后里程继续累加及需发12帧清零指令才清零禅道问题
//V0.02
//20250110 变更，水温变动，延时2秒
//20250205 增加回差
INT8U Read_OUT_2000km_Clear(void) INT8U Read_OUT_2000km_Clear(void)
{ {
......
TBDML.ini
View file @ 39bfc54d
...@@ -10,7 +10,7 @@ Target=TBDML ...@@ -10,7 +10,7 @@ Target=TBDML
Layout=C_layout.hwl Layout=C_layout.hwl
LoadDialogOptions=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main" LoadDialogOptions=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
CPU=HC12 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 TOOLBAR=57600 57601 32795 0 57635 57634 57637 0 57671 57669 0 32777 32776 32782 32780 32781 32778 0 32806
AEFWarningDialog=FALSE AEFWarningDialog=FALSE
Configuration=TBDML.hwc Configuration=TBDML.hwc
...@@ -138,10 +138,10 @@ File3= ...@@ -138,10 +138,10 @@ File3=
[Recent Applications File List] [Recent Applications File List]
File0=H:\五征\五征DG01\变更241008\变更后代码\3-程序源码\bin\WZ-DG01 File0=H:\五征\五征DG01\变更241125\变更后代码\3-程序源码\bin\WZ-DG01-01
File1=H:\五征DG01\变更\03-程序源码\源码\bin\Project.abs File1=H:\五征\五征DG01\变更241008\变更后代码\3-程序源码\bin\WZ-DG01
File2=E:\Edge下载\五征DG01_充电指示灯_20231005.s19 File2=H:\五征DG01\变更\03-程序源码\源码\bin\Project.abs
File3=H:\五征DG01\DG01_16C22_20230314.s19 File3=E:\Edge下载\五征DG01_充电指示灯_20231005.s19
LoadFlags0=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main" LoadFlags0=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags1=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main" LoadFlags1=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
LoadFlags2=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main" LoadFlags2=AUTOERASEANDFLASH RUNANDSTOPAFTERLOAD="main"
...@@ -155,19 +155,19 @@ TARGET_FREQUENCY=16000000 ...@@ -155,19 +155,19 @@ TARGET_FREQUENCY=16000000
[Recent HI-WAVE FindProcedure Search] [Recent HI-WAVE FindProcedure Search]
Search0=bsp_CANSendStdFrame Search0=App_CalTmpBoard
Search1=App_SendCANMsg Search1=main
Search2=GUI_CheckKeyProc Search2=bsp_CANSendStdFrame
Search3=App_ReadAccKm Search3=App_SendCANMsg
Search4=App_CalAccKm Search4=GUI_CheckKeyProc
Search5=GUI_BeepOut Search5=App_ReadAccKm
Search6=Api_CAN_Rev_isr Search6=App_CalAccKm
Search7=main Search7=GUI_BeepOut
Search8=GUI_LedNormalDisplay Search8=Api_CAN_Rev_isr
Search9=App_CheckCanDrop Search9=GUI_LedNormalDisplay
Search10=GUI_ZAQD_QDDPRG Search10=App_CheckCanDrop
Search11=Api_InitParamer Search11=GUI_ZAQD_QDDPRG
Search12=App_CalFuelBoard Search12=Api_InitParamer
Search13=App_CalVehBoard Search13=App_CalFuelBoard
Search14=Gui_Icon Search14=App_CalVehBoard
Search15=QY1_Disp Search15=Gui_Icon
WZ24v--DG01.mcp
View file @ 39bfc54d
...@@ -660,7 +660,7 @@ ...@@ -660,7 +660,7 @@
<SETTING><NAME>Options</NAME><VALUE></VALUE></SETTING> <SETTING><NAME>Options</NAME><VALUE></VALUE></SETTING>
<SETTING><NAME>LinkParameterFilename</NAME><VALUE>out.prm</VALUE></SETTING> <SETTING><NAME>LinkParameterFilename</NAME><VALUE>out.prm</VALUE></SETTING>
<SETTING><NAME>EchoCommandLine</NAME><VALUE>0</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>UseTemplate</NAME><VALUE>2</VALUE></SETTING>
<SETTING><NAME>PrmTemplateName</NAME><VALUE>mc9s12hy32.prm</VALUE></SETTING> <SETTING><NAME>PrmTemplateName</NAME><VALUE>mc9s12hy32.prm</VALUE></SETTING>
<SETTING><NAME>RunPreprocessor</NAME><VALUE>0</VALUE></SETTING> <SETTING><NAME>RunPreprocessor</NAME><VALUE>0</VALUE></SETTING>
...@@ -854,13 +854,6 @@ ...@@ -854,13 +854,6 @@
<FILEKIND>Unknown</FILEKIND> <FILEKIND>Unknown</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS> <FILEFLAGS>Debug</FILEFLAGS>
</FILE> </FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>Project.map</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE> <FILE>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>API_AT24C04.c</PATH> <PATH>API_AT24C04.c</PATH>
...@@ -1162,6 +1155,13 @@ ...@@ -1162,6 +1155,13 @@
<FILEKIND>Text</FILEKIND> <FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS> <FILEFLAGS></FILEFLAGS>
</FILE> </FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>WZ-DG01-01.map</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
</FILELIST> </FILELIST>
<LINKORDER> <LINKORDER>
<FILEREF> <FILEREF>
...@@ -1194,11 +1194,6 @@ ...@@ -1194,11 +1194,6 @@
<PATH>ansisi.lib</PATH> <PATH>ansisi.lib</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF> </FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>Project.map</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF> <FILEREF>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>API_AT24C04.c</PATH> <PATH>API_AT24C04.c</PATH>
...@@ -1414,6 +1409,11 @@ ...@@ -1414,6 +1409,11 @@
<PATH>API_16C23.h</PATH> <PATH>API_16C23.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF> </FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>WZ-DG01-01.map</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
</LINKORDER> </LINKORDER>
</TARGET> </TARGET>
</TARGETLIST> </TARGETLIST>
...@@ -1716,7 +1716,7 @@ ...@@ -1716,7 +1716,7 @@
<FILEREF> <FILEREF>
<TARGETNAME>Standard</TARGETNAME> <TARGETNAME>Standard</TARGETNAME>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>Project.map</PATH> <PATH>WZ-DG01-01.map</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF> </FILEREF>
</GROUP> </GROUP>
......
s19/文件释放说明.txt
View file @ 39bfc54d
无boot，无升级文件 工程文件：WZ-DG01-01_S0.02_250206.s19
工程文件：WZ-DG01-01_S0.02_250110.s19 升级文件：无
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment