Skip to content

V
VC66_7C
Commit d06fea00 authored by hu's avatar hu
Browse files
Options

调整CAN发送BUF

parent bfcfb4f2
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 58 deletions
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
View file @ d06fea00
...@@ -5,17 +5,17 @@ ...@@ -5,17 +5,17 @@
const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] = 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}, {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, 3u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF3E17, (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, 4u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FED917, (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, 5u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEE617, (void *)0}, {0x18FEE617ul, 1000ul * 1000ul, 5ul, 0u, MSG_EXT, 6u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEE617, (void *)0},
{0x18EF1817ul, 0ul * 1000ul, 7ul, 0u, MSG_EXT, 6u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18EF1817, (void *)0}, {0x18EF1817ul, 0ul * 1000ul, 7ul, 0u, MSG_EXT, 7u, 8u, CAN_MSG_TX_CYCKE_EVENT, 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}, {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, 8u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FEFC17, (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, 9u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF2517, (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, 10u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF2A17, (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, 11u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF9D17, (void *)0}, {0x18FF9D17ul, 100ul * 1000ul, 23ul, 0u, MSG_EXT, 12u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF9D17, (void *)0},
{0x18FFE517ul, 0ul * 1000ul, 29ul, 0u, MSG_EXT, 12u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18FFE517, Common_SetId18FFE517Msg_TXSUCCESS}, {0x18FFE517ul, 0ul * 1000ul, 29ul, 0u, MSG_EXT, 13u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18FFE517, Common_SetId18FFE517Msg_TXSUCCESS},
//{0x18EF2D17ul, 1000ul * 1000ul, 31ul, 0u, MSG_EXT, 13u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18EF2D17, (void *)0}, //{0x18EF2D17ul, 1000ul * 1000ul, 31ul, 0u, MSG_EXT, 13u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18EF2D17, (void *)0},
{0x18033317ul, 0ul * 1000ul, 34ul, 0u, MSG_EXT, 14u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18033317, (void *)0}, {0x18033317ul, 0ul * 1000ul, 34ul, 0u, MSG_EXT, 14u, 8u, CAN_MSG_TX_CYCKE_EVENT, 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}, {0x180433A2ul, 100ul * 1000ul, 47ul, 0u, MSG_EXT, 15u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_180433A2, (void *)0},
......
source/Application/Graphic/GUI/GUI.c
View file @ d06fea00
...@@ -289,9 +289,12 @@ void GUI_Display_Value_Init(void) ...@@ -289,9 +289,12 @@ void GUI_Display_Value_Init(void)
GUIDTCNumDis = 0u; /*当前显示的故障码*/ GUIDTCNumDis = 0u; /*当前显示的故障码*/
Display_DTC[0u].Disp_Mod_Menu_Cbk = GUI_BG_DTCEngine_Display; /*发动机故障*/ Display_DTC[0u].Disp_Mod_Menu_Cbk = GUI_BG_DTCEngine_Display; /*发动机故障*/
Display_DTC[1u].Disp_Mod_Menu_Cbk = GUI_BG_DTCSCR_Display; /*SRC故障*/ Display_DTC[1u].Disp_Mod_Menu_Cbk = GUI_BG_DTCBrake_Display; /*刹车故障*/
Display_DTC[2u].Disp_Mod_Menu_Cbk = GUI_BG_DTCAMT_Display; /*AMT故障*/ Display_DTC[2u].Disp_Mod_Menu_Cbk = GUI_BG_DTCAMT_Display; /*变速箱故障*/
Display_DTC[3u].Disp_Mod_Menu_Cbk = GUI_Display_NULL; /*无故障*/ Display_DTC[3u].Disp_Mod_Menu_Cbk = GUI_BG_DTCRadar_Display; /*雷达故障码*/
Display_DTC[4u].Disp_Mod_Menu_Cbk = GUI_BG_DTCCamera_Display; /*摄像头故障码*/
Display_DTC[5u].Disp_Mod_Menu_Cbk = GUI_BG_DTCIntarder_Display; /*液力缓速器故障码*/
Display_DTC[6u].Disp_Mod_Menu_Cbk = GUI_Display_NULL; /*无故障*/
DPD_Display_Time = 0u; DPD_Display_Time = 0u;
} }
...@@ -3987,7 +3990,7 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode) ...@@ -3987,7 +3990,7 @@ void GUI_BG_RepMenu_3_1_Display(uint8_t Mode)
Sig_Starter_OH = Get_ID_18FF3018_Sig_Starter_OH_Warnning();/*12*/ Sig_Starter_OH = Get_ID_18FF3018_Sig_Starter_OH_Warnning();/*12*/
CanStatus = CAN_MSG_Status(ID_CanMsg18EF1718_Msg_Count); CanStatus = CAN_MSG_Status(ID_CanMsg18EF1718_Msg_Count);
User_Value = User_ECU.Engine_Oil;/*显示数据*/ User_Value = (User_ECU.Engine_Oil / 1000u); /*显示数据*/
if (CanStatus == CAN_SIG_LOST) if (CanStatus == CAN_SIG_LOST)
{ {
...@@ -7055,32 +7058,80 @@ void GUI_BG_DTCEngine_Display(uint8_t Mode) ...@@ -7055,32 +7058,80 @@ void GUI_BG_DTCEngine_Display(uint8_t Mode)
} }
} }
/*-------------------------------------------------------------------------- void GUI_BG_DTCBrake_Display(uint8_t Mode)
* Function Name : GUI_BG_DTCSCR_Display
* Description :
* Input : None
* Output : None
* Return : None
* onther : 区域
--------------------------------------------------------------------------*/
void GUI_BG_DTCSCR_Display(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/ GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/ GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_02_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_03_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER); void GUI_BG_DTCAMT_Display(uint8_t Mode)
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 378u, 267u, GUI_BLENDMODE_SRC_OVER); {
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 408u, 267u, GUI_BLENDMODE_SRC_OVER); if (Mode == GUI_DISP_MODE_NORMAL)
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 438u, 267u, GUI_BLENDMODE_SRC_OVER); {
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 468u, 267u, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_heng, 498u, 262u, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 528u, 267u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 558u, 267u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
void GUI_BG_DTCRadar_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
void GUI_BG_DTCCamera_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER);
}
else
{
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
void GUI_BG_DTCIntarder_Display(uint8_t Mode)
{
if (Mode == GUI_DISP_MODE_NORMAL)
{
GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER);
} }
else else
{ {
...@@ -7089,22 +7140,22 @@ void GUI_BG_DTCSCR_Display(uint8_t Mode) ...@@ -7089,22 +7140,22 @@ void GUI_BG_DTCSCR_Display(uint8_t Mode)
} }
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
* Function Name : GUI_BG_FacMenu6_Display * Function Name : GUI_BG_DTCSCR_Display
* Description : * Description :
* Input : None * Input : None
* Output : None * Output : None
* Return : None * Return : None
* onther : 区域 * onther : 区域
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
void GUI_BG_DTCAMT_Display(uint8_t Mode) void GUI_BG_DTCSCR_Display(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/ GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/ GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_02_image, 230u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_01_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Alarm_Fault_03_wenzi, 346u, 154u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, CN_Alarm_Fault_P, GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 378u, 267u, GUI_BLENDMODE_SRC_OVER); GUI_Translate_Display(MENU_Sprite, CN_Nb_28_0, 378u, 267u, GUI_BLENDMODE_SRC_OVER);
...@@ -7125,7 +7176,8 @@ void GUI_Display_NULL(uint8_t Mode) ...@@ -7125,7 +7176,8 @@ void GUI_Display_NULL(uint8_t Mode)
{ {
if (Mode == GUI_DISP_MODE_NORMAL) if (Mode == GUI_DISP_MODE_NORMAL)
{ {
GUI_General_Display(MENU_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER); GUI_General_Display(MENU_Sprite, CN_User_Menu2_01_wenzi, GUI_BLENDMODE_SRC_OVER); /*menu*/
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
} }
else else
{ {
......
source/Application/Graphic/GUI/GUI.h
View file @ d06fea00
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
#define Language_En 0u #define Language_En 0u
#define Language_Cn 1u #define Language_Cn 1u
#define DTCNumeber 3u /*最小数值为1*/
#define DTCNumeber 6u /*最小数值为1*/
#define FState_COilTimeOutNum 60u /*3S*/ #define FState_COilTimeOutNum 60u /*3S*/
...@@ -221,7 +222,7 @@ static const GUIGeneralPopupStruct GUIGeneralPopupTable[] = ...@@ -221,7 +222,7 @@ static const GUIGeneralPopupStruct GUIGeneralPopupTable[] =
{CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi4, SpriteSize, CN_Alarm_G5_12_25_wenzi4, SpriteSize}, /*37. 高圧警報-轮胎高压警告*/ {CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi4, SpriteSize, CN_Alarm_G5_12_25_wenzi4, SpriteSize}, /*37. 高圧警報-轮胎高压警告*/
{CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi9, SpriteSize, CN_Alarm_G5_12_25_wenzi9, SpriteSize}, /*38. 高温警報-轮胎高温警告*/ {CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi9, SpriteSize, CN_Alarm_G5_12_25_wenzi9, SpriteSize}, /*38. 高温警報-轮胎高温警告*/
{CN_Alarm_G5_12_23_image, CN_Alarm_G5_12_23_wenzi2, SpriteSize, CN_Alarm_G5_12_23_wenzi1, SpriteSize}, /*39. DPD手动再生要求1-请按下DPD开关*/ {CN_Alarm_G5_12_23_image, CN_Alarm_G5_12_23_wenzi2, SpriteSize, CN_Alarm_G5_12_23_wenzi1, SpriteSize}, /*39. DPD手动再生要求1-请按下DPD开关*/
{CN_Alarm_G5_12_23_image, CN_Alarm_G5_12_23_wenzi2, CN_Alarm_G5_17_18_21_wenzi4,CN_Alarm_G5_12_23_wenzi1, SpriteSize}, /*40. DPD手动再生要求2-请按下DPD开关*/ {CN_Alarm_G5_12_23_image, CN_Alarm_G5_12_23_wenzi2, CN_Alarm_G5_17_18_21_wenzi4, CN_Alarm_G5_12_23_wenzi1, SpriteSize}, /*40. DPD手动再生要求2-请按下DPD开关*/
{CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi7, SpriteSize, CN_Alarm_G5_12_25_wenzi7, SpriteSize}, /*41. TPMS故障*/ {CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi7, SpriteSize, CN_Alarm_G5_12_25_wenzi7, SpriteSize}, /*41. TPMS故障*/
{CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi6, SpriteSize, CN_Alarm_G5_12_25_wenzi6, SpriteSize}, /*42. TPMS電池低下-轮胎监控传感器电压下降*/ {CN_Alarm_G5_12_25_image, CN_Alarm_G5_12_25_wenzi6, SpriteSize, CN_Alarm_G5_12_25_wenzi6, SpriteSize}, /*42. TPMS電池低下-轮胎监控传感器电压下降*/
{CN_Alarm_stop_31_image, SpriteSize, SpriteSize, CN_Alarm_stop_31_wenzi1, SpriteSize}, /*43.第六组 遥控车辆高度调整中(无车速)*/ {CN_Alarm_stop_31_image, SpriteSize, SpriteSize, CN_Alarm_stop_31_wenzi1, SpriteSize}, /*43.第六组 遥控车辆高度调整中(无车速)*/
...@@ -475,10 +476,16 @@ void GUI_BG_DeaMeterExit_Display(uint8_t Mode); /*经销商模式是否 ...@@ -475,10 +476,16 @@ void GUI_BG_DeaMeterExit_Display(uint8_t Mode); /*经销商模式是否
void GUI_Display_DTC_Server(void); /**/ void GUI_Display_DTC_Server(void); /**/
void GUI_BG_DTCEngine_Display(uint8_t Mode); /*发动机故障*/ void GUI_BG_DTCEngine_Display(uint8_t Mode); /*发动机故障*/
void GUI_BG_DTCBrake_Display(uint8_t Mode); /*刹车故障*/
void GUI_BG_DTCAMT_Display(uint8_t Mode); /*变速箱故障*/
void GUI_BG_DTCRadar_Display(uint8_t Mode); /*雷达故障码*/
void GUI_BG_DTCCamera_Display(uint8_t Mode); /*摄像头故障码*/
void GUI_BG_DTCIntarder_Display(uint8_t Mode); /*液力缓速器故障码*/
void GUI_BG_DTCSCR_Display(uint8_t Mode); /*SCR故障*/ void GUI_BG_DTCSCR_Display(uint8_t Mode); /*SCR故障*/
void GUI_BG_DTCAMT_Display(uint8_t Mode); /*AMT故障*/
void GUI_Display_NULL(uint8_t Mode); /*无故障码*/ void GUI_Display_NULL(uint8_t Mode); /*无故障码*/
void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/ void GUI_BG_Enter_Return_Display(uint8_t Mode); /**/
void GUI_Test_Display(uint8_t Mode); /**/ void GUI_Test_Display(uint8_t Mode); /**/
void Common_EOL_User_Server(void); /**/ void Common_EOL_User_Server(void); /**/
......
source/Application/Graphic/Menu/Menu_user.c
View file @ d06fea00
...@@ -562,7 +562,7 @@ void Level2_1Menu_1Enter(void) ...@@ -562,7 +562,7 @@ void Level2_1Menu_1Enter(void)
canMag.MsgID = 0x7E0u; canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 0u; canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
canMag.MsgRTR = 0u; canMag.MsgRTR = 0u;
...@@ -1927,7 +1927,7 @@ void LevelF1Menu_1Enter(void) ...@@ -1927,7 +1927,7 @@ void LevelF1Menu_1Enter(void)
canMag.MsgID = 0x7E0u; canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 0u; canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
canMag.MsgRTR = 0u; canMag.MsgRTR = 0u;
...@@ -2020,7 +2020,7 @@ void LevelF1_1Menu_1Enter(void) ...@@ -2020,7 +2020,7 @@ void LevelF1_1Menu_1Enter(void)
canMag.MsgID = 0x7E0u; canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 0u; canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
canMag.MsgRTR = 0u; canMag.MsgRTR = 0u;
...@@ -2131,7 +2131,7 @@ void LevelF1_2Menu_3Enter(void) ...@@ -2131,7 +2131,7 @@ void LevelF1_2Menu_3Enter(void)
canMag.MsgID = 0x7E0u; canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 0u; canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
canMag.MsgRTR = 0u; canMag.MsgRTR = 0u;
...@@ -2252,7 +2252,7 @@ void LevelD1Menu_1Enter(void) ...@@ -2252,7 +2252,7 @@ void LevelD1Menu_1Enter(void)
canMag.MsgID = 0x7E0u; canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 0u; canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
canMag.MsgRTR = 0u; canMag.MsgRTR = 0u;
...@@ -2344,7 +2344,7 @@ void LevelD1_1Menu_1Enter(void) ...@@ -2344,7 +2344,7 @@ void LevelD1_1Menu_1Enter(void)
canMag.MsgID = 0x7E0u; canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 0u; canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
canMag.MsgRTR = 0u; canMag.MsgRTR = 0u;
...@@ -2423,7 +2423,7 @@ void LevelD1_2Menu_3Enter(void) ...@@ -2423,7 +2423,7 @@ void LevelD1_2Menu_3Enter(void)
canMag.MsgID = 0x7E0u; canMag.MsgID = 0x7E0u;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 0u; canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
canMag.MsgRTR = 0u; canMag.MsgRTR = 0u;
......
source/Application/UDS/APP/Common/UDS_Common.c
View file @ d06fea00
...@@ -244,7 +244,7 @@ void UDS_S11_Sand(uint8_t subid) ...@@ -244,7 +244,7 @@ void UDS_S11_Sand(uint8_t subid)
canMag.Msg[6] = FILLER_BYTE; canMag.Msg[6] = FILLER_BYTE;
canMag.Msg[7] = FILLER_BYTE; canMag.Msg[7] = FILLER_BYTE;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 9u; canMag.MsgPro = 0u;//9u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
Can_Write(&canMag); Can_Write(&canMag);
UDS_S11_Confirm(); UDS_S11_Confirm();
...@@ -274,7 +274,7 @@ void UDS_NRC78_Sand(uint8_t sid) ...@@ -274,7 +274,7 @@ void UDS_NRC78_Sand(uint8_t sid)
canMag.Msg[6] = FILLER_BYTE; canMag.Msg[6] = FILLER_BYTE;
canMag.Msg[7] = FILLER_BYTE; canMag.Msg[7] = FILLER_BYTE;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 9u; canMag.MsgPro = 0u;//9u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
Can_Write(&canMag); Can_Write(&canMag);
} }
...@@ -295,7 +295,7 @@ void UDS_14_SendRsp(uint8_t sid) ...@@ -295,7 +295,7 @@ void UDS_14_SendRsp(uint8_t sid)
canMag.Msg[6] = FILLER_BYTE; canMag.Msg[6] = FILLER_BYTE;
canMag.Msg[7] = FILLER_BYTE; canMag.Msg[7] = FILLER_BYTE;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 9u; canMag.MsgPro = 0u;//9u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
Can_Write(&canMag); Can_Write(&canMag);
} }
...@@ -316,7 +316,7 @@ void UDS_SendNRCRsp(uint8_t sid, uint8_t status) ...@@ -316,7 +316,7 @@ void UDS_SendNRCRsp(uint8_t sid, uint8_t status)
canMag.Msg[6] = FILLER_BYTE; canMag.Msg[6] = FILLER_BYTE;
canMag.Msg[7] = FILLER_BYTE; canMag.Msg[7] = FILLER_BYTE;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 9u; canMag.MsgPro = 0u;//9u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
Can_Write(&canMag); Can_Write(&canMag);
} }
......
source/Application/UDS_M/TP_Layer.c
View file @ d06fea00
...@@ -516,7 +516,7 @@ void TP_TransmitPDU(void) ...@@ -516,7 +516,7 @@ void TP_TransmitPDU(void)
canMag.MsgID = g_txCanMsg.id; canMag.MsgID = g_txCanMsg.id;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 0u; canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
canMag.MsgRTR = 0u; canMag.MsgRTR = 0u;
...@@ -548,7 +548,7 @@ void TP_TransmitPDU(void) ...@@ -548,7 +548,7 @@ void TP_TransmitPDU(void)
canMag.MsgID = g_txCanMsg.id; canMag.MsgID = g_txCanMsg.id;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 0u; canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
canMag.MsgRTR = 0u; canMag.MsgRTR = 0u;
...@@ -617,7 +617,7 @@ void TP_TransmitPDU(void) ...@@ -617,7 +617,7 @@ void TP_TransmitPDU(void)
canMag.MsgID = g_txCanMsg.id; canMag.MsgID = g_txCanMsg.id;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 0u; canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
canMag.MsgRTR = 0u; canMag.MsgRTR = 0u;
...@@ -652,7 +652,7 @@ void TP_TransmitPDU(void) ...@@ -652,7 +652,7 @@ void TP_TransmitPDU(void)
/*重新赋值----20220326----*/ /*重新赋值----20220326----*/
canMag.MsgID = g_txCanMsg.id; canMag.MsgID = g_txCanMsg.id;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 0u; canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
canMag.MsgRTR = 0u; canMag.MsgRTR = 0u;
...@@ -742,7 +742,7 @@ void TP_TransmitNegatePDU(_ErrorFrame *Err) ...@@ -742,7 +742,7 @@ void TP_TransmitNegatePDU(_ErrorFrame *Err)
canMag.MsgID = g_txCanMsg.id; canMag.MsgID = g_txCanMsg.id;
canMag.MsgDLC = 8u; canMag.MsgDLC = 8u;
canMag.MsgPro = 0u; canMag.MsgPro = 1u;//0u;
canMag.MsgStd = 0u; canMag.MsgStd = 0u;
canMag.MsgRTR = 0u; canMag.MsgRTR = 0u;
......
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