Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
HaoJin232
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
时昊
HaoJin232
Commits
0cf48992
Commit
0cf48992
authored
Feb 17, 2024
by
时昊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🎉
init:删除无用文件-水温模块
parent
6900e60a
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
6816 additions
and
7454 deletions
+6816
-7454
QJ300_circle.hex
HJ232_Source/Out/QJ300_circle.hex
+4361
-4462
QJ300_circle.lnp
HJ232_Source/Out/QJ300_circle.lnp
+0
-1
QJ300_circle.map
HJ232_Source/Out/QJ300_circle.map
+2411
-2500
CAN_User.c
HJ232_Source/source/Application/APPCan/CAN_User.c
+3
-35
CoolantTemp.c
HJ232_Source/source/Application/CoolantTemp/CoolantTemp.c
+0
-353
CoolantTemp.h
HJ232_Source/source/Application/CoolantTemp/CoolantTemp.h
+0
-24
MCU_Core_Protocol.c
.../source/Application/MCU_Core_Protocol/MCU_Core_Protocol.c
+3
-4
PowerManagement_user.c
...source/Application/PowerManagement/PowerManagement_user.c
+3
-3
Telltales_user.c
HJ232_Source/source/Application/Telltales/Telltales_user.c
+3
-3
tasks.c
HJ232_Source/source/System/tasks.c
+3
-6
U2_app_Service.c
HJ232_Source/source/UDS2/U2_app_Service.c
+5
-5
tim4DelayCounter.uvoptx
HJ232_Source/tim4DelayCounter.uvoptx
+24
-48
tim4DelayCounter.uvprojx
HJ232_Source/tim4DelayCounter.uvprojx
+0
-10
No files found.
HJ232_Source/Out/QJ300_circle.hex
View file @
0cf48992
This diff is collapsed.
Click to expand it.
HJ232_Source/Out/QJ300_circle.lnp
View file @
0cf48992
...
@@ -47,7 +47,6 @@
...
@@ -47,7 +47,6 @@
".\source\Application\APPCan\CAN_Lib.lib"
".\source\Application\APPCan\CAN_Lib.lib"
".\objects\can_user.o"
".\objects\can_user.o"
".\objects\gauges.o"
".\objects\gauges.o"
".\objects\coolanttemp.o"
".\objects\app_telltales.o"
".\objects\app_telltales.o"
".\source\Application\Telltales\Telltales.lib"
".\source\Application\Telltales\Telltales.lib"
".\objects\app_service.o"
".\objects\app_service.o"
...
...
HJ232_Source/Out/QJ300_circle.map
View file @
0cf48992
This diff is collapsed.
Click to expand it.
HJ232_Source/source/Application/APPCan/CAN_User.c
View file @
0cf48992
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
#include "BGLInterface.h"
#include "BGLInterface.h"
#include "Fuel.h"
#include "Fuel.h"
#include "Telltales_user.h"
#include "Telltales_user.h"
#include "CoolantTemp.h"
#include "MCU_Core_Protocol.h"
#include "MCU_Core_Protocol.h"
#include "Services_Mileage_User.h"
#include "Services_Mileage_User.h"
#include "U2_app_Service.h"
#include "U2_app_Service.h"
...
@@ -225,23 +225,7 @@ void Can_Set_Buff_515(uint8_t CopyData[])
...
@@ -225,23 +225,7 @@ void Can_Set_Buff_515(uint8_t CopyData[])
GetAllDtcFault
(
CurFault
,
&
CurFaultNum
,
HisFault
,
&
HisFaultNum
);
GetAllDtcFault
(
CurFault
,
&
CurFaultNum
,
HisFault
,
&
HisFaultNum
);
if
(
CurFaultNum
)
{
tempFaultCode
=
0x00000000
;
for
(
uint8_t
i
=
0
;
i
<
CurFaultNum
;
i
++
)
{
temp32
=
CurFault
[
i
];
if
(
0x01170000
==
(
temp32
&
0xFFFF0000
)
)
{
tempFaultCode
=
0x00000117
;
}
else
if
(
0x01180000
==
(
temp32
&
0xFFFF0000
)
)
{
tempFaultCode
=
0x00000118
;
}
else
{
;
}
}
}
else
{
tempFaultCode
=
0x00000000
;
}
...
@@ -261,23 +245,7 @@ void Can_Set_Buff_515(uint8_t CopyData[])
...
@@ -261,23 +245,7 @@ void Can_Set_Buff_515(uint8_t CopyData[])
CopyData
[
3
]
=
0u
;
/* 4 */
CopyData
[
3
]
=
0u
;
/* 4 */
// bcm_module_temp = Get_Bcm_Module();
// if(bcm_module_temp == BCM_DELFU){
// if(Get_CoolantTemp_Signal_Connect()){
// SendTempValue = get_CoolantTempVal();
// }
// else{
// SendTempValue = 215;
// }
// }
// else if(bcm_module_temp == BCM_LIANDIAN){
// /*if(CAN_SIG_NORMAL == CAN_MSG_Status(ID_ECU_Engine_Data_M2_Msg_Count)){
// SendTempValue = get_CoolantTempVal();
// }
// else{
// SendTempValue = 215;
// } */
// }
SendTempValue
=
get_CoolantTempVal
();
SendTempValue
=
get_CoolantTempVal
();
if
(
SendTempValue
>=
(
-
40
)){
if
(
SendTempValue
>=
(
-
40
)){
...
...
HJ232_Source/source/Application/CoolantTemp/CoolantTemp.c
deleted
100644 → 0
View file @
6900e60a
#include "CoolantTemp.h"
#include "Flash_synchronizer.h"
#include "Common_Interface.h"
#include "CAN_User.h"
#include "CAN_Communication_Matrix.h"
#define COOLANT_TEMP_RETURN_DIFFERENCE 3 //80u
/*判断上升或下降的回差,精?1*/
#define COOLANT_TEMP_SEG_UP 0u
#define COOLANT_TEMP_SEG_DOWN 1u
int16_t
CoolantTempValue
=
0u
;
static
int16_t
CoolantTempValueBak
=
0
;
uint8_t
DesCoolantTempSetp
=
0u
;
uint8_t
CurCoolantTempSetp
=
0u
;
uint8_t
CoolantTempInitFlag
=
0u
;
uint8_t
CoolantTempDir
=
COOLANT_TEMP_SEG_UP
;
CoolantTempSensorSts_t
CoolantTempSensorState
=
CoolantTempSensorNormal
;
uint16_t
CoolantTempSensorNormalTime
=
0u
;
uint16_t
CoolantTempSensorShortTime
=
0u
;
uint16_t
CoolantTempSensorOpenTime
=
0u
;
static
uint8_t
CoolantTempAlarm
=
0u
;
uint16_t
CoolantTemp_Signal_Time
=
0
;
uint8_t
CoolantTemp_Signal_Connect
=
0
;
uint32_t
tempFaultCode
=
0x00000000
;
void
CoolantTemp_KL30_Init
(
void
)
{
}
void
CoolantTemp_KL15_Init
(
void
)
{
DesCoolantTempSetp
=
0u
;
CurCoolantTempSetp
=
0u
;
CoolantTempInitFlag
=
1u
;
CoolantTempDir
=
COOLANT_TEMP_SEG_UP
;
CoolantTempSensorState
=
CoolantTempSensorNormal
;
CoolantTempSensorNormalTime
=
0u
;
CoolantTempSensorShortTime
=
0u
;
CoolantTempSensorOpenTime
=
0u
;
CoolantTempAlarm
=
0
;
CoolantTemp_Signal_Time
=
0
;
CoolantTemp_Signal_Connect
=
0
;
CoolantTempValue
=
-
273
;
CoolantTempValueBak
=
-
273
;
tempFaultCode
=
0x00000000
;
}
void
CoolantTemp_State_Check
(
uint8_t
deltaTime
)
{
if
(
CoolantTempValue
>=
135
){
/*短路*/
CoolantTempSensorOpenTime
=
0
;
CoolantTempSensorNormalTime
=
0
;
if
(
CoolantTempSensorShortTime
<
3000
){
CoolantTempSensorShortTime
+=
deltaTime
;
}
else
{
CoolantTempSensorState
=
CoolantTempSensorShortCircuit
;
CurCoolantTempSetp
=
0
;
DesCoolantTempSetp
=
0
;
CoolantTempInitFlag
=
1
;
CoolantTempDir
=
COOLANT_TEMP_SEG_UP
;
}
}
else
if
(
CoolantTempValue
<
-
30
){
/*断路*/
CoolantTempSensorShortTime
=
0
;
CoolantTempSensorNormalTime
=
0
;
if
(
CoolantTempSensorOpenTime
<
3000
){
CoolantTempSensorOpenTime
+=
deltaTime
;
}
else
{
CoolantTempSensorState
=
CoolantTempSensorOpenCircuit
;
CurCoolantTempSetp
=
0
;
DesCoolantTempSetp
=
0
;
CoolantTempInitFlag
=
1
;
CoolantTempDir
=
COOLANT_TEMP_SEG_UP
;
}
}
else
{
CoolantTempSensorShortTime
=
0
;
CoolantTempSensorOpenTime
=
0
;
if
(
CoolantTempSensorNormalTime
<
3000
){
CoolantTempSensorNormalTime
+=
deltaTime
;
}
else
{
CoolantTempSensorState
=
CoolantTempSensorNormal
;
}
}
if
(
tempFaultCode
==
0x00000117
)
{
CoolantTempSensorState
=
CoolantTempSensorShortCircuit
;
CoolantTempSensorShortTime
=
0
;
CoolantTempSensorOpenTime
=
0
;
CoolantTempSensorNormalTime
=
3000
;
}
else
if
(
tempFaultCode
==
0x00000118
)
{
CoolantTempSensorState
=
CoolantTempSensorOpenCircuit
;
CoolantTempSensorShortTime
=
0
;
CoolantTempSensorOpenTime
=
0
;
CoolantTempSensorNormalTime
=
3000
;
}
}
void
CoolantTemp_Gauges_Cal
(
uint8_t
deltaTime
)
{
static
uint16_t
time
=
0
;
if
((
Get_CoolantTemp_Signal_Connect
())
&&
(
CoolantTempSensorState
==
CoolantTempSensorNormal
)
&&
(
CoolantTempValue
>=
-
30
)
&&
(
CoolantTempValue
<
135
)){
if
(
CoolantTempInitFlag
){
CoolantTempValueBak
=
CoolantTempValue
;
}
/*根据回差计算走动方向*/
if
(
CoolantTempDir
==
COOLANT_TEMP_SEG_UP
){
if
(
CoolantTempValue
+
COOLANT_TEMP_RETURN_DIFFERENCE
<=
CoolantTempValueBak
){
CoolantTempDir
=
COOLANT_TEMP_SEG_DOWN
;
CoolantTempValueBak
=
CoolantTempValue
;
}
if
(
CoolantTempValue
>
CoolantTempValueBak
){
CoolantTempValueBak
=
CoolantTempValue
;
}
}
else
{
if
(
CoolantTempValue
>=
CoolantTempValueBak
+
COOLANT_TEMP_RETURN_DIFFERENCE
){
CoolantTempDir
=
COOLANT_TEMP_SEG_UP
;
CoolantTempValueBak
=
CoolantTempValue
;
}
if
(
CoolantTempValue
<
CoolantTempValueBak
){
CoolantTempValueBak
=
CoolantTempValue
;
}
}
/*计算目标格数*/
if
(
CoolantTempDir
==
COOLANT_TEMP_SEG_UP
){
if
(((
DesCoolantTempSetp
==
4
)
||
(
CoolantTempInitFlag
))
&&
(
CoolantTempValue
>=
115
)){
DesCoolantTempSetp
=
5
;
}
else
if
(((
DesCoolantTempSetp
==
3
)
||
(
CoolantTempInitFlag
))
&&
(
CoolantTempValue
>=
100
)){
DesCoolantTempSetp
=
4
;
}
else
if
(((
DesCoolantTempSetp
==
2
)
||
(
CoolantTempInitFlag
))
&&
(
CoolantTempValue
>=
90
)){
DesCoolantTempSetp
=
3
;
}
else
if
(((
DesCoolantTempSetp
==
1
)
||
(
CoolantTempInitFlag
))
&&
(
CoolantTempValue
>=
70
)){
DesCoolantTempSetp
=
2
;
}
else
if
(
DesCoolantTempSetp
==
0
){
DesCoolantTempSetp
=
1
;
}
}
else
if
(
CoolantTempDir
==
COOLANT_TEMP_SEG_DOWN
){
if
(((
DesCoolantTempSetp
==
2
)
||
(
CoolantTempInitFlag
))
&&
(
CoolantTempValue
<=
70
-
COOLANT_TEMP_RETURN_DIFFERENCE
)){
DesCoolantTempSetp
=
1
;
}
else
if
(((
DesCoolantTempSetp
==
3
)
||
(
CoolantTempInitFlag
))
&&
(
CoolantTempValue
<=
90
-
COOLANT_TEMP_RETURN_DIFFERENCE
)){
DesCoolantTempSetp
=
2
;
}
else
if
(((
DesCoolantTempSetp
==
4
)
||
(
CoolantTempInitFlag
))
&&
(
CoolantTempValue
<=
100
-
COOLANT_TEMP_RETURN_DIFFERENCE
)){
DesCoolantTempSetp
=
3
;
}
else
if
(((
DesCoolantTempSetp
==
5
)
||
(
CoolantTempInitFlag
))
&&
(
CoolantTempValue
<=
115
-
COOLANT_TEMP_RETURN_DIFFERENCE
)){
DesCoolantTempSetp
=
4
;
}
}
/*IGN ON 1秒后,开始走?*/
if
(
Common_GetIgnOnTime
()
>=
1000
){
time
+=
deltaTime
;
if
(
CoolantTempInitFlag
){
CoolantTempInitFlag
=
0
;
time
=
0
;
CurCoolantTempSetp
=
DesCoolantTempSetp
;
}
if
(
time
>=
5000
){
time
=
0
;
if
(
CurCoolantTempSetp
<
DesCoolantTempSetp
){
CurCoolantTempSetp
++
;
}
else
if
(
CurCoolantTempSetp
>
DesCoolantTempSetp
){
CurCoolantTempSetp
--
;
}
}
if
(
CurCoolantTempSetp
==
DesCoolantTempSetp
){
time
=
0
;
}
}
}
if
(
Get_CoolantTemp_Signal_Connect
()
==
0
)
{
CoolantTempAlarm
=
0
;
CoolantTempSensorState
=
CoolantTempSensorNormal
;
CoolantTempSensorOpenTime
=
0
;
CoolantTempSensorShortTime
=
0
;
CoolantTempValue
=
-
50
;
CoolantTempValueBak
=
-
50
;
CoolantTempInitFlag
=
1
;
CurCoolantTempSetp
=
0
;
DesCoolantTempSetp
=
0
;
CoolantTempDir
=
COOLANT_TEMP_SEG_UP
;
}
else
{
if
(
CurCoolantTempSetp
==
5
)
{
CoolantTempAlarm
=
1
;
}
else
{
CoolantTempAlarm
=
0
;
}
}
}
void
CoolantTemp_Cal_Sevice
(
uint8_t
deltaTime
)
{
CoolantTempValue
=
get_CoolantTempVal
();
/*?测水温传感器状??*/
CoolantTemp_State_Check
(
deltaTime
);
/*显示水温?*/
CoolantTemp_Gauges_Cal
(
deltaTime
);
}
uint8_t
Get_CoolantTemp_Step
(
void
)
{
return
CurCoolantTempSetp
;
}
int16_t
Get_CoolantTempValue
(
void
)
{
return
CoolantTempValue
;
}
CoolantTempSensorSts_t
Get_CoolantTemp_Sensor_State
(
void
)
{
return
CoolantTempSensorState
;
}
uint8_t
Get_CoolantTemp_Disp_Byte
(
void
)
{
uint8_t
CoolantTempDispByte
=
0u
;
CoolantTempDispByte
=
CurCoolantTempSetp
;
if
(
CoolantTempSensorState
==
CoolantTempSensorShortCircuit
)
{
//Shot
CoolantTempDispByte
=
FLASH_SYNC_1Hz
?
9
:
0
;
}
else
if
(
CoolantTempSensorState
==
CoolantTempSensorOpenCircuit
)
{
//Open
CoolantTempDispByte
=
FLASH_SYNC_1Hz
?
8
:
0
;
}
if
(
CoolantTemp_Signal_Connect
==
0
)
{
//CanErr
CoolantTempDispByte
=
FLASH_SYNC_1Hz
?
7
:
6
;
}
if
(
CoolantTempDispByte
==
5
)
{
CoolantTempDispByte
=
FLASH_SYNC_1Hz
?
5
:
0
;
}
if
(
Get_ID_101_ECU_Engine_Temperature_State
()
==
1
)
{
CoolantTempDispByte
=
FLASH_SYNC_1Hz
?
8
:
0
;
}
return
CoolantTempDispByte
;
}
uint8_t
Get_CoolantTemp_Alarm
(
void
)
{
return
CoolantTempAlarm
;
}
void
CoolantTemp_Signal_Time_Service
(
uint8_t
deltaTime
)
{
/*_BCM_Module bcm_module_temp;
bcm_module_temp = Get_Bcm_Module();
if(bcm_module_temp == BCM_DELFU){
CoolantTemp_Signal_Time += deltaTime;
if(CoolantTemp_Signal_Time > 3000){ //3秒超?
CoolantTemp_Signal_Connect = 0;
}
}
else if(bcm_module_temp == BCM_LIANDIAN){
if(CAN_SIG_NORMAL == CAN_MSG_Status(ID_ECU_Count)){
CoolantTemp_Signal_Connect = 1;
}
else{
CoolantTemp_Signal_Connect = 0;
}
}*/
if
(
CAN_SIG_NORMAL
==
CAN_MSG_Status
(
ID_ECU_Count
))
{
CoolantTemp_Signal_Connect
=
1
;
}
else
{
CoolantTemp_Signal_Connect
=
0
;
}
}
void
Reset_CoolantTemp_Signal_Time
(
void
)
{
CoolantTemp_Signal_Time
=
0
;
CoolantTemp_Signal_Connect
=
1
;
}
uint8_t
Get_CoolantTemp_Signal_Connect
(
void
)
{
return
CoolantTemp_Signal_Connect
;
}
HJ232_Source/source/Application/CoolantTemp/CoolantTemp.h
deleted
100644 → 0
View file @
6900e60a
#ifndef COOLANT_TEMP_H
#define COOLANT_TEMP_H
#include "common.h"
typedef
enum
{
CoolantTempSensorNormal
=
0
,
CoolantTempSensorShortCircuit
,
CoolantTempSensorOpenCircuit
,
}
CoolantTempSensorSts_t
;
extern
uint32_t
tempFaultCode
;
extern
void
CoolantTemp_KL15_Init
(
void
);
extern
void
CoolantTemp_KL30_Init
(
void
);
extern
void
CoolantTemp_Cal_Sevice
(
uint8_t
deltaTime
);
extern
uint8_t
Get_CoolantTemp_Step
(
void
);
extern
CoolantTempSensorSts_t
Get_CoolantTemp_Sensor_State
(
void
);
extern
uint8_t
Get_CoolantTemp_Disp_Byte
(
void
);
extern
uint8_t
Get_CoolantTemp_Alarm
(
void
);
extern
int16_t
Get_CoolantTempValue
(
void
);
extern
void
Reset_CoolantTemp_Signal_Time
(
void
);
extern
uint8_t
Get_CoolantTemp_Signal_Connect
(
void
);
extern
void
CoolantTemp_Signal_Time_Service
(
uint8_t
deltaTime
);
#endif
HJ232_Source/source/Application/MCU_Core_Protocol/MCU_Core_Protocol.c
View file @
0cf48992
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
#include "SEG_LCD.h"
#include "SEG_LCD.h"
#include "System_Monitor.h"
#include "System_Monitor.h"
#include "Gauges.h"
#include "Gauges.h"
#include "CoolantTemp.h"
#include "Services_Mileage_User.h"
#include "Services_Mileage_User.h"
#include "CAN_Communication_Matrix.h"
#include "CAN_Communication_Matrix.h"
#include "CAN_User.h"
#include "CAN_User.h"
...
@@ -242,7 +242,7 @@ void Get_ID_01_Data(uint8_t** buffer, uint8_t* length)
...
@@ -242,7 +242,7 @@ void Get_ID_01_Data(uint8_t** buffer, uint8_t* length)
/*Byte13*/
/*Byte13*/
Send_ID_01_02
.
Sig
.
Time_minute
=
(
RtcTime
.
min
>>
4
)
*
10
+
(
RtcTime
.
min
&
0x0f
);
Send_ID_01_02
.
Sig
.
Time_minute
=
(
RtcTime
.
min
>>
4
)
*
10
+
(
RtcTime
.
min
&
0x0f
);
/*Byte14*/
/*Byte14*/
//Send_ID_01_02.Sig.Coolant_Temp_Bars = Get_CoolantTemp_Disp_Byte();
/*Byte15*/
/*Byte15*/
//Send_ID_01_02.Sig.Fuel_Bars = Get_Fuel_Disp_Byte();
//Send_ID_01_02.Sig.Fuel_Bars = Get_Fuel_Disp_Byte();
...
@@ -449,8 +449,7 @@ void Drive_Info_Display_Update_Service(void)
...
@@ -449,8 +449,7 @@ void Drive_Info_Display_Update_Service(void)
SEG_LCD_ODO_Trip_Display
(
1
,
Get_Disp_Mileage_Mode
(),
Get_Unit_Setting
(),
totaldisp
);
// mode/unit/batt/totaldisp
SEG_LCD_ODO_Trip_Display
(
1
,
Get_Disp_Mileage_Mode
(),
Get_Unit_Setting
(),
totaldisp
);
// mode/unit/batt/totaldisp
}
}
}
}
// 水温显示
SEG_Coolant_Temp_Display
(
1
,
Get_CoolantTemp_Disp_Byte
());
// 燃油显示
// 燃油显示
SEG_Fuel_Level_Display
(
1
,
Get_Fuel_Disp_Byte
());
SEG_Fuel_Level_Display
(
1
,
Get_Fuel_Disp_Byte
());
...
...
HJ232_Source/source/Application/PowerManagement/PowerManagement_user.c
View file @
0cf48992
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
#include "tim4.h"
#include "tim4.h"
#include "Fuel.h"
#include "Fuel.h"
#include "CoolantTemp.h"
#include "Services_Mileage_User.h"
#include "Services_Mileage_User.h"
#include "eeManager_Interface.h"
#include "eeManager_Interface.h"
#include "Data_Gear.h"
#include "Data_Gear.h"
...
@@ -42,7 +42,7 @@ void Power_KL30_Init ( void )
...
@@ -42,7 +42,7 @@ void Power_KL30_Init ( void )
// uart2_User_KL30_Init();
// uart2_User_KL30_Init();
Telltales_Init
();
Telltales_Init
();
Fuel_KL30_Init
();
Fuel_KL30_Init
();
CoolantTemp_KL30_Init
();
// eeprom_StoreInfo_Init( );
// eeprom_StoreInfo_Init( );
// CalcODOKL30Init();
// CalcODOKL30Init();
Data_Gear_KL30_Init
();
Data_Gear_KL30_Init
();
...
@@ -234,7 +234,7 @@ void Power_IG_ON_Init(void)
...
@@ -234,7 +234,7 @@ void Power_IG_ON_Init(void)
Enable_Cyc_Msg
(
CycMsg_02
);
Enable_Cyc_Msg
(
CycMsg_02
);
Common_DataInit
();
Common_DataInit
();
Fuel_KL15_Init
();
Fuel_KL15_Init
();
CoolantTemp_KL15_Init
();
Data_Gear_KL15_Init
();
Data_Gear_KL15_Init
();
// PORT_SetBit(SOC_3V3_en);
// PORT_SetBit(SOC_3V3_en);
TMB0_PWM_Pin33_Init
();
TMB0_PWM_Pin33_Init
();
...
...
HJ232_Source/source/Application/Telltales/Telltales_user.c
View file @
0cf48992
...
@@ -5,10 +5,10 @@
...
@@ -5,10 +5,10 @@
#include "Line_in.h"
#include "Line_in.h"
#include "CAN_User.h"
#include "CAN_User.h"
#include "SEG_LCD.h"
#include "SEG_LCD.h"
#include "CoolantTemp.h"
#include "gpio.h"
#include "gpio.h"
#include "Fuel.h"
#include "Fuel.h"
#include "CoolantTemp.h"
#include "CAN_Communication_Matrix.h"
#include "CAN_Communication_Matrix.h"
#include "MCU_Core_Protocol.h"
#include "MCU_Core_Protocol.h"
#include "Data_Gear.h"
#include "Data_Gear.h"
...
@@ -696,7 +696,7 @@ uint16_t LED_Temp_Judgement(void)
...
@@ -696,7 +696,7 @@ uint16_t LED_Temp_Judgement(void)
{
{
uint16_t
u8Result
=
0u
;
uint16_t
u8Result
=
0u
;
uint8_t
Get_CANdate
=
0u
;
uint8_t
Get_CANdate
=
0u
;
Get_CANdate
=
Get_CoolantTemp_Alarm
();
if
(
Get_CANdate
==
0u
)
if
(
Get_CANdate
==
0u
)
{
{
u8Result
=
2u
;
u8Result
=
2u
;
...
...
HJ232_Source/source/System/tasks.c
View file @
0cf48992
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
#include "Telltales_Lib.h"
#include "Telltales_Lib.h"
#include "Sys_Tick.h"
#include "Sys_Tick.h"
#include "Fuel.h"
#include "Fuel.h"
#include "CoolantTemp.h"
#include "rtc.h"
#include "rtc.h"
#include "Flash_synchronizer.h"
#include "Flash_synchronizer.h"
#include "eepromManage.h"
#include "eepromManage.h"
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
#include "gpio.h"
#include "gpio.h"
#include "uds_includes.h"
#include "uds_includes.h"
#include "U2_uds_includes.h"
#include "U2_uds_includes.h"
#include "CoolantTemp.h"
#include "BU98R10.h"
#include "BU98R10.h"
#include "Gauges.h"
#include "Gauges.h"
#include "Services_Mileage_User.h"
#include "Services_Mileage_User.h"
...
@@ -259,8 +259,6 @@ void Sys_Run_Mode_100ms_Tasks_Group2(void)
...
@@ -259,8 +259,6 @@ void Sys_Run_Mode_100ms_Tasks_Group2(void)
void
Sys_Run_Mode_100ms_Tasks_Group3
(
void
)
void
Sys_Run_Mode_100ms_Tasks_Group3
(
void
)
{
{
/*水温计算*/
CoolantTemp_Cal_Sevice
(
100u
);
}
}
void
Sys_Run_Mode_100ms_Tasks_Group4
(
void
)
void
Sys_Run_Mode_100ms_Tasks_Group4
(
void
)
...
@@ -310,8 +308,7 @@ void Sys_Run_Mode_100ms_Tasks_Group8(void)
...
@@ -310,8 +308,7 @@ void Sys_Run_Mode_100ms_Tasks_Group8(void)
{
{
/*水温信号超时计算*/
CoolantTemp_Signal_Time_Service
(
100
);
bsp_CAN_MaskCheck
();
bsp_CAN_MaskCheck
();
...
...
HJ232_Source/source/UDS2/U2_app_Service.c
View file @
0cf48992
...
@@ -8,13 +8,13 @@
...
@@ -8,13 +8,13 @@
#include "U2_app_ServiceProc.h"
#include "U2_app_ServiceProc.h"
#include <string.h>
#include <string.h>
#include "CAN_User.h"
#include "CAN_User.h"
#include "CoolantTemp.h"
#define U2_GLOBALS_UDS_CFG
#define U2_GLOBALS_UDS_CFG
#define U2_GLOBALS_USER_DEF
#define U2_GLOBALS_USER_DEF
volatile
_U2_DiagnoCtl
U2_DiagnoCtl
;
//诊断当前状??
volatile
_U2_DiagnoCtl
U2_DiagnoCtl
;
//诊断当前状
�
??
volatile
_U2_N_USData
U2_Exct_USData
;
//报文接收的ID数据
volatile
_U2_N_USData
U2_Exct_USData
;
//报文接收的ID数据
volatile
_U2_DiagClock
U2_DiagClock
;
volatile
_U2_DiagClock
U2_DiagClock
;
volatile
_U2_ErrorFrame
U2_Error
;
//错误信息
volatile
_U2_ErrorFrame
U2_Error
;
//错误信息
...
@@ -233,7 +233,7 @@ void U2_Diagnosis_main(void)
...
@@ -233,7 +233,7 @@ void U2_Diagnosis_main(void)
default:
default:
/* Error.N_TAtype = ID_PhyAddr;
/* Error.N_TAtype = ID_PhyAddr;
Error.FrameErr = ServiceNotSupported; //服务不支?
Error.FrameErr = ServiceNotSupported; //服务不支
�
?
Error.RespSerId = Exct_USData.ind.MsgData[0];*/
Error.RespSerId = Exct_USData.ind.MsgData[0];*/
break
;
break
;
}
}
...
@@ -375,10 +375,10 @@ void U2_App_62_service(_U2_N_USData *AppUSData)
...
@@ -375,10 +375,10 @@ void U2_App_62_service(_U2_N_USData *AppUSData)
switch
(
DID
)
switch
(
DID
)
{
{
case
U2_DID0005
:
//?-当前会话模式
case
U2_DID0005
:
//
�
?-当前会话模式
U2_App_CopyRam
((
uint8_t
*
)
&
U2_DiagReciveGaugePara
.
CoolantTemp
,
(
uint8_t
*
)
&
AppUSData
->
ind
.
MsgData
[
3
],
(
AppUSData
->
ind
.
Length
-
3
));
U2_App_CopyRam
((
uint8_t
*
)
&
U2_DiagReciveGaugePara
.
CoolantTemp
,
(
uint8_t
*
)
&
AppUSData
->
ind
.
MsgData
[
3
],
(
AppUSData
->
ind
.
Length
-
3
));
UDS_62_MsgRecFlg
=
1
;
UDS_62_MsgRecFlg
=
1
;
Reset_CoolantTemp_Signal_Time
();
SetSendUdsTimeCount_220005
(
0
);
SetSendUdsTimeCount_220005
(
0
);
break
;
break
;
...
...
HJ232_Source/tim4DelayCounter.uvoptx
View file @
0cf48992
...
@@ -1335,30 +1335,6 @@
...
@@ -1335,30 +1335,6 @@
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
<bDave2>
0
</bDave2>
<bDave2>
0
</bDave2>
<PathWithFileName>
.\source\Application\CoolantTemp\CoolantTemp.c
</PathWithFileName>
<FilenameWithoutPath>
CoolantTemp.c
</FilenameWithoutPath>
<RteFlg>
0
</RteFlg>
<bShared>
0
</bShared>
</File>
<File>
<GroupNumber>
3
</GroupNumber>
<FileNumber>
92
</FileNumber>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<bDave2>
0
</bDave2>
<PathWithFileName>
.\source\Application\CoolantTemp\CoolantTemp.h
</PathWithFileName>
<FilenameWithoutPath>
CoolantTemp.h
</FilenameWithoutPath>
<RteFlg>
0
</RteFlg>
<bShared>
0
</bShared>
</File>
<File>
<GroupNumber>
3
</GroupNumber>
<FileNumber>
93
</FileNumber>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<bDave2>
0
</bDave2>
<PathWithFileName>
.\source\Application\Telltales\app_Telltales.c
</PathWithFileName>
<PathWithFileName>
.\source\Application\Telltales\app_Telltales.c
</PathWithFileName>
<FilenameWithoutPath>
app_Telltales.c
</FilenameWithoutPath>
<FilenameWithoutPath>
app_Telltales.c
</FilenameWithoutPath>
<RteFlg>
0
</RteFlg>
<RteFlg>
0
</RteFlg>
...
@@ -1366,7 +1342,7 @@
...
@@ -1366,7 +1342,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
3
</GroupNumber>
<GroupNumber>
3
</GroupNumber>
<FileNumber>
9
4
</FileNumber>
<FileNumber>
9
2
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1386,7 +1362,7 @@
...
@@ -1386,7 +1362,7 @@
<RteFlg>
0
</RteFlg>
<RteFlg>
0
</RteFlg>
<File>
<File>
<GroupNumber>
4
</GroupNumber>
<GroupNumber>
4
</GroupNumber>
<FileNumber>
9
5
</FileNumber>
<FileNumber>
9
3
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1398,7 +1374,7 @@
...
@@ -1398,7 +1374,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
4
</GroupNumber>
<GroupNumber>
4
</GroupNumber>
<FileNumber>
9
6
</FileNumber>
<FileNumber>
9
4
</FileNumber>
<FileType>
4
</FileType>
<FileType>
4
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1418,7 +1394,7 @@
...
@@ -1418,7 +1394,7 @@
<RteFlg>
0
</RteFlg>
<RteFlg>
0
</RteFlg>
<File>
<File>
<GroupNumber>
5
</GroupNumber>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
9
7
</FileNumber>
<FileNumber>
9
5
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1430,7 +1406,7 @@
...
@@ -1430,7 +1406,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
5
</GroupNumber>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
9
8
</FileNumber>
<FileNumber>
9
6
</FileNumber>
<FileType>
1
</FileType>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1442,7 +1418,7 @@
...
@@ -1442,7 +1418,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
5
</GroupNumber>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
9
9
</FileNumber>
<FileNumber>
9
7
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1454,7 +1430,7 @@
...
@@ -1454,7 +1430,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
5
</GroupNumber>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
100
</FileNumber>
<FileNumber>
98
</FileNumber>
<FileType>
1
</FileType>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1466,7 +1442,7 @@
...
@@ -1466,7 +1442,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
5
</GroupNumber>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
101
</FileNumber>
<FileNumber>
99
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1478,7 +1454,7 @@
...
@@ -1478,7 +1454,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
5
</GroupNumber>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
2
</FileNumber>
<FileNumber>
10
0
</FileNumber>
<FileType>
1
</FileType>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1490,7 +1466,7 @@
...
@@ -1490,7 +1466,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
5
</GroupNumber>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
3
</FileNumber>
<FileNumber>
10
1
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1502,7 +1478,7 @@
...
@@ -1502,7 +1478,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
5
</GroupNumber>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
4
</FileNumber>
<FileNumber>
10
2
</FileNumber>
<FileType>
1
</FileType>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1514,7 +1490,7 @@
...
@@ -1514,7 +1490,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
5
</GroupNumber>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
5
</FileNumber>
<FileNumber>
10
3
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1526,7 +1502,7 @@
...
@@ -1526,7 +1502,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
5
</GroupNumber>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
6
</FileNumber>
<FileNumber>
10
4
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1538,7 +1514,7 @@
...
@@ -1538,7 +1514,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
5
</GroupNumber>
<GroupNumber>
5
</GroupNumber>
<FileNumber>
10
7
</FileNumber>
<FileNumber>
10
5
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1558,7 +1534,7 @@
...
@@ -1558,7 +1534,7 @@
<RteFlg>
0
</RteFlg>
<RteFlg>
0
</RteFlg>
<File>
<File>
<GroupNumber>
6
</GroupNumber>
<GroupNumber>
6
</GroupNumber>
<FileNumber>
10
8
</FileNumber>
<FileNumber>
10
6
</FileNumber>
<FileType>
1
</FileType>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1570,7 +1546,7 @@
...
@@ -1570,7 +1546,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
6
</GroupNumber>
<GroupNumber>
6
</GroupNumber>
<FileNumber>
10
9
</FileNumber>
<FileNumber>
10
7
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1582,7 +1558,7 @@
...
@@ -1582,7 +1558,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
6
</GroupNumber>
<GroupNumber>
6
</GroupNumber>
<FileNumber>
1
10
</FileNumber>
<FileNumber>
1
08
</FileNumber>
<FileType>
1
</FileType>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1594,7 +1570,7 @@
...
@@ -1594,7 +1570,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
6
</GroupNumber>
<GroupNumber>
6
</GroupNumber>
<FileNumber>
1
11
</FileNumber>
<FileNumber>
1
09
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1606,7 +1582,7 @@
...
@@ -1606,7 +1582,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
6
</GroupNumber>
<GroupNumber>
6
</GroupNumber>
<FileNumber>
11
2
</FileNumber>
<FileNumber>
11
0
</FileNumber>
<FileType>
1
</FileType>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1618,7 +1594,7 @@
...
@@ -1618,7 +1594,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
6
</GroupNumber>
<GroupNumber>
6
</GroupNumber>
<FileNumber>
11
3
</FileNumber>
<FileNumber>
11
1
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1630,7 +1606,7 @@
...
@@ -1630,7 +1606,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
6
</GroupNumber>
<GroupNumber>
6
</GroupNumber>
<FileNumber>
11
4
</FileNumber>
<FileNumber>
11
2
</FileNumber>
<FileType>
1
</FileType>
<FileType>
1
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1642,7 +1618,7 @@
...
@@ -1642,7 +1618,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
6
</GroupNumber>
<GroupNumber>
6
</GroupNumber>
<FileNumber>
11
5
</FileNumber>
<FileNumber>
11
3
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1654,7 +1630,7 @@
...
@@ -1654,7 +1630,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
6
</GroupNumber>
<GroupNumber>
6
</GroupNumber>
<FileNumber>
11
6
</FileNumber>
<FileNumber>
11
4
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
@@ -1666,7 +1642,7 @@
...
@@ -1666,7 +1642,7 @@
</File>
</File>
<File>
<File>
<GroupNumber>
6
</GroupNumber>
<GroupNumber>
6
</GroupNumber>
<FileNumber>
11
7
</FileNumber>
<FileNumber>
11
5
</FileNumber>
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<tvExp>
0
</tvExp>
<tvExp>
0
</tvExp>
<tvExpOptDlg>
0
</tvExpOptDlg>
<tvExpOptDlg>
0
</tvExpOptDlg>
...
...
HJ232_Source/tim4DelayCounter.uvprojx
View file @
0cf48992
...
@@ -843,16 +843,6 @@
...
@@ -843,16 +843,6 @@
<FileType>
5
</FileType>
<FileType>
5
</FileType>
<FilePath>
.\source\Application\Gauges\Gauges.h
</FilePath>
<FilePath>
.\source\Application\Gauges\Gauges.h
</FilePath>
</File>
</File>
<File>
<FileName>
CoolantTemp.c
</FileName>
<FileType>
1
</FileType>
<FilePath>
.\source\Application\CoolantTemp\CoolantTemp.c
</FilePath>
</File>
<File>
<FileName>
CoolantTemp.h
</FileName>
<FileType>
5
</FileType>
<FilePath>
.\source\Application\CoolantTemp\CoolantTemp.h
</FilePath>
</File>
<File>
<File>
<FileName>
app_Telltales.c
</FileName>
<FileName>
app_Telltales.c
</FileName>
<FileType>
1
</FileType>
<FileType>
1
</FileType>
...
...
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