修改禅道问题

source/Application/APP/GaugesMode/GaugesInterface.c

@@ -26,12 +26,12 @@ static const uint16_t GaugesDataInInit[GaugesTotal][3][25] =
         { 0,  1,  2,  3,  4,  5,   6,   7,   8,   9,  10,  11,  12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
     },
     /*PRI气压*/
-    {   {500, 720,  940, 1160, 1380, 1600, 1820, 2040, 2260, 2480, 2700, 2920, 3140, 3360, 3580, 3800, 4020, 4240, 4500, 0, 0, 0, 0, 0},
+    {   {500, 720,  940, 1160, 1380, 1600, 1820, 1990, 2260, 2480, 2700, 2920, 3140, 3360, 3580, 3800, 4020, 4240, 4500, 0, 0, 0, 0, 0},
         {610, 830, 1050, 1270, 1490, 1710, 1930, 2150, 2370, 2590, 2810, 3030, 3250, 3470, 3690, 3910, 4130, 4350, 4500, 0, 0, 0, 0, 0},
         {  0,   1,    2,    3,    4,    5,    6,    7,    8,    9,   10,   11,   12,   13,   14,   15,   16,   17,   18, 0, 0, 0, 0, 0}
     },
     /*SEC气压*/
-    {   {500, 720,  940, 1160, 1380, 1600, 1820, 2040, 2260, 2480, 2700, 2920, 3140, 3360, 3580, 3800, 4020, 4240, 4500, 0, 0, 0, 0, 0},
+    {   {500, 720,  940, 1160, 1380, 1600, 1820, 1990, 2260, 2480, 2700, 2920, 3140, 3360, 3580, 3800, 4020, 4240, 4500, 0, 0, 0, 0, 0},
         {610, 830, 1050, 1270, 1490, 1710, 1930, 2150, 2370, 2590, 2810, 3030, 3250, 3470, 3690, 3910, 4130, 4350, 4500, 0, 0, 0, 0, 0},
         {  0,   1,    2,    3,    4,    5,    6,    7,    8,    9,   10,   11,   12,   13,   14,   15,   16,   17,   18, 0, 0, 0, 0, 0}
     },

source/Application/APP/PowerManagement/PowerManagement_user.c

@@ -344,39 +344,38 @@ Power_Status_t Power_Stay_OFF(void)
 Power_Status_t  Power_Stay_Protect(void)
 {
     Power_Status_t u8PowerSts = m_IGN_OFF_Init;
-	uint32_t Delaycnt = 0;
-    /*关应用 123……*/
+    uint32_t Delaycnt = 0;
 
+    /*关应用 123……*/
+    
 
     for (;;)
     {
         /*喂狗*/
         WDT_Clear( );
-        //CAN_SET_APP_SEND(1u);
-        //CAN_SET_NM_SEND(1u);
         CAN_TX_SetEnable(0);
+
         /*一定周期调用2ms*/
         Gen_TimeDelay(2000u, 50u);
         DoCAN_Communication_Service( );
         UDS_Server_Application_Service( );
         UDS_10ms_Service( );
-        //RTE_ADC_Services( );
         Analog_Signal_Conv_Service();
         Sys_Status_Update_Service( );
         Delaycnt++;
         if ( Delaycnt >= 5u )
         {
             Delaycnt = 0u;
-            Can_BusOff_Fun();
+            CAN_BUSOFF_Recover();
+            //Can_BusOff_Fun();
         }
+
         /*- 电源模式正常，退出 -*/
         if ( SYS_OPR_STAT_RUN )
         {
-            //CAN_SET_APP_SEND(0u);
-            //CAN_SET_NM_SEND(0u);
             CAN_TX_SetEnable(0x55);
             /*初始化需要*/
-            //BackLight_30_Init( );
+
             return u8PowerSts;
         }
     }

source/Application/Alarm/Popups.c

@@ -202,9 +202,10 @@ void Popups_Polling(void)
 
             /*5.--4--ASR工作*/
             variable_1 = (uint8_t)Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State();/*byte6 78*/
-            variable_2 = (uint8_t)Get_ID_18F0010B_Sig_ASR_Lamp_State(); /*byte1 12*/
-            variable_3 = (uint8_t)Get_ID_18F0010B_Sig_ASR_Brake_Control_Active();/*byte1 34*/
-            if (((variable_2 == 0x01u) || (variable_3 == 0x01u)) && (K_Line_Set.K_Line_LID21 == 0x01u)) //|| (variable_1 == 0x01))
+            //variable_2 = (uint8_t)Get_ID_18F0010B_Sig_ASR_Lamp_State(); /*byte1 12*/
+            //variable_3 = (uint8_t)Get_ID_18F0010B_Sig_ASR_Brake_Control_Active();/*byte1 34*/
+            //if (((variable_2 == 0x01u) || (variable_3 == 0x01u)) && (K_Line_Set.K_Line_LID21 == 0x01u)) //|| (variable_1 == 0x01))
+            if ((variable_1 == 1) || (variable_1 == 3))/*禅道3162*/
             {
                 Popup_Request(POPUT1_ASR_OPERATE);
                 return;

source/Application/CAN_APP_NM/CAN_App/COM_CAN.c

@@ -129,9 +129,9 @@ void Can_BusOff_Fun(void)
     //{
     //    RSCAN0_CH0_Busoff_Recover();
     //}
-    //if (RSCAN0_CH0_Get_Busoff_Status() != 0)
+    //if (RSCAN0_CH2_Get_Busoff_Status() != 0)
     //{
-    //    RSCAN0_CH0_Busoff_Recover();
+    //    RSCAN0_CH2_Busoff_Recover();
     //}
 }
 

source/Application/Graphic/GUI/GUI.c

@@ -555,12 +555,12 @@ void GUI_Data_Dispaly(uint8_t Mode)
 
         if (CanStatus == CAN_SIG_NORMAL)
         {
-            GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 591u, 64u, GUI_BLENDMODE_SRC_OVER); /*显示年份后面的 “ . ”   */
-            GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 642u, 64u, GUI_BLENDMODE_SRC_OVER); /*显示月份后面的 “ . ”   */
+            GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 591u, 62u, GUI_BLENDMODE_SRC_OVER); /*显示年份后面的 “ . ”   */
+            GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 640u, 62u, GUI_BLENDMODE_SRC_OVER); /*显示月份后面的 “ . ”   */
 
