Commit 6b3cee17 authored by 郑萍's avatar 郑萍

feat:增加系统电源信号的0x7模式

parent dd5548e7
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define BACK_LIGHT_DAY 200 #define BACK_LIGHT_DAY 200
#define openLED_flag ((Get_CAN_Power_State() != PKEY_ON) && (Get_CAN_Power_State() != KEY_OFF) ) #define openLED_flag ((Get_CAN_Power_State() != PKEY_ON) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != POWER_CHECK_NULL))
uint8_t interact_PWM_Low_Duty = 0; uint8_t interact_PWM_Low_Duty = 0;
void BackLight_Process(void) void BackLight_Process(void)
......
...@@ -85,7 +85,7 @@ void Set_CAN_ALL_Signal(void) ...@@ -85,7 +85,7 @@ void Set_CAN_ALL_Signal(void)
else else
{ {
MMCU_SeatDetectState = Get_CAN_CH0_ID_125_Sig_MMCU_SeatDetectState(); // 掉线需要做处理 MMCU_SeatDetectState = Get_CAN_CH0_ID_125_Sig_MMCU_SeatDetectState(); // 掉线需要做处理
MMCU_PowerMode = Get_CAN_CH0_ID_125_Sig_MMCU_PowerMode(); MMCU_PowerMode = POWER_CHECK_NULL;
} }
if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x339_Msg)) == CAN_ERR_OK) if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x339_Msg)) == CAN_ERR_OK)
{ {
...@@ -240,6 +240,9 @@ uint8_t Get_CAN_Power_State(void) ...@@ -240,6 +240,9 @@ uint8_t Get_CAN_Power_State(void)
case 0x6: case 0x6:
state = CHRGEND; state = CHRGEND;
break; break;
case 0x7:
state = POWER_CHECK_NULL;
break;
default: default:
break; break;
} }
......
...@@ -331,7 +331,7 @@ void Gauge_Service(void) ...@@ -331,7 +331,7 @@ void Gauge_Service(void)
uint8_t i = 0; uint8_t i = 0;
if (Common_Get_IG_Sts() == COMMON_POWER_ON) if (Common_Get_IG_Sts() == COMMON_POWER_ON)
{ {
if ((Get_CAN_Power_State() != PKEY_ON) && (Get_CAN_Power_State() != KEY_OFF)) if ((Get_CAN_Power_State() != PKEY_ON) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != POWER_CHECK_NULL))
{ {
BUZZER_Init(); BUZZER_Init();
if (Common_GetIgnOnTime() > 1500) if (Common_GetIgnOnTime() > 1500)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "Application.h" #include "Application.h"
#include "CAN_APP\CAN_CH0_CAN_Communication_Matrix.h" #include "CAN_APP\CAN_CH0_CAN_Communication_Matrix.h"
#include "Components.h" #include "Components.h"
#define openLED_flag ((Get_CAN_Power_State() != PKEY_ON) && (Get_CAN_Power_State() != KEY_OFF) && (Charge_OFF_Flag == 0)) #define openLED_flag ((Get_CAN_Power_State() != PKEY_ON) && (Get_CAN_Power_State() != KEY_OFF) && (Charge_OFF_Flag == 0) && (Get_CAN_Power_State() != POWER_CHECK_NULL))
static Tellib_uint16_t LED_EFI_failure_Judgement(void); static Tellib_uint16_t LED_EFI_failure_Judgement(void);
static void LED_EFI_failure_Execution(Tellib_uint16_t led_status); static void LED_EFI_failure_Execution(Tellib_uint16_t led_status);
static Tellib_uint16_t LED_Fuel_Alarm_Judgement(void); static Tellib_uint16_t LED_Fuel_Alarm_Judgement(void);
...@@ -373,7 +373,7 @@ static Tellib_uint16_t LED_Battery_Charging_Judgement(void) ...@@ -373,7 +373,7 @@ static Tellib_uint16_t LED_Battery_Charging_Judgement(void)
Tellib_uint8_t Signal1 = Get_CAN_Num_MBMS_TOTALSigAcc(); Tellib_uint8_t Signal1 = Get_CAN_Num_MBMS_TOTALSigAcc();
Tellib_uint8_t Signal2 = Get_CAN_Num_MBMS_TOTALSigCharge(); Tellib_uint8_t Signal2 = Get_CAN_Num_MBMS_TOTALSigCharge();
Tellib_uint8_t Signal3 = Get_CAN_Power_State(); Tellib_uint8_t Signal3 = Get_CAN_Power_State();
if((Get_CAN_Power_State() != PKEY_ON) && (Get_CAN_Power_State() != KEY_OFF)) if((Get_CAN_Power_State() != PKEY_ON) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != POWER_CHECK_NULL))
{ {
if (((Signal1 == 0x1) || (Signal1 == 0x0) ) && (Signal2 == 0X1)) if (((Signal1 == 0x1) || (Signal1 == 0x0) ) && (Signal2 == 0X1))
{ {
...@@ -934,7 +934,7 @@ static Tellib_uint16_t LED_Charging_Connection_R_Judgement(void) ...@@ -934,7 +934,7 @@ static Tellib_uint16_t LED_Charging_Connection_R_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
Tellib_uint8_t Signal1 = Get_CAN_Num_MBMS_StatBattChargeState(); Tellib_uint8_t Signal1 = Get_CAN_Num_MBMS_StatBattChargeState();
if (((Signal1 == 0x1) || (Signal1 == 0x2) ||(Signal1 == 0x3)) && ((Get_CAN_Power_State() != PKEY_ON) && (Get_CAN_Power_State() != KEY_OFF))) if (((Signal1 == 0x1) || (Signal1 == 0x2) ||(Signal1 == 0x3)) && ((Get_CAN_Power_State() != PKEY_ON) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != POWER_CHECK_NULL)))
{ {
LED_STATE = 1; LED_STATE = 1;
} }
......
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