Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
haoJin750TFT
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
时昊
haoJin750TFT
Commits
7341515d
Commit
7341515d
authored
Aug 19, 2024
by
王雅楠
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
feat:新增“自动”显示模式
parent
2385fd04
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
67 additions
and
7 deletions
+67
-7
userdefine.h
...BAT32A279/MDK_ARM/RTE/Device/BAT32A279KM64FB/userdefine.h
+1
-1
AMT630H_Datas.c
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
+66
-6
No files found.
Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/RTE/Device/BAT32A279KM64FB/userdefine.h
View file @
7341515d
...
...
@@ -20,7 +20,7 @@ User definitions
typedef
unsigned
short
MD_STATUS
;
#define HAS_BOOTLOADER (
1
u) // 仅仿真App时设置为0
#define HAS_BOOTLOADER (
0
u) // 仅仿真App时设置为0
#define APP_BASE (0x0000C400ul)
/* Status list definition */
...
...
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @
7341515d
...
...
@@ -3,6 +3,7 @@
uint8_t
Pic_mode
=
PIC_DAYTIME_CH
;
uint8_t
g_u8Display_Mode
=
ModeDAY
;
uint8_t
g_u8Display_Mode_select
=
ModeDAY
;
uint8_t
g_u8Language
=
CH
;
uint8_t
g_u8Backlight
=
Backlight_4
;
uint8_t
g_u8UnitSetting
=
Metric
;
...
...
@@ -282,7 +283,7 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
*/
void
AMT630H_GUI_Display_Mode_Information
()
{
if
(
g_u8Display_Mode
==
ModeDAY
)
if
(
g_u8Display_Mode
_select
==
ModeDAY
)
{
if
(
g_u8Language
==
CH
)
/*日间中文*/
{
...
...
@@ -309,7 +310,7 @@ void AMT630H_GUI_Display_Mode_Information()
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
)
/*夜间中文*/
{
...
...
@@ -334,8 +335,43 @@ void AMT630H_GUI_Display_Mode_Information()
SetPagePic
(
GRAPHICS_PAGE_0
,
Pic_0262_461_118
);
}
}
/*else if自动模式没写*/
else
if
(
g_u8Display_Mode_select
==
ModeATUO
)
{
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) /*图 显示
if
(
Menu_Item_Select_Get
(
MENU_ITEM_SELECT_DAYTIME
)
==
1
)
{
g_u8Display_Mode
=
ModeDAY
;
g_u8Display_Mode_select
=
ModeDAY
;
}
else
{
...
...
@@ -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
)
{
g_u8Display_Mode
=
ModeNIGHT
;
g_u8Display_Mode_select
=
ModeNIGHT
;
}
else
{
...
...
@@ -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
)
{
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
{
...
...
@@ -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
)
{
g_u8Display_Mode
=
ModeDAY
;
g_u8Display_Mode_select
=
ModeDAY
;
}
else
{
...
...
@@ -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
)
{
g_u8Display_Mode
=
ModeNIGHT
;
g_u8Display_Mode_select
=
ModeNIGHT
;
}
else
{
...
...
@@ -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
)
{
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
{
...
...
@@ -1612,6 +1668,10 @@ void AMT630H_GUI_Display_Mode_Setting(Menu_Item_en_t display_mode) /*图 显示
break
;
}
}
else
{
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment