Merge branch 'jinshuo' into 'dev'

🐞 fix:基于评审的修改项

See merge request !104

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,7 +37,8 @@ void Oil_R_Cal(uint8_t deltaTime)
     // {
     //     OilPressureR = ADC_Read_Signal(ADC_CH_OIL_PRESSURE_R);
     // }
-
+    if(AMT630H_Animation_Finish_Flage() == 1)
+    {
         if (timeCount >= OIL_DATA_TIME)
         {
             timeCount = 0;
@@ -87,6 +88,7 @@ void Oil_R_Cal(uint8_t 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;
         }