Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
VC66_7C
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
ISUZU
VC66_7C
Commits
ddf667ca
Commit
ddf667ca
authored
Jan 12, 2023
by
hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整上电时序,修改影线采集消抖时间
parent
7066719f
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
66 deletions
+22
-66
Line_In_user.c
source/Application/APP/LINE_IN/Line_In_user.c
+1
-1
PowerManagement_user.c
...ce/Application/APP/PowerManagement/PowerManagement_user.c
+0
-15
Telltales_user.c
source/Application/APP/Telltales/Telltales_user.c
+1
-1
CD4051.c
source/Driver/CD4051/CD4051.c
+9
-44
CD4051.h
source/Driver/CD4051/CD4051.h
+2
-2
init.c
source/System/init.c
+9
-3
No files found.
source/Application/APP/LINE_IN/Line_In_user.c
View file @
ddf667ca
...
@@ -42,7 +42,7 @@ const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] =
...
@@ -42,7 +42,7 @@ const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] =
/*指示灯信号 硬线输入*/
/*指示灯信号 硬线输入*/
{
LINE_IN_LEVEL_LOW
,
200U
,
0U
,
LINE_IN_IG_ON
,
LINE_IN_Get_ABS
,},
/*A22 ABS*/
{
LINE_IN_LEVEL_LOW
,
200U
,
0U
,
LINE_IN_IG_ON
,
LINE_IN_Get_ABS
,},
/*A22 ABS*/
{
LINE_IN_LEVEL_LOW
,
200U
,
0U
,
LINE_IN_IG_ON
,
LINE_IN_Get_PARK_BRAKE
,},
/*A23 PARK BRAKE*/
{
LINE_IN_LEVEL_LOW
,
200U
,
0U
,
LINE_IN_IG_ON
,
LINE_IN_Get_PARK_BRAKE
,},
/*A23 PARK BRAKE*/
{
LINE_IN_LEVEL_HIGH
,
20
0U
,
0U
,
LINE_IN_IG_ON
,
LINE_IN_Get_HI_BEAM
,},
/*A25 HI BEAM*/
{
LINE_IN_LEVEL_HIGH
,
6
0U
,
0U
,
LINE_IN_IG_ON
,
LINE_IN_Get_HI_BEAM
,},
/*A25 HI BEAM*/
{
LINE_IN_LEVEL_LOW
,
200U
,
0U
,
LINE_IN_IG_ON
,
LINE_IN_Get_BRAKE_AIR_EBS
,},
/*A28 BRAKE AIR/EBS*/
{
LINE_IN_LEVEL_LOW
,
200U
,
0U
,
LINE_IN_IG_ON
,
LINE_IN_Get_BRAKE_AIR_EBS
,},
/*A28 BRAKE AIR/EBS*/
{
LINE_IN_LEVEL_LOW
,
200U
,
0U
,
LINE_IN_IG_ON
,
LINE_IN_Get_SEAT_BELT
,},
/*A30 SEAT BELT*/
{
LINE_IN_LEVEL_LOW
,
200U
,
0U
,
LINE_IN_IG_ON
,
LINE_IN_Get_SEAT_BELT
,},
/*A30 SEAT BELT*/
{
LINE_IN_LEVEL_LOW
,
200U
,
0U
,
LINE_IN_IG_ON
,
LINE_IN_Get_MIL
,},
/*A31 MIL*/
{
LINE_IN_LEVEL_LOW
,
200U
,
0U
,
LINE_IN_IG_ON
,
LINE_IN_Get_MIL
,},
/*A31 MIL*/
...
...
source/Application/APP/PowerManagement/PowerManagement_user.c
View file @
ddf667ca
...
@@ -106,14 +106,6 @@ Power_Status_t Power_KL30_Init ( void )
...
@@ -106,14 +106,6 @@ Power_Status_t Power_KL30_Init ( void )
/*按键部分 杨真东维护开始*/
/*按键部分 杨真东维护开始*/
Key_Init
();
Key_Init
();
VCC12V0_OUT_EN
=
1U
;
/*12V 电源使能*/
D1530_EN_MCU_OUT
=
1U
;
/*1530 使能*/
//BL_ACC_EN = 1U; /*8867 使能*/
Fuel_VCC05V_OUT_EN
=
1U
;
/*燃油电源 使能*/
AIR_5V_OUT_EN
=
1u
;
/*气压 5V*/
ACC5V_LED_PWM_MCU
=
1u
;
BUZZER_ACC_OUT_EN
=
1u
;
LED_Driver_Init
();
LED_Driver_Init
();
Sound_Scheduler_Init
();
Sound_Scheduler_Init
();
Sound_Player_Init
();
Sound_Player_Init
();
...
@@ -199,13 +191,6 @@ Power_Status_t Power_Wakeup_Init ( void )
...
@@ -199,13 +191,6 @@ Power_Status_t Power_Wakeup_Init ( void )
/*燃油新增 ----20220503----*/
/*燃油新增 ----20220503----*/
Fuel_User_Wakeup_Init
();
Fuel_User_Wakeup_Init
();
VCC12V0_OUT_EN
=
1u
;
/*12V 电源使能*/
D1530_EN_MCU_OUT
=
1u
;
/*1530 使能*/
//BL_ACC_EN = 1U; /*8867 使能*/
Fuel_VCC05V_OUT_EN
=
1u
;
/*燃油电源 使能*/
AIR_5V_OUT_EN
=
1u
;
/*气压 5V*/
ACC5V_LED_PWM_MCU
=
1u
;
BUZZER_ACC_OUT_EN
=
1u
;
LED_Driver_Init
();
LED_Driver_Init
();
/*报警调度初始化*/
/*报警调度初始化*/
Popup_Scheduler_Init
();
Popup_Scheduler_Init
();
...
...
source/Application/APP/Telltales/Telltales_user.c
View file @
ddf667ca
...
@@ -571,7 +571,7 @@ void LED_MIL_T_Execution(uint8_t led_status)
...
@@ -571,7 +571,7 @@ void LED_MIL_T_Execution(uint8_t led_status)
{
{
if
(
led_status
==
1
)
if
(
led_status
==
1
)
{
{
LED_Driver_Channel_Set
(
0u
,
30u
,
LED_BRIGHTNESSY
);
LED_Driver_Channel_Set
(
0u
,
30u
,
0xFFu
);
SEG_LED_MIL_T
(
7
);
SEG_LED_MIL_T
(
7
);
}
}
else
else
...
...
source/Driver/CD4051/CD4051.c
View file @
ddf667ca
...
@@ -146,23 +146,6 @@ void CD4051B_Debounce_Service(void)
...
@@ -146,23 +146,6 @@ void CD4051B_Debounce_Service(void)
{
{
CD4051CtrStr
[
comcnt
][
chcnt
].
time
++
;
CD4051CtrStr
[
comcnt
][
chcnt
].
time
++
;
if
(
CD4051B_GeneralCOM_Cache
[
comcnt
][
chcnt
]
==
1u
)
if
(
CD4051B_GeneralCOM_Cache
[
comcnt
][
chcnt
]
==
1u
)
{
/*特殊*/
if
((
comcnt
==
COM3
)
&&
(
chcnt
==
Channel5
))
{
if
(
CD4051CtrStr
[
comcnt
][
chcnt
].
time
>=
2
)
{
CD4051CtrStr
[
comcnt
][
chcnt
].
time
=
0u
;
CD4051B_GeneralCOM_Value
[
comcnt
][
chcnt
]
=
1u
;
}
else
{
;
}
}
/*一般*/
else
{
{
if
(
CD4051CtrStr
[
comcnt
][
chcnt
].
time
>=
CD4051B_DEBOUNCE_High_CNT
)
if
(
CD4051CtrStr
[
comcnt
][
chcnt
].
time
>=
CD4051B_DEBOUNCE_High_CNT
)
{
{
...
@@ -175,23 +158,6 @@ void CD4051B_Debounce_Service(void)
...
@@ -175,23 +158,6 @@ void CD4051B_Debounce_Service(void)
;
;
}
}
}
}
}
else
{
/*特殊*/
if
((
comcnt
==
COM3
)
&&
(
chcnt
==
Channel5
))
{
if
(
CD4051CtrStr
[
comcnt
][
chcnt
].
time
>=
2
)
{
CD4051CtrStr
[
comcnt
][
chcnt
].
time
=
0u
;
CD4051B_GeneralCOM_Value
[
comcnt
][
chcnt
]
=
0u
;
}
else
{
;
}
}
/*一般*/
else
else
{
{
if
(
CD4051CtrStr
[
comcnt
][
chcnt
].
time
>=
CD4051B_DEBOUNCE_Low_CNT
)
if
(
CD4051CtrStr
[
comcnt
][
chcnt
].
time
>=
CD4051B_DEBOUNCE_Low_CNT
)
...
@@ -205,7 +171,6 @@ void CD4051B_Debounce_Service(void)
...
@@ -205,7 +171,6 @@ void CD4051B_Debounce_Service(void)
}
}
}
}
}
}
}
else
else
{
{
CD4051CtrStr
[
comcnt
][
chcnt
].
time
=
0u
;
CD4051CtrStr
[
comcnt
][
chcnt
].
time
=
0u
;
...
...
source/Driver/CD4051/CD4051.h
View file @
ddf667ca
...
@@ -15,8 +15,8 @@
...
@@ -15,8 +15,8 @@
#define CD4051B_InputGOIO_Com6 CD4051A_COM6_MCU_IN
#define CD4051B_InputGOIO_Com6 CD4051A_COM6_MCU_IN
#define CD4051B_InputGOIO_Com7 CD4051A_COM7_MCU_IN
#define CD4051B_InputGOIO_Com7 CD4051A_COM7_MCU_IN
#define CD4051B_DEBOUNCE_High_TIME 20
0
u
#define CD4051B_DEBOUNCE_High_TIME 20u
#define CD4051B_DEBOUNCE_Low_TIME 20
0
u
#define CD4051B_DEBOUNCE_Low_TIME 20u
#define CD4051B_DEBOUNCE_High_CNT CD4051B_DEBOUNCE_High_TIME / 20u
#define CD4051B_DEBOUNCE_High_CNT CD4051B_DEBOUNCE_High_TIME / 20u
#define CD4051B_DEBOUNCE_Low_CNT CD4051B_DEBOUNCE_Low_TIME / 20u
#define CD4051B_DEBOUNCE_Low_CNT CD4051B_DEBOUNCE_Low_TIME / 20u
/*通道枚举*/
/*通道枚举*/
...
...
source/System/init.c
View file @
ddf667ca
...
@@ -133,12 +133,18 @@ void Sys_Startup_Init(void)
...
@@ -133,12 +133,18 @@ void Sys_Startup_Init(void)
Sys_Tick_Timer_Start
();
Sys_Tick_Timer_Start
();
/*COM_CAN_Init(); ÔCAN³õʼ»¯Î»ÖÃ*/
/*COM_CAN_Init(); ÔCAN³õʼ»¯Î»ÖÃ*/
IGH_5VLED
=
1
;
RTE_ADC_Init
();
RTE_ADC_Init
();
VCC05V0_OUT_EN
=
1u
;
/*外设5V 电源使能 3-2*/
DelayUs
(
50000
);
IGH_5VLED
=
1
;
/* 42-7*/
DelayUs
(
50000
);
DelayUs
(
50000
);
DelayUs
(
50001
);
VCC12V0_OUT_EN
=
1u
;
/*12V 电源使能 3-3*/
D1530_EN_MCU_OUT
=
1u
;
/*1530 使能 42-14*/
Fuel_VCC05V_OUT_EN
=
1u
;
/*燃油电源 使能 3-5*/
AIR_5V_OUT_EN
=
1u
;
/*气压 5V 3-4*/
ACC5V_LED_PWM_MCU
=
1u
;
/*42-6*/
BUZZER_ACC_OUT_EN
=
1u
;
/*3-6*/
Int_Flash_Init
();
Int_Flash_Init
();
SEG_BUFF_Init
();
SEG_BUFF_Init
();
...
...
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