Merge branch 'lijianshuang' into 'dev'

Lijianshuang

See merge request ty/tianying_ty100!15

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/GUI_Display/GUI_Display.c

@@ -66,7 +66,7 @@ void Clear_Bu98(void)
 void Gauge_Service(void)
 {
     static uint16_t VSpeed_Count = 0u;    
-    uint32_t i = 0;
+    
     if (ClearODO_Flag == 1)
     {
         if ( Common_Get_IG_Sts( ) == COMMON_POWER_ON )
@@ -86,10 +86,10 @@ void Gauge_Service(void)
             {
                 //for(i = 0; i < BU98R10_DDRAM_SIZE; i ++)
                 //{
-                //    BU98R10Chip0DDRAM.Byte[i] = 1;
-                //    BU98R10Chip1DDRAM.Byte[i] = 1;
+                //    BU98R10Chip0DDRAM.Byte[i] = 0x77;
+                //    BU98R10Chip1DDRAM.Byte[i] = 0x77;
                 //}
-                i = Get_Trip_Value();
+                
                 if (VSpeed_Count < 3)
                 {
                     VSpeed_Count++;

Firmware/Source/Component/Key/Key_user.c

@@ -378,7 +378,7 @@ void TYW_RESET_ODO(void)
     {
         if(ClearODO_Flag < 1)
         {
-            if((Get_DispVechileSpeed() >= 1200)&&(Get_DispEngineSpeed() >= 11000))
+            if((Get_DispVechileSpeed() >= 1990)&&(Get_DispEngineSpeed() >= 12000))
             {
                 ClearODO_Flag = 1;
                 Data_Mileage_Clear();

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -82,7 +82,7 @@ static void Power_KL30_Init(void)
 	g_stRTCInformation.u8RTCDayOfMonth = 1;
 	g_stRTCInformation.u8RTCMonth = 1;   
 	g_stRTCInformation.u8RTCYear = 20; 
-    //RTE_RTC_Init(g_stRTCInformation);
+    RTE_RTC_Init(g_stRTCInformation);
     RTE_DEEPSLEEP_GPIO_Interrupt_Enable(WAKEUP_KL15_In,Trigger_Rising);
 
 }

Firmware/Source/System/Sys_Task_List.c

@@ -72,12 +72,12 @@ void Sys_50ms_Tasks(void)
 uint8_t u8LEDDriverCheckCount = 0U;
 void Sys_100ms_Tasks(void)
 {
-    // if((PageType != Page_Time_Hour)&&(PageType != Page_Time_Minute))
-    // {
-    //     RTE_RTC_Get_CounterValue(&counter_val);
-    //     counter_val.time.RTC_Hours = RTC_Bcd2ToByte(counter_val.time.RTC_Hours);
-	// 	counter_val.time.RTC_Minutes = RTC_Bcd2ToByte(counter_val.time.RTC_Minutes);
-    // }
+    if((PageType != Page_Time_Hour)&&(PageType != Page_Time_Minute))
+    {
+        RTE_RTC_Get_CounterValue(&counter_val);
+        counter_val.time.RTC_Hours = RTC_Bcd2ToByte(counter_val.time.RTC_Hours);
+		counter_val.time.RTC_Minutes = RTC_Bcd2ToByte(counter_val.time.RTC_Minutes);
+    }
     Fuel_Cal_Sevice(100u);
     BackLight_Process();
     Services_Mileage_Callback();