Merge branch 'development' into withBoot

source/Application/APP/BackLight/BackLight_APP.c

@@ -8,7 +8,7 @@
 #include "CAN_Communication_Matrix.h"
 #include "BGLInterface.h"
 #include "Line_in.h"
-
+#include "RTE_ADC.h"
 #include "TimerB.h"
 #include "Data_Fuel_User.h"
 #include "Menu.h"
@@ -64,11 +64,10 @@ void BL_Management_service(void)
     uint8_t LED_Plus;
     uint8_t WARNING_PARKING_BRAKE_TEL = 0u;
     uint8_t BCM_PositionLight = 0;
-
     uint8_t DutyCycle;
-
     uint8_t ILL = 0;
     uint32_t Get_Menu_Off_Time = 0u;
+    uint32_t DNC_NumValue = 0u;
 
     if (Line_In_Get_Status(LINE_IN_ILLUMINATION))
     {
@@ -150,7 +149,8 @@ void BL_Management_service(void)
     GetBGLLvl((BackLightVLv - 1), LED_Pos);
 
     /*得到热敏电阻电压参数为100倍电压值*/
-    GetBGLNTCVol(0);
+    DNC_NumValue = RTE_Read_NTC_R_Valid();
+    GetBGLNTCVol((uint16_t)DNC_NumValue);
 
     /*主函数中调用第一个参数电源状态 1是 ON档 2 off 第二个参数 唤醒条件 1是TTF唤醒 2 是表盘唤醒 3 是表盘和屏都有唤醒，0无唤醒*/
 

source/Application/APP/Telltales/Telltales_user.c

@@ -1859,7 +1859,7 @@ uint8_t LED_ABS_R_Judgement(void)
     m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_ABS);
 
     if ((((CanStatus1 == CAN_SIG_LOST) || (m_Condition2 == 0u)) && (K_Line_Set.K_Line_LID21 == 0x01u)) ||
-            (m_Condition1 == 1u) && (K_Line_Set.K_Line_LID21 == 0x03u))
+            ((m_Condition1 == 1u) && (K_Line_Set.K_Line_LID21 == 0x03u)))
     {
         u8Result = 1u;
     }