Merge branch 'lijianshuang' into 'dev'

Lijianshuang

See merge request !68

Firmware/Source/Application/Data_Coolant/Data_Coolant.c

@@ -322,11 +322,11 @@ void Data_Coolant_Temp_Display ( void )
         }
         else
         {
-            if (DataCoolantTemp.Value >= 115)
+            if (GET_DataCoolantSegValue() >= 115)
             {
                 DataCoolantTemp_Dis.u8_Warnflg = 2;
             }
-            else if (DataCoolantTemp.Value <= 112)
+            else if (GET_DataCoolantSegValue() <= 112)
             {
                 DataCoolantTemp_Dis.u8_Warnflg = 0;
             }

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -50,9 +50,10 @@ static void Power_KL30_Init(void)
     eeprom_StoreInfo_Init();
     Can_Init();
 
+    Data_TPMS_KL30_Init ();
     CAN_TX_Count_Init();
     CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
-    Data_TPMS_KL30_Init ();
+    
     
     DFlash_init();
     Data_Read_DiagPara();
@@ -75,7 +76,7 @@ static void Power_KL30_Init(void)
     Fuel_KL30_Init();
     Data_Voltage_Init();
 //    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER0, 400, 64000000);
-    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
+    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 1260, 64000000);
 //    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER0, 400);
 //    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400);
 //    TimerM_PWM_CH_Output_init(TIMERM_COUNTER0, TIMERM_CHB, ActiveLevel_High);
@@ -132,7 +133,7 @@ static void Power_Wakeup_Init(void)
     Fuel_KL30_Init();
     Data_Voltage_Init();
 //    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER0, 400, 64000000);
-    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
+    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 1260, 64000000);
 //	  TimerM_PWM_counter_Output_Init(TIMERM_COUNTER0, 400);
 //    TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400);
 //    TimerM_PWM_CH_Output_init(TIMERM_COUNTER0, TIMERM_CHB, ActiveLevel_High);