Commit 7b131bd3 authored by hu's avatar hu

调整报警调度

parent 41651a28
No preview for this file type
This diff is collapsed.
project .intvect 1536
project .text 320108
project .text 320172
project .rodata 411103
project .secinfo 120
project .syscall 6
......
......@@ -86,7 +86,11 @@ void Tacho_Processing_Service(void)
u32Result += 500u;
u32Result /= 1000u;
if (u32Result > 3000u)
if (u32Result < 330u)
{
u32Result = 0u;
}
else if (u32Result > 3000u)
{
u32Result = 3000u;
}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -4,20 +4,20 @@
const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] =
{
{0x18FEAE17ul, 200ul * 1000ul, 0ul, 0u, MSG_EXT, 2u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEAE17, (void *)0},
{0x18FF3E17ul, 500ul * 1000ul, 1ul, 0u, MSG_EXT, 3u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF3E17, (void *)0},
{0x18FED917ul, 100ul * 1000ul, 3ul, 0u, MSG_EXT, 4u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FED917, (void *)0},
{0x18FEE617ul, 1000ul * 1000ul, 5ul, 0u, MSG_EXT, 5u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEE617, (void *)0},
{0x18EF1817ul, 100ul * 1000ul, 7ul, 0u, MSG_EXT, 6u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18EF1817, (void *)0},
{0x18FEE017ul, 100ul * 1000ul, 11ul, 0u, MSG_EXT, 7u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEE017, (void *)0},
{0x18FEFC17ul, 1000ul * 1000ul, 13ul, 0u, MSG_EXT, 8u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEFC17, (void *)0},
{0x18FF2517ul, 1000ul * 1000ul, 17ul, 0u, MSG_EXT, 9u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF2517, (void *)0},
{0x18FF2A17ul, 2000ul * 1000ul, 19ul, 0u, MSG_EXT, 10u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF2A17, (void *)0},
{0x18FF9D17ul, 100ul * 1000ul, 23ul, 0u, MSG_EXT, 11u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF9D17, (void *)0},
{0x18FEAE17ul, 200ul * 1000ul, 0ul, 0u, MSG_EXT, 2u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEAE17, (void *)0},
{0x18FF3E17ul, 500ul * 1000ul, 1ul, 0u, MSG_EXT, 3u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF3E17, (void *)0},
{0x18FED917ul, 100ul * 1000ul, 3ul, 0u, MSG_EXT, 4u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FED917, (void *)0},
{0x18FEE617ul, 1000ul * 1000ul, 5ul, 0u, MSG_EXT, 5u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEE617, (void *)0},
{0x18EF1817ul, 100ul * 1000ul, 7ul, 0u, MSG_EXT, 6u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18EF1817, (void *)0},
{0x18FEE017ul, 100ul * 1000ul, 11ul, 0u, MSG_EXT, 7u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEE017, (void *)0},
{0x18FEFC17ul, 1000ul * 1000ul, 13ul, 0u, MSG_EXT, 8u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEFC17, (void *)0},
{0x18FF2517ul, 1000ul * 1000ul, 17ul, 0u, MSG_EXT, 9u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF2517, (void *)0},
{0x18FF2A17ul, 2000ul * 1000ul, 19ul, 0u, MSG_EXT, 10u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF2A17, (void *)0},
{0x18FF9D17ul, 100ul * 1000ul, 23ul, 0u, MSG_EXT, 11u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF9D17, (void *)0},
{0x18FFE517ul, 1000ul * 1000ul, 29ul, 0u, MSG_EXT, 12u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18FFE517, (void *)0},
{0x18EF2D17ul, 1000ul * 1000ul, 31ul, 0u, MSG_EXT, 13u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18EF2D17, (void *)0},
{0x18033317ul, 100ul * 1000ul, 34ul, 0u, MSG_EXT, 14u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18033317, (void *)0},
{0x180433A2ul, 100ul * 1000ul, 47ul, 0u, MSG_EXT, 15u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_180433A2, (void *)0},
{0x18EF2D17ul, 1000ul * 1000ul, 31ul, 0u, MSG_EXT, 13u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18EF2D17, (void *)0},
{0x18033317ul, 100ul * 1000ul, 34ul, 0u, MSG_EXT, 14u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18033317, (void *)0},
{0x180433A2ul, 100ul * 1000ul, 47ul, 0u, MSG_EXT, 15u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_180433A2, (void *)0},
};
const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
......
......@@ -205,6 +205,7 @@ void GUI_DisplayServices(void)
if (BG_display_flag == 0)
{
BG_display_flag = 1;
MenuInit();
}
else
......@@ -225,6 +226,7 @@ void GUI_DisplayServices(void)
JCUA_Enable_window();
}
}
MenuManage();
//BG_display_flag = 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