Commit 7341515d authored by 王雅楠's avatar 王雅楠

feat:新增“自动”显示模式

parent 2385fd04
...@@ -20,7 +20,7 @@ User definitions ...@@ -20,7 +20,7 @@ User definitions
typedef unsigned short MD_STATUS; typedef unsigned short MD_STATUS;
#define HAS_BOOTLOADER (1u) // 仅仿真App时设置为0 #define HAS_BOOTLOADER (0u) // 仅仿真App时设置为0
#define APP_BASE (0x0000C400ul) #define APP_BASE (0x0000C400ul)
/* Status list definition */ /* Status list definition */
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
uint8_t Pic_mode = PIC_DAYTIME_CH; uint8_t Pic_mode = PIC_DAYTIME_CH;
uint8_t g_u8Display_Mode = ModeDAY; uint8_t g_u8Display_Mode = ModeDAY;
uint8_t g_u8Display_Mode_select = ModeDAY;
uint8_t g_u8Language = CH; uint8_t g_u8Language = CH;
uint8_t g_u8Backlight = Backlight_4 ; uint8_t g_u8Backlight = Backlight_4 ;
uint8_t g_u8UnitSetting = Metric ; uint8_t g_u8UnitSetting = Metric ;
...@@ -282,7 +283,7 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight ...@@ -282,7 +283,7 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
*/ */
void AMT630H_GUI_Display_Mode_Information() void AMT630H_GUI_Display_Mode_Information()
{ {
if (g_u8Display_Mode == ModeDAY) if (g_u8Display_Mode_select == ModeDAY)
{ {
if(g_u8Language == CH)/*日间中文*/ if(g_u8Language == CH)/*日间中文*/
{ {
...@@ -309,7 +310,7 @@ void AMT630H_GUI_Display_Mode_Information() ...@@ -309,7 +310,7 @@ void AMT630H_GUI_Display_Mode_Information()
SetPagePic(GRAPHICS_PAGE_0, Pic_0074_422_103); SetPagePic(GRAPHICS_PAGE_0, Pic_0074_422_103);
} }
} }
else if(g_u8Display_Mode == ModeNIGHT) else if(g_u8Display_Mode_select == ModeNIGHT)
{ {
if(g_u8Language == CH)/*夜间中文*/ if(g_u8Language == CH)/*夜间中文*/
{ {
...@@ -334,8 +335,43 @@ void AMT630H_GUI_Display_Mode_Information() ...@@ -334,8 +335,43 @@ void AMT630H_GUI_Display_Mode_Information()
SetPagePic(GRAPHICS_PAGE_0, Pic_0262_461_118); SetPagePic(GRAPHICS_PAGE_0, Pic_0262_461_118);
} }
} }
else if(g_u8Display_Mode_select == ModeATUO)
/*else if自动模式没写*/ {
if(g_u8Display_Mode == ModeDAY)
{
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0146_27_396);/*下方菜单*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0150_448_343);
SetPagePic(GRAPHICS_PAGE_0, Pic_0148_472_231);
SetPagePic(GRAPHICS_PAGE_0, Pic_0151_476_117);
}
else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0071_18_397);/*下方菜单*/
SetPagePic(GRAPHICS_PAGE_0, Pic_0075_409_345);
SetPagePic(GRAPHICS_PAGE_0, Pic_0073_456_232);
SetPagePic(GRAPHICS_PAGE_0, Pic_0076_461_118);
}
}
else if(g_u8Display_Mode == ModeNIGHT)
{
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0333_27_396);
SetPagePic(GRAPHICS_PAGE_0, Pic_0337_448_343);
SetPagePic(GRAPHICS_PAGE_0, Pic_0335_472_231);
SetPagePic(GRAPHICS_PAGE_0, Pic_0338_476_117);
}
else if(g_u8Language == EN)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0257_18_397);
SetPagePic(GRAPHICS_PAGE_0, Pic_0261_409_345);
SetPagePic(GRAPHICS_PAGE_0, Pic_0259_456_232);
SetPagePic(GRAPHICS_PAGE_0, Pic_0262_461_118);
}
}
}
} }
...@@ -1444,6 +1480,7 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示 ...@@ -1444,6 +1480,7 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_DAYTIME) == 1) if(Menu_Item_Select_Get(MENU_ITEM_SELECT_DAYTIME) == 1)
{ {
g_u8Display_Mode = ModeDAY; g_u8Display_Mode = ModeDAY;
g_u8Display_Mode_select = ModeDAY;
} }
else else
{ {
...@@ -1474,6 +1511,7 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示 ...@@ -1474,6 +1511,7 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_NIGHTTIME) == 1) if(Menu_Item_Select_Get(MENU_ITEM_SELECT_NIGHTTIME) == 1)
{ {
g_u8Display_Mode = ModeNIGHT; g_u8Display_Mode = ModeNIGHT;
g_u8Display_Mode_select = ModeNIGHT;
} }
else else
{ {
...@@ -1502,7 +1540,15 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示 ...@@ -1502,7 +1540,15 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
} }
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_AUTO) == 1) if(Menu_Item_Select_Get(MENU_ITEM_SELECT_AUTO) == 1)
{ {
g_u8Display_Mode = ModeATUO; g_u8Display_Mode_select = ModeATUO;
if(LightR_Status == 0)
{
g_u8Display_Mode = ModeNIGHT;
}
else if(LightR_Status == 1)
{
g_u8Display_Mode = ModeDAY;
}
} }
else else
{ {
...@@ -1541,6 +1587,7 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示 ...@@ -1541,6 +1587,7 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_DAYTIME) == 1) if(Menu_Item_Select_Get(MENU_ITEM_SELECT_DAYTIME) == 1)
{ {
g_u8Display_Mode = ModeDAY; g_u8Display_Mode = ModeDAY;
g_u8Display_Mode_select = ModeDAY;
} }
else else
{ {
...@@ -1572,6 +1619,7 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示 ...@@ -1572,6 +1619,7 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_NIGHTTIME) == 1) if(Menu_Item_Select_Get(MENU_ITEM_SELECT_NIGHTTIME) == 1)
{ {
g_u8Display_Mode = ModeNIGHT; g_u8Display_Mode = ModeNIGHT;
g_u8Display_Mode_select = ModeNIGHT;
} }
else else
{ {
...@@ -1601,7 +1649,15 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示 ...@@ -1601,7 +1649,15 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
} }
if(Menu_Item_Select_Get(MENU_ITEM_SELECT_AUTO) == 1) if(Menu_Item_Select_Get(MENU_ITEM_SELECT_AUTO) == 1)
{ {
g_u8Display_Mode = ModeATUO ; g_u8Display_Mode_select = ModeATUO;
if(LightR_Status == 0)
{
g_u8Display_Mode = ModeNIGHT;
}
else if(LightR_Status == 1)
{
g_u8Display_Mode = ModeDAY;
}
} }
else else
{ {
...@@ -1612,6 +1668,10 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示 ...@@ -1612,6 +1668,10 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
break; break;
} }
} }
else
{
;
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment