Merge branch 'dev' into LYK

Firmware/Source/Component/AMT630H/AMT630H_Datas.h

 #ifndef A69FAEFD_36D2_473A_A858_C02318EB402B
 #define A69FAEFD_36D2_473A_A858_C02318EB402B
 
+/*语言*/
 typedef enum
 {
-   PIC_DAYTIME_CH =0 ,//日间中文
-   PIC_NIGHTTIME_CH ,//夜间中文
-   PIC_DAYTIME_EN ,//日间英文
-   PIC_NIGHTTIME_EN ,//夜间英文
-   
+   PIC_DAYTIME_CH =0 ,//日间
+   PIC_NIGHTTIME_CH ,
+   PIC_DAYTIME_EN,//夜间
+   PIC_NIGHTTIME_EN,
+
    PIC_Max,
 }_Picture_Mode;
 
+/*日间夜间自动*/
+typedef enum
+{
+   ModeDAY =0 ,//日间中文
+   ModeNIGHT ,
+   ModeATUO, 
+}_g_u8Display_Mode;
 
+/*语言设置*/
 typedef enum
 {
-   MAIN_MENU = 0,
-   SETTING_MENU , 
+   CH = 0,
+   EN , 
    
-}_MENU_MODE;
+}_g_u8Language;
+
+typedef enum
+{
+   Backlight_1 =0 ,
+   Backlight_2 ,
+   Backlight_3 ,
+   Backlight_4 ,
+   Backlight_5,
+   Backlight_ATUO,
+
+}_g_u8Backlight;
+
+
 
 
 extern void AMT630H_GUI_DisplayProc(void);

Firmware/Source/Component/Menu/Menu.h

