调整FLASH初始化

ghs/project.siz

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

source/Application/Alarm/Popup_List.h

@@ -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,},   
 	{/*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,},   
-	{/*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,},
-    {/*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,},
-    {/*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,},
-    {/*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,},
-    {/*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,},
-    {/*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,},
-    {/*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,},
-    {/*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,},
+	{/*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_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_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_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_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_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_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_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,},
     {/*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,},   

source/Application/Alarm/Popup_Message_List.h

@@ -217,20 +217,20 @@ static const PopupMsgAttributeStruct PopupMsgAttributeTable[] =
     { /* POPUP8_MSG_DPD_AUTO_SPEED              */  POPUP_TYPE_GENERAL,}, //78.DPD自动再生-DPD自动再生中
     { /* POPUP8_MSG_DPD_AUTO                    */  POPUP_TYPE_GENERAL,}, //79.DPD自动再生-再生将自动完成，不需要操作开关
     { /* 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 					*/  POPUP_TYPE_GENERAL, },//83.EBS故障（红）-请与五十铃公司联系
-    { /* POPUP10_MSG_RAPID_ACC            		*/  POPUP_TYPE_GENERAL, },//84.省油耗建议-急加速
-    { /* POPUP10_MSG_RAPID_SUB            		*/  POPUP_TYPE_GENERAL, },//85.省油耗建议-急减速
-    { /* POPUP10_MSG_REVAL_ENGINE         		*/  POPUP_TYPE_GENERAL, },//86.省油耗建议-请降低发动机转速
-    { /* POPUP10_MSG_REVAL_SPEED          		*/  POPUP_TYPE_GENERAL, },//87.省油耗建议-请降低速度
-    { /* POPUP11_MSG_ENGINE_OIL_FILTER_ERROR    */  POPUP_TYPE_GENERAL, },//88.发动机机油＆滤清器
-    { /* POPUP11_MSG_FUEL_FILTER_ERROR          */  POPUP_TYPE_GENERAL, },//89.燃油滤清器
-    { /* POPUP11_MSG_T_MISSION_OIL_ERROR        */  POPUP_TYPE_GENERAL, },//90.变速箱油
-    { /* POPUP11_MSG_DIFF_OIL_ERROR           	*/  POPUP_TYPE_GENERAL, },//91.差速器油
-    { /* POPUP11_MSG_CLUTCH_OIL_ERROR           */  POPUP_TYPE_GENERAL, },//92.顺畅系统离合器油
-    { /* POPUP11_MSG_P_STEERING_FRUID_ERROR     */  POPUP_TYPE_GENERAL, },//93.动力转向液
-    { /* POPUP11_MSG_TIRE_ROTATION 				*/  POPUP_TYPE_GENERAL, },//94.更换轮胎・轮胎位置
+    { /* POPUP9_MSG_EBS_ERROR                   */  POPUP_TYPE_GENERAL,},//83.EBS故障（红）-请与五十铃公司联系
+    { /* POPUP10_MSG_RAPID_ACC                  */  POPUP_TYPE_GENERAL,},//84.省油耗建议-急加速
+    { /* POPUP10_MSG_RAPID_SUB                  */  POPUP_TYPE_GENERAL,},//85.省油耗建议-急减速
+    { /* POPUP10_MSG_REVAL_ENGINE               */  POPUP_TYPE_GENERAL,},//86.省油耗建议-请降低发动机转速
+    { /* POPUP10_MSG_REVAL_SPEED                */  POPUP_TYPE_GENERAL,},//87.省油耗建议-请降低速度
+    { /* POPUP11_MSG_ENGINE_OIL_FILTER_ERROR    */  POPUP_TYPE_GENERAL,},//88.发动机机油＆滤清器
+    { /* POPUP11_MSG_FUEL_FILTER_ERROR          */  POPUP_TYPE_GENERAL,},//89.燃油滤清器
+    { /* POPUP11_MSG_T_MISSION_OIL_ERROR        */  POPUP_TYPE_GENERAL,},//90.变速箱油
+    { /* POPUP11_MSG_DIFF_OIL_ERROR             */  POPUP_TYPE_GENERAL,},//91.差速器油
+    { /* POPUP11_MSG_CLUTCH_OIL_ERROR           */  POPUP_TYPE_GENERAL,},//92.顺畅系统离合器油
+    { /* POPUP11_MSG_P_STEERING_FRUID_ERROR     */  POPUP_TYPE_GENERAL,},//93.动力转向液
+    { /* POPUP11_MSG_TIRE_ROTATION              */  POPUP_TYPE_GENERAL,},//94.更换轮胎・轮胎位置
 
 };
 

source/Application/Alarm/Popups.c

@@ -40,7 +40,7 @@ void      GUI_RADAR_Sys_Failure_Flash_Reset(void)
 
 
 uint8_t wbytest = 0 ;
