Commit 98678bb1 authored by 李冠华's avatar 李冠华

feat:修改行走挡位未接到信号时的显示效果

parent 54feb690
......@@ -88,6 +88,15 @@ void Gauge_Gears_Display(void)
uint8_t GearValid = Get_Gear_Valid();
SEG_SET_GEAR(GearValid, GearValue, 0);
if (Get_CAN_Power_State() == KEY_ACC)
{
SEG_SET_GEAR_FRAME(1U);
}
else
{
SEG_SET_GEAR_FRAME(0U);
}
}
void Gauge_EleDial_AllSOC_Display(void)
......
......@@ -360,15 +360,6 @@ _Fun_Res SEG_SET_GEAR(uint8_t m_Gear_Flag, uint8_t m_Gear, uint8_t checkself)
_Fun_Res Res = EX_ERR;
if (m_Gear_Flag == 1u)
{
IC2_SEG094 = IC_SEG_ON;
IC2_SEG095 = IC_SEG_ON;
IC2_SEG149 = IC_SEG_ON;
IC2_SEG145 = IC_SEG_ON;
IC2_SEG141 = IC_SEG_ON;
IC2_SEG104 = IC_SEG_ON;
IC2_SEG103 = IC_SEG_ON;
IC2_SEG098 = IC_SEG_ON;
IC2_SEG150 = IC_SEG_ON;
if (checkself == 1)
{
m8 = SEG_DISPLAY_NUMBER0[m_Gear];
......@@ -554,14 +545,6 @@ _Fun_Res SEG_SET_GEAR(uint8_t m_Gear_Flag, uint8_t m_Gear, uint8_t checkself)
}
else
{
IC2_SEG094 = IC_SEG_OFF;
IC2_SEG095 = IC_SEG_OFF;
IC2_SEG149 = IC_SEG_OFF;
IC2_SEG145 = IC_SEG_OFF;
IC2_SEG141 = IC_SEG_OFF;
IC2_SEG104 = IC_SEG_OFF;
IC2_SEG103 = IC_SEG_OFF;
IC2_SEG098 = IC_SEG_OFF;
IC2_SEG097 = IC_SEG_OFF;
IC2_SEG148 = IC_SEG_OFF;
IC2_SEG147 = IC_SEG_OFF;
......@@ -574,11 +557,49 @@ _Fun_Res SEG_SET_GEAR(uint8_t m_Gear_Flag, uint8_t m_Gear, uint8_t checkself)
IC2_SEG099 = IC_SEG_OFF;
IC2_SEG146 = IC_SEG_OFF;
IC2_SEG142 = IC_SEG_OFF;
Res = EX_ERR;
}
return Res;
}
/**@brief 挡位边框显示函数
* @param[in] m_Gear_Flag 挡位边框是否显示 -1 显示 -0 不显示
* @return 函数执行结果
* - EX_OK 上报成功
* - EX_ERR 上报失败
*/
_Fun_Res SEG_SET_GEAR_FRAME(uint8_t m_Gear_Flag)
{
_Fun_Res Res = EX_ERR;
if (m_Gear_Flag == 1u)
{
IC2_SEG094 = IC_SEG_ON;
IC2_SEG095 = IC_SEG_ON;
IC2_SEG149 = IC_SEG_ON;
IC2_SEG145 = IC_SEG_ON;
IC2_SEG141 = IC_SEG_ON;
IC2_SEG104 = IC_SEG_ON;
IC2_SEG103 = IC_SEG_ON;
IC2_SEG098 = IC_SEG_ON;
IC2_SEG150 = IC_SEG_ON;
Res = EX_OK;
}
else
{
IC2_SEG094 = IC_SEG_OFF;
IC2_SEG095 = IC_SEG_OFF;
IC2_SEG098 = IC_SEG_OFF;
IC2_SEG103 = IC_SEG_OFF;
IC2_SEG104 = IC_SEG_OFF;
IC2_SEG141 = IC_SEG_OFF;
IC2_SEG145 = IC_SEG_OFF;
IC2_SEG149 = IC_SEG_OFF;
IC2_SEG150 = IC_SEG_OFF;
Res = EX_ERR;
}
return Res;
}
/**@brief 燃油表盘显示函数
* @param[in] m_Flag 段与数字是否显示 -1 显示 -0 不显示
* @param[in] m_SEG 燃油表盘段数0<=m_SEG<=5
......@@ -2757,6 +2778,7 @@ void Check_SEG_Display(void)
min = Checkself_num * 11;
SEG_SET_Clock(hour, min, 1, 1, 1);
SEG_SET_GEAR(1, Checkself_num, 1);
SEG_SET_GEAR_FRAME(1U);
SEG_SET_Cutterhead(1, Checkself_num, 1);
LED_Driver_Channel_Set(LampChannel_0, LampCh0_00_Grass_Full_R, LED_ON);
......@@ -2842,6 +2864,7 @@ void Checkself_SEG_Display(void)
min = Checkself_num * 11;
SEG_SET_Clock(hour, min, 1, 1, 1);
SEG_SET_GEAR(1, Checkself_num, 1);
SEG_SET_GEAR_FRAME(1U);
SEG_SET_Cutterhead(1, Checkself_num, 1);
if (Checkself_SEG_step_count < 100)
{
......
......@@ -54,6 +54,9 @@ _Fun_Res SEG_SET_Frame(uint8_t m_Flag);
/**@brief 挡位显示函数*/
_Fun_Res SEG_SET_GEAR(uint8_t m_Gear_Flag,uint8_t m_Gear,uint8_t checkself);
/**@brief 挡位边框显示函数*/
_Fun_Res SEG_SET_GEAR_FRAME(uint8_t m_Gear_Flag);
/**@brief 电量表盘1SOC显示函数*/
_Fun_Res SEG_SET_EleDial_1SOC(uint8_t m_Flag,uint8_t m_SEG);
......
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