-            GUI_General_Digit_Display(Calendar_Sprite, Year, CN_RC_Nb_14_0, 4u, 0u, GUI_DISP_Year, 48, GUI_BLENDMODE_SRC_OVER);   /*显示年*/
-            GUI_General_Digit_Display(Calendar_Sprite, Month, CN_RC_Nb_14_0, 2u, 0u, GUI_DISP_Month, 48, GUI_BLENDMODE_SRC_OVER); /*显示月*/
-            GUI_General_Digit_Display(Calendar_Sprite, Date, CN_RC_Nb_14_0, 2u, 0u, GUI_DISP_Date, 48, GUI_BLENDMODE_SRC_OVER);   /*显示日*/
+            GUI_General_Digit_Display(Calendar_Sprite, Year, CN_RC_Nb_14_0, 4u, 0u, GUI_DISP_Year, 44, GUI_BLENDMODE_SRC_OVER);   /*显示年*/
+            GUI_General_Digit_Display(Calendar_Sprite, Month, CN_RC_Nb_14_0, 2u, 0u, GUI_DISP_Month, 44, GUI_BLENDMODE_SRC_OVER); /*显示月*/
+            GUI_General_Digit_Display(Calendar_Sprite, Date, CN_RC_Nb_14_0, 2u, 0u, GUI_DISP_Date, 44, GUI_BLENDMODE_SRC_OVER);   /*显示日*/
 
             GUI_General_Display(Calendar_Sprite, GUIWedk[Week], GUI_BLENDMODE_SRC_OVER); /*星期 */
         }
@@ -690,12 +690,12 @@ void GUI_WetGas_Dispaly(uint8_t Mode)
         {
             switch (current_value)
             {
-            case 0x14u: /*20*/
-                GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x13), 405u, GUI_BLENDMODE_SRC_OVER);
-            case 0x13u:
-                GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x12), 405u, GUI_BLENDMODE_SRC_OVER);
-            case 0x12u:
-                GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x11), 405u, GUI_BLENDMODE_SRC_OVER);
+            //case 0x14u: /*20*/
+            //    GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x13), 405u, GUI_BLENDMODE_SRC_OVER);
+            //case 0x13u:
+            //    GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x12), 405u, GUI_BLENDMODE_SRC_OVER);
+            //case 0x12u:
+            //    GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x11), 405u, GUI_BLENDMODE_SRC_OVER);
             case 0x11u: /*17*/
                 GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x10), 405u, GUI_BLENDMODE_SRC_OVER);
             case 0x10u:
@@ -730,20 +730,20 @@ void GUI_WetGas_Dispaly(uint8_t Mode)
                 GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x01), 405u, GUI_BLENDMODE_SRC_OVER);
             case 0x01u:
                 GUI_Translate_Display(WET_Sprite, CN_qiyazouge_01, (145u + 8u * 0x00), 405u, GUI_BLENDMODE_SRC_OVER);
+                GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER); /*气压符号灯。*/
+                GUI_General_Display(WET_Sprite, CN_qiya, GUI_BLENDMODE_SRC_OVER); /*刷长条的气压表框。*/
                 break;
             default:
-                GUI_General_Display(WET_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
+                GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER); /*气压符号灯。*/
+                //GUI_General_Display(WET_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
                 break;
             }
-
-            GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER); /*气压符号灯。*/
-            GUI_General_Display(WET_Sprite, CN_qiya, GUI_BLENDMODE_SRC_OVER); /*刷长条的气压表框。*/
+            //GUI_General_Display(WET_Sprite, CN_qiyafuhaodeng, GUI_BLENDMODE_SRC_OVER); /*气压符号灯。*/
         }
         else
         {
             GUI_General_Display(WET_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
         }
-
     }
     else
     {

source/System/tasks.c

@@ -185,7 +185,6 @@ void Sys_Run_Mode_10ms_Tasks(void)
     }
 
     Key_Service();
-    CAN_BUSOFF_Recover();
 
     /*表头调度函数 added by yutian*/
     UserGaugeSchedule(); /*在主循环中调用*/
@@ -193,7 +192,8 @@ void Sys_Run_Mode_10ms_Tasks(void)
     CD4051B_ReadSignal_Serviece();
     Sound_Play_Service();
     UDS_10ms_Service();
-    Can_BusOff_Fun();
+    CAN_BUSOFF_Recover();
+    //Can_BusOff_Fun();
 
     Fuel_User_KL15_ON_Processing_Service();
 }