Commit ddf667ca authored by hu's avatar hu

调整上电时序,修改影线采集消抖时间

parent 7066719f
...@@ -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, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_HI_BEAM,}, /*A25 HI BEAM*/ { LINE_IN_LEVEL_HIGH, 60U, 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*/
......
...@@ -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();
......
...@@ -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
......
...@@ -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;
......
...@@ -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 200u #define CD4051B_DEBOUNCE_High_TIME 20u
#define CD4051B_DEBOUNCE_Low_TIME 200u #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
/*通道枚举*/ /*通道枚举*/
......
...@@ -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();
......
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