Merge branch 'lijianshuang' into 'dev'

Lijianshuang

See merge request !8

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing200.BAT

 SET PATH=C:\Keil_v5\ARM\ARMCC\Bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Users\tyw05\AppData\Local\Microsoft\WindowsApps;
-SET ARMCC5_ASMOPT=--diag_suppress=9931
-SET ARMCC5_CCOPT=--diag_suppress=9931
-SET ARMCC5_LINKOPT=--diag_suppress=9931
 SET CPU_TYPE=BAT32G139GK64FB
 SET CPU_VENDOR=Cmsemicon
 SET UV2_TARGET=TianYing200

Firmware/Source/Application/BackLight/BackLight.c

@@ -6,7 +6,7 @@
 
 
 #define BACK_LIGHT_DAY 600
-#define BACK_LIGHT_NIGHT 200
+#define BACK_LIGHT_NIGHT 420
 _Light g_Light;
 
 void BackLight_Init(void)
@@ -19,32 +19,16 @@ void BackLight_Process(void)
 {
     if (SYS_OPR_STAT_IGN_ON)
     {
-        // if(ALS_Get_Data1() > 200)//data1 500以内,data0 3000以内
-        // {
-        //     if (g_Light.Light_Day < 15)//1.5s 1500ms
-        //     {
-        //         g_Light.Light_Day++;//100ms
-        //     }
-        //     else
-        //     {
-        //         g_Light.Light_Night = 0;
-        //         TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, BACK_LIGHT_DAY);
-        //     }
-        // }
-        // else
-        // {
-        //     if (g_Light.Light_Night < 15)
-        //     {
-        //         g_Light.Light_Night++;
-        //     }
-        //     else
-        //     {
-        //         g_Light.Light_Day = 0;
-        //         TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, BACK_LIGHT_NIGHT);
-        //     }
-        // }
+        if ( HighBeam_Timer.LED_Turnon == 5 )
+        {
+            TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, BACK_LIGHT_NIGHT);
+        }
+        else
+        {
             TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, BACK_LIGHT_DAY);
         }
+        
+    }
     else
     {
         g_Light.Light_Day = 0;

Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c

@@ -30,7 +30,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
-        5000ul,
+        1000ul,
         0x341ul,
         (( void * )0),
         (( void * )0),
@@ -40,7 +40,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
-        5000ul,
+        1000ul,
         0x111ul,
         (( void * )0),
         (( void * )0),
@@ -50,7 +50,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
-        5000ul,
+        1000ul,
         0x401ul,
         (( void * )0),
         (( void * )0),

Firmware/Source/Component/LED_Driver/LED_Driver_Interface.h

@@ -47,10 +47,10 @@ typedef enum
     LampCh0_26_Tire_PressureW,
     LampCh0_27_Tire_PressureY,
     LampCh0_28_Auto_Star_Stop,
-    LampCh0_29_MPH,
+    LampCh0_29_High_Beam,
 
-    LampCh0_30_High_Beam,
-    LampCh0_31_Lateral_Support,
+    LampCh0_30_Lateral_Support,
+    LampCh0_31_Low_Voltage,
     LampCh0_32_Fault_Diagnosis,
     LampCh0_33_Upkeep,
     LampCh0_34_TRIP,

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -50,7 +50,6 @@ static void Power_KL30_Init(void)
     DFlash_init();
     Analog_Signal_Conv_Init();
     BU98R10_Init();    
-    BackLight_Init();
     Sys_KL30_Init();
     Checkself_Init();
     Data_Vehicle_Speed_KL30_Init();
@@ -71,6 +70,7 @@ static void Power_KL30_Init(void)
     TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
     
     Telltales_Init();
+    Telltales_UserInit();
     MenuData_Unit_Init();
     g_stRTCInformation.u8RTCSecond = 0;
 	g_stRTCInformation.u8RTCMinute = 0;
@@ -93,7 +93,6 @@ static void Power_Wakeup_Init(void)
     Analog_Signal_Conv_Init();
     Data_User_Mileage_WakeupInit();
     BU98R10_Init();    
-    BackLight_Init();
     Sys_WakeUp_Init();
     Data_Vehicle_Speed_KL30_Init();
     Data_Vehicle_Speed_Wakeup_Init();
@@ -113,6 +112,7 @@ static void Power_Wakeup_Init(void)
     TimerM_PWM_CH_Output_init(TIMERM_COUNTER0, TIMERM_CHD, ActiveLevel_High);
     TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
     Telltales_Init();
+    Telltales_UserInit();
     RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising);
 }
 
@@ -134,10 +134,10 @@ static void Power_IG_OFF_Init(void)
 static void Power_IG_ON_Init(void)
 {
     ClearODO_Flag = 0;    
-    BackLight_Init();
     Checkself_Init();
     Line_In_KL15_ON_Init();
     Telltales_KL15_Init();
+    Telltales_UserInit();
     Fuel_KL15_Init();
     
 }

Firmware/Source/Component/Telltales/Telltales_user.h

@@ -13,7 +13,7 @@ typedef enum
     em_LED_Bluetooth,
     em_LED_TCS,
     em_LED_Auto_Start_Stop,
-    em_LED_Keys,
+    //em_LED_Keys,
     em_LED_Maintain,
     em_LED_Low_Batt_Vol,
     em_LED_Lateral_Strut,
@@ -32,6 +32,7 @@ extern Led_HighBeam_Count HighBeam_Timer;
 
 
 void Telltales_Init(void);
+void Telltales_UserInit(void);
 
 
 #endif