-uint8_t wbyTrigger[6] ={0};
+uint8_t wbyTrigger[6] = {0};
 void Popups_Management_Service(void)
 {
     /*    uint8_t PopupMsg = 0u;
@@ -48,9 +48,9 @@ void Popups_Management_Service(void)
 
     //Popups_Polling( );
     uint8_t i = 0 ;
-    for(i = 0 ;i < POPUP_MAX ;i ++)
+    for (i = 0 ; i < POPUP_MAX ; i ++)
     {
-        if(i == wbytest )
+        if (i == wbytest )
             Popup_Request(i);
         else
             Popup_Delete(i);
@@ -77,16 +77,16 @@ void Popups_Polling(void)
     //共用参数
     uint8_t V_Speed = 0 ;//车速
     uint8_t E_Speed = 0 ;//转速
-	uint8_t variable_1 ,variable_2,variable_3,variable_4,variable_5;
+    uint8_t variable_1 , variable_2, variable_3, variable_4, variable_5;
 
     uint16_t KL30_Volt = 0 ;
 
-    if(Get_Voltmeter_Valid())
+    if (Get_Voltmeter_Valid())
     {
         KL30_Volt = Get_Voltmeter_AvrVoltage();
     }
 
-	if(Common_Get_IG_Sts_Valid())
+    if (Common_Get_IG_Sts_Valid())
     {
         Ign_Time = Common_GetIgnOnTime();
         PowerSts = Common_Get_IG_Sts();
@@ -99,7 +99,7 @@ void Popups_Polling(void)
 
 
     //车速有效判定
-    if(Common_Get_Act_V_Speed_Valid())
+    if (Common_Get_Act_V_Speed_Valid())
     {
         V_Speed = Common_Get_Act_V_Speed();
     }
@@ -108,7 +108,7 @@ void Popups_Polling(void)
         V_Speed = 0 ;
     }
     //转速有效判定
-    if(Common_Get_Act_E_Speed_Valid())
+    if (Common_Get_Act_E_Speed_Valid())
     {
         E_Speed = Common_Get_Act_E_Speed();
     }
@@ -123,9 +123,9 @@ void Popups_Polling(void)
     //0.紧急警报-刹车
     variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
     variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
-    if(EOL == 0x01)
+    if (EOL == 0x01)
     {
-        if(variable_1 == 7 || variable_2 == 7)
+        if (variable_1 == 7 || variable_2 == 7)
         {
             Popup_Request(POPUP1_BRAKE_BLACK);
         }
@@ -142,9 +142,9 @@ void Popups_Polling(void)
 
     //1.紧急警报-紧急制动
     variable_1 = Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
-    if(EOL == 0x01)
+    if (EOL == 0x01)
     {
-        if(variable_1 == 7)
+        if (variable_1 == 7)
         {
             Popup_Request(POPUP1_BRAKE_BRAKE);
         }
@@ -162,9 +162,9 @@ void Popups_Polling(void)
     //2.车间距警报-刹车(红字)
     variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
     variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
-    if(EOL == 0x01)
+    if (EOL == 0x01)
     {
-        if(variable_1 == 6 || variable_2 == 6)
+        if (variable_1 == 6 || variable_2 == 6)
         {
             Popup_Request(POPUP1_BRAKE_SPACING_R);
         }
@@ -181,9 +181,9 @@ void Popups_Polling(void)
 
     //3.车间距警报-碰撞报警
     variable_1 = Get_ID_CF02FA1_Sig_Advanced_Emerg_Braking_Sys_Sta();
-    if(EOL == 0x01)
+    if (EOL == 0x01)
     {
-        if(variable_1 == 6)
+        if (variable_1 == 6)
         {
             Popup_Request(POPUP1_BRAKE_SPACING_COLLISION    );
         }
@@ -201,9 +201,9 @@ void Popups_Polling(void)
     //4.车间距警报-刹车(黄字)
     variable_1 = Get_ID_CF02F2A_Sig_Advanced_Emerg_Braking_Sys_Sta();
     variable_2 = Get_ID_CF02FA0_Sig_Advanced_Emerg_Braking_Sys_Sta();
-    if(EOL == 0x01)
+    if (EOL == 0x01)
     {
-        if(variable_1 == 5 || variable_2 == 5)
+        if (variable_1 == 5 || variable_2 == 5)
         {
             Popup_Request(POPUP1_BRAKE_SPACING_Y);
         }
@@ -216,7 +216,7 @@ void Popups_Polling(void)
 
     //5.ASR工作
     variable_1 = Get_ID_18F0010B_Sig_ASR_Brake_Control_Active();
-    if(variable_1 == 1)
+    if (variable_1 == 1)
     {
         Popup_Request(POPUT1_ASR_OPERATE);
     }
@@ -228,7 +228,7 @@ void Popups_Polling(void)
     //6.PTO紧急警报-刹车
     variable_1 = Get_ID_18FED900_Sig_PTO_SW();
     variable_2 = Line_In_Get_Status(LINE_IN_PTO);//B01
-    if(V_Speed &&(variable_1 || variable_2)) 
+    if (V_Speed && (variable_1 || variable_2))
     {
         Popup_Request(POPUT2_PTO);
     }
@@ -238,7 +238,7 @@ void Popups_Polling(void)
     }
     //7.忘记松手刹车    LINE_IN_Get_PARK_BRAKE 驻车制动
     variable_1 = Line_In_Get_Status(LINE_IN_PARK_BRAKE);//获取硬线结果
-    if((V_Speed > 66)&&(variable_1 == LINE_IN_LOGIC_VALID)) //6.67Km
+    if ((V_Speed > 66) && (variable_1 == LINE_IN_LOGIC_VALID)) //6.67Km
     {
         Popup_Request(POPUP2_PARKING_BRAKE);
     }
@@ -249,7 +249,7 @@ void Popups_Polling(void)
 
     //8.遥控调整车辆高度(有车速)
     variable_1 = Line_In_Get_Status(LINE_IN_AIR_SUS);//获取硬线结果
-    if((V_Speed > 5)&&(variable_1 == LINE_IN_LOGIC_VALID)) //0.5Km
+    if ((V_Speed > 5) && (variable_1 == LINE_IN_LOGIC_VALID)) //0.5Km
     {
         Popup_Request(POPUP2_AIRMATIC_HIGHT);
     }
@@ -261,7 +261,7 @@ void Popups_Polling(void)
     //9.自动巡航模式
 
     variable_1 = Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp();
-    if((Ign_Time > 5000)&&(variable_1 == 1))//5s内不显示
+    if ((Ign_Time > 5000) && (variable_1 == 1)) //5s内不显示
     {
         Popup_Request(POPUP3_CRUISE);
     }
@@ -272,7 +272,7 @@ void Popups_Polling(void)
 
     //10.可变SLD 模式
     variable_1 = Get_ID_18FF4100_Sig_Cruise_VariableSLD_Disp();
-    if((Ign_Time > 5000)&&(variable_1 == 3))//5s内不显示
+    if ((Ign_Time > 5000) && (variable_1 == 3)) //5s内不显示
     {
         Popup_Request(POPUP3_VARIABLE_SLD);
     }
@@ -283,11 +283,12 @@ void Popups_Polling(void)
 
     //11.充电异常（系统检测）
     variable_1 = Line_In_Get_Status(LINE_IN_CHARGE);
-    if(EOL == 0X00)
-    {   //检出A34信号（10ms周期监测）时（Lo 或 电压值＜21V连续500回以上），且EOL：LID$2B＝0ｘ00
-        if((E_Speed < 350)&&(variable_1 == LINE_IN_LOGIC_VALID)) //转速350R/min
+    if (EOL == 0X00)
     {
-            if(variable_1)
+        //检出A34信号（10ms周期监测）时（Lo 或 电压值＜21V连续500回以上），且EOL：LID$2B＝0ｘ00
+        if ((E_Speed < 350) && (variable_1 == LINE_IN_LOGIC_VALID)) //转速350R/min
+        {
+            if (variable_1)
             {
                 Popup_Request(POPUT4_ABNORMAL_CHARGE);
             }
@@ -305,11 +306,11 @@ void Popups_Polling(void)
 
     //12.油压（系统检测）
     variable_1 = Line_In_Get_Status(LINE_IN_ENG_OIL);
-    if(EOL == 0X00)
+    if (EOL == 0X00)
     {
-        if((E_Speed < 350)&&(variable_1 == LINE_IN_LOGIC_VALID)) //转速350R/min
+        if ((E_Speed < 350) && (variable_1 == LINE_IN_LOGIC_VALID)) //转速350R/min
         {
-            if(variable_1)
+            if (variable_1)
             {
                 Popup_Request(POPUP4_OIL_PRESSURE);
             }
@@ -326,9 +327,9 @@ void Popups_Polling(void)
 
 
     //13.AMT初始化异常           DM1 SPN4220 Key On時
-    if(EOL == 0x13)
+    if (EOL == 0x13)
     {
-        if(PowerSts == COMMON_POWER_ON)
+        if (PowerSts == COMMON_POWER_ON)
         {
             Popup_Request(POPUP4_AMT_INIT_EXCE);
         }
@@ -346,7 +347,7 @@ void Popups_Polling(void)
     //14.尿素品质异常（系统检测）
     //variable_1 = Get_ID_18FF2300_Sig_Amber3();
     //if(variable_1 == 1 )
-    if(PowerSts == COMMON_POWER_ON)
+    if (PowerSts == COMMON_POWER_ON)
     {
         Popup_Request(POPUP4_ADBLUE_QUALITY);
     }
@@ -358,7 +359,7 @@ void Popups_Polling(void)
     //15.尿素喷射异常（系统检测）
     //variable_1 = Get_ID_18FF2300_Sig_Amber1();
     //if(variable_1 == 1)
-    if(PowerSts == COMMON_POWER_ON)
+    if (PowerSts == COMMON_POWER_ON)
     {
         Popup_Request(POPUP4_ADBLUE_SPRAY);
     }
@@ -370,7 +371,7 @@ void Popups_Polling(void)
     //16.尿素水补给（系统检测）
     //variable_1 = Get_ID_18FF2300_Sig_Amber2();
     //if(variable_1 == 1)
-    if(PowerSts == COMMON_POWER_ON)
+    if (PowerSts == COMMON_POWER_ON)
     {
         Popup_Request(POPUP4_ADBLUE_SUPPLY);
     }
@@ -380,9 +381,9 @@ void Popups_Polling(void)
     }
 
     //17.AMT初始化结束               DM1 SPN4021  Key On時
-    if(EOL == 0x13)
+    if (EOL == 0x13)
     {
-        if(PowerSts == COMMON_POWER_ON)
+        if (PowerSts == COMMON_POWER_ON)
         {
             Popup_Request(POPUP4_START_ENG);
         }
@@ -398,7 +399,7 @@ void Popups_Polling(void)
 
     //18.DPD自动再生
     //variable_1 = Get_ID_18FED900_Sig_DPF_Regeneration_Status();
-    if(PowerSts == COMMON_POWER_ON)
+    if (PowerSts == COMMON_POWER_ON)
     {
         Popup_Request(POPUP4_DPD_AUTO);
     }
@@ -410,7 +411,7 @@ void Popups_Polling(void)
 
     //19.过热（过热，请在安全的场所停车）有车速     LID $43 :0x82
     //variable_1 = Get_ID_18FEEE00_Sig_Engine_Coolant_Temperature();
-    if(V_Speed && (Coolant_Get_CurSeg() > 10))
+    if (V_Speed && (Coolant_Get_CurSeg() > 10))
     {
         Popup_Request(POPUP5_OVER_HEAT_SPEED);
     }
@@ -419,7 +420,7 @@ void Popups_Polling(void)
         Popup_Delete(POPUP5_OVER_HEAT_SPEED);
     }
     //20.过热（冷却液温度过高）         无车速  LID $43 :0x82
-    if((V_Speed == 0) && (Coolant_Get_CurSeg() > 10))
+    if ((V_Speed == 0) && (Coolant_Get_CurSeg() > 10))
     {
         Popup_Request(POPUP5_OVER_HEAT);
     }
@@ -430,7 +431,7 @@ void Popups_Polling(void)
 
     //21.冷却水（冷却液不足） B32 GND
     variable_1 = Line_In_Get_Status(LINE_IN_LOW_COOLANT);
-    if(V_Speed && variable_1)
+    if (V_Speed && variable_1)
     {
         Popup_Request(POPUP5_LOW_COOLANT_SPEED);
     }
@@ -439,7 +440,7 @@ void Popups_Polling(void)
         Popup_Delete(POPUP5_LOW_COOLANT_SPEED);
     }
     //22.冷却水（冷却水不足）B32 GND
-    if((V_Speed == 0) && variable_1)
+    if ((V_Speed == 0) && variable_1)
     {
         Popup_Request(POPUP5_LOW_COOLANT);
     }
@@ -452,7 +453,7 @@ void Popups_Polling(void)
     //发动机启动(350r/min)后、350r/min持续5秒以上时，A32信号（10ms周期监测），连续20次检出Lo时。
     variable_1 = Line_In_Get_Status(LINE_IN_ENG_OIL);
     //variable_2 = Get_ID_CF00400_Sig_Engine_speed();发动机转速 预留
-    if(V_Speed && (E_Speed > 350) && variable_1)
+    if (V_Speed && (E_Speed > 350) && variable_1)
     {
         Popup_Request(POPUP5_ENGINE_OIL_PRESSURE_SPEED);
     }
@@ -461,7 +462,7 @@ void Popups_Polling(void)
         Popup_Delete(POPUP5_ENGINE_OIL_PRESSURE_SPEED);
     }
     //24.油压异常
-    if((V_Speed == 0) && (E_Speed > 350) && variable_1)
+    if ((V_Speed == 0) && (E_Speed > 350) && variable_1)
     {
         Popup_Request(POPUP5_ENGINE_OIL_PRESSURE);
     }
@@ -480,7 +481,7 @@ void Popups_Polling(void)
 
     //29.车速限制-图1   ID：18FF2300 Byte：7 Bit：4,3   10(B)
     variable_1 = Get_ID_18FF2300_Sig_Engine_Derate();
-    if(V_Speed && (variable_1 == 2))
+    if (V_Speed && (variable_1 == 2))
     {
         Popup_Request(POPUP5_SPEED_LIMIT_SPEED);
     }
@@ -489,7 +490,7 @@ void Popups_Polling(void)
         Popup_Delete(POPUP5_SPEED_LIMIT_SPEED);
     }
     //30.车速限制-图2 ID：18FF2300 Byte：7 Bit：4,3   10(B)
-    if((V_Speed == 0) && (variable_1 == 2))
+    if ((V_Speed == 0) && (variable_1 == 2))
     {
         Popup_Request(POPUP5_SPEED_LIMIT);
     }
@@ -498,7 +499,7 @@ void Popups_Polling(void)
         Popup_Delete(POPUP5_SPEED_LIMIT);
     }
     //31.扭矩限制-图1 ID：18FF2300 Byte：7 Bit：4,3   01(B)
-    if(V_Speed && (variable_1 == 1)) 
+    if (V_Speed && (variable_1 == 1))
     {
         Popup_Request(POPUP5_TORQUE_REDUCTION_SPEED);
     }
@@ -507,7 +508,7 @@ void Popups_Polling(void)
         Popup_Delete(POPUP5_TORQUE_REDUCTION_SPEED);
     }
     //32.扭矩限制-图2 ID：18FF2300 Byte：7 Bit：4,3   01(B)
-    if((V_Speed == 0) && (variable_1 == 1))
+    if ((V_Speed == 0) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_TORQUE_REDUCTION);
     }
@@ -516,7 +517,7 @@ void Popups_Polling(void)
         Popup_Delete(POPUP5_TORQUE_REDUCTION);
     }
     //33.扭矩限制、车速限制 交互 显示 ID：18FF2300 Byte：7 Bit：4,3   11(B)
-    if(variable_1 == 3)
+    if (variable_1 == 3)
     {
         Popup_Request(POPUP5_SPEED_TORQUE);
     }
@@ -528,7 +529,7 @@ void Popups_Polling(void)
 
     //34.尿素品质异常-图1 ID：18FF2300 Byte：3 Bit：6,5  01(B)
     variable_1 = Get_ID_18FF2300_Sig_Amber3();
-    if(V_Speed && (variable_1 ==1))
+    if (V_Speed && (variable_1 == 1))
     {
         Popup_Request(POPUP5_INCORRECT_ADBLUE_SPEED);
     }
@@ -537,7 +538,7 @@ void Popups_Polling(void)
         Popup_Delete(POPUP5_INCORRECT_ADBLUE_SPEED);
     }
     //35.尿素品质异常-图2 ID：18FF2300 Byte：3 Bit：6,5  01(B)
-    if((V_Speed == 0) && (variable_1 ==1))
+    if ((V_Speed == 0) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_INCORRECT_ADBLUE);
     }
@@ -549,7 +550,7 @@ void Popups_Polling(void)
     //36.临界排放故障-图1 ID：18FF2300 Byte：7 Bit：6,5  01(B)
     variable_1 = Get_ID_18FF2300_Sig_EXH_System();
 
-    if(V_Speed && (variable_1 == 1))
+    if (V_Speed && (variable_1 == 1))
     {
         Popup_Request(POPUP5_CRITICAL_EMISSION_SPEED);
     }
@@ -559,7 +560,7 @@ void Popups_Polling(void)
     }
 
     //37.临界排放故障-图2 ID：18FF2300 Byte：7 Bit：6,5  01(B)
-    if((V_Speed == 0)&&(variable_1 == 1))
+    if ((V_Speed == 0) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_CRITICAL_EMISSION);
     }
@@ -571,7 +572,7 @@ void Popups_Polling(void)
 
     //38.AMT异常-图1 ID：18FF8503 Byte：1 Bit：4,3 01(B) LID $41 : 0x13
     variable_1 = Get_ID_18FF8503_Sig_Spanner_Warning();
-    if((EOL == 0x13)&&(V_Speed) && (variable_1 == 1))
+    if ((EOL == 0x13) && (V_Speed) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_AMT_SPANNER_WARNING_SPEED);
     }
@@ -581,7 +582,7 @@ void Popups_Polling(void)
     }
 
     //39.AMT异常-请重启发动机 ID：18FF8503 Byte：1 Bit：4,3 01(B) LID $41 : 0x13
-    if((EOL == 0x13)&&(V_Speed == 0) && (variable_1 == 1))
+    if ((EOL == 0x13) && (V_Speed == 0) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_AMT_SPANNER_WARNING);
     }
@@ -593,7 +594,7 @@ void Popups_Polling(void)
 
     //40.AMT异常(气压低下)-图1 ID：18FF8503 Byte：2 Bit：6,5 01(B) LID $41 : 0x13
     variable_1 = Get_ID_18FF2300_Sig_Glow_Lamp();
-    if((EOL == 0x13)&&(V_Speed)&&(variable_1 == 1))
+    if ((EOL == 0x13) && (V_Speed) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_AMT_LOW_AIR_WARNING_SPEED);
     }
@@ -603,7 +604,7 @@ void Popups_Polling(void)
     }
 
     //41.AMT异常(气压低下)-图2
-    if((EOL == 0x13)&&(V_Speed == 0)&&(variable_1 == 1))
+    if ((EOL == 0x13) && (V_Speed == 0) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_AMT_LOW_AIR_WARNING);
     }
@@ -614,7 +615,7 @@ void Popups_Polling(void)
 
     //42.低圧警報-轮胎漏气警告 ID：18011733  Byte：5 Bit：5 01(B) LID $3E : 0x01
     variable_1 = Get_ID_18011733_Sig_Fast_air_leakage_alarm();
-    if((EOL == 0x01)&&(variable_1 == 1))
+    if ((EOL == 0x01) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_LOW_PRESSURE_ALARM_SPEED);
     }
@@ -626,7 +627,7 @@ void Popups_Polling(void)
 
     //44.尿素补给-补充尿素溶液-图1 ID：18FF2300 Byte：3 Bit：4,3 01(B)
     variable_1 = Get_ID_18FF2300_Sig_Amber2();
-    if((V_Speed)&&(variable_1 == 1))
+    if ((V_Speed) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_APP_ADBLUE_SPEED);
     }
@@ -636,7 +637,7 @@ void Popups_Polling(void)
     }
 
     //45.尿素补给-补充尿素溶液-图2 ID：18FF2300 Byte：3 Bit：4,3 01(B)
-    if((V_Speed == 0)&&(variable_1 == 1))
+    if ((V_Speed == 0) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_APP_ADBLUE);
     }
@@ -646,7 +647,7 @@ void Popups_Polling(void)
     }
 
     //46.尿素余量少-有车速-图1 ID：18FF2300 Byte：3 Bit：4,3 10(B)
-    if((V_Speed)&&(variable_1 == 2))
+    if ((V_Speed) && (variable_1 == 2))
     {
         Popup_Request(POPUP5_ADBLUE_LEVEL_LOW_SPEED);
     }
@@ -656,7 +657,7 @@ void Popups_Polling(void)
     }
 
     //47.尿素余量少-无车速-图2 ID：18FF2300 Byte：3 Bit：4,3 10(B)
-    if((V_Speed == 0)&&(variable_1 == 2))
+    if ((V_Speed == 0) && (variable_1 == 2))
     {
         Popup_Request(POPUP5_ADBLUE_LEVEL_LOW);
     }
@@ -667,7 +668,7 @@ void Popups_Polling(void)
 
     //48. 低圧警報（低下）ID：18011733  Byte：5 Bit：8 01(B) LID $3E : 0x01
     variable_1 = Get_ID_18011733_Sig_Low_Presure_Alarm();
-    if((EOL == 0x01)&&(variable_1 == 1))
+    if ((EOL == 0x01) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_LOW_FAILURE_SPEED);
     }
@@ -680,9 +681,9 @@ void Popups_Polling(void)
 
     //50.摄像头有污染-图1 ID：18FE5BE8 Byte7  Bit5-8 0010(B) 0011(B) LID $27: 0x01
     variable_1 = Get_ID_18FE5BE8_Sig_Camera_Status();
-    if(V_Speed)
+    if (V_Speed)
     {
-        if((EOL == 0x01)&&(V_Speed)&&((variable_1 ==2) || (variable_2 ==3)))
+        if ((EOL == 0x01) && (V_Speed) && ((variable_1 == 2) || (variable_2 == 3)))
         {
             Popup_Request(POPUP5_CAMERA_POLLUTION_SPEED);
         }
@@ -692,7 +693,7 @@ void Popups_Polling(void)
         }
     }
     //51.摄像头有污染-请与五十铃公司联系 ID：18FE5BE8 Byte7  Bit5-8 0010(B) 0011(B) LID $27: 0x01
-    if((EOL == 0x01)&&(V_Speed == 0x00)&&((variable_1 ==2) || (variable_2 ==3)))
+    if ((EOL == 0x01) && (V_Speed == 0x00) && ((variable_1 == 2) || (variable_2 == 3)))
     {
         Popup_Request(POPUP5_CAMERA_POLLUTION);
     }
@@ -703,7 +704,7 @@ void Popups_Polling(void)
 
     //52.尿素喷射异常（停止）-图1 ID：18FF2300 Byte：3 Bit：2,1 01(B)
     variable_1 = Get_ID_18FF2300_Sig_Amber1();
-    if((V_Speed)&&(variable_1 == 1))
+    if ((V_Speed) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_AdBlue_LEVEL_LOW_SPEED);
     }
@@ -713,7 +714,7 @@ void Popups_Polling(void)
     }
 
     //53.尿素喷射异常（停止）-图2 ID：18FF2300 Byte：3 Bit：2,1 01(B)
-    if((V_Speed == 0)&&(variable_1 == 1))
+    if ((V_Speed == 0) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_AdBlue_LEVEL_LOW);
     }
@@ -723,7 +724,7 @@ void Popups_Polling(void)
     }
 
     //54.尿素喷射异常（消耗量）-图1  ID：18FF2300 Byte：3 Bit：2,1 10(B)
-    if((V_Speed)&&(variable_1 == 2))
+    if ((V_Speed) && (variable_1 == 2))
     {
         Popup_Request(POPUP5_AdBlue_INJ_SYSTEM_SPEED);
     }
@@ -733,7 +734,7 @@ void Popups_Polling(void)
     }
 
     //55.尿素喷射异常（消耗量）-图2 ID：18FF2300 Byte：3 Bit：2,1 10(B)
-    if((V_Speed == 0)&&(variable_1 == 2))
+    if ((V_Speed == 0) && (variable_1 == 2))
     {
         Popup_Request(POPUP5_AdBlue_INJ_SYSTEM);
     }
@@ -744,7 +745,7 @@ void Popups_Polling(void)
 
     //56.高圧警報-轮胎高压警告 ID：18011733  Byte：5 Bit：7  01(B) LID $3E : 0x01
     variable_1 = Get_ID_18011733_Sig_High_Presure_Alarm();
-    if((EOL == 0x01)&&(variable_1 == 1))
+    if ((EOL == 0x01) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_TPMS_HIGH_AIR);
     }
@@ -755,7 +756,7 @@ void Popups_Polling(void)
 
     //57.高温警報-轮胎高温警告 ID：18011733  Byte：5 Bit：6  01(B) LID $3E : 0x01
     variable_1 = Get_ID_18011733_Sig_High_Temperature_Alarm();
-    if((EOL == 0x01)&&(variable_1  == 1))
+    if ((EOL == 0x01) && (variable_1  == 1))
     {
         Popup_Request(POPUP5_TPMS_HIGH_TEMP);
     }
@@ -766,7 +767,7 @@ void Popups_Polling(void)
 
     //58.尿素喷射异常(停止、消耗量)交互显示----尿素喷射系统异常 ID：18FF2300 Byte：3 Bit：2,1 11(B)
     variable_1 = Get_ID_18FF2300_Sig_Amber1();
-    if(variable_1 == 3)
+    if (variable_1 == 3)
     {
         Popup_Request(POPUP5_AdBlue_DOS_MALFUNC);
     }
@@ -778,7 +779,7 @@ void Popups_Polling(void)
     //59.DPD手动再生要求1-DPD需要再生 18FD7C00 Byte：1 Bit：3-1  001：On – solid
     variable_1 = Get_ID_18FD7C00_Sig_DPF_Lamp_Status_Amber();
 
-    if((V_Speed) && (variable_1 == 1))
+    if ((V_Speed) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_PUSH_DPD_SWITCH1_SPEED);
     }
@@ -788,7 +789,7 @@ void Popups_Polling(void)
     }
 
     //60.DPD手动再生要求1-请按下DPD开关 18FD7C00 Byte：1 Bit：3-1   001：On – solid
-    if((V_Speed == 0) && (variable_1 == 1))
+    if ((V_Speed == 0) && (variable_1 == 1))
     {
         Popup_Request(POPUP5_PUSH_DPD_SWITCH1);
     }
@@ -798,7 +799,7 @@ void Popups_Polling(void)
     }
 
     //61.DPD手动再生要求2-DPD需要再生 18FD7C00 Byte：1 Bit：3-1     100：On – fast blink (1 HZ)
-    if((V_Speed) && (variable_1 == 4))
+    if ((V_Speed) && (variable_1 == 4))
     {
         Popup_Request(POPUP5_PUSH_DPD_SWITCH2_SPEED);
     }
@@ -808,7 +809,7 @@ void Popups_Polling(void)
     }
 
     //62.DPD手动再生要求2-请按下DPD开关 18FD7C00 Byte：1 Bit：3-1     100：On – fast blink (1 HZ)
-    if((V_Speed == 0) && (variable_1 == 4))
+    if ((V_Speed == 0) && (variable_1 == 4))
     {
         Popup_Request(POPUP5_PUSH_DPD_SWITCH2);
     }
@@ -819,7 +820,7 @@ void Popups_Polling(void)
 
     //63.TPMS故障-轮胎监控失败  ID：18011733  Byte：6 Bit：ALL 0111(B) or 1000(B) or 1001(B)
     variable_1 = Get_ID_18011733_Sig_Sensor_fault_information();
-    if((variable_1 == 7) || (variable_1 == 8) ||(variable_1 == 9) )
+    if ((variable_1 == 7) || (variable_1 == 8) || (variable_1 == 9) )
     {
         Popup_Request(POPUP5_TPMS_FAILURE);
     }
@@ -831,7 +832,7 @@ void Popups_Polling(void)
 
     //64.TPMS電池低下-轮胎监控传感器电压下降  ID：18011733  Byte：5 Bit：4  01(B)  LID $3E : 0x01
     variable_1 = Get_ID_18011733_Sig_Low_Voltage_Alarm();
-    if((EOL == 0x01) && (variable_1  == 1))
+    if ((EOL == 0x01) && (variable_1  == 1))
     {
         Popup_Request(POPUP5_TPMS_MONITOR_DROP);
     }
@@ -843,7 +844,7 @@ void Popups_Polling(void)
 
     //66.遥控车辆高度调整中(无车速) B30 28V
     variable_1 = Line_In_Get_Status(LINE_IN_AIR_SUS);//获取硬线结果 B30
-    if((V_Speed == 0) && (variable_1 == 1))
+    if ((V_Speed == 0) && (variable_1 == 1))
     {
         Popup_Request(POPUP6_HEIGHT_CONTROL);
     }
@@ -857,7 +858,7 @@ void Popups_Polling(void)
     variable_1 = Get_ID_18FED900_Sig_PTO_SW();
     variable_2 = Line_In_Get_Status(LINE_IN_PTO);
 
-    if((V_Speed == 0) || (variable_1 == 1) || ( variable_2 == 1))   
+    if ((V_Speed == 0) || (variable_1 == 1) || ( variable_2 == 1))
     {
         Popup_Request(POPUP6_PTO_STOP);
     }
@@ -872,7 +873,7 @@ void Popups_Polling(void)
     //检出（Lo 或 连续500次以上电压值＜21V）时。
     variable_1                  = Line_In_Get_Status(LINE_IN_CHARGE);                //A34
 
-    if((V_Speed) && (variable_1 == 1) && (E_Speed > 350))
+    if ((V_Speed) && (variable_1 == 1) && (E_Speed > 350))
     {
         Popup_Request(POPUP7_CHARGE_ABNORMAL_SPEED);
     }
@@ -882,7 +883,7 @@ void Popups_Polling(void)
     }
 
     //69.充电异常-请与五十铃公司联系
-    if((V_Speed == 0) && (variable_1 == 1) && (E_Speed > 350))
+    if ((V_Speed == 0) && (variable_1 == 1) && (E_Speed > 350))
     {
         Popup_Request(POPUP7_CHARGE_ABNORMAL);
     }
@@ -894,7 +895,7 @@ void Popups_Polling(void)
     //70.AMT異常-AMT异常  ID：18FF8503　Bite：1 Bit：2,1   LID $41 : 0x13
     variable_1 = Get_ID_18FF8503_Sig_Stop_Warning();
 
-    if((EOL == 0x13) && (V_Speed) && (variable_1))
+    if ((EOL == 0x13) && (V_Speed) && (variable_1))
     {
         Popup_Request(POPUP7_AMT_ERROR_SPEED);
     }
@@ -904,7 +905,7 @@ void Popups_Polling(void)
     }
 
     //71.AMT異常-请联系经销商
-    if((EOL == 0x13) && (V_Speed == 0) && (variable_1))
+    if ((EOL == 0x13) && (V_Speed == 0) && (variable_1))
     {
         Popup_Request(POPUP7_AMT_ERROR);
     }
@@ -917,7 +918,7 @@ void Popups_Polling(void)
     //显示条件　 　：　A11的13秒平均値≧128Ω
     //不显示条件　：　A11的13秒平均値< 128Ω
 
-    if((EOL == 0x82) && (Fuel_Get_Res() > 128))
+    if ((EOL == 0x82) && (Fuel_Get_Res() > 128))
     {
         Popup_Request(POPUP8_REFUEL);
     }
@@ -928,7 +929,7 @@ void Popups_Polling(void)
 
     //73.AMT过热-离合器过载 ID：18FF8503　Bite：2 Bit：4,3  001(B)  LID $41 : 0x13
     variable_1 = Get_ID_18FF8503_Sig_Clutch_Overload_warning();
-    if((EOL == 0x13) && (V_Speed) && (variable_1 == 1))
+    if ((EOL == 0x13) && (V_Speed) && (variable_1 == 1))
     {
         Popup_Request(POPUP8_ATM_CLUCH_OVERHEATING_SPEED);
     }
@@ -938,7 +939,7 @@ void Popups_Polling(void)
     }
 
     //74.AMT过热-选择合适的档位 ID：18FF8503　Bite：2 Bit：4,3  001(B)  LID $41 : 0x13
-    if((EOL == 0x13) && (V_Speed == 0) && (variable_1 == 1))
+    if ((EOL == 0x13) && (V_Speed == 0) && (variable_1 == 1))
     {
         Popup_Request(POPUP8_ATM_CLUCH_OVERHEATING);
     }
@@ -949,7 +950,7 @@ void Popups_Polling(void)
 
     //75.AMT磨耗-离合器磨损 ID：18FF8503　Bite：2 Bit：2,1  001(B)  LID $41 : 0x13
     variable_1 = Get_ID_18FF8503_Sig_Manouvering_mode();
-    if((EOL == 0x13) && (variable_1 == 1))
+    if ((EOL == 0x13) && (variable_1 == 1))
     {
         Popup_Request(POPUP1_BRAKE_BRAKE);
     }
@@ -962,13 +963,13 @@ void Popups_Polling(void)
     //76.低电压报警
     //显示条件：发动机启动(350r/min)后，7秒检测到23.5V时
     //显示消失条件：10秒检测到25V以上时
-    if( E_Speed > 350) //转速350R/min
+    if ( E_Speed > 350) //转速350R/min
     {
-        if( KL30_Volt < 2350)    //23.5V
+        if ( KL30_Volt < 2350)   //23.5V
         {
             Popup_Request(POPUP8_LOW_VOLTAGE_SPEED);
         }
-        else if(KL30_Volt > 2500)
+        else if (KL30_Volt > 2500)
         {
             Popup_Delete(POPUP8_LOW_VOLTAGE_SPEED);
         }
@@ -981,13 +982,13 @@ void Popups_Polling(void)
     //77.过电压报警
     //显示条件：发动机启动(350r/min)后，7秒检测到30.4V以上时
     //显示消失条件：10秒检测到29.4V以下时
-    if( E_Speed > 350) //转速350R/min
+    if ( E_Speed > 350) //转速350R/min
     {
-        if(KL30_Volt > 3044)    //30.44V
+        if (KL30_Volt > 3044)   //30.44V
         {
             Popup_Request(POPUP8_OVERVOLTAGE);
         }
-        else if(KL30_Volt < 2940)
+        else if (KL30_Volt < 2940)
         {
             Popup_Delete(POPUP8_OVERVOLTAGE);
         }
@@ -1000,7 +1001,7 @@ void Popups_Polling(void)
     //78.DPD自动再生-DPD自动再生中  ID：18FED900 (AUXIO)  Byte：8  bit：5,4  01(B)  Engine Speed ： 350rpm以上
     variable_1  = Get_ID_18FED900_Sig_DPF_Regeneration_Status();
 
-    if((V_Speed) &&(E_Speed >= 350)&&(variable_1 == 1))  
+    if ((V_Speed) && (E_Speed >= 350) && (variable_1 == 1))
     {
         Popup_Request(POPUP8_DPD_AUTO_SPEED);
     }
@@ -1009,7 +1010,7 @@ void Popups_Polling(void)
         Popup_Delete(POPUP8_DPD_AUTO_SPEED);
     }
     //79.DPD自动再生-再生将自动完成，不需要操作开关
-    if((V_Speed == 0) &&(E_Speed >= 350)&&(variable_1 == 1)) //转速350R/min
+    if ((V_Speed == 0) && (E_Speed >= 350) && (variable_1 == 1)) //转速350R/min
     {
         Popup_Request(POPUP8_DPD_AUTO);
     }
@@ -1023,7 +1024,7 @@ void Popups_Polling(void)
     //OR条件
     //与LED等同时 任一压力传感器为539kPa(1.89V)以下时
     variable_1 = Line_In_Get_Status(LINE_IN_BRAKE_AIR_EBS);
-    if((V_Speed) && (variable_1 == 0) )
+    if ((V_Speed) && (variable_1 == 0) )
     {
         Popup_Request(POPUP9_AIR_PRESSURE_SPEED);
     }
@@ -1033,7 +1034,7 @@ void Popups_Polling(void)
     }
 
     //81.气压过低-请冲入空气
-    if((V_Speed == 0) && (variable_1 == 0) )
+    if ((V_Speed == 0) && (variable_1 == 0) )
     {
         Popup_Request(POPUP9_AIR_PRESSURE);
     }
@@ -1044,7 +1045,7 @@ void Popups_Polling(void)
 
     //82.EBS故障（红）-请在安全的场所停车 ID：18F0010B (EBC1)  Byte：6 Bit：3-4  01(B)  LID $21: 0x01
     variable_1 = Get_ID_18F0010B_Sig_EBS_Red_Warning_Lamp_State();
-    if((EOL == 0x01) && (V_Speed ) && (variable_1 == 1)) 
+    if ((EOL == 0x01) && (V_Speed ) && (variable_1 == 1))
     {
         Popup_Request(POPUP9_EBS_ERROR_SPEED);
     }
@@ -1053,7 +1054,7 @@ void Popups_Polling(void)
         Popup_Delete(POPUP9_EBS_ERROR_SPEED);
     }
     //83.EBS故障（红）-请与五十铃公司联系
-    if((EOL == 0x01) && (V_Speed == 0 ) && (variable_1 == 1))
+    if ((EOL == 0x01) && (V_Speed == 0 ) && (variable_1 == 1))
     {
         Popup_Request(POPUP9_EBS_ERROR);
     }
@@ -1069,7 +1070,7 @@ void Popups_Polling(void)
 
     //88.发动机机油＆滤清器  ID：18FF3018 Byte：1 Bit：8,7   01(B) 10(B)
     variable_1 = Get_ID_18FF3018_Sig_Engine_Oil_Warnning();
-    if(variable_1 == 1 || variable_1 == 2)
+    if (variable_1 == 1 || variable_1 == 2)
     {
         Popup_Request(POPUP11_ENGINE_OIL_FILTER_ERROR);
     }

source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c

@@ -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},
     {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},
+    {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},
     {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},

source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c

@@ -609,10 +609,10 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
         {
             CopyData[0] =  0x40;
             CopyData[1] =  0x50;
-            CopyData[2] =  0x00; //User_ECU.TripA_Fuel_1;    //0x00;
-            CopyData[3] =  0x00; //User_ECU.TripA_Fuel_2;    //0x00;
-            CopyData[4] =  0x00; //User_ECU.TripA_Fuel_3;    //0x00;
-            CopyData[5] =  0x00; //User_ECU.TripA_Fuel_4;    //0x00;
+            CopyData[2] =  0x00;
+            CopyData[3] =  0x00;
+            CopyData[4] =  0x00;
+            CopyData[5] =  0x00;
             CopyData[6] =  0xFF;
             CopyData[7] =  0xFF;
         }
@@ -620,16 +620,18 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
         {
             CopyData[0] =  0x40;
             CopyData[1] =  0x60;
-            CopyData[2] =  0x00; //User_ECU.TripA_Fuel_1;    //0x00;
-            CopyData[3] =  0x00; //User_ECU.TripA_Fuel_2;    //0x00;
-            CopyData[4] =  0x00; //User_ECU.TripA_Fuel_3;    //0x00;
-            CopyData[5] =  0x00; //User_ECU.TripA_Fuel_4;    //0x00;
+            CopyData[2] =  0x00;
+            CopyData[3] =  0x00;
+            CopyData[4] =  0x00;
+            CopyData[5] =  0x00;
             CopyData[6] =  0xFF;
             CopyData[7] =  0xFF;
         }
         User_BCM_Flag = 1u;/*从头轮询*/
 
         State_Flag.FState_ClearOilTx = 0u;
+
+        //Can_Msg_Tx_Overwrite(MSGID_18EF1817, 1, 100 * 1000);
     }
     else
     {
@@ -759,6 +761,8 @@ void Can_Set_Buff_18EF1817(uint8_t CopyData[])
         default:
             break;
         }
+
+        //Can_Msg_Tx_Overwrite(MSGID_18EF1817, 0XFFFF, 100 * 1000);
     }
 }
 

source/Driver/Memory/TYW_FLASH.c

@@ -349,7 +349,7 @@ Total_Begin:
 
     if ((TEMP[0] != 0x50415247) || (TEMP[1] != 0x50415f45))
     {
-       //goto Total_Begin;
+       goto Total_Begin;
     }
 End_Begin:
     //i_count=0;