Merge branch 'shihao' into 'dev'

Shihao

See merge request !32

Firmware/Source/Application/BackLight.c

 #include "Backlight.h"
 #include "Components.h"
 
+#define BACK_LIGHT_Val_1 100
+#define BACK_LIGHT_Val_2 300
+#define BACK_LIGHT_Val_3 500
+#define BACK_LIGHT_Val_4 700
+#define BACK_LIGHT_Val_5 900
+
 typedef struct
 {
     Light_uint16_t Temperature; /* 温度 */
@@ -377,4 +383,32 @@ void BackLight_Service(void)
     {
         Backlight_Operate.SetPwmCbk(0);
     }
-}
+}
\ No newline at end of file
+
+void BackLight_Process(void)
+{
+    if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_5) == 1)
+    {
+        TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, BACK_LIGHT_Val_5);
+    }
+    else if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_4) == 1)
+    {
+        TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, BACK_LIGHT_Val_4);
+    }
+    else if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_3) == 1)
+    {
+        TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, BACK_LIGHT_Val_3);
+    }
+    else if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_2) == 1)
+    {
+        TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, BACK_LIGHT_Val_2);
+    }
+    else if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_1) == 1)
+    {
+        TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, BACK_LIGHT_Val_1);
+    }
+    else
+    {
+        ;
+    }
+}

Firmware/Source/Application/BackLight.h

@@ -22,7 +22,7 @@
 #endif /* NULL */
 
 void Backlight_KL30_Wakeup_Init(void);
-
+void BackLight_Process(void);
 
 
 

Firmware/Source/Component/Menu/Menu_Interface.c

@@ -65,6 +65,10 @@ void Menu_User_Init(void)
 	Menu_Init_st.enMenuItemLen = MENU_ITEM_MAX;
 	Menu_Init_st.uintMenuConfig = 0x0001;
 	Menu_Init_st.uintMenuCursorMemoryDepth = 0;
+	Menu_Item_Select_Set(MENU_ITEM_SELECT_DAYTIME, 1);
+	Menu_Item_Select_Set(MENU_ITEM_BACKLIGHT_4, 1);
+	Menu_Item_Select_Set(MENU_ITEM_UNIT_KM, 1);
+	Menu_Item_Select_Set(MENU_ITEM_LANGUAGE_CHINESE, 1);
 	Menu_Init((uint8_t *)u8MenuRamData, (Menu_Item_Attribute_st_t *)stMenuItemAttribute, (Menu_Init_st_t *)&Menu_Init_st);
 }
 
@@ -76,6 +80,10 @@ void Menu_User_WAKEUP(void)
 	Menu_Init_st.enMenuItemLen = MENU_ITEM_MAX;
 	Menu_Init_st.uintMenuConfig = 0x0001;
 	Menu_Init_st.uintMenuCursorMemoryDepth = 0;
+	Menu_Item_Select_Set(MENU_ITEM_SELECT_DAYTIME, 1);
+	Menu_Item_Select_Set(MENU_ITEM_BACKLIGHT_4, 1);
+	Menu_Item_Select_Set(MENU_ITEM_UNIT_KM, 1);
+	Menu_Item_Select_Set(MENU_ITEM_LANGUAGE_CHINESE, 1);
 	Menu_Wake_Up_Init((uint8_t *)u8MenuRamData, (Menu_Item_Attribute_st_t *)stMenuItemAttribute, (Menu_Init_st_t *)&Menu_Init_st);
 }
 
@@ -326,12 +334,15 @@ void Menu_Logic_Operation_Bluetooth_Back(Menu_Key_en_t enKeyType)
 
 void Menu_Logic_Operation_Clock_Hour_Tenb(Menu_Key_en_t enKeyType) 
 {
-	// counter_val.time.RTC_Hours = (MenuData.Dis_Hour_Tenb*10 + MenuData.Dis_Hour_Bit);
-    // counter_val.time.RTC_Minutes = (MenuData.Dis_Minute_Tenb*10 + MenuData.Dis_Minute_Bit);
-	// if(MENU_KEY_CONFIRM_SHORT == enKeyType)
-	// {
-	// 	RTC_SetTime(&counter_val.time);
-	// }
+	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);
+
+	MenuData.Dis_Hour_Tenb = counter_val.time.RTC_Hours / 10;
+	MenuData.Dis_Hour_Bit = counter_val.time.RTC_Hours % 10;
+
+	MenuData.Dis_Minute_Tenb = counter_val.time.RTC_Minutes / 10;
+	MenuData.Dis_Minute_Bit = counter_val.time.RTC_Minutes % 10;
 }
 
 void Menu_Logic_Operation_Clock_Hour_Bit(Menu_Key_en_t enKeyType)