@@ -35,51 +35,51 @@ typedef unsigned int Menu_uint32_t;
 typedef enum
 {
 	MENU_ITEM_MAIN_ITEM = 0,				/*主界面*/
-	MENU_ITEM_DISPLAY_MODE,  			    /*00 显示模式*/
-	MENU_ITEM_BACKLIGHT_SETTING,   			/*04 背光设置*/
-	MENU_ITEM_BLUETOOTH_CONNECT,   			/*11 蓝牙连接*/
-	MENU_ITEM_CLOCK_SETTING,  	  			/*15 时钟设置*/
-	MENU_ITEM_UNIT_SETTING,	   				/*21 单位设置*/
-	MENU_ITEM_LANGUAGE_SETTING,				/*24 语言设置*/
-	MENU_ITEM_FAULT_INFORMATION,			/*27 故障信息*/
-	MENU_ITEM_PHONE_CONNECT,  				/*28 手机互联*/
-	MENU_ITEM_QUIT,  						/*29 退出*/
+	MENU_ITEM_DISPLAY_MODE,  			    /*01 显示模式*/
+	MENU_ITEM_BACKLIGHT_SETTING,   			/*02 背光设置*/
+	MENU_ITEM_BLUETOOTH_CONNECT,   			/*03 蓝牙连接*/
+	MENU_ITEM_CLOCK_SETTING,  	  			/*04 时钟设置*/
+	MENU_ITEM_UNIT_SETTING,	   				/*05 单位设置*/
+	MENU_ITEM_LANGUAGE_SETTING,				/*06 语言设置*/
+	MENU_ITEM_FAULT_INFORMATION,			/*07 故障信息*/
+	MENU_ITEM_PHONE_CONNECT,  				/*08 手机互联*/
+	MENU_ITEM_QUIT,  						/*09 退出*/
 
-	MENU_ITEM_SELECT_DAYTIME,	   			/*01 选中日间*/
-	MENU_ITEM_SELECT_NIGHTTIME,    			/*02 选中夜间*/
-	MENU_ITEM_SELECT_AUTO,	       			/*03 选中自动*/
+	MENU_ITEM_SELECT_DAYTIME,	   			/*10 选中日间*/
+	MENU_ITEM_SELECT_NIGHTTIME,    			/*11 选中夜间*/
+	MENU_ITEM_SELECT_AUTO,	       			/*12 选中自动*/
 
-	MENU_ITEM_BACKLIGHT_5,	       			/*10 背光_5*/
-	MENU_ITEM_BACKLIGHT_4,		   			/*09 背光_4*/
-	MENU_ITEM_BACKLIGHT_3,	   	   			/*08 背光_3*/
-	MENU_ITEM_BACKLIGHT_2,        			/*07 背光_2*/
-	MENU_ITEM_BACKLIGHT_1,	      			/*06 背光_1*/
-	MENU_ITEM_BACKLIGHT_AUTO,	 			/*05 背光自动*/
+	MENU_ITEM_BACKLIGHT_5,	       			/*13 背光_5*/
+	MENU_ITEM_BACKLIGHT_4,		   			/*14 背光_4*/
+	MENU_ITEM_BACKLIGHT_3,	   	   			/*15 背光_3*/
+	MENU_ITEM_BACKLIGHT_2,        			/*16 背光_2*/
+	MENU_ITEM_BACKLIGHT_1,	      			/*17 背光_1*/
+	MENU_ITEM_BACKLIGHT_AUTO,	 			/*18 背光自动*/
 
-	MENU_ITEM_BLUETOOTH_OPEN_CLOSE,         /*12 蓝牙_开*/
-	MENU_ITEM_BLUETOOTH_SYNC,	   	        /*13 蓝牙同步联系人*/
-	MENU_ITEM_BLUETOOTH_BACK,	   			/*14 蓝牙返回*/
+	MENU_ITEM_BLUETOOTH_OPEN_CLOSE,         /*19 蓝牙_开*/
+	MENU_ITEM_BLUETOOTH_SYNC,	   	        /*20 蓝牙同步联系人*/
+	MENU_ITEM_BLUETOOTH_BACK,	   			/*30 蓝牙返回*/
 
-	MENU_ITEM_CLOCK_HOUR_TENB,	    		/*20 时钟小时十位*/
-	MENU_ITEM_CLOCK_HOUR_BIT,				/*19 时钟小时个位*/
-	MENU_ITEM_CLOCK_MIN_TENB,	  			/*18 时钟分钟十位*/
-	MENU_ITEM_CLOCK_MIN_BIT,	  			/*17 时钟分钟个位*/
-	MENU_ITEM_CLOCK_BACK, 	      			/*16 时钟返回*/
+	MENU_ITEM_CLOCK_HOUR_TENB,	    		/*31 时钟小时十位*/
+	MENU_ITEM_CLOCK_HOUR_BIT,				/*32 时钟小时个位*/
+	MENU_ITEM_CLOCK_MIN_TENB,	  			/*33 时钟分钟十位*/
+	MENU_ITEM_CLOCK_MIN_BIT,	  			/*34 时钟分钟个位*/
+	MENU_ITEM_CLOCK_BACK, 	      			/*35 时钟返回*/
 
-	MENU_ITEM_CLOCK_HOUR_TENB_SET,	    		/*20 时钟小时十位*/
-	MENU_ITEM_CLOCK_HOUR_BIT_SET,				/*19 时钟小时个位*/
-	MENU_ITEM_CLOCK_MIN_TENB_SET,	  			/*18 时钟分钟十位*/
-	MENU_ITEM_CLOCK_MIN_BIT_SET,	  			/*17 时钟分钟个位*/
+	MENU_ITEM_CLOCK_HOUR_TENB_SET,	    		/*36 时钟小时十位*/
+	MENU_ITEM_CLOCK_HOUR_BIT_SET,				/*37 时钟小时个位*/
+	MENU_ITEM_CLOCK_MIN_TENB_SET,	  			/*38 时钟分钟十位*/
+	MENU_ITEM_CLOCK_MIN_BIT_SET,	  			/*39 时钟分钟个位*/
 
-	MENU_ITEM_UNIT_KM,	   					/*22 选中公制*/
-	MENU_ITEM_UNIT_MILE,	   				/*23 选中英制*/
+	MENU_ITEM_UNIT_KM,	   					/*40 选中公制*/
+	MENU_ITEM_UNIT_MILE,	   				/*41 选中英制*/
 		
-	MENU_ITEM_LANGUAGE_CHINESE,   			/*25 选中中文*/
-	MENU_ITEM_LANGUAGE_ENGLISH,	   			/*26 选中英文*/
+	MENU_ITEM_LANGUAGE_CHINESE,   			/*42 选中中文*/
+	MENU_ITEM_LANGUAGE_ENGLISH,	   			/*43 选中英文*/
 
 	MENU_ITEM_PHONE_CONNECT_SET,
 		
-	MENU_ITEM_PHONE_CONNECT_APP,  			/*28 手机互联成功*/
+	MENU_ITEM_PHONE_CONNECT_APP,  			/*44 手机互联成功*/
 		
 	MENU_ITEM_MAX,
 } Menu_Item_en_t;