Commit 0c128970 authored by 李冠华's avatar 李冠华

feat:混动车型修改电源条件判断

parent 6c520d78
...@@ -215,6 +215,7 @@ uint8_t Get_CAN_Num_SMCU_ErrorGrage(void) ...@@ -215,6 +215,7 @@ uint8_t Get_CAN_Num_SMCU_ErrorGrage(void)
} }
uint8_t g_powerState = 0U;
uint8_t Get_CAN_Power_State(void) uint8_t Get_CAN_Power_State(void)
{ {
...@@ -257,20 +258,20 @@ uint8_t Get_CAN_Power_State(void) ...@@ -257,20 +258,20 @@ uint8_t Get_CAN_Power_State(void)
state = POWER_CHECK_NULL; state = POWER_CHECK_NULL;
} }
#else #else
if ((Common_Get_IG_Sts() == COMMON_POWER_ON)) switch(g_powerState)
{
if ((CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x220_Msg)) == CAN_SIG_NORMAL) && (Get_CAN_CH0_ID_220_Sig_VCU_KeySts() == 1U))
{
state = KEY_ACC;
}
else
{
state = PKEY_ON;
}
}
else
{ {
case 0:
state = KEY_OFF;
break;
case 1:
state = PKEY_ON;
break;
case 2:
state = KEY_ACC;
break;
default:
state = KEY_OFF; state = KEY_OFF;
break;
} }
#endif #endif
return state; return state;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "Components.h" #include "Components.h"
extern uint8_t g_powerState;
extern uint8_t Get_CAN_Num_BMCU_ErrorGrage(void); extern uint8_t Get_CAN_Num_BMCU_ErrorGrage(void);
......
...@@ -115,21 +115,23 @@ monitorlib_uint8_t System_LINE_KL15(void) ...@@ -115,21 +115,23 @@ monitorlib_uint8_t System_LINE_KL15(void)
u8KL15 = 0u; u8KL15 = 0u;
} }
#else #else
if ((Sys_Read_KL15_Voltage() >= 5500u ) && (Sys_Read_KL30_Voltage() >= 5500u)) if ((Sys_Read_KL15_Voltage() >= 5500u ) && (Sys_Read_KL30_Voltage() >= 5500u))
{ {
if ((CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x220_Msg)) == CAN_SIG_NORMAL) && (Get_CAN_CH0_ID_220_Sig_VCU_KeySts() == 1U)) if ((CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x220_Msg)) == CAN_SIG_NORMAL) && (Get_CAN_CH0_ID_220_Sig_VCU_KeySts() == 1U))
{ {
u8KL15 = 1U; u8KL15 = 1U;
g_powerState = 2U;
} }
else else
{ {
u8KL15 = 0U; u8KL15 = 0U;
g_powerState = 1U;
} }
} }
else else
{ {
u8KL15 = 0U; u8KL15 = 0U;
g_powerState = 0U;
} }
#endif #endif
......
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