Commit 9fe0bad9 authored by 张金硕's avatar 张金硕

🐞 fix:基于评审的修改项

parent 944e9564
...@@ -65,7 +65,7 @@ typedef enum { ...@@ -65,7 +65,7 @@ typedef enum {
//-------- <<< Use Configuration Wizard in Context Menu >>> ------------------ //-------- <<< Use Configuration Wizard in Context Menu >>> ------------------
#if (HAS_BOOTLOADER != 1U) #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"))) =
{ {
/** /**
......
...@@ -37,7 +37,8 @@ void Oil_R_Cal(uint8_t deltaTime) ...@@ -37,7 +37,8 @@ void Oil_R_Cal(uint8_t deltaTime)
// { // {
// OilPressureR = ADC_Read_Signal(ADC_CH_OIL_PRESSURE_R); // OilPressureR = ADC_Read_Signal(ADC_CH_OIL_PRESSURE_R);
// } // }
if(AMT630H_Animation_Finish_Flage() == 1)
{
if (timeCount >= OIL_DATA_TIME) if (timeCount >= OIL_DATA_TIME)
{ {
timeCount = 0; timeCount = 0;
...@@ -87,6 +88,7 @@ void Oil_R_Cal(uint8_t deltaTime) ...@@ -87,6 +88,7 @@ void Oil_R_Cal(uint8_t deltaTime)
} }
} }
timeCount += deltaTime; timeCount += deltaTime;
}
} }
uint8_t Get_OilPressureStauts(void) uint8_t Get_OilPressureStauts(void)
......
...@@ -217,7 +217,7 @@ static Power_Status_em Power_Stay_Protect(void) ...@@ -217,7 +217,7 @@ static Power_Status_em Power_Stay_Protect(void)
/* 关闭所有外设,坪保留AD采集,电溝状思切�? */ /* 关闭所有外设,坪保留AD采集,电溝状思切�? */
{ {
TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 0); 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; u8PowerSts = EM_IGN_OFF_Init;
/* 电溝模弝正常 */ /* 电溝模弝正常 */
...@@ -231,7 +231,7 @@ static Power_Status_em Power_Stay_Protect(void) ...@@ -231,7 +231,7 @@ static Power_Status_em Power_Stay_Protect(void)
if ( SYS_OPR_STAT_RUN ) if ( SYS_OPR_STAT_RUN )
{ {
Amt630hInit(); Amt630hInit();
CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable); // CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
return u8PowerSts; return u8PowerSts;
} }
......
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