Skip to content

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

调整FLASH初始化

parent 769e46d1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 19767 additions and 19762 deletions
ghs/project
View file @ fc431538
No preview for this file type
ghs/project.hex
View file @ fc431538
This diff is collapsed.
ghs/project.siz
View file @ fc431538
project .intvect 1536 project .intvect 1536
project .text 324588 project .text 324604
project .rodata 411103 project .rodata 411103
project .secinfo 120 project .secinfo 120
project .syscall 6 project .syscall 6
......
source/Application/Alarm/Popup_List.h
View file @ fc431538
...@@ -186,14 +186,14 @@ static const PopupAttributeStruct PopupAttributeTable[] = ...@@ -186,14 +186,14 @@ static const PopupAttributeStruct PopupAttributeTable[] =
{/*08 POPUP2_AIRMATIC_HIGHT */ POPUP_TYPE_WARNING , 2u, 3u, POPUP_IGN_ON, POPUP2_AIRMATIC_HIGHT , NULL, 1u, POPUP2_MSG_AIRMATIC_HIGHT , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_SINGLE,}, {/*08 POPUP2_AIRMATIC_HIGHT */ POPUP_TYPE_WARNING , 2u, 3u, POPUP_IGN_ON, POPUP2_AIRMATIC_HIGHT , NULL, 1u, POPUP2_MSG_AIRMATIC_HIGHT , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_SINGLE,},
{/*09 POPUP3_CRUISE */ POPUP_TYPE_WARNING , 3u, 1u, POPUP_IGN_ON, POPUP3_CRUISE , NULL, 1u, POPUP3_MSG_CRUISE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_SINGLE,}, {/*09 POPUP3_CRUISE */ POPUP_TYPE_WARNING , 3u, 1u, POPUP_IGN_ON, POPUP3_CRUISE , NULL, 1u, POPUP3_MSG_CRUISE , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_SINGLE,},
{/*10 POPUP3_VARIABLE_SLD */ POPUP_TYPE_WARNING , 3u, 2u, POPUP_IGN_ON, POPUP3_VARIABLE_SLD , NULL, 1u, POPUP3_MSG_VARIABLE_SLD , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_SINGLE,}, {/*10 POPUP3_VARIABLE_SLD */ POPUP_TYPE_WARNING , 3u, 2u, POPUP_IGN_ON, POPUP3_VARIABLE_SLD , NULL, 1u, POPUP3_MSG_VARIABLE_SLD , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_SINGLE,},
{/*11 POPUT4_ABNORMAL_CHARGE */ POPUP_TYPE_HINT , 4u, 1u, POPUP_IGN_ON, POPUT4_ABNORMAL_CHARGE , NULL, 1u, POPUT4_MSG_ABNORMAL_CHARGE , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,}, {/*11 POPUT4_ABNORMAL_CHARGE */ POPUP_TYPE_WARNING , 4u, 1u, POPUP_IGN_ON, POPUT4_ABNORMAL_CHARGE , NULL, 1u, POPUT4_MSG_ABNORMAL_CHARGE , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,},
{/*12 POPUP4_OIL_PRESSURE */ POPUP_TYPE_HINT , 4u, 2u, POPUP_IGN_ON, POPUP4_OIL_PRESSURE , NULL, 1u, POPUP4_MSG_OIL_PRESSURE , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,}, {/*12 POPUP4_OIL_PRESSURE */ POPUP_TYPE_WARNING , 4u, 2u, POPUP_IGN_ON, POPUP4_OIL_PRESSURE , NULL, 1u, POPUP4_MSG_OIL_PRESSURE , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,},
{/*13 POPUP4_AMT_INIT_EXCE */ POPUP_TYPE_HINT , 4u, 3u, POPUP_IGN_ON, POPUP4_AMT_INIT_EXCE , NULL, 1u, POPUP4_MSG_AMT_INIT_EXCE , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,}, {/*13 POPUP4_AMT_INIT_EXCE */ POPUP_TYPE_WARNING , 4u, 3u, POPUP_IGN_ON, POPUP4_AMT_INIT_EXCE , NULL, 1u, POPUP4_MSG_AMT_INIT_EXCE , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,},
{/*14 POPUP4_ADBLUE_QUALITY */ POPUP_TYPE_HINT , 4u, 4u, POPUP_IGN_ON, POPUP4_ADBLUE_QUALITY , NULL, 1u, POPUP4_MSG_ADBLUE_QUALITY , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,}, {/*14 POPUP4_ADBLUE_QUALITY */ POPUP_TYPE_WARNING , 4u, 4u, POPUP_IGN_ON, POPUP4_ADBLUE_QUALITY , NULL, 1u, POPUP4_MSG_ADBLUE_QUALITY , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,},
{/*15 POPUP4_ADBLUE_SPRAY */ POPUP_TYPE_HINT , 4u, 5u, POPUP_IGN_ON, POPUP4_ADBLUE_SPRAY , NULL, 1u, POPUP4_MSG_ADBLUE_SPRAY , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,}, {/*15 POPUP4_ADBLUE_SPRAY */ POPUP_TYPE_WARNING , 4u, 5u, POPUP_IGN_ON, POPUP4_ADBLUE_SPRAY , NULL, 1u, POPUP4_MSG_ADBLUE_SPRAY , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,},
{/*16 POPUP4_ADBLUE_SUPPLY */ POPUP_TYPE_HINT , 4u, 6u, POPUP_IGN_ON, POPUP4_ADBLUE_SUPPLY , NULL, 1u, POPUP4_MSG_ADBLUE_SUPPLY , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,}, {/*16 POPUP4_ADBLUE_SUPPLY */ POPUP_TYPE_WARNING , 4u, 6u, POPUP_IGN_ON, POPUP4_ADBLUE_SUPPLY , NULL, 1u, POPUP4_MSG_ADBLUE_SUPPLY , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,},
{/*17 POPUP4_START_ENG */ POPUP_TYPE_HINT , 4u, 7u, POPUP_IGN_ON, POPUP4_START_ENG , NULL, 1u, POPUP4_MSG_START_ENG , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,}, {/*17 POPUP4_START_ENG */ POPUP_TYPE_WARNING , 4u, 7u, POPUP_IGN_ON, POPUP4_START_ENG , NULL, 1u, POPUP4_MSG_START_ENG , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,},
{/*18 POPUP4_DPD_AUTO */ POPUP_TYPE_HINT , 4u, 8u, POPUP_IGN_ON, POPUP4_DPD_AUTO , NULL, 1u, POPUP4_MSG_DPD_AUTO , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,}, {/*18 POPUP4_DPD_AUTO */ POPUP_TYPE_WARNING , 4u, 8u, POPUP_IGN_ON, POPUP4_DPD_AUTO , NULL, 1u, POPUP4_MSG_DPD_AUTO , POPUP_MODE_SINGLE, POPUP_NONE , POPUP_MODE_SINGLE,},
{/*19 POPUP5_OVER_HEAT_SPEED */ POPUP_TYPE_WARNING , 5u, 1u, POPUP_IGN_ON, POPUP5_OVER_HEAT_SPEED , NULL, 1u, POPUP5_MSG_OVER_HEAT_SPEED , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_SINGLE,}, {/*19 POPUP5_OVER_HEAT_SPEED */ POPUP_TYPE_WARNING , 5u, 1u, POPUP_IGN_ON, POPUP5_OVER_HEAT_SPEED , NULL, 1u, POPUP5_MSG_OVER_HEAT_SPEED , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_SINGLE,},
{/*20 POPUP5_OVER_HEAT */ POPUP_TYPE_WARNING , 5u, 1u, POPUP_IGN_ON, POPUP5_OVER_HEAT , NULL, 1u, POPUP5_MSG_OVER_HEAT , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_SINGLE,}, {/*20 POPUP5_OVER_HEAT */ POPUP_TYPE_WARNING , 5u, 1u, POPUP_IGN_ON, POPUP5_OVER_HEAT , NULL, 1u, POPUP5_MSG_OVER_HEAT , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_SINGLE,},
{/*21 POPUP5_LOW_COOLANT_SPEED */ POPUP_TYPE_WARNING , 5u, 2u, POPUP_IGN_ON, POPUP5_LOW_COOLANT_SPEED , NULL, 1u, POPUP5_MSG_LOW_COOLANT_SPEED , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_SINGLE,}, {/*21 POPUP5_LOW_COOLANT_SPEED */ POPUP_TYPE_WARNING , 5u, 2u, POPUP_IGN_ON, POPUP5_LOW_COOLANT_SPEED , NULL, 1u, POPUP5_MSG_LOW_COOLANT_SPEED , POPUP_MODE_MULTI, POPUP_NONE , POPUP_MODE_SINGLE,},
......
source/Application/Alarm/Popup_Message_List.h
View file @ fc431538
...@@ -217,20 +217,20 @@ static const PopupMsgAttributeStruct PopupMsgAttributeTable[] = ...@@ -217,20 +217,20 @@ static const PopupMsgAttributeStruct PopupMsgAttributeTable[] =
{ /* POPUP8_MSG_DPD_AUTO_SPEED */ POPUP_TYPE_GENERAL,}, //78.DPD自动再生-DPD自动再生中 { /* POPUP8_MSG_DPD_AUTO_SPEED */ POPUP_TYPE_GENERAL,}, //78.DPD自动再生-DPD自动再生中
{ /* POPUP8_MSG_DPD_AUTO */ POPUP_TYPE_GENERAL,}, //79.DPD自动再生-再生将自动完成，不需要操作开关 { /* POPUP8_MSG_DPD_AUTO */ POPUP_TYPE_GENERAL,}, //79.DPD自动再生-再生将自动完成，不需要操作开关
{ /* POPUP9_MSG_AIR_PRESSURE_SPEED */ POPUP_TYPE_GENERAL,}, //80.气压过低-气压过低请注意 { /* POPUP9_MSG_AIR_PRESSURE_SPEED */ POPUP_TYPE_GENERAL,}, //80.气压过低-气压过低请注意
{ /* POPUP9_MSG_AIR_PRESSURE */ POPUP_TYPE_GENERAL, },//81.气压过低-请冲入空气 { /* POPUP9_MSG_AIR_PRESSURE */ POPUP_TYPE_GENERAL,},//81.气压过低-请冲入空气
{ /* POPUP9_MSG_EBS_ERROR_SPEED */ POPUP_TYPE_GENERAL,}, //82.EBS故障（红）-请在安全的场所停车 { /* POPUP9_MSG_EBS_ERROR_SPEED */ POPUP_TYPE_GENERAL,}, //82.EBS故障（红）-请在安全的场所停车
{ /* POPUP9_MSG_EBS_ERROR */ POPUP_TYPE_GENERAL, },//83.EBS故障（红）-请与五十铃公司联系 { /* POPUP9_MSG_EBS_ERROR */ POPUP_TYPE_GENERAL,},//83.EBS故障（红）-请与五十铃公司联系
{ /* POPUP10_MSG_RAPID_ACC */ POPUP_TYPE_GENERAL, },//84.省油耗建议-急加速 { /* POPUP10_MSG_RAPID_ACC */ POPUP_TYPE_GENERAL,},//84.省油耗建议-急加速
{ /* POPUP10_MSG_RAPID_SUB */ POPUP_TYPE_GENERAL, },//85.省油耗建议-急减速 { /* POPUP10_MSG_RAPID_SUB */ POPUP_TYPE_GENERAL,},//85.省油耗建议-急减速
{ /* POPUP10_MSG_REVAL_ENGINE */ POPUP_TYPE_GENERAL, },//86.省油耗建议-请降低发动机转速 { /* POPUP10_MSG_REVAL_ENGINE */ POPUP_TYPE_GENERAL,},//86.省油耗建议-请降低发动机转速
{ /* POPUP10_MSG_REVAL_SPEED */ POPUP_TYPE_GENERAL, },//87.省油耗建议-请降低速度 { /* POPUP10_MSG_REVAL_SPEED */ POPUP_TYPE_GENERAL,},//87.省油耗建议-请降低速度
{ /* POPUP11_MSG_ENGINE_OIL_FILTER_ERROR */ POPUP_TYPE_GENERAL, },//88.发动机机油＆滤清器 { /* POPUP11_MSG_ENGINE_OIL_FILTER_ERROR */ POPUP_TYPE_GENERAL,},//88.发动机机油＆滤清器
{ /* POPUP11_MSG_FUEL_FILTER_ERROR */ POPUP_TYPE_GENERAL, },//89.燃油滤清器 { /* POPUP11_MSG_FUEL_FILTER_ERROR */ POPUP_TYPE_GENERAL,},//89.燃油滤清器
{ /* POPUP11_MSG_T_MISSION_OIL_ERROR */ POPUP_TYPE_GENERAL, },//90.变速箱油 { /* POPUP11_MSG_T_MISSION_OIL_ERROR */ POPUP_TYPE_GENERAL,},//90.变速箱油
{ /* POPUP11_MSG_DIFF_OIL_ERROR */ POPUP_TYPE_GENERAL, },//91.差速器油 { /* POPUP11_MSG_DIFF_OIL_ERROR */ POPUP_TYPE_GENERAL,},//91.差速器油
{ /* POPUP11_MSG_CLUTCH_OIL_ERROR */ POPUP_TYPE_GENERAL, },//92.顺畅系统离合器油 { /* POPUP11_MSG_CLUTCH_OIL_ERROR */ POPUP_TYPE_GENERAL,},//92.顺畅系统离合器油
{ /* POPUP11_MSG_P_STEERING_FRUID_ERROR */ POPUP_TYPE_GENERAL, },//93.动力转向液 { /* POPUP11_MSG_P_STEERING_FRUID_ERROR */ POPUP_TYPE_GENERAL,},//93.动力转向液
{ /* POPUP11_MSG_TIRE_ROTATION */ POPUP_TYPE_GENERAL, },//94.更换轮胎・轮胎位置 { /* POPUP11_MSG_TIRE_ROTATION */ POPUP_TYPE_GENERAL,},//94.更换轮胎・轮胎位置
}; };
......
source/Application/Alarm/Popups.c
View file @ fc431538
This diff is collapsed.
source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
View file @ fc431538
...@@ -8,7 +8,7 @@ const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] = ...@@ -8,7 +8,7 @@ const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] =
{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, 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}, {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}, {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}, {0x18EF1817ul, 100ul * 1000ul, 7ul, 0u, MSG_EXT, 6u, 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, 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}, {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}, {0x18FF2517ul, 1000ul * 1000ul, 17ul, 0u, MSG_EXT, 9u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18FF2517, (void *)0},
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ fc431538
...@@ -609,10 +609,10 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[]) ...@@ -609,10 +609,10 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
{ {
CopyData[0] = 0x40; CopyData[0] = 0x40;
CopyData[1] = 0x50; CopyData[1] = 0x50;
CopyData[2] = 0x00; //User_ECU.TripA_Fuel_1; //0x00; CopyData[2] = 0x00;
CopyData[3] = 0x00; //User_ECU.TripA_Fuel_2; //0x00; CopyData[3] = 0x00;
CopyData[4] = 0x00; //User_ECU.TripA_Fuel_3; //0x00; CopyData[4] = 0x00;
CopyData[5] = 0x00; //User_ECU.TripA_Fuel_4; //0x00; CopyData[5] = 0x00;
CopyData[6] = 0xFF; CopyData[6] = 0xFF;
CopyData[7] = 0xFF; CopyData[7] = 0xFF;
} }
...@@ -620,16 +620,18 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[]) ...@@ -620,16 +620,18 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
{ {
CopyData[0] = 0x40; CopyData[0] = 0x40;
CopyData[1] = 0x60; CopyData[1] = 0x60;
CopyData[2] = 0x00; //User_ECU.TripA_Fuel_1; //0x00; CopyData[2] = 0x00;
CopyData[3] = 0x00; //User_ECU.TripA_Fuel_2; //0x00; CopyData[3] = 0x00;
CopyData[4] = 0x00; //User_ECU.TripA_Fuel_3; //0x00; CopyData[4] = 0x00;
CopyData[5] = 0x00; //User_ECU.TripA_Fuel_4; //0x00; CopyData[5] = 0x00;
CopyData[6] = 0xFF; CopyData[6] = 0xFF;
CopyData[7] = 0xFF; CopyData[7] = 0xFF;
} }
User_BCM_Flag = 1u;/*从头轮询*/ User_BCM_Flag = 1u;/*从头轮询*/
State_Flag.FState_ClearOilTx = 0u; State_Flag.FState_ClearOilTx = 0u;
//Can_Msg_Tx_Overwrite(MSGID_18EF1817, 1, 100 * 1000);
} }
else else
{ {
...@@ -759,6 +761,8 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[]) ...@@ -759,6 +761,8 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
default: default:
break; break;
} }
//Can_Msg_Tx_Overwrite(MSGID_18EF1817, 0XFFFF, 100 * 1000);
} }
} }
......
source/Driver/Memory/TYW_FLASH.c
View file @ fc431538
...@@ -349,7 +349,7 @@ Total_Begin: ...@@ -349,7 +349,7 @@ Total_Begin:
if ((TEMP[0] != 0x50415247) || (TEMP[1] != 0x50415f45)) if ((TEMP[0] != 0x50415247) || (TEMP[1] != 0x50415f45))
{ {
//goto Total_Begin; goto Total_Begin;
} }
End_Begin: End_Begin:
//i_count=0; //i_count=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