Commit 89de3cf0 authored by hu's avatar hu

增加显示图片,FV00.06

parent 6627d6bf
......@@ -603,7 +603,7 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
{
uint8_t Trip_Type = 0u;
if (State_Flag.FState_ClearOilTx == 1)
if (State_Flag.FState_ClearOilTx == 0x01u)
{
if (Trip_Type == TRAPA)
{
......@@ -627,11 +627,9 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
CopyData[6] = 0xFF;
CopyData[7] = 0xFF;
}
User_BCM_Flag = 1u;/*从头轮询*/
State_Flag.FState_ClearOilTx = 0u;
//Can_Msg_Tx_Overwrite(MSGID_18EF1817, 1, 100 * 1000);
User_BCM_Flag = 1u;/*从头轮询*/
State_Flag.FState_ClearOilTx = 0x00u;
}
else
{
......@@ -761,14 +759,31 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
default:
break;
}
}
}
//Can_Msg_Tx_Overwrite(MSGID_18EF1817, 0XFFFF, 100 * 1000);
void Id18ef1817_Send_Service(void)
{
if (State_Flag.FState_COilTimeOut == 1u)
{
Can_Msg_Tx_Overwrite(MSGID_18EF1817, 1u, 100 * 1000);
}
else
{
if ((State_Flag.FState_ClearOilRx == 0u) && (State_Flag.FState_COilTimeOut != FState_COilTimeOutNum))
{
Can_Msg_Tx_Overwrite(MSGID_18EF1817, 0u, 100 * 1000);
}
else
{
Can_Msg_Tx_Overwrite(MSGID_18EF1817, 0xFFFFu, 100 * 1000);
}
}
}
/*-------------------------------------------------------------------------
* Function Name : Drive_Info_IC1_STATUS_Rx
* Description : 18EF1718 报文循环接收处理
* Description : 18EF1718 报文循环接收处理 100ms任务中执行
* Input : None
* Output : None
* Return : None
......@@ -870,14 +885,22 @@ void Drive_Info_IC1_STATUS_Rx(void)
break;
}
// if (State_Flag.FState_COilTimeOut < FState_COilTimeOutNum)
//{
// State_Flag.FState_COilTimeOut++;
// }
// if (Data_Sig == 0x40u)
//{
// State_Flag.FState_ClearOilRx == 1;
// }
#if 0
if (State_Flag.FState_COilTimeOut < FState_COilTimeOutNum)
{
State_Flag.FState_COilTimeOut++;
if (State_Flag.FState_COilTimeOut == FState_COilTimeOutNum)
{
State_Flag.FState_ClearOilTx = 0u;
}
}
if (Data_Sig == 0x40u)
{
State_Flag.FState_ClearOilRx == 1;
}
#endif
}
/*-------------------------------------------------------------------------
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -196,6 +196,10 @@ enum SpriteName
CN_tianlanyezouge_03,
CN_tianlanyezouge_04,
CN_tianlanyezouge_05,
CN_AUTO,
CN_A_ECO,
CN_A_POWER,
CN_black,
CN_dangwei_1,
CN_dangwei_10,
CN_dangwei_11,
......@@ -219,7 +223,9 @@ enum SpriteName
CN_dangwei_RM,
CN_MANUAL,
CN_Alarm_01,
CN_Alarm_01_1,
CN_Alarm_02,
CN_Alarm_02_1,
CN_ODO,
CN_ODO_danwei,
CN_TRIP,
......
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