🐞 fix:基于评审的修改项

Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/RTE/Device/BAT32A279KM64FB/system_BAT32A279.c

@@ -65,7 +65,7 @@ typedef enum {
 
 //-------- <<< Use Configuration Wizard in Context Menu >>> ------------------
 #if (HAS_BOOTLOADER != 1U)
-const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".ARM.__AT_0x0000C4C0"))) =
+const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".ARM.__AT_0x000000C0"))) =
 {
 
 /**

Firmware/Source/Application/Data_OilPressure.c

@@ -37,56 +37,58 @@ void Oil_R_Cal(uint8_t deltaTime)
     // {
     //     OilPressureR = ADC_Read_Signal(ADC_CH_OIL_PRESSURE_R);
     // }
-
-    if (timeCount >= OIL_DATA_TIME)
+    if(AMT630H_Animation_Finish_Flage() == 1)
     {
-        timeCount = 0;
-        if (g_u8OilDataCount < OIL_DATA_NUM)
+        if (timeCount >= OIL_DATA_TIME)
         {
-            /*获取机油压力电阻*/
-            OilPressureRes = ADC_Read_Signal(ADC_CH_OIL_PRESSURE_R);
-
-            /*四舍五入*/
-            if (OilPressureRes < 60000)  //针对此项目机油压力采集电路补偿后的阻值
+            timeCount = 0;
+            if (g_u8OilDataCount < OIL_DATA_NUM)
             {
-                if (OilPressureRes % 10 >= 5)
+                /*获取机油压力电阻*/
+                OilPressureRes = ADC_Read_Signal(ADC_CH_OIL_PRESSURE_R);
+
+                /*四舍五入*/
+                if (OilPressureRes < 60000)  //针对此项目机油压力采集电路补偿后的阻值
+                {
+                    if (OilPressureRes % 10 >= 5)
+                    {
+                        OilPressureRes += 5;
+                    }
+                }
+                else
+                {
+                    OilPressureRes = 0xFFFF;
+                }
+                /*由小到大插入数据*/
+                for (i = 0; i < g_u8OilDataCount; i++)
+                {
+                    if (OilPressureRes < g_u16OilData[i])
+                    {
+                        break;
+                    }
+                }
+                for (j = g_u8OilDataCount; j > i; j--)
                 {
-                    OilPressureRes += 5;
+                    g_u16OilData[j] = g_u16OilData[j - 1];
                 }
+                g_u16OilData[i] = OilPressureRes;
+                g_u8OilDataCount++;
             }
             else
             {
-                OilPressureRes = 0xFFFF;
-            }
-            /*由小到大插入数据*/
-            for (i = 0; i < g_u8OilDataCount; i++)
-            {
-                if (OilPressureRes < g_u16OilData[i])
+                /*一组数据采集完毕，取中间部分计算平均值*/
+                temp32 = 0;
+                for (i = OIL_CAL_START; i < OIL_CAL_END; i++)
                 {
-                    break;
+                    temp32 += g_u16OilData[i];
                 }
+                OilPressureR = temp32 / (OIL_CAL_END - OIL_CAL_START);
+                g_u8OilDataCount = 0;
+                g_u8OilADCompleteFlg = 1;
             }
-            for (j = g_u8OilDataCount; j > i; j--)
-            {
-                g_u16OilData[j] = g_u16OilData[j - 1];
-            }
-            g_u16OilData[i] = OilPressureRes;
-            g_u8OilDataCount++;
-        }
-        else
-        {
-            /*一组数据采集完毕，取中间部分计算平均值*/
-            temp32 = 0;
-            for (i = OIL_CAL_START; i < OIL_CAL_END; i++)
-            {
-                temp32 += g_u16OilData[i];
-            }
-            OilPressureR = temp32 / (OIL_CAL_END - OIL_CAL_START);
-            g_u8OilDataCount = 0;
-            g_u8OilADCompleteFlg = 1;
         }
+        timeCount += deltaTime;
     }
-    timeCount += deltaTime;
 }
 
 uint8_t Get_OilPressureStauts(void)

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -217,7 +217,7 @@ static Power_Status_em Power_Stay_Protect(void)
     /* 关闭所有外设，坪保留AD采集，电溝状思切�? */
     {
         TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 0);
-        CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);
+        // CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);
     }
     u8PowerSts = EM_IGN_OFF_Init;
     /* 电溝模弝正常 */
@@ -231,7 +231,7 @@ static Power_Status_em Power_Stay_Protect(void)
         if ( SYS_OPR_STAT_RUN )
         {
             Amt630hInit();
-            CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
+            // CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
             return u8PowerSts;
         }