Commit 25f29724 authored by 时昊's avatar 时昊

feat:40584修改can上30电默认在线

parent 80a9a11c
......@@ -357,7 +357,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
5000ul,
0x18FEE69Ful,
(( void * )0),
(( void * )0),
Can_Receive,
(( void * )0),
},
{
......
......@@ -286,5 +286,5 @@ void Can_Set_Buff_18FF6F17(canlib_uint8_t *CopyData);
//void Can_Set_Buff_18FF4117(canlib_uint8_t *CopyData);
void Can_Set_Buff_18FEDA17(canlib_uint8_t *CopyData);
void Can_Set_Buff_18FEE017(canlib_uint8_t *CopyData);
void Can_Receive(uint8_t val []);
#endif
......@@ -414,6 +414,7 @@ void Gauge_Battery_Display(void)
* \attention �÷��������뱻ʵʱ����
* \retval ��
******************************************************************************/
extern uint8_t Can18fee69f_receive;
void Gauge_Clock_Display(void)
{
if ( SYS_OPR_STAT_IGN_ON )
......@@ -425,8 +426,9 @@ void Gauge_Clock_Display(void)
//ʱ����ʾ
if(Factory_ClearOdo_Display_Flag == 0)
{
if(CAN_MSG_Status(ID_can0x18FEE69F_Msg_Count) != 0u)
if((CAN_MSG_Status(ID_can0x18FEE69F_Msg_Count) != 0u)||(Can18fee69f_receive != 1))
{
Can18fee69f_receive = 0;
SEG_SET_Clock(0, 0, 0, 0, 0);
}
else
......
......@@ -73,8 +73,12 @@ uint32_t TestBackupRam;
uint16_t CANModeInitFlag = 0U;
extern uint32_t Factory_ClearOdo_Display_Flag;
uint8_t Can18fee69f_receive = 0;
void Can_Receive(uint8_t val [])
{
Can18fee69f_receive = 1;
}
uint16_t SleepTime_Timing;
......@@ -349,6 +353,7 @@ void Power_KL30_Init(void)
Temp_Calc_Init();
Maintenance_Init_Example();
EnergyRecovery_KL30_Init();
Can18fee69f_receive = 0;
}
/**********************************************************************************************************
*@Function: Power_Wakeup_Init
......@@ -383,6 +388,7 @@ void Power_Wakeup_Init(void)
Temp_Calc_Init();
LED_Driver_Init_Wakeup(u8LEDDriverRamData, &led_dr);
Maintenance_Init_Example();
Can18fee69f_receive = 0;
}
/**********************************************************************************************************
*@Function: Power_Management_Init
......
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