@@ -371,11 +382,7 @@ void Menu_Logic_Operation_Clock_Hour_Tenb_Set(Menu_Key_en_t enKeyType)
 	uint8_t updataDir = 0u;
 	uint8_t datmax = 0u;
 	uint8_t datmin = 0u;	
-	// 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);
-
-	// MenuData.Dis_Hour_Tenb = counter_val.time.RTC_Hours / 10;
+	
 
 	if(enKeyType == MENU_KEY_DOWN_SHORT)
 	{

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -68,6 +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);
     RTE_DEEPSLEEP_GPIO_Interrupt_Enable(KL15_AD_IN, Trigger_Rising);
     FaultCode_Init();
 }
@@ -110,7 +111,7 @@ static void Power_OVP_Init(void)
 static void Power_IG_OFF_Init(void)
 {
    Line_In_KL15_OFF_Init();
-   RTE_GPIO_Set_Level(Blacklight_PWM, 0);
+   TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 0);
 }
 
 static void Power_IG_ON_Init(void)
@@ -168,18 +169,10 @@ static Power_Status_em Power_Stay_OFF(void)
     }
     else
     {
-        if ((Common_GetIgnOffTime() < 1000))
+        if ((Common_GetIgnOffTime() < 20000))
         {
             u8PowerSts = EM_IGN_OFF;
         }
-        else
-        {
-            //igoff大于1s且下15电才进休眠,否则一直保持在igoff状态
-            //if(Sys_Read_KL15_Voltage() < 5000)
-            {
-               u8PowerSts = EM_IGN_Sleep_Init;
-            }
-        }
     }
 
     return u8PowerSts;
@@ -195,7 +188,7 @@ static Power_Status_em Power_Stay_Protect(void)
     /* 关闭所有外设，坪保留AD采集，电溝状思切�? */
     {
         TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 0);
-        CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);
+        //CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Disable);
     }
     u8PowerSts = EM_IGN_OFF_Init;
     /* 电溝模弝正常 */
@@ -208,15 +201,10 @@ static Power_Status_em Power_Stay_Protect(void)
  
         if ( SYS_OPR_STAT_RUN )
         {
-            CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
+            //CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
             return u8PowerSts;
         }
  
-        //进入异常电压,电源库里直接将15电等于0,则直接退出,状态是igoff,下15则进入休眠
-        // if ( SYS_OPR_STAT_IGN_OFF )
-        // {
-        //    break;
-        // }
     }
 }
 

Firmware/Source/System/Sys_Task_List.c

@@ -5,6 +5,7 @@
 #include "RTE.h"
 #include "UDS_ISO14229_Server.h"
 #include "FaultCode.h"
+extern _Menu_Data MenuData;
 
 void Sys_Pseudo_Real_Time_Tasks(void)
 {
@@ -53,17 +54,17 @@ void Sys_50ms_Tasks(void)
     g_u8Cursor_Posittion = Menu_Get_Current_Cursor_Information();
 
 
-    // if((MenuData.Dis_Hour_Tenb*10 + MenuData.Dis_Hour_Bit) > 23)
-    // {
-    //     MenuData.Dis_Hour_Tenb = 2;
-    //     MenuData.Dis_Hour_Bit = 3;
-    // }
+    if((MenuData.Dis_Hour_Tenb*10 + MenuData.Dis_Hour_Bit) > 23)
+    {
+        MenuData.Dis_Hour_Tenb = 2;
+        MenuData.Dis_Hour_Bit = 3;
+    }
 
-    // if((MenuData.Dis_Minute_Tenb*10 + MenuData.Dis_Minute_Bit) > 59)
-    // {
-    //     MenuData.Dis_Minute_Tenb = 5;
-    //     MenuData.Dis_Minute_Bit = 9;
-    // }
+    if((MenuData.Dis_Minute_Tenb*10 + MenuData.Dis_Minute_Bit) > 59)
+    {
+        MenuData.Dis_Minute_Tenb = 5;
+        MenuData.Dis_Minute_Bit = 9;
+    }
 }
 
 uint32_t ODOtest = 0;
@@ -82,6 +83,8 @@ void Sys_100ms_Tasks(void)
     //Data_Mileage_Clear();
 
     RTE_GPIO_Config(RTE_GPIO_PORT05_PIN04, GpioOut_High);
+    BackLight_Process();
+    //TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 100);
 
     // aaa = Menu_Item_Select_Get(MENU_ITEM_SELECT_AUTO);
 }