Commit d40294fa authored by hu's avatar hu

调整FLASH增加ABS指示灯图片 FV00.05

parent 074def16
No preview for this file type
This diff is collapsed.
project .intvect 1536 project .intvect 1536
project .text 324604 project .text 324876
project .rodata 411103 project .rodata 411119
project .secinfo 120 project .secinfo 120
project .syscall 6 project .syscall 6
project .romdata 9021 project .romdata 9021
......
...@@ -379,16 +379,40 @@ uint8_t Common_Get_WET_Valid(void) ...@@ -379,16 +379,40 @@ uint8_t Common_Get_WET_Valid(void)
return DataStrWET.Valid; return DataStrWET.Valid;
} }
/*-------------------------------------------------------------------------
* Function Name : Common_Get_Air1_Data
* Description : 获取
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
uint16_t Common_Get_Air1_Data(void) uint16_t Common_Get_Air1_Data(void)
{ {
return DataStrGas1.DataDisplay; return DataStrGas1.DataDisplay;
} }
/*-------------------------------------------------------------------------
* Function Name : Common_Get_Air2_Data
* Description : 获取
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
uint16_t Common_Get_Air2_Data(void) uint16_t Common_Get_Air2_Data(void)
{ {
return DataStrGas2.DataDisplay; return DataStrGas2.DataDisplay;
} }
/*-------------------------------------------------------------------------
* Function Name : Common_Get_WET_Data
* Description : 获取
* Input : None
* Output : None
* Return : None
* onther : None
--------------------------------------------------------------------------*/
uint16_t Common_Get_WET_Data(void) uint16_t Common_Get_WET_Data(void)
{ {
return DataStrWET.DataDisplay; return DataStrWET.DataDisplay;
......
...@@ -1333,9 +1333,11 @@ uint8_t LED_EVSC_L_Judgement(void) ...@@ -1333,9 +1333,11 @@ uint8_t LED_EVSC_L_Judgement(void)
m_Condition3 = (uint8_t)Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State(); m_Condition3 = (uint8_t)Get_ID_18F0010B_Sig_ATC_or_ASR_Lamp_State();
m_Condition4 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Lamp_State(); m_Condition4 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Lamp_State();
m_Condition5 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Fully_operational(); m_Condition5 = (uint8_t)Get_ID_18FE4F0B_Sig_VDC_Fully_operational();
m_Condition6 = 0u; /*气压1 1.89以下*/
m_Condition7 = 0u; /*气压1 1.89以下*/
if ( if (
(m_Condition1 == 1u) || (m_Condition1 == 1u) ||
(m_Condition6 < 1890u) || (m_Condition7 < 1890u) ||
((m_Condition2 == 1u) && (K_Line_Set.K_Line_LID21 == 0x01u)) || ((m_Condition2 == 1u) && (K_Line_Set.K_Line_LID21 == 0x01u)) ||
((CanStatus1 == CAN_SIG_LOST) && (K_Line_Set.K_Line_LID22 == 0x01u)) ((CanStatus1 == CAN_SIG_LOST) && (K_Line_Set.K_Line_LID22 == 0x01u))
) )
...@@ -1909,7 +1911,7 @@ void LED_ABS_R_Execution(uint8_t led_status) ...@@ -1909,7 +1911,7 @@ void LED_ABS_R_Execution(uint8_t led_status)
} }
else else
{ {
ABS_LED_MCU_OUT = 0x0u; ABS_LED_MCU_OUT = 0x00u;
SEG_LED_ABS_R(0); SEG_LED_ABS_R(0);
} }
} }
......
...@@ -537,7 +537,7 @@ static void GPIO_PIN_Init(GPIO_Config_Mode_en_t enGPIOConfigMode) ...@@ -537,7 +537,7 @@ static void GPIO_PIN_Init(GPIO_Config_Mode_en_t enGPIOConfigMode)
PORTJ_AWOJPCR0_3 = g_u32GPIOConfigArray[124U][enGPIOConfigMode]; PORTJ_AWOJPCR0_3 = g_u32GPIOConfigArray[124U][enGPIOConfigMode];
PORTJ_AWOJPCR0_4 = g_u32GPIOConfigArray[125U][enGPIOConfigMode]; PORTJ_AWOJPCR0_4 = g_u32GPIOConfigArray[125U][enGPIOConfigMode];
PORTJ_AWOJPCR0_5 = g_u32GPIOConfigArray[126U][enGPIOConfigMode]; PORTJ_AWOJPCR0_5 = g_u32GPIOConfigArray[126U][enGPIOConfigMode];
*/ */
} }
void GPIO_Init(GPIO_Config_Mode_en_t enGPIOConfigMode) void GPIO_Init(GPIO_Config_Mode_en_t enGPIOConfigMode)
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -219,6 +219,7 @@ enum SpriteName ...@@ -219,6 +219,7 @@ enum SpriteName
CN_dangwei_RM, CN_dangwei_RM,
CN_MANUAL, CN_MANUAL,
CN_Alarm_01, CN_Alarm_01,
CN_Alarm_02,
CN_ODO, CN_ODO,
CN_ODO_danwei, CN_ODO_danwei,
CN_TRIP, CN_TRIP,
......
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