调整报文外发

ghs/project.siz

 project          .intvect            1536
-project          .text             322892
+project          .text             324588
 project          .rodata           411103
 project          .secinfo             120
 project          .syscall               6

source/Application/APP/Data_Fuel/Data_Fuel_User.c

@@ -269,7 +269,7 @@ uint16_t Fuel_Get_Step(void)
 
     FuelStep = GetFuelStep();
 
-    return FuelStep
+    return FuelStep;
 }
 
 uint8_t Fuel_Get_LowAlarm(void)

source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c

@@ -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},
-    {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},
+    {0x18FEAE17ul,  200ul * 1000ul,  0ul, 0u, MSG_EXT,  3u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18FEAE17, (void *)0},
+    {0x18FF3E17ul,  500ul * 1000ul,  1ul, 0u, MSG_EXT,  4u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18FF3E17, (void *)0},
+    {0x18FED917ul,  100ul * 1000ul,  3ul, 0u, MSG_EXT,  5u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18FED917, (void *)0},
+    {0x18FEE617ul, 1000ul * 1000ul,  5ul, 0u, MSG_EXT,  6u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18FEE617, (void *)0},
+    {0x18EF1817ul,  100ul * 1000ul,  7ul, 0u, MSG_EXT,  7u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18EF1817, (void *)0},
+    {0x18FEE017ul,  100ul * 1000ul, 11ul, 0u, MSG_EXT,  8u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18FEE017, (void *)0},
+    {0x18FEFC17ul, 1000ul * 1000ul, 13ul, 0u, MSG_EXT,  9u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18FEFC17, (void *)0},
+    {0x18FF2517ul, 1000ul * 1000ul, 17ul, 0u, MSG_EXT, 10u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18FF2517, (void *)0},
+    {0x18FF2A17ul, 2000ul * 1000ul, 19ul, 0u, MSG_EXT, 11u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18FF2A17, (void *)0},
+    {0x18FF9D17ul,  100ul * 1000ul, 23ul, 0u, MSG_EXT, 12u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18FF9D17, (void *)0},
+    {0x18FFE517ul, 1000ul * 1000ul, 29ul, 0u, MSG_EXT, 13u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18FFE517, (void *)0},
+    {0x18EF2D17ul, 1000ul * 1000ul, 31ul, 0u, MSG_EXT, 14u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18EF2D17, (void *)0},
+    {0x18033317ul,  100ul * 1000ul, 34ul, 0u, MSG_EXT, 15u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_18033317, (void *)0},
+    {0x180433A2ul,  100ul * 1000ul, 47ul, 0u, MSG_EXT, 16u, 8u, CAN_MSG_TX_CYCLE,       Can_Set_Buff_180433A2, (void *)0},
 };
 
 const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =

source/Application/Graphic/GUI/GUI.c

@@ -27,9 +27,6 @@
 #include "Data_Voltmeter.h"
 #include "Data_AirPressure.h"
 
-#define TRAPA 0u
-#define TRAPB 1u
-
 uint32_t HYQ_TEST = 3;
 
 volatile _Display_State_Flag State_Flag; /*0-常态 1-小于0 2-小于1000 3-无此功能*/

source/Application/Graphic/GUI/GUI.h

@@ -6,6 +6,9 @@
 #include "images.h"
 #include "TYW_stdint.h"
 
+#define TRAPA 0u
+#define TRAPB 1u
+
 #define Language_En 0u
 #define Language_Cn 1u