Skip to content

R
RT_RMR42E
Commit 6dca2b61 authored by 李冠华's avatar 李冠华
Browse files
Options

🐞 fix:累计工作时长增加前置0显示

parent 86d2380b
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 36 deletions
Firmware/Source/Application/BackLight/BackLight_User.c
View file @ 6dca2b61
......@@ -183,6 +183,7 @@ void BackLight_Process(void)
void BackLight_Clock_All_Process(void)
{
#if (PART_NUMBER == RMR42E_60)
if (openLED_flag && (Charge_OFF_Flag == 0))
{
//总计时间
......@@ -208,6 +209,18 @@ void BackLight_Clock_All_Process(void)
RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN05, RTE_GPIO_LEVEL_LOW); //总计工作时长统计千位_MCU_OUT
RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN06, RTE_GPIO_LEVEL_LOW); //总计工作时长统计百十位_MCU_OUT
}
#else
if (Get_CAN_Power_State() == KEY_ACC)
{
RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN05, RTE_GPIO_LEVEL_HIGH); //总计工作时长统计千位_MCU_OUT
RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN06, RTE_GPIO_LEVEL_HIGH); //总计工作时长统计百十位_MCU_OUT
}
else
{
RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN05, RTE_GPIO_LEVEL_LOW); //总计工作时长统计千位_MCU_OUT
RTE_GPIO_Set_Level(RTE_GPIO_PORT01_PIN06, RTE_GPIO_LEVEL_LOW); //总计工作时长统计百十位_MCU_OUT
}
#endif
}
void Interact_Light_Process(void)
......
Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c
View file @ 6dca2b61
......@@ -2557,14 +2557,14 @@ _Fun_Res SEG_SET_Clock_ALL(uint8_t m_Flag, uint32_t m_NUM)
IC2_SEG077 = IC_SEG_ON;
Num = m_NUM / 10000u;
if ((m_NUM > 10000) || (checkself_seg_Flag == 1))
{
// if ((m_NUM > 10000) || (checkself_seg_Flag == 1))
// {
m8 = SEG_DISPLAY_NUMBER0[Num];
}
else
{
m8 = SEG_UNDISPLAY_NUMBER0[Num];
}
// }
// else
// {
// m8 = SEG_UNDISPLAY_NUMBER0[Num];
// }
if (Bit_Is_Set(m8, 0))
{
......@@ -2624,14 +2624,14 @@ _Fun_Res SEG_SET_Clock_ALL(uint8_t m_Flag, uint32_t m_NUM)
}
/*千位*/
Num = (m_NUM / 1000u) % 10u;
if ((m_NUM > 1000) || (checkself_seg_Flag == 1))
{
// if ((m_NUM > 1000) || (checkself_seg_Flag == 1))
// {
m8 = SEG_DISPLAY_NUMBER0[Num];
}
else
{
m8 = SEG_UNDISPLAY_NUMBER0[Num];
}
// }
// else
// {
// m8 = SEG_UNDISPLAY_NUMBER0[Num];
// }
if (Bit_Is_Set(m8, 0))
{
......@@ -2691,14 +2691,14 @@ _Fun_Res SEG_SET_Clock_ALL(uint8_t m_Flag, uint32_t m_NUM)
}
/*百位*/
Num = (m_NUM / 100u) % 10u;
if ((m_NUM > 100) || (checkself_seg_Flag == 1))
{
// if ((m_NUM > 100) || (checkself_seg_Flag == 1))
// {
m8 = SEG_DISPLAY_NUMBER0[Num];
}
else
{
m8 = SEG_UNDISPLAY_NUMBER0[Num];
}
// }
// else
// {
// m8 = SEG_UNDISPLAY_NUMBER0[Num];
// }
if (Bit_Is_Set(m8, 0))
{
......
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