Commit dcd21f87 authored by huangguoqing's avatar huangguoqing

feat:CAN诊断nfc

parent 1db795da
......@@ -37,11 +37,11 @@ uint8_t COM_APP_Process(st_CAN_Msg *Msg)
void COM_TX_Process(void)
{
Can_Write_Fun(&CAN_CH4_CanMsgTxOp, 50000u);
Can_Write_Fun(&CAN_CH4_CanMsgTxOp, 20000u);
}
void COM_RX_Process(void)
{
CanMSg_XMS_Analysis(&CAN_CH4_CanMsgOp, 5u);
CanMSg_XMS_Analysis(&CAN_CH4_CanMsgOp, 2u);
}
......@@ -109,12 +109,6 @@ uint8_t Get_DID_Low_Byte(uint16_t Input_DID)
return (uint8_t)(Res);
}
void HW_CHECK_IPK_EXIST(void)
{
......@@ -162,7 +156,7 @@ void CHECK_IPK_COUNT(void)
memset(Voltage_UDS, 0xFF, sizeof(Voltage_UDS));
Display_Menu_Type = 0;
Display_TFT_Clear( );
//Display_TFT_Clear();
Send_Init();
// MENU_CHECK_Init( );
Global_Session = 0;//掉线时,认为会话模式归零,重连CAN线后,重新将会话模式切到03扩展会话。
......
......@@ -50,7 +50,6 @@ void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
{
POWER_CTRL_KL15 = 1;
}
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
......@@ -166,7 +165,6 @@ void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
{
}
}
void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
......@@ -215,6 +213,7 @@ void Key_Operation_SW9(Key_Event_en_t enKeyEvent)
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
......@@ -378,6 +377,9 @@ Key_Real_Status_en_t Key_Real_sw10(void)
return enKeyRealStatus;
}
void User_CheckMode_Service(uint8_t CbkCycle)
{
if(Check_Control_Mode == 1)
......@@ -416,6 +418,7 @@ void User_CheckMode_Service(uint8_t CbkCycle)
Left_Led = 0;
Right_Led = 0;
Headlights_Led = 0;
NFC_C_card = 0;
break;
case 1:
......@@ -435,6 +438,7 @@ void User_CheckMode_Service(uint8_t CbkCycle)
Left_Led = 1;
Right_Led = 1;
Headlights_Led = 0;
NFC_C_card = 1;
break;
case 2:
Vspeed = 19;
......@@ -453,6 +457,7 @@ void User_CheckMode_Service(uint8_t CbkCycle)
Left_Led = 0;
Right_Led = 0;
Headlights_Led = 1;
NFC_C_card=2;
break;
case 3:
Vspeed = 29;
......@@ -471,6 +476,7 @@ void User_CheckMode_Service(uint8_t CbkCycle)
Left_Led = 0;
Right_Led = 0;
Headlights_Led = 0;
NFC_C_card=0;
break;
case 4:
Vspeed = 38;
......
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