Merge branch 'dev' of http://tyw-server.synology.me:12345/shihao/haojin750tft into wjw_dev

Firmware/Source/Application/BackLight.c

@@ -519,6 +519,6 @@ void BackLight_Process(void)
     }
     else
     {
-        ;
+        TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, BACK_LIGHT_Val_4);
     }
 }

Firmware/Source/Application/GpioUser.c

@@ -20,7 +20,7 @@ void Gpio_Init(_GpioUser_Enum InitMode)
         RTE_GPIO_Config(RTE_GPIO_PORT00_PIN05, GpioOut_Low);  //L_BiasBitSW 里程百位---
         RTE_GPIO_Config(RTE_GPIO_PORT00_PIN06, GpioOut_Low);  //L_BiasBitSW 里程千位---
 
-        RTE_GPIO_Config(RTE_GPIO_PORT01_PIN00, RTE_GPIO_DIR_OUT);  //表盘背光-PWM
+        RTE_GPIO_Config(RTE_GPIO_PORT01_PIN00, GpioOut_Low);  //表盘背光-PWM
         RTE_GPIO_Config(RTE_GPIO_PORT01_PIN01, GpioOut_Low);      //RXD-ESP-IN-MCU
         RTE_GPIO_Config(RTE_GPIO_PORT01_PIN02, GpioOut_Low);      //TXD-ESP-IN-MCU
         RTE_GPIO_Config(RTE_GPIO_PORT01_PIN03, RTE_GPIO_DIR_IN);     

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -3402,6 +3402,7 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
                 SetPagePic(GRAPHICS_PAGE_0, Pic_0861_91_324);/*单位mile*/
             }
         }
+        DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Tripnumber);
     }
     else if(g_u8Display_Mode == ModeNIGHT)
     {
@@ -3457,6 +3458,7 @@ static void AMT630H_GUI_Trip(uint32_t Trip, uint8_t Uint)
                 SetPagePic(GRAPHICS_PAGE_0, Pic_0863_91_324);/*单位mile*/
             }
         }
+        DisplayNum(GRAPHICS_PAGE_0, &DisplayNumPara, Tripnumber);
     }
 }
 

Firmware/Source/Component/Mileage/Services_Mileage_User.c

@@ -75,7 +75,7 @@ void Data_User_Mileage_KL30Init(void)
     {
         ODOInit.Offset = TempBuf[2];
     }
-    ODOInit.MaxValue = 16103058;
+    ODOInit.MaxValue = 9999999;
     Data_ODO_KL30_Init(DataODOBuf, &ODOInit, Func.EEPromWrite_Cbk);
 
     (void)Data_User_EEPROM_Read(EM_TRIP_BLOCK, TempBuf + 3, 8);
@@ -194,18 +194,18 @@ void Services_Mileage_Callback(void)
 uint32_t Get_ODO_Value(void)
 {
     uint32_t ODO = 0;
-    // if (Get_Dis_Unit() == 0) /* 公制 */
-    // {
-    //     ODO = Data_ODO_Read();
-    // }
-    // else if (Get_Dis_Unit() == 1) /* 英制 */
-    // {
-    //     ODO = Data_Km_To_Mile(Data_ODO_Read());
-    // }
-    // else /* 无效值，按照公里处理，理论上不会执行到这 */
-    // {
-    //     ODO = Data_ODO_Read();
-    // }
+    if (Get_Dis_Unit() == 0) /* 公制 */
+    {
+        ODO = Data_ODO_Read();
+    }
+    else if (Get_Dis_Unit() == 1) /* 英制 */
+    {
+        ODO = Data_Km_To_Mile(Data_ODO_Read());
+    }
+    else /* 无效值，按照公里处理，理论上不会执行到这 */
+    {
+        ODO = Data_ODO_Read();
+    }
     return ODO;
 }
 
@@ -216,18 +216,18 @@ uint32_t Get_ODO_Value(void)
 uint32_t Get_Trip_Value(void)
 {
     uint32_t Trip = 0;
-    // if (Get_Dis_Unit() == 0) /* 公制 */
-    // {
-    //     Trip = Data_Read_Trip(EM_TRIP_A);
-    // }
-    // else if (Get_Dis_Unit() == 1) /* 英制 */
-    // {
-    //     Trip = Data_Km_To_Mile(Data_Read_Trip(EM_TRIP_A));
-    // }
-    // else /* 无效值，按照公里处理，理论上不会执行到这 */
-    // {
-    //     Trip = Data_Read_Trip(EM_TRIP_A);
-    // }
+    if (Get_Dis_Unit() == 0) /* 公制 */
+    {
+        Trip = Data_Read_Trip(EM_TRIP_A);
+    }
+    else if (Get_Dis_Unit() == 1) /* 英制 */
+    {
+        Trip = Data_Km_To_Mile(Data_Read_Trip(EM_TRIP_A));
+    }
+    else /* 无效值，按照公里处理，理论上不会执行到这 */
+    {
+        Trip = Data_Read_Trip(EM_TRIP_A);
+    }
     return Trip;
 }
 
@@ -237,13 +237,13 @@ uint32_t Get_Trip_Value(void)
  */
 void Trip_Clear_Km_Service(void)
 {
-    // if (Get_Dis_Unit() == 0) /* 公制 */
-    // {
-    //     if (Data_Read_Trip(EM_TRIP_A) > 9999) /* 当前单位在KM时，里程大于999.9KM进行清零 */
-    //     {
-    //         Data_Clear_Trip_All();
-    //     }
-    // }
+    if (Get_Dis_Unit() == 0) /* 公制 */
+    {
+        if (Data_Read_Trip(EM_TRIP_A) > 9999) /* 当前单位在KM时，里程大于999.9KM进行清零 */
+        {
+            Data_Clear_Trip_All();
+        }
+    }
 }
 
 

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -56,7 +56,7 @@ static void Power_KL30_Init(void)
     Fuel_KL30_Init();
     Amt630hInit();
     Telltales_Init();
-    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
+    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 20000, 64000000);
     TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
     g_stRTCInformation.u8RTCSecond = 0;
 	g_stRTCInformation.u8RTCMinute = 0;
@@ -68,7 +68,7 @@ static void Power_KL30_Init(void)
     Menu_User_Init();
     Can_Init();
     Protocol_KL30_Wakeup_Init();
-    TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 100);
+    TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 500);
     RTE_DEEPSLEEP_GPIO_Interrupt_Enable(KL15_AD_IN, Trigger_Rising);
     FaultCode_Init();
 }
@@ -88,7 +88,7 @@ static void Power_Wakeup_Init(void)
     Line_In_KL15_ON_Init();
     Fuel_KL30_Init();
     Amt630hInit();
-    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
+    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 20000, 64000000);
     TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
     Telltales_Init();
     Key_KL30_Init_EXample();    
@@ -120,13 +120,13 @@ static void Power_IG_ON_Init(void)
    Line_In_KL15_ON_Init();
    Telltales_KL15_Init();
    Fuel_KL15_Init();
-   RTE_GPIO_Set_Level(Blacklight_PWM, 1);
+   //RTE_GPIO_Set_Level(Blacklight_PWM, 1);
    FaultCode_Init();
 }
 
 static void Power_Sleep_Init(void)
 {
-    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 0);
+    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 20000, 0);
 	rte_can_deinit(CAN_CH_0);
 	TMM0_Stop();
 	TMM1_Stop();