Commit 2f3d6ec5 authored by 郑萍's avatar 郑萍

🐞 fix:125无效值开窗问题,以及档位指示灯点亮问题,并将大于6的电源信号都定义为无效值

parent f0dbf732
...@@ -241,10 +241,8 @@ uint8_t Get_CAN_Power_State(void) ...@@ -241,10 +241,8 @@ 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:
state = POWER_CHECK_NULL;
break; break;
} }
return state; return state;
......
...@@ -489,6 +489,20 @@ void Gauge_Service(void) ...@@ -489,6 +489,20 @@ void Gauge_Service(void)
Buzzer_time++; Buzzer_time++;
} }
} }
else
{
if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x125_Msg)) == CAN_SIG_NORMAL)
{
BUZZER_Init();
poweroff_time = 0;
Clear_Bu98();
interact_PWM_Low_Duty = 100;
for (i = 0; i < LampCh0_MAX; i++)
{
LED_Driver_Channel_Set(LampChannel_0, i, LED_OFF);
}
}
}
} }
else else
{ {
......
...@@ -471,7 +471,7 @@ static void LED_Cutterhead_Switch_Execution(Tellib_uint16_t led_status) ...@@ -471,7 +471,7 @@ static void LED_Cutterhead_Switch_Execution(Tellib_uint16_t led_status)
static Tellib_uint16_t LED_GEAR_Judgement(void) static Tellib_uint16_t LED_GEAR_Judgement(void)
{ {
Tellib_uint16_t LED_STATE = 0u; Tellib_uint16_t LED_STATE = 0u;
if((Charge_OFF_Flag == 0) && (System_Indicator_CANFlag != 1)) if((Charge_OFF_Flag == 0) && (System_Indicator_CANFlag != 1) && (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