Commit dd5548e7 authored by 郑萍's avatar 郑萍

🐞 fix:档位指示灯颜色以及发送0x125 MMCU_PowerMode=0x1,P档闪烁周期更改为500ms

parent 3c0c38e7
#include "GUI_Display\GUI_Display.h" #include "GUI_Display\GUI_Display.h"
#include "SEG_DISPLAY\SEG_DISPLAY.h" #include "SEG_DISPLAY\SEG_DISPLAY.h"
#include "Application.h" #include "Application.h"
#define DISPLAY_OPEN ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Charge_OFF_Flag == 0) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != PKEY_ON)) #define DISPLAY_OPEN ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Charge_OFF_Flag == 0) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != PKEY_ON) && (System_Indicator_CANFlag != 1))
uint16_t poweroff_time = 0; uint16_t poweroff_time = 0;
uint8_t SOC_Count_Time = 0; uint8_t SOC_Count_Time = 0;
...@@ -30,7 +30,7 @@ void Gauge_Cutterhead_Gear_Display(void) ...@@ -30,7 +30,7 @@ void Gauge_Cutterhead_Gear_Display(void)
uint8_t Signal1 = Get_CAN_Num_BMCU_BladeSpeedGear(); uint8_t Signal1 = Get_CAN_Num_BMCU_BladeSpeedGear();
uint8_t Signal2 = Get_CAN_Num_BMCU_ErrorGrage(); uint8_t Signal2 = Get_CAN_Num_BMCU_ErrorGrage();
// uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState(); // uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Charge_OFF_Flag == 0) && (Get_CAN_Power_State() == READY)) if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Charge_OFF_Flag == 0) && (Get_CAN_Power_State() == READY)&& (System_Indicator_CANFlag != 1))
{ {
if ((Signal2 == 0x1) || (Signal2 == 0x2) || (Signal2 == 0x3) || (Signal2 == 0x4)) if ((Signal2 == 0x1) || (Signal2 == 0x2) || (Signal2 == 0x3) || (Signal2 == 0x4))
{ {
...@@ -59,7 +59,7 @@ void Gauge_Gears_Display(void) ...@@ -59,7 +59,7 @@ void Gauge_Gears_Display(void)
uint8_t Signal1 = Get_CAN_Num_MMCU_TravelSpeedGear(); uint8_t Signal1 = Get_CAN_Num_MMCU_TravelSpeedGear();
uint8_t Signal2 = Get_CAN_Num_MMCU_ParkingGearState(); uint8_t Signal2 = Get_CAN_Num_MMCU_ParkingGearState();
// uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState(); // uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Charge_OFF_Flag == 0) &&(Get_CAN_Power_State() != KEY_OFF)) if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Charge_OFF_Flag == 0) &&(Get_CAN_Power_State() != KEY_OFF) && (System_Indicator_CANFlag != 1))
{ {
if (Signal2 != 0x1) if (Signal2 != 0x1)
{ {
...@@ -110,7 +110,7 @@ void Gauge_Power_SOC_CHAGING_Display(void) ...@@ -110,7 +110,7 @@ void Gauge_Power_SOC_CHAGING_Display(void)
uint8_t MBMS_TOTALSigCharge = Get_CAN_Num_MBMS_TOTALSigCharge(); uint8_t MBMS_TOTALSigCharge = Get_CAN_Num_MBMS_TOTALSigCharge();
uint8_t MBMS_StatBattWorkState = Get_CAN_Num_MBMS_StatBattWorkState(); uint8_t MBMS_StatBattWorkState = Get_CAN_Num_MBMS_StatBattWorkState();
// uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState(); // uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
if ((Common_Get_IG_Sts() == COMMON_POWER_ON)) if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (System_Indicator_CANFlag != 1))
{ {
uint8_t Current_1_Grid = Get_CAN_Num_MBMS_Soc_1_Grid(); uint8_t Current_1_Grid = Get_CAN_Num_MBMS_Soc_1_Grid();
uint8_t Current_2_Grid = Get_CAN_Num_SBMS_Soc_2_Grid(); uint8_t Current_2_Grid = Get_CAN_Num_SBMS_Soc_2_Grid();
...@@ -210,7 +210,7 @@ uint8_t AllSOC_DIS = 0; ...@@ -210,7 +210,7 @@ uint8_t AllSOC_DIS = 0;
void Gauge_EleDial_AllSOC_Display(void) void Gauge_EleDial_AllSOC_Display(void)
{ {
if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != PKEY_ON)) if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != PKEY_ON)&& (System_Indicator_CANFlag != 1))
{ {
AllSOC_DIS = Get_CAN_Num_MBMS_StatSoc(); AllSOC_DIS = Get_CAN_Num_MBMS_StatSoc();
SEG_SET_EleDial_AllSOC(1, AllSOC_DIS); SEG_SET_EleDial_AllSOC(1, AllSOC_DIS);
...@@ -364,7 +364,6 @@ void Gauge_Service(void) ...@@ -364,7 +364,6 @@ void Gauge_Service(void)
interact_PWM_Low_Duty = 50; interact_PWM_Low_Duty = 50;
if (FLASH_SYNC_05Hz) if (FLASH_SYNC_05Hz)
{ {
SEG_SET_GEAR(1, Gear_P, 0);
if (Buzzer_time <= 6000) if (Buzzer_time <= 6000)
{ {
RTE_GPIO_Set_Level(RTE_GPIO_PORT04_PIN01, RTE_GPIO_LEVEL_HIGH); // OUT_EN_1 RTE_GPIO_Set_Level(RTE_GPIO_PORT04_PIN01, RTE_GPIO_LEVEL_HIGH); // OUT_EN_1
...@@ -378,7 +377,6 @@ void Gauge_Service(void) ...@@ -378,7 +377,6 @@ void Gauge_Service(void)
} }
else else
{ {
SEG_SET_GEAR(1, Gear_OFF, 0);
RTE_GPIO_Set_Level(RTE_GPIO_PORT04_PIN01, RTE_GPIO_LEVEL_LOW); // OUT_EN_1 RTE_GPIO_Set_Level(RTE_GPIO_PORT04_PIN01, RTE_GPIO_LEVEL_LOW); // OUT_EN_1
BUZZER_ON = 0; BUZZER_ON = 0;
} }
......
...@@ -882,23 +882,25 @@ static void LED_P_GEAR_G_Execution(Tellib_uint16_t led_status) ...@@ -882,23 +882,25 @@ static void LED_P_GEAR_G_Execution(Tellib_uint16_t led_status)
{ {
if ( led_status == 1u ) if ( led_status == 1u )
{ {
LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_P_GEAR_G, LED_ON); LED_Driver_Channel_Set(LampChannel_0, LampCh0_05_Gears_W, LED_ON);
SEG_SET_GEAR(1, Gear_P, 0); SEG_SET_GEAR(1, Gear_P, 0);
} }
else if(led_status == 2u) else if(led_status == 2u)
{ {
if(FLASH_SYNC_05Hz) if(FLASH_SYNC_1Hz)
{ {
LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_P_GEAR_G, LED_ON); LED_Driver_Channel_Set(LampChannel_0, LampCh0_05_Gears_W, LED_ON);
SEG_SET_GEAR(1, Gear_P, 0);
} }
else else
{ {
LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_P_GEAR_G, LED_OFF); LED_Driver_Channel_Set(LampChannel_0, LampCh0_05_Gears_W, LED_OFF);
SEG_SET_GEAR(1, Gear_OFF, 0);
} }
} }
else if(checkself_seg_Flag == 0) else if(checkself_seg_Flag == 0)
{ {
LED_Driver_Channel_Set(LampChannel_0, LampCh0_03_P_GEAR_G, LED_OFF); LED_Driver_Channel_Set(LampChannel_0, LampCh0_05_Gears_W, LED_OFF);
SEG_SET_GEAR(0, Gear_P, 0); SEG_SET_GEAR(0, Gear_P, 0);
} }
} }
